changes for player type, install return instance, fixes

src/treepuncher/game/tablist.py

@@ -1,16 +1,24 @@
 import uuid
 import datetime
 
+from enum import Enum
 from typing import Dict, List
 
-from aiocraft.mc.definitions import Item
+from aiocraft.mc.definitions import Player
 from aiocraft.mc.proto import PacketPlayerInfo
 
 from ..scaffold import Scaffold
 from ..events import ConnectedEvent
 
+class ActionType(Enum): # TODO move this in aiocraft
+	ADD_PLAYER = 0
+	UPDATE_GAMEMODE = 1
+	UPDATE_LATENCY = 2
+	UPDATE_DISPLAY_NAME = 3
+	REMOVE_PLAYER = 4
+
 class GameTablist(Scaffold):
-	tablist : Dict[uuid.UUID, dict]
+	tablist : Dict[uuid.UUID, Player]
 
 	def __init__(self, *args, **kwargs):
 		super().__init__(*args, **kwargs)
@@ -25,18 +33,18 @@ class GameTablist(Scaffold):
 		async def tablist_update(packet:PacketPlayerInfo):
 			for record in packet.data:
 				uid = record['UUID']
-				if packet.action != 0 and uid not in self.tablist:
+				if packet.action != ActionType.ADD_PLAYER.value and uid not in self.tablist:
 					continue # TODO this happens kinda often but doesn't seem to be an issue?
-				if packet.action == 0:
+				if packet.action == ActionType.ADD_PLAYER.value:
-					self.tablist[uid] = record
+					record['joinTime'] = datetime.datetime.now()
-					self.tablist[uid]['joinTime'] = datetime.datetime.now()
+					self.tablist[uid] = Player(**record) # TODO have it be a Player type inside packet
-				elif packet.action == 1:
+				elif packet.action == ActionType.UPDATE_GAMEMODE.value:
-					self.tablist[uid]['gamemode'] = record['gamemode']
+					self.tablist[uid].gamemode = record['gamemode']
-				elif packet.action == 2:
+				elif packet.action == ActionType.UPDATE_LATENCY.value:
-					self.tablist[uid]['ping'] = record['ping']
+					self.tablist[uid].ping = record['ping']
-				elif packet.action == 3:
+				elif packet.action == ActionType.UPDATE_DISPLAY_NAME.value:
-					self.tablist[uid]['displayName'] = record['displayName']
+					self.tablist[uid].displayName = record['displayName']
-				elif packet.action == 4:
+				elif packet.action == ActionType.REMOVE_PLAYER.value:
 					self.tablist.pop(uid, None)
 
 

src/treepuncher/traits/callbacks.py

@@ -49,5 +49,4 @@ class CallbacksHolder:
 
 	async def join_callbacks(self):
 		await asyncio.gather(*list(self._tasks.values()))
-		self._tasks.clear()
 

src/treepuncher/treepuncher.py

@@ -159,7 +159,7 @@ class Treepuncher(
 		await super().stop()
 		self.logger.info("Treepuncher stopped")
 
-	def install(self, module: Type[Addon]) -> Type[Addon]:
+	def install(self, module: Type[Addon]) -> Addon:
 		m = module(self)
 		if isinstance(m, Provider):
 			self.notifier.add_provider(m)
@@ -167,7 +167,7 @@ class Treepuncher(
 			self.modules.append(m)
 		else:
 			raise ValueError("Given type is not an addon")
-		return module
+		return m
 
 	async def _work(self):
 		try:
@@ -189,13 +189,12 @@ class Treepuncher(
 					await self.join()
 				except OSError as e:
 					self.logger.error("Connection error : %s", str(e))
-				except AuthException as e:
-					self.logger.error("Auth exception : [%s|%d] %s (%s)", e.endpoint, e.code, e.data, e.kwargs)
-					break
 
 				if self._processing: # don't sleep if Treepuncher is stopping
 					await asyncio.sleep(self.cfg.getfloat('reconnect_delay', fallback=5))
 
+		except AuthException as e:
+			self.logger.error("Auth exception : [%s|%d] %s (%s)", e.endpoint, e.code, e.data, e.kwargs)
 		except Exception:
 			self.logger.exception("Unhandled exception")