From c2d66943d328881e37a590cdce48e343d9db4a20 Mon Sep 17 00:00:00 2001
From: Alastair Holland <hollan84@coventry.ac.uk>
Date: Sun, 3 May 2020 01:08:26 +0100
Subject: [PATCH] Deleted old files

---
 .gitignore                        |   1 +
 NewLogin.py                       |  70 ------------------------------
 __pycache__/status.cpython-37.pyc | Bin
 setup.py                          |   2 +
 status.py                         |  20 ---------
 5 files changed, 3 insertions(+), 90 deletions(-)
 delete mode 100755 NewLogin.py
 mode change 100644 => 100755 __pycache__/status.cpython-37.pyc
 delete mode 100644 status.py

diff --git a/.gitignore b/.gitignore
index 4c49bd7..e40a23e 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .env
+nicknames/
\ No newline at end of file
diff --git a/NewLogin.py b/NewLogin.py
deleted file mode 100755
index a791e4c..0000000
--- a/NewLogin.py
+++ /dev/null
@@ -1,70 +0,0 @@
-import os
-
-import discord
-import status
-from mcstatus import MinecraftServer
-from datetime import datetime
-from datetime import timedelta
-from discord.ext import commands, tasks
-import difflib
-import asyncio
-server = MinecraftServer("192.168.0.89", 25565)
-
-status = server.status()
-print("The server has {0} players and replied in {1} ms".format(status.players.online, status.latency))
-query = server.query()
-print("The server has the following players online: {0}".format(", ".join(query.players.names)))
-
-
-client = discord.Client()
-
-@client.event
-async def on_ready():
-    print(f'{client.user} has connected to Discord!')
-
-async def checkLogin():
-	server = MinecraftServer("192.168.0.89", 25565)
-	oldPlayers = ""
-	while not client.is_closed():
-		msg = ""
-		query = server.query()
-		currentPlayers = "".join(query.players.names)
-		print(currentPlayers)
-		msg = currentPlayers
-		checkNicknames = msg.split("\n - ")
-		for i in checkNicknames:
-			path = "nicknames/" + i
-			try:
-				n = open(path, "r")
-				nick = i + " [" + n.read() + "]"
-				msg = msg.replace(i, nick)
-				n.close()
-			except:
-				msg = msg
-		login = msg
-		logout = msg
-		for i,s in enumerate(difflib.ndiff(msg, oldPlayers)):
-			if s[0] == ' ':
-				continue
-			elif s[0]=="-":
-				logout = logout + (u'"{}"'.format(s[-1])) + "\n"
-			elif s[0]=="+":
-				login = login + (u'"{}"'.format(s[-1])) + "\n"
-		for i in login:
-			msg = msg + i
-		msg = msg + " logged in"
-		for i in logout:
-			msg = msg + i
-		msg = msg + " logged out"
-		oldPlayers = currentPlayers
-		if msg == "":
-			print("Nobody logged in")
-		else:
-			channel = client.get_channel(694572684566331473)
-			await channel.send(msg)
-		await asyncio.sleep(10)
-		
-
-client.loop.create_task(checkLogin())
-client.run(token)
-
diff --git a/__pycache__/status.cpython-37.pyc b/__pycache__/status.cpython-37.pyc
old mode 100644
new mode 100755
diff --git a/setup.py b/setup.py
index 0493c61..bcdc49c 100755
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,7 @@
 def environment():
     import os.path
     
+    '''Checks to see if there is an environment file'''
     if os.path.isfile('.env'):
         overwrite = input("Would you like to overwrite your current credentials? (y/n)")
         overwrite = overwrite.lower()
@@ -9,6 +10,7 @@ def environment():
         else:
             return
 
+    '''Gets information'''
     token = input("Input your bot token here > ")
     serverIP = input("Input your server URL/IP here > ")
     port = input("Input your bot port here (If you don't know it, leave blank) > ")
diff --git a/status.py b/status.py
deleted file mode 100644
index 8d31f78..0000000
--- a/status.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#from mcstatus import MinecraftServer
-
-# If you know the host and port, you may skip this and use MinecraftServer("example.org", 1234)
-#server = MinecraftServer.lookup("example.org:1234")
-
-# 'status' is supported by all Minecraft servers that are version 1.7 or higher.
-#status = server.status()
-#print("The server has {0} players and replied in {1} ms".format(status.players.online, status.latency))
-
-# 'ping' is supported by all Minecraft servers that are version 1.7 or higher.
-# It is included in a 'status' call, but is exposed separate if you do not require the additional info.
-#latency = server.ping()
-#print("The server replied in {0} ms".format(latency))
-
-# 'query' has to be enabled in a servers' server.properties file.
-# It may give more information than a ping, such as a full player list or mod information.
-def playerStatus(server):
-	query = server.query()
-	return("The server has the following players online: {0}".format(", ".join(query.players.names)))
-