Upstream
/
pyCraft
mirror of https://github.com/ammaraskar/pyCraft.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

initial 1.17 update changes

This commit is contained in:
Andrew So 2021-06-11 10:34:27 -07:00
parent 2813d02ae7
commit 6400602625
4 changed files with 69 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
minecraft/__init__.py
View File

@ -460,6 +460,7 @@ KNOWN_MINECRAFT_VERSION_RECORDS = [
Version('20w45a', PRE | 5, True), Version('20w45a', PRE | 5, True),
Version('20w46a', PRE | 6, True), Version('20w46a', PRE | 6, True),
Version('20w48a', PRE | 7, True), Version('20w48a', PRE | 7, True),
Version('1.17', 755, True),
] ]
# An OrderedDict mapping the id string of each known Minecraft version to its # An OrderedDict mapping the id string of each known Minecraft version to its

54
minecraft/networking/packets/clientbound/play/__init__.py
View File

@ -44,7 +44,8 @@ def get_packets(context):
RespawnPacket, RespawnPacket,
PluginMessagePacket, PluginMessagePacket,
PlayerListHeaderAndFooterPacket, PlayerListHeaderAndFooterPacket,
EntityLookPacket EntityLookPacket,
ResourcePackSendPacket
} }
if context.protocol_earlier_eq(47): if context.protocol_earlier_eq(47):
packets |= { packets |= {
@ -64,7 +65,8 @@ def get_packets(context):
class KeepAlivePacket(AbstractKeepAlivePacket): class KeepAlivePacket(AbstractKeepAlivePacket):
@staticmethod @staticmethod
def get_id(context): def get_id(context):
return 0x1F if context.protocol_later_eq(741) else \ return 0x21 if context.protocol_later_eq(755) else \
0x1F if context.protocol_later_eq(741) else \
0x20 if context.protocol_later_eq(721) else \ 0x20 if context.protocol_later_eq(721) else \
0x21 if context.protocol_later_eq(550) else \ 0x21 if context.protocol_later_eq(550) else \
0x20 if context.protocol_later_eq(471) else \ 0x20 if context.protocol_later_eq(471) else \
@ -79,7 +81,8 @@ class KeepAlivePacket(AbstractKeepAlivePacket):
class ServerDifficultyPacket(Packet): class ServerDifficultyPacket(Packet):
@staticmethod @staticmethod
def get_id(context): def get_id(context):
return 0x0D if context.protocol_later_eq(721) else \ return 0x0E if context.protocol_later_eq(755) else \
0x0D if context.protocol_later_eq(721) else \
0x0E if context.protocol_later_eq(550) else \ 0x0E if context.protocol_later_eq(550) else \
0x0D if context.protocol_later_eq(332) else \ 0x0D if context.protocol_later_eq(332) else \
0x0E if context.protocol_later_eq(318) else \ 0x0E if context.protocol_later_eq(318) else \
@ -99,7 +102,8 @@ class ServerDifficultyPacket(Packet):
class ChatMessagePacket(Packet): class ChatMessagePacket(Packet):
@staticmethod @staticmethod
def get_id(context): def get_id(context):
return 0x0E if context.protocol_later_eq(721) else \ return 0x0F if context.protocol_later_eq(755) else \
0x0E if context.protocol_later_eq(721) else \
0x0F if context.protocol_later_eq(550) else \ 0x0F if context.protocol_later_eq(550) else \
0x0E if context.protocol_later_eq(343) else \ 0x0E if context.protocol_later_eq(343) else \
0x0F if context.protocol_later_eq(332) else \ 0x0F if context.protocol_later_eq(332) else \
@ -123,7 +127,8 @@ class ChatMessagePacket(Packet):
class DisconnectPacket(Packet): class DisconnectPacket(Packet):
@staticmethod @staticmethod
def get_id(context): def get_id(context):
return 0x19 if context.protocol_later_eq(741) else \ return 0x1A if context.protocol_later_eq(755) else \
0x19 if context.protocol_later_eq(741) else \
0x1A if context.protocol_later_eq(721) else \ 0x1A if context.protocol_later_eq(721) else \
0x1B if context.protocol_later_eq(550) else \ 0x1B if context.protocol_later_eq(550) else \
0x1A if context.protocol_later_eq(471) else \ 0x1A if context.protocol_later_eq(471) else \
@ -141,7 +146,11 @@ class DisconnectPacket(Packet):
class SetCompressionPacket(Packet): class SetCompressionPacket(Packet):
# Note: removed between protocol versions 47 and 107. # Note: removed between protocol versions 47 and 107.
id = 0x46 @staticmethod
def get_id(context):
return 0x02 if context.protocol_later_eq(755) else \
0x46
packet_name = "set compression" packet_name = "set compression"
definition = [ definition = [
{'threshold': VarInt}] {'threshold': VarInt}]
@ -186,7 +195,8 @@ class SpawnPlayerPacket(Packet):
class EntityVelocityPacket(Packet): class EntityVelocityPacket(Packet):
@staticmethod @staticmethod
def get_id(context): def get_id(context):
return 0x46 if context.protocol_later_eq(721) else \ return 0x4F if context.protocol_later_eq(755) else \
0x46 if context.protocol_later_eq(721) else \
0x47 if context.protocol_later_eq(707) else \ 0x47 if context.protocol_later_eq(707) else \
0x46 if context.protocol_later_eq(550) else \ 0x46 if context.protocol_later_eq(550) else \
0x45 if context.protocol_later_eq(471) else \ 0x45 if context.protocol_later_eq(471) else \
@ -214,7 +224,8 @@ class EntityVelocityPacket(Packet):
class EntityPositionDeltaPacket(Packet): class EntityPositionDeltaPacket(Packet):
@staticmethod @staticmethod
def get_id(context): def get_id(context):
return 0x27 if context.protocol_later_eq(741) else \ return 0x29 if context.protocol_later_eq(755) else \
0x27 if context.protocol_later_eq(741) else \
0x28 if context.protocol_later_eq(721) else \ 0x28 if context.protocol_later_eq(721) else \
0x29 if context.protocol_later_eq(550) else \ 0x29 if context.protocol_later_eq(550) else \
0x28 if context.protocol_later_eq(389) else \ 0x28 if context.protocol_later_eq(389) else \
@ -253,7 +264,8 @@ class EntityPositionDeltaPacket(Packet):
class TimeUpdatePacket(Packet): class TimeUpdatePacket(Packet):
@staticmethod @staticmethod
def get_id(context): def get_id(context):
return 0x4E if context.protocol_later_eq(721) else \ return 0x58 if context.protocol_later_eq(755) else \
0x4E if context.protocol_later_eq(721) else \
0x4F if context.protocol_later_eq(550) else \ 0x4F if context.protocol_later_eq(550) else \
0x4E if context.protocol_later_eq(471) else \ 0x4E if context.protocol_later_eq(471) else \
0x4A if context.protocol_later_eq(461) else \ 0x4A if context.protocol_later_eq(461) else \
@ -277,7 +289,8 @@ class TimeUpdatePacket(Packet):
class UpdateHealthPacket(Packet): class UpdateHealthPacket(Packet):
@staticmethod @staticmethod
def get_id(context): def get_id(context):
return 0x49 if context.protocol_later_eq(721) else \ return 0x52 if context.protocol_later_eq(755) else \
0x49 if context.protocol_later_eq(721) else \
0x4A if context.protocol_later_eq(707) else \ 0x4A if context.protocol_later_eq(707) else \
0x49 if context.protocol_later_eq(550) else \ 0x49 if context.protocol_later_eq(550) else \
0x48 if context.protocol_later_eq(471) else \ 0x48 if context.protocol_later_eq(471) else \
@ -304,7 +317,8 @@ class UpdateHealthPacket(Packet):
class PluginMessagePacket(AbstractPluginMessagePacket): class PluginMessagePacket(AbstractPluginMessagePacket):
@staticmethod @staticmethod
def get_id(context): def get_id(context):
return 0x17 if context.protocol_later_eq(741) else \ return 0x18 if context.protocol_later_eq(755) else \
0x17 if context.protocol_later_eq(741) else \
0x18 if context.protocol_later_eq(721) else \ 0x18 if context.protocol_later_eq(721) else \
0x19 if context.protocol_later_eq(550) else \ 0x19 if context.protocol_later_eq(550) else \
0x18 if context.protocol_later_eq(471) else \ 0x18 if context.protocol_later_eq(471) else \
@ -318,7 +332,8 @@ class PluginMessagePacket(AbstractPluginMessagePacket):
class PlayerListHeaderAndFooterPacket(Packet): class PlayerListHeaderAndFooterPacket(Packet):
@staticmethod @staticmethod
def get_id(context): def get_id(context):
return 0x53 if context.protocol_later_eq(721) else \ return 0x5E if context.protocol_later_eq(755) else \
0x53 if context.protocol_later_eq(721) else \
0x54 if context.protocol_later_eq(550) else \ 0x54 if context.protocol_later_eq(550) else \
0x53 if context.protocol_later_eq(471) else \ 0x53 if context.protocol_later_eq(471) else \
0x5F if context.protocol_later_eq(461) else \ 0x5F if context.protocol_later_eq(461) else \
@ -340,7 +355,8 @@ class PlayerListHeaderAndFooterPacket(Packet):
class EntityLookPacket(Packet): class EntityLookPacket(Packet):
@staticmethod @staticmethod
def get_id(context): def get_id(context):
return 0x29 if context.protocol_later_eq(741) else \ return 0x3E if context.protocol_later_eq(755) else \
0x29 if context.protocol_later_eq(741) else \
0x2A if context.protocol_later_eq(721) else \ 0x2A if context.protocol_later_eq(721) else \
0x2B if context.protocol_later_eq(550) else \ 0x2B if context.protocol_later_eq(550) else \
0x2A if context.protocol_later_eq(389) else \ 0x2A if context.protocol_later_eq(389) else \
@ -357,3 +373,15 @@ class EntityLookPacket(Packet):
{'pitch': Angle}, {'pitch': Angle},
{'on_ground': Boolean} {'on_ground': Boolean}
] ]
class ResourcePackSendPacket(Packet):
@staticmethod
def get_id(context):
return 0x3C if context.protocol_later_eq(755) else \
0x38
packet_name = "resource pack send"
definition = [
{"url": String},
{"hash": String}
]

3
minecraft/networking/packets/clientbound/play/player_list_item_packet.py
View File

@ -9,7 +9,8 @@ from minecraft.networking.types import (
class PlayerListItemPacket(Packet): class PlayerListItemPacket(Packet):
@staticmethod @staticmethod
def get_id(context): def get_id(context):
return 0x32 if context.protocol_later_eq(741) else \ return 0x36 if context.protocol_later_eq(755) else \
0x32 if context.protocol_later_eq(741) else \
0x33 if context.protocol_later_eq(721) else \ 0x33 if context.protocol_later_eq(721) else \
0x34 if context.protocol_later_eq(550) else \ 0x34 if context.protocol_later_eq(550) else \
0x33 if context.protocol_later_eq(471) else \ 0x33 if context.protocol_later_eq(471) else \

33
minecraft/networking/packets/serverbound/play/__init__.py
View File

@ -37,7 +37,8 @@ def get_packets(context):
class KeepAlivePacket(AbstractKeepAlivePacket): class KeepAlivePacket(AbstractKeepAlivePacket):
@staticmethod @staticmethod
def get_id(context): def get_id(context):
return 0x10 if context.protocol_later_eq(712) else \ return 0x0F if context.protocol_later_eq(755) else \
0x10 if context.protocol_later_eq(712) else \
0x0F if context.protocol_later_eq(471) else \ 0x0F if context.protocol_later_eq(471) else \
0x10 if context.protocol_later_eq(464) else \ 0x10 if context.protocol_later_eq(464) else \
0x0E if context.protocol_later_eq(389) else \ 0x0E if context.protocol_later_eq(389) else \
@ -53,7 +54,8 @@ class KeepAlivePacket(AbstractKeepAlivePacket):
class ChatPacket(Packet): class ChatPacket(Packet):
@staticmethod @staticmethod
def get_id(context): def get_id(context):
return 0x03 if context.protocol_later_eq(464) else \ return 0x03 if context.protocol_later_eq(755) else \
0x03 if context.protocol_later_eq(464) else \
0x02 if context.protocol_later_eq(389) else \ 0x02 if context.protocol_later_eq(389) else \
0x01 if context.protocol_later_eq(343) else \ 0x01 if context.protocol_later_eq(343) else \
0x02 if context.protocol_later_eq(336) else \ 0x02 if context.protocol_later_eq(336) else \
@ -79,7 +81,8 @@ class ChatPacket(Packet):
class PositionAndLookPacket(Packet): class PositionAndLookPacket(Packet):
@staticmethod @staticmethod
def get_id(context): def get_id(context):
return 0x13 if context.protocol_later_eq(712) else \ return 0x12 if context.protocol_later_eq(755) else \
0x13 if context.protocol_later_eq(712) else \
0x12 if context.protocol_later_eq(471) else \ 0x12 if context.protocol_later_eq(471) else \
0x13 if context.protocol_later_eq(464) else \ 0x13 if context.protocol_later_eq(464) else \
0x11 if context.protocol_later_eq(389) else \ 0x11 if context.protocol_later_eq(389) else \
@ -126,7 +129,8 @@ class TeleportConfirmPacket(Packet):
class AnimationPacket(Packet): class AnimationPacket(Packet):
@staticmethod @staticmethod
def get_id(context): def get_id(context):
return 0x2C if context.protocol_later_eq(738) else \ return 0x2C if context.protocol_later_eq(755) else \
0x2C if context.protocol_later_eq(738) else \
0x2B if context.protocol_later_eq(712) else \ 0x2B if context.protocol_later_eq(712) else \
0x2A if context.protocol_later_eq(468) else \ 0x2A if context.protocol_later_eq(468) else \
0x29 if context.protocol_later_eq(464) else \ 0x29 if context.protocol_later_eq(464) else \
@ -150,7 +154,8 @@ class AnimationPacket(Packet):
class ClientStatusPacket(Packet, Enum): class ClientStatusPacket(Packet, Enum):
@staticmethod @staticmethod
def get_id(context): def get_id(context):
return 0x04 if context.protocol_later_eq(464) else \ return 0x04 if context.protocol_later_eq(755) else \
0x04 if context.protocol_later_eq(464) else \
0x03 if context.protocol_later_eq(389) else \ 0x03 if context.protocol_later_eq(389) else \
0x02 if context.protocol_later_eq(343) else \ 0x02 if context.protocol_later_eq(343) else \
0x03 if context.protocol_later_eq(336) else \ 0x03 if context.protocol_later_eq(336) else \
@ -175,7 +180,8 @@ class ClientStatusPacket(Packet, Enum):
class PluginMessagePacket(AbstractPluginMessagePacket): class PluginMessagePacket(AbstractPluginMessagePacket):
@staticmethod @staticmethod
def get_id(context): def get_id(context):
return 0x0B if context.protocol_later_eq(464) else \ return 0x0A if context.protocol_later_eq(755) else \
0x0B if context.protocol_later_eq(464) else \
0x0A if context.protocol_later_eq(389) else \ 0x0A if context.protocol_later_eq(389) else \
0x09 if context.protocol_later_eq(345) else \ 0x09 if context.protocol_later_eq(345) else \
0x08 if context.protocol_later_eq(343) else \ 0x08 if context.protocol_later_eq(343) else \
@ -201,7 +207,8 @@ class PlayerBlockPlacementPacket(Packet):
@staticmethod @staticmethod
def get_id(context): def get_id(context):
return 0x2E if context.protocol_later_eq(738) else \ return 0x2E if context.protocol_later_eq(755) else \
0x2E if context.protocol_later_eq(738) else \
0x2D if context.protocol_later_eq(712) else \ 0x2D if context.protocol_later_eq(712) else \
0x2C if context.protocol_later_eq(468) else \ 0x2C if context.protocol_later_eq(468) else \
0x2B if context.protocol_later_eq(464) else \ 0x2B if context.protocol_later_eq(464) else \
@ -240,7 +247,8 @@ class PlayerBlockPlacementPacket(Packet):
class UseItemPacket(Packet): class UseItemPacket(Packet):
@staticmethod @staticmethod
def get_id(context): def get_id(context):
return 0x2F if context.protocol_later_eq(738) else \ return 0x2F if context.protocol_later_eq(755) else \
0x2F if context.protocol_later_eq(738) else \
0x2E if context.protocol_later_eq(712) else \ 0x2E if context.protocol_later_eq(712) else \
0x2D if context.protocol_later_eq(468) else \ 0x2D if context.protocol_later_eq(468) else \
0x2C if context.protocol_later_eq(464) else \ 0x2C if context.protocol_later_eq(464) else \
@ -259,3 +267,12 @@ class UseItemPacket(Packet):
{'hand': VarInt}]) {'hand': VarInt}])
Hand = RelativeHand Hand = RelativeHand
class ResourcePackStatusPacket(Packet):
@staticmethod
def get_id(context):
return 0x21
packet_name = "resource pask status"
definition = [
{"result": VarInt}
]