tanner/minecraft-bot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch USERNAME to EMAIL to avoid collisions

Browse Source
This commit is contained in:
Tanner Collin 2021-05-01 23:34:43 +00:00
parent 0d2be1378f
commit a41d9f2793
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -41,7 +41,7 @@ $ SERVER=localhost PORT=12345 ./run_linux.sh
If you have your own alt account for the bot: If you have your own alt account for the bot:
``` ```
$ USERNAME=you@domain.com PASSWORD=supersecret SERVER=minecraft.example.com ./run_linux.sh $ EMAIL=you@domain.com PASSWORD=supersecret SERVER=minecraft.example.com ./run_linux.sh
``` ```
## Commands ## Commands

16
mosfet/bot.py
View File

@ -240,7 +240,7 @@ def init(global_state):
g.maximum_supply_slots = 33 g.maximum_supply_slots = 33
def bot(global_state): def bot(global_state):
USERNAME = os.getenv('USERNAME') EMAIL = os.getenv('EMAIL')
PASSWORD = os.getenv('PASSWORD') PASSWORD = os.getenv('PASSWORD')
SERVER = os.getenv('SERVER') SERVER = os.getenv('SERVER')
PORT = int(os.environ.get('PORT', 25565)) PORT = int(os.environ.get('PORT', 25565))
@ -257,28 +257,28 @@ def bot(global_state):
print('SERVER=localhost PORT=12345 ./run_linux.sh') print('SERVER=localhost PORT=12345 ./run_linux.sh')
print() print()
print('If you want to use your own account:') print('If you want to use your own account:')
print('USERNAME=you@domain.com PASSWORD=supersecret SERVER=minecraft.example.com ./run_linux.sh') print('EMAIL=you@domain.com PASSWORD=supersecret SERVER=minecraft.example.com ./run_linux.sh')
os._exit(0) os._exit(0)
elif not g.connection: elif not g.connection:
if USERNAME and PASSWORD: if EMAIL and PASSWORD:
auth_token = authentication.AuthenticationToken() auth_token = authentication.AuthenticationToken()
try: try:
auth_token.authenticate(USERNAME, PASSWORD) auth_token.authenticate(EMAIL, PASSWORD)
except YggdrasilError as e: except YggdrasilError as e:
print(e) print(e)
os._exit(0) os._exit(0)
print("Logged in as %s..." % auth_token.username) print("Logged in as %s..." % auth_token.username)
g.connection = Connection(SERVER, PORT, auth_token=auth_token) g.connection = Connection(SERVER, PORT, auth_token=auth_token)
elif USERNAME: elif EMAIL:
print('No password provided, attempting to connect in offline mode...') print('No password provided, attempting to connect in offline mode...')
g.connection = Connection(SERVER, PORT, username=USERNAME) g.connection = Connection(SERVER, PORT, username=EMAIL)
else: else:
print('No username or password provided, using burner minecraft account...') print('No username or password provided, using burner minecraft account...')
USERNAME = 'moc.liamg@monortem'[::-1] EMAIL = 'moc.liamg@monortem'[::-1]
PASSWORD = '!8891anteR'[::-1] PASSWORD = '!8891anteR'[::-1]
auth_token = authentication.AuthenticationToken() auth_token = authentication.AuthenticationToken()
try: try:
auth_token.authenticate(USERNAME, PASSWORD) auth_token.authenticate(EMAIL, PASSWORD)
except YggdrasilError as e: except YggdrasilError as e:
print(e) print(e)
os._exit(0) os._exit(0)