Protocol changes for 1.20.80.24 beta

dktapps · dktapps · commit dc7606a9f778 · 2024-04-05T18:53:35.000+01:00
diff --git a/src/FilterTextPacket.php b/src/FilterTextPacket.php
diff --git a/src/PacketHandlerDefaultImplTrait.php b/src/PacketHandlerDefaultImplTrait.php
@@ -630,10 +630,6 @@ public function handleItemComponent(ItemComponentPacket $packet) : bool{
 		return false;
 	}
 
-	public function handleFilterText(FilterTextPacket $packet) : bool{
-		return false;
-	}
-
 	public function handleClientboundDebugRenderer(ClientboundDebugRendererPacket $packet) : bool{
 		return false;
 	}
diff --git a/src/PacketHandlerInterface.php b/src/PacketHandlerInterface.php
@@ -322,8 +322,6 @@ public function handleCorrectPlayerMovePrediction(CorrectPlayerMovePredictionPac
 
 	public function handleItemComponent(ItemComponentPacket $packet) : bool;
 
-	public function handleFilterText(FilterTextPacket $packet) : bool;
-
 	public function handleClientboundDebugRenderer(ClientboundDebugRendererPacket $packet) : bool;
 
 	public function handleSyncActorProperty(SyncActorPropertyPacket $packet) : bool;
diff --git a/src/PacketPool.php b/src/PacketPool.php
@@ -185,7 +185,6 @@ public function __construct(){
 		$this->registerPacket(new PlayerFogPacket());
 		$this->registerPacket(new CorrectPlayerMovePredictionPacket());
 		$this->registerPacket(new ItemComponentPacket());
-		$this->registerPacket(new FilterTextPacket());
 		$this->registerPacket(new ClientboundDebugRendererPacket());
 		$this->registerPacket(new SyncActorPropertyPacket());
 		$this->registerPacket(new AddVolumeEntityPacket());
diff --git a/src/ProtocolInfo.php b/src/ProtocolInfo.php
@@ -32,11 +32,11 @@ private function __construct(){
 	 */
 
 	/** Actual Minecraft: PE protocol version */
-	public const CURRENT_PROTOCOL = 662;
+	public const CURRENT_PROTOCOL = 671;
 	/** Current Minecraft PE version reported by the server. This is usually the earliest currently supported version. */
-	public const MINECRAFT_VERSION = 'v1.20.70';
+	public const MINECRAFT_VERSION = 'v1.20.80';
 	/** Version number sent to clients in ping responses. */
-	public const MINECRAFT_VERSION_NETWORK = '1.20.70';
+	public const MINECRAFT_VERSION_NETWORK = '1.20.80';
 
 	public const LOGIN_PACKET = 0x01;
 	public const PLAY_STATUS_PACKET = 0x02;
@@ -197,7 +197,7 @@ private function __construct(){
 	public const PLAYER_FOG_PACKET = 0xa0;
 	public const CORRECT_PLAYER_MOVE_PREDICTION_PACKET = 0xa1;
 	public const ITEM_COMPONENT_PACKET = 0xa2;
-	public const FILTER_TEXT_PACKET = 0xa3;
+
 	public const CLIENTBOUND_DEBUG_RENDERER_PACKET = 0xa4;
 	public const SYNC_ACTOR_PROPERTY_PACKET = 0xa5;
 	public const ADD_VOLUME_ENTITY_PACKET = 0xa6;
diff --git a/src/ResourcePackStackPacket.php b/src/ResourcePackStackPacket.php
@@ -29,19 +29,21 @@ class ResourcePackStackPacket extends DataPacket implements ClientboundPacket{
 	public bool $mustAccept = false;
 	public string $baseGameVersion = ProtocolInfo::MINECRAFT_VERSION_NETWORK;
 	public Experiments $experiments;
+	public bool $useVanillaEditorPacks;
 
 	/**
 	 * @generate-create-func
 	 * @param ResourcePackStackEntry[] $resourcePackStack
 	 * @param ResourcePackStackEntry[] $behaviorPackStack
 	 */
-	public static function create(array $resourcePackStack, array $behaviorPackStack, bool $mustAccept, string $baseGameVersion, Experiments $experiments) : self{
+	public static function create(array $resourcePackStack, array $behaviorPackStack, bool $mustAccept, string $baseGameVersion, Experiments $experiments, bool $useVanillaEditorPacks) : self{
 		$result = new self;
 		$result->resourcePackStack = $resourcePackStack;
 		$result->behaviorPackStack = $behaviorPackStack;
 		$result->mustAccept = $mustAccept;
 		$result->baseGameVersion = $baseGameVersion;
 		$result->experiments = $experiments;
+		$result->useVanillaEditorPacks = $useVanillaEditorPacks;
 		return $result;
 	}
 
@@ -59,6 +61,7 @@ protected function decodePayload(PacketSerializer $in) : void{
 
 		$this->baseGameVersion = $in->getString();
 		$this->experiments = Experiments::read($in);
+		$this->useVanillaEditorPacks = $in->getBool();
 	}
 
 	protected function encodePayload(PacketSerializer $out) : void{
@@ -76,6 +79,7 @@ protected function encodePayload(PacketSerializer $out) : void{
 
 		$out->putString($this->baseGameVersion);
 		$this->experiments->write($out);
+		$out->putBool($this->useVanillaEditorPacks);
 	}
 
 	public function handle(PacketHandlerInterface $handler) : bool{
diff --git a/src/UpdatePlayerGameTypePacket.php b/src/UpdatePlayerGameTypePacket.php
@@ -23,29 +23,35 @@ class UpdatePlayerGameTypePacket extends DataPacket implements ClientboundPacket
 	/** @see GameMode */
 	private int $gameMode;
 	private int $playerActorUniqueId;
+	private int $tick;
 
 	/**
 	 * @generate-create-func
 	 */
-	public static function create(int $gameMode, int $playerActorUniqueId) : self{
+	public static function create(int $gameMode, int $playerActorUniqueId, int $tick) : self{
 		$result = new self;
 		$result->gameMode = $gameMode;
 		$result->playerActorUniqueId = $playerActorUniqueId;
+		$result->tick = $tick;
 		return $result;
 	}
 
 	public function getGameMode() : int{ return $this->gameMode; }
 
 	public function getPlayerActorUniqueId() : int{ return $this->playerActorUniqueId; }
 
+	public function getTick() : int{ return $this->tick; }
+
 	protected function decodePayload(PacketSerializer $in) : void{
 		$this->gameMode = $in->getVarInt();
 		$this->playerActorUniqueId = $in->getActorUniqueId();
+		$this->tick = $in->getUnsignedVarInt();
 	}
 
 	protected function encodePayload(PacketSerializer $out) : void{
 		$out->putVarInt($this->gameMode);
 		$out->putActorUniqueId($this->playerActorUniqueId);
+		$out->putUnsignedVarInt($this->tick);
 	}
 
 	public function handle(PacketHandlerInterface $handler) : bool{
diff --git a/src/types/LevelSettings.php b/src/types/LevelSettings.php
@@ -25,6 +25,7 @@ final class LevelSettings{
 	public SpawnSettings $spawnSettings;
 	public int $generator = GeneratorType::OVERWORLD;
 	public int $worldGamemode;
+	public bool $hardcore = false;
 	public int $difficulty;
 	public BlockPosition $spawnPosition;
 	public bool $hasAchievementsDisabled = true;
@@ -96,6 +97,7 @@ private function internalRead(PacketSerializer $in) : void{
 		$this->spawnSettings = SpawnSettings::read($in);
 		$this->generator = $in->getVarInt();
 		$this->worldGamemode = $in->getVarInt();
+		$this->hardcore = $in->getBool();
 		$this->difficulty = $in->getVarInt();
 		$this->spawnPosition = $in->getBlockPosition();
 		$this->hasAchievementsDisabled = $in->getBool();
@@ -146,6 +148,7 @@ public function write(PacketSerializer $out) : void{
 		$this->spawnSettings->write($out);
 		$out->putVarInt($this->generator);
 		$out->putVarInt($this->worldGamemode);
+		$out->putBool($this->hardcore);
 		$out->putVarInt($this->difficulty);
 		$out->putBlockPosition($this->spawnPosition);
 		$out->putBool($this->hasAchievementsDisabled);
diff --git a/src/types/LevelSoundEvent.php b/src/types/LevelSoundEvent.php
@@ -15,9 +15,8 @@
 namespace pocketmine\network\mcpe\protocol\types;
 
 /**
- * This file is generated from level_sound_id_map.json in BedrockData.
- *
  * This file is automatically generated; do NOT edit it by hand.
+ * Regenerate it by running tools/generate-level-sound-ids.php
  */
 final class LevelSoundEvent{
 	private function __construct(){
@@ -501,6 +500,14 @@ private function __construct(){
 	public const HURT_REDUCED = 508;
 	public const WIND_CHARGE_BURST = 509;
 
+	public const ARMOR_CRACK_WOLF = 511;
+	public const ARMOR_BREAK_WOLF = 512;
+	public const ARMOR_REPAIR_WOLF = 513;
+	public const MACE_SMASH_AIR = 514;
+	public const MACE_SMASH_GROUND = 515;
+
+	public const MACE_HEAVY_SMASH_GROUND = 520;
+
 	//The following aliases are kept for backwards compatibility only
 	public const SCULK_SENSOR_POWER_ON = self::POWER_ON_SCULK_SENSOR;
 	public const SCULK_SENSOR_POWER_OFF = self::POWER_OFF_SCULK_SENSOR;
diff --git a/src/types/ParticleIds.php b/src/types/ParticleIds.php
@@ -110,4 +110,5 @@ private function __construct(){
 	public const WHITE_SMOKE = 89;
 	public const VAULT_CONNECTION = 90;
 	public const WIND_EXPLOSION = 91;
+	public const WOLF_ARMOR_CRACK = 92;
 }
diff --git a/src/types/entity/EntityIds.php b/src/types/entity/EntityIds.php
@@ -15,10 +15,8 @@
 namespace pocketmine\network\mcpe\protocol\types\entity;
 
 /**
- * This file is directly generated from the entity definitions provided by the client. The entities listed in this file
- * are expected to always have the same IDs.
- *
  * This file is automatically generated; do NOT edit it by hand.
+ * Regenerate it by running tools/generate-entity-ids.php
  */
 final class EntityIds{
 
@@ -29,6 +27,7 @@ private function __construct(){
 	public const AGENT = "minecraft:agent";
 	public const ALLAY = "minecraft:allay";
 	public const AREA_EFFECT_CLOUD = "minecraft:area_effect_cloud";
+	public const ARMADILLO = "minecraft:armadillo";
 	public const ARMOR_STAND = "minecraft:armor_stand";
 	public const ARROW = "minecraft:arrow";
 	public const AXOLOTL = "minecraft:axolotl";
diff --git a/src/types/entity/EntityMetadataFlags.php b/src/types/entity/EntityMetadataFlags.php
@@ -137,4 +137,5 @@ private function __construct(){
 	public const TIMER_FLAG_1 = 115;
 	public const TIMER_FLAG_2 = 116;
 	public const TIMER_FLAG_3 = 117;
+	public const BODY_ROTATION_BLOCKED = 118;
 }
diff --git a/src/types/hud/HudElement.php b/src/types/hud/HudElement.php
@@ -30,4 +30,6 @@ enum HudElement : int{
 	case FOOD = 8;
 	case AIR_BUBBLES = 9;
 	case HORSE_HEALTH = 10;
+	case STATUS_EFFECTS = 11;
+	case ITEM_TEXT = 12;
 }
diff --git a/src/types/recipe/ShapedRecipe.php b/src/types/recipe/ShapedRecipe.php
@@ -34,6 +34,7 @@ public function __construct(
 		private UuidInterface $uuid,
 		string $blockType, //TODO: rename this
 		private int $priority,
+		private bool $symmetric,
 		private int $recipeNetId
 	){
 		parent::__construct($typeId);
@@ -90,6 +91,8 @@ public function getPriority() : int{
 		return $this->priority;
 	}
 
+	public function isSymmetric() : bool{ return $this->symmetric; }
+
 	public function getRecipeNetId() : int{
 		return $this->recipeNetId;
 	}
@@ -112,9 +115,11 @@ public static function decode(int $recipeType, PacketSerializer $in) : self{
 		$uuid = $in->getUUID();
 		$block = $in->getString();
 		$priority = $in->getVarInt();
+		$symmetric = $in->getBool();
+
 		$recipeNetId = $in->readRecipeNetId();
 
-		return new self($recipeType, $recipeId, $input, $output, $uuid, $block, $priority, $recipeNetId);
+		return new self($recipeType, $recipeId, $input, $output, $uuid, $block, $priority, $symmetric, $recipeNetId);
 	}
 
 	public function encode(PacketSerializer $out) : void{
@@ -135,6 +140,8 @@ public function encode(PacketSerializer $out) : void{
 		$out->putUUID($this->uuid);
 		$out->putString($this->blockName);
 		$out->putVarInt($this->priority);
+		$out->putBool($this->symmetric);
+
 		$out->writeRecipeNetId($this->recipeNetId);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -630,10 +630,6 @@ public function handleItemComponent(ItemComponentPacket $packet) : bool{`
`630`	`630`	`return false;`
`631`	`631`	`}`
`632`	`632`
`633`		`- public function handleFilterText(FilterTextPacket $packet) : bool{`
`634`		`- return false;`
`635`		`- }`
`636`		`-`
`637`	`633`	`public function handleClientboundDebugRenderer(ClientboundDebugRendererPacket $packet) : bool{`
`638`	`634`	`return false;`
`639`	`635`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,4 +110,5 @@ private function __construct(){`
`110`	`110`	`public const WHITE_SMOKE = 89;`
`111`	`111`	`public const VAULT_CONNECTION = 90;`
`112`	`112`	`public const WIND_EXPLOSION = 91;`
	`113`	`+ public const WOLF_ARMOR_CRACK = 92;`
`113`	`114`	`}`