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

fix: correctly process 1.16 dimension and difficulty

Browse source
This commit is contained in:
əlemi 2023-03-17 10:33:38 +01:00
parent 82cd2fbf1d
commit e6a1ecc5c4
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/treepuncher/game/state.py
View file

@ -1,10 +1,12 @@
import asyncio import asyncio
import datetime import datetime
import json
#from aiocraft.client import MinecraftClient #from aiocraft.client import MinecraftClient
from aiocraft.mc.definitions import Gamemode, Dimension, Difficulty from aiocraft.mc.definitions import Gamemode, Dimension, Difficulty
from aiocraft.mc.proto import ( from aiocraft.mc.proto import (
PacketRespawn, PacketLogin, PacketUpdateHealth, PacketExperience, PacketSettings, PacketClientCommand, PacketAbilities PacketRespawn, PacketLogin, PacketUpdateHealth, PacketExperience, PacketSettings,
PacketClientCommand, PacketAbilities, PacketDifficulty
) )
from ..events import JoinGameEvent, DeathEvent, DisconnectedEvent from ..events import JoinGameEvent, DeathEvent, DisconnectedEvent
@ -37,9 +39,9 @@ class GameState(Scaffold):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.in_game = False self.in_game = False
self.gamemode = Gamemode.SURVIVAL self.gamemode = Gamemode.UNKNOWN
self.dimension = Dimension.OVERWORLD self.dimension = Dimension.UNKNOWN
self.difficulty = Difficulty.HARD self.difficulty = Difficulty.UNKNOWN
self.join_time = datetime.datetime(2011, 11, 18) self.join_time = datetime.datetime(2011, 11, 18)
self.hp = 20.0 self.hp = 20.0
@ -56,7 +58,8 @@ class GameState(Scaffold):
async def on_player_respawning(packet:PacketRespawn): async def on_player_respawning(packet:PacketRespawn):
self.gamemode = Gamemode(packet.gamemode) self.gamemode = Gamemode(packet.gamemode)
if isinstance(packet.dimension, dict): if isinstance(packet.dimension, dict):
self.dimension = Dimension.OVERWORLD # TODO wtf??? self.logger.info("Received dimension data: %s", json.dumps(packet.dimensionCodec, indent=2))
self.dimension = Dimension.from_str(packet.dimension['effects'])
else: else:
self.dimension = Dimension(packet.dimension) self.dimension = Dimension(packet.dimension)
self.difficulty = Difficulty(packet.difficulty) self.difficulty = Difficulty(packet.difficulty)
@ -72,12 +75,19 @@ class GameState(Scaffold):
self.gamemode.name self.gamemode.name
) )
@self.on_packet(PacketDifficulty)
async def on_set_difficulty(packet:PacketDifficulty):
self.difficulty = Difficulty(packet.difficulty)
self.logger.info("Difficulty set to %s", self.difficulty.name)
@self.on_packet(PacketLogin) @self.on_packet(PacketLogin)
async def player_joining_cb(packet:PacketLogin): async def player_joining_cb(packet:PacketLogin):
self.entity_id = packet.entityId self.entity_id = packet.entityId
self.gamemode = Gamemode(packet.gameMode) self.gamemode = Gamemode(packet.gameMode)
if isinstance(packet.dimension, dict): if isinstance(packet.dimension, dict):
self.dimension = Dimension.OVERWORLD # TODO wtf??? with open('world_codec.json', 'w') as f:
json.dump(packet.dimensionCodec, f)
self.dimension = Dimension.from_str(packet.dimension['effects'])
else: else:
self.dimension = Dimension(packet.dimension) self.dimension = Dimension(packet.dimension)
self.difficulty = Difficulty(packet.difficulty) self.difficulty = Difficulty(packet.difficulty)