README.md

@@ -6,21 +6,13 @@ Mosfet is able to farm wood by cutting trees, gather sand, gather netherwart,
 and trade with villagers to get emeralds. He can eat, sleep, and flee from
 threats.
 
-## Requirements
-- Python >= 3.8
-- pip
-- virtualenv
-- git
-- wget
-- unzip
-
 ## Linux Setup
 
 Assuming Debian / Ubuntu based distro:
 
 ```
 $ sudo apt update
-$ sudo apt install build-essential python3 python3-dev python3-pip python3-virtualenv virtualenv git wget unzip
+$ sudo apt install build-essential python3 python3-dev python3-pip python3-virtualenv git wget unzip
 
 $ git clone https://git.tannercollin.com/tanner/minecraft-bot.git
 $ cd minecraft-bot/

mosfet/bot.py

@@ -3,15 +3,14 @@ if __name__ == '__main__':
     exit(1)
 
 import os
-import sys
 import time
 import importlib
 from math import floor, ceil
 from copy import copy
 
-USERNAME = os.getenv('USERNAME')
-PASSWORD = os.getenv('PASSWORD')
-SERVER = os.getenv('SERVER')
+USERNAME = os.environ['USERNAME']
+PASSWORD = os.environ['PASSWORD']
+SERVER = os.environ['SERVER']
 PORT = int(os.environ.get('PORT', 25565))
 
 from . import monkey_patch # must be before any possible pyCraft imports
@@ -250,22 +249,15 @@ def bot(global_state):
     if not g.mcdata:
         g.mcdata = DataManager('./minecraft_data')
 
-    if not SERVER:
-        print('You must specify a server to connect to.')
-        sys.exit()
-    elif not g.connection:
-        if USERNAME and PASSWORD:
-            auth_token = authentication.AuthenticationToken()
-            try:
-                auth_token.authenticate(USERNAME, PASSWORD)
-            except YggdrasilError as e:
-                print(e)
-                sys.exit()
-            print("Logged in as %s..." % auth_token.username)
-            g.connection = Connection(SERVER, PORT, auth_token=auth_token)
-        elif USERNAME:
-            print('No password provided, attempting to connect in offline mode...')
-            g.connection = Connection(SERVER, PORT, username=USERNAME)
+    if not g.connection:
+        auth_token = authentication.AuthenticationToken()
+        try:
+            auth_token.authenticate(USERNAME, PASSWORD)
+        except YggdrasilError as e:
+            print(e)
+            sys.exit()
+        print("Logged in as %s..." % auth_token.username)
+        g.connection = Connection(SERVER, PORT, auth_token=auth_token)
 
         g.chunks = ChunksManager(g.mcdata)