alemi/aiocraft
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

implemented offline mode

Browse source
This commit is contained in:
əlemi 2021-12-09 12:39:02 +01:00
parent 4c69fc4080
commit 96e76fca4c
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
aiocraft/client.py
View file

@ -60,6 +60,7 @@ class MinecraftClient(CallbacksHolder, Runnable):
username:Optional[str] = None, username:Optional[str] = None,
password:Optional[str] = None, password:Optional[str] = None,
token:Optional[Token] = None, token:Optional[Token] = None,
online_mode:bool = True,
reconnect:bool = True, reconnect:bool = True,
reconnect_delay:float = 10.0, reconnect_delay:float = 10.0,
keep_alive:bool = True, keep_alive:bool = True,
@ -80,6 +81,7 @@ class MinecraftClient(CallbacksHolder, Runnable):
self.token = token self.token = token
self.username = username self.username = username
self.password = password self.password = password
self.online_mode = online_mode
self.dispatcher = Dispatcher() self.dispatcher = Dispatcher()
self._processing = False self._processing = False
@ -168,11 +170,12 @@ class MinecraftClient(CallbacksHolder, Runnable):
async def _client_worker(self): async def _client_worker(self):
while self._processing: while self._processing:
try: if self.online_mode:
await self.authenticate() try:
except AuthException as e: await self.authenticate()
self._logger.error(str(e)) except AuthException as e:
break self._logger.error(str(e))
break
try: try:
await self.dispatcher.connect(self.host, self.port) await self.dispatcher.connect(self.host, self.port)
await self._handshake() await self._handshake()
@ -205,7 +208,7 @@ class MinecraftClient(CallbacksHolder, Runnable):
await self.dispatcher.write( await self.dispatcher.write(
PacketLoginStart( PacketLoginStart(
340, 340,
username=self.token.profile.name if self.token else self.username username=self.token.profile.name if self.online_mode and self.token else self.username
) )
) )
return True return True
@ -214,13 +217,19 @@ class MinecraftClient(CallbacksHolder, Runnable):
self.dispatcher.state = ConnectionState.LOGIN self.dispatcher.state = ConnectionState.LOGIN
async for packet in self.dispatcher.packets(): async for packet in self.dispatcher.packets():
if isinstance(packet, PacketEncryptionBegin): if isinstance(packet, PacketEncryptionBegin):
if not self.online_mode:
self._logger.error("Cannot answer Encryption Request in offline mode")
return False
if not self.token:
self._logger.error("No available token to enable encryption")
return False
secret = encryption.generate_shared_secret() secret = encryption.generate_shared_secret()
token, encrypted_secret = encryption.encrypt_token_and_secret( token, encrypted_secret = encryption.encrypt_token_and_secret(
packet.publicKey, packet.publicKey,
packet.verifyToken, packet.verifyToken,
secret secret
) )
if packet.serverId != '-' and self.token: if packet.serverId != '-':
try: try:
await self.token.join( await self.token.join(
encryption.generate_verification_hash( encryption.generate_verification_hash(
@ -232,7 +241,9 @@ class MinecraftClient(CallbacksHolder, Runnable):
except AuthException: except AuthException:
self._logger.error("Could not authenticate with Mojang") self._logger.error("Could not authenticate with Mojang")
self._authenticated = False self._authenticated = False
break return False
else:
self._logger.warning("Server gave an offline-mode serverId but still requested Encryption")
encryption_response = PacketEncryptionResponse( encryption_response = PacketEncryptionResponse(
340, # TODO!!!! 340, # TODO!!!!
sharedSecret=encrypted_secret, sharedSecret=encrypted_secret,
@ -250,7 +261,7 @@ class MinecraftClient(CallbacksHolder, Runnable):
return True return True
elif isinstance(packet, PacketDisconnect): elif isinstance(packet, PacketDisconnect):
self._logger.error("Kicked while logging in : %s", helpers.parse_chat(packet.reason)) self._logger.error("Kicked while logging in : %s", helpers.parse_chat(packet.reason))
break return False
return False return False
async def _play(self) -> bool: async def _play(self) -> bool: