Protocol changes for 1.21.111

dries-c · dries-c · commit f8f3422f3917 · 2025-10-01T00:39:19.000+02:00
diff --git a/src/BiomeDefinitionListPacket.php b/src/BiomeDefinitionListPacket.php
@@ -100,6 +100,10 @@ public static function fromDefinitions(array $definitions) : self{
 			$entry->getId(),
 			$entry->getTemperature(),
 			$entry->getDownfall(),
+			$entry->getRedSporeDensity(),
+			$entry->getBlueSporeDensity(),
+			$entry->getAshDensity(),
+			$entry->getWhiteAshDensity(),
 			$entry->getFoliageSnow(),
 			$entry->getDepth(),
 			$entry->getScale(),
@@ -133,6 +137,10 @@ public function buildDefinitionsFromData() : array{
 			$data->getId(),
 			$data->getTemperature(),
 			$data->getDownfall(),
+			$data->getRedSporeDensity(),
+			$data->getBlueSporeDensity(),
+			$data->getAshDensity(),
+			$data->getWhiteAshDensity(),
 			$data->getFoliageSnow(),
 			$data->getDepth(),
 			$data->getScale(),
diff --git a/src/ClientMovementPredictionSyncPacket.php b/src/ClientMovementPredictionSyncPacket.php
@@ -122,7 +122,8 @@ public function getActorFlyingState() : bool{ return $this->actorFlyingState; }
 
 	protected function decodePayload(ByteBufferReader $in, int $protocolId) : void{
 		$this->flags = BitSet::read($in, match(true) {
-			$protocolId === ProtocolInfo::CURRENT_PROTOCOL => self::FLAG_LENGTH,
+			$protocolId >= ProtocolInfo::PROTOCOL_1_21_111 => self::FLAG_LENGTH,
+			$protocolId >= ProtocolInfo::PROTOCOL_1_21_90 => 125,
 			$protocolId >= ProtocolInfo::PROTOCOL_1_21_80 => 124,
 			$protocolId >= ProtocolInfo::PROTOCOL_1_21_70 => 123,
 			default => 120,
@@ -144,7 +145,8 @@ protected function decodePayload(ByteBufferReader $in, int $protocolId) : void{
 
 	protected function encodePayload(ByteBufferWriter $out, int $protocolId) : void{
 		$this->flags->write($out, match(true) {
-			$protocolId === ProtocolInfo::CURRENT_PROTOCOL => self::FLAG_LENGTH,
+			$protocolId >= ProtocolInfo::PROTOCOL_1_21_111 => self::FLAG_LENGTH,
+			$protocolId >= ProtocolInfo::PROTOCOL_1_21_90 => 125,
 			$protocolId >= ProtocolInfo::PROTOCOL_1_21_80 => 124,
 			$protocolId >= ProtocolInfo::PROTOCOL_1_21_70 => 123,
 			default => 120,
diff --git a/src/PlayerArmorDamagePacket.php b/src/PlayerArmorDamagePacket.php
@@ -56,7 +56,7 @@ private function maybeReadDamage(int $flags, int $flag, ByteBufferReader $in) :
 	}
 
 	protected function decodePayload(ByteBufferReader $in, int $protocolId) : void{
-		if($protocolId >= ProtocolInfo::PROTOCOL_1_21_110_OLD){
+		if($protocolId >= ProtocolInfo::PROTOCOL_1_21_111){
 			$length = VarInt::readUnsignedInt($in);
 			for($i = 0; $i < $length; ++$i){
 				$this->armorSlotAndDamagePairs[$i] = ArmorSlotAndDamagePair::read($in);
@@ -109,7 +109,7 @@ private function getDamageBySlot(ArmorSlot $slot) : ?int{
 	}
 
 	protected function encodePayload(ByteBufferWriter $out, int $protocolId) : void{
-		if($protocolId >= ProtocolInfo::PROTOCOL_1_21_110_OLD){
+		if($protocolId >= ProtocolInfo::PROTOCOL_1_21_111){
 			VarInt::writeUnsignedInt($out, count($this->armorSlotAndDamagePairs));
 			foreach($this->armorSlotAndDamagePairs as $pair){
 				$pair->write($out);
diff --git a/src/ServerboundPackSettingChangePacket.php b/src/ServerboundPackSettingChangePacket.php
@@ -45,7 +45,7 @@ public function getPackId() : UuidInterface{ return $this->packId; }
 
 	public function getPackSetting() : PackSetting{ return $this->packSetting; }
 
-	protected function decodePayload(ByteBufferReader $in) : void{
+	protected function decodePayload(ByteBufferReader $in, int $protocolId) : void{
 		$this->packId = CommonTypes::getUUID($in);
 
 		$name = CommonTypes::getString($in);
@@ -57,7 +57,7 @@ protected function decodePayload(ByteBufferReader $in) : void{
 		};
 	}
 
-	protected function encodePayload(ByteBufferWriter $out) : void{
+	protected function encodePayload(ByteBufferWriter $out, int $protocolId) : void{
 		CommonTypes::putUUID($out, $this->packId);
 		CommonTypes::putString($out, $this->packSetting->getName());
 		VarInt::writeUnsignedInt($out, $this->packSetting->getTypeId()->value);
diff --git a/src/serializer/CommonTypes.php b/src/serializer/CommonTypes.php
@@ -542,11 +542,11 @@ public static function putRotationByte(ByteBufferWriter $out, float $rotation) :
 	}
 
 	/** @throws DataDecodeException */
-	private static function readGameRule(ByteBufferReader $in, int $type, bool $isPlayerModifiable, bool $isStartGame) : GameRule{
+	private static function readGameRule(ByteBufferReader $in, int $protocolId, int $type, bool $isPlayerModifiable, bool $isStartGame) : GameRule{
 		return match($type){
-			BoolGameRule::ID => BoolGameRule::decode($in, $isPlayerModifiable),
-			IntGameRule::ID => IntGameRule::decode($in, $isPlayerModifiable, $isStartGame),
-			FloatGameRule::ID => FloatGameRule::decode($in, $isPlayerModifiable),
+			BoolGameRule::ID => BoolGameRule::decode($in, $protocolId, $isPlayerModifiable),
+			IntGameRule::ID => IntGameRule::decode($in, $protocolId, $isPlayerModifiable, $isStartGame),
+			FloatGameRule::ID => FloatGameRule::decode($in, $protocolId, $isPlayerModifiable),
 			default => throw new PacketDecodeException("Unknown gamerule type $type"),
 		};
 	}
@@ -560,14 +560,14 @@ private static function readGameRule(ByteBufferReader $in, int $type, bool $isPl
 	 * @throws PacketDecodeException
 	 * @throws DataDecodeException
 	 */
-	public static function getGameRules(ByteBufferReader $in, bool $isStartGame) : array{
+	public static function getGameRules(ByteBufferReader $in, int $protocolId, bool $isStartGame) : array{
 		$count = VarInt::readUnsignedInt($in);
 		$rules = [];
 		for($i = 0; $i < $count; ++$i){
 			$name = self::getString($in);
 			$isPlayerModifiable = self::getBool($in);
 			$type = VarInt::readUnsignedInt($in);
-			$rules[$name] = self::readGameRule($in, $type, $isPlayerModifiable, $isStartGame);
+			$rules[$name] = self::readGameRule($in, $protocolId, $type, $isPlayerModifiable, $isStartGame);
 		}
 
 		return $rules;
@@ -579,13 +579,13 @@ public static function getGameRules(ByteBufferReader $in, bool $isStartGame) : a
 	 * @param GameRule[] $rules
 	 * @phpstan-param array<string, GameRule> $rules
 	 */
-	public static function putGameRules(ByteBufferWriter $out, array $rules, bool $isStartGame) : void{
+	public static function putGameRules(ByteBufferWriter $out, int $protocolId, array $rules, bool $isStartGame) : void{
 		VarInt::writeUnsignedInt($out, count($rules));
 		foreach($rules as $name => $rule){
 			self::putString($out, $name);
 			self::putBool($out, $rule->isPlayerModifiable());
 			VarInt::writeUnsignedInt($out, $rule->getTypeId());
-			$rule->encode($out, $isStartGame);
+			$rule->encode($out, $protocolId, $isStartGame);
 		}
 	}
 
diff --git a/src/types/BoolGameRule.php b/src/types/BoolGameRule.php
@@ -34,11 +34,11 @@ public function getValue() : bool{
 		return $this->value;
 	}
 
-	public function encode(ByteBufferWriter $out, bool $isStartGame) : void{
+	public function encode(ByteBufferWriter $out, int $protocolId, bool $isStartGame) : void{
 		CommonTypes::putBool($out, $this->value);
 	}
 
-	public static function decode(ByteBufferReader $in, bool $isPlayerModifiable) : self{
+	public static function decode(ByteBufferReader $in, int $protocolId, bool $isPlayerModifiable) : self{
 		return new self(CommonTypes::getBool($in), $isPlayerModifiable);
 	}
 }
diff --git a/src/types/FloatGameRule.php b/src/types/FloatGameRule.php
@@ -34,11 +34,11 @@ public function getValue() : float{
 		return $this->value;
 	}
 
-	public function encode(ByteBufferWriter $out, bool $isStartGame) : void{
+	public function encode(ByteBufferWriter $out, int $protocolId, bool $isStartGame) : void{
 		LE::writeFloat($out, $this->value);
 	}
 
-	public static function decode(ByteBufferReader $in, bool $isPlayerModifiable) : self{
+	public static function decode(ByteBufferReader $in, int $protocolId, bool $isPlayerModifiable) : self{
 		return new self(LE::readFloat($in), $isPlayerModifiable);
 	}
 }
diff --git a/src/types/GameRule.php b/src/types/GameRule.php
@@ -25,5 +25,5 @@ public function isPlayerModifiable() : bool{ return $this->isPlayerModifiable; }
 
 	abstract public function getTypeId() : int;
 
-	abstract public function encode(ByteBufferWriter $out, bool $isStartGame) : void;
+	abstract public function encode(ByteBufferWriter $out, int $protocolId, bool $isStartGame) : void;
 }
diff --git a/src/types/IntGameRule.php b/src/types/IntGameRule.php
@@ -18,6 +18,7 @@
 use pmmp\encoding\ByteBufferWriter;
 use pmmp\encoding\LE;
 use pmmp\encoding\VarInt;
+use pocketmine\network\mcpe\protocol\ProtocolInfo;
 
 final class IntGameRule extends GameRule{
 	use GetTypeIdFromConstTrait;
@@ -35,15 +36,15 @@ public function getValue() : int{
 		return $this->value;
 	}
 
-	public function encode(ByteBufferWriter $out, bool $isStartGame) : void{
-		if($isStartGame){
+	public function encode(ByteBufferWriter $out, int $protocolId, bool $isStartGame) : void{
+		if($isStartGame || $protocolId < ProtocolInfo::PROTOCOL_1_21_111){
 			VarInt::writeUnsignedInt($out, $this->value);
 		}else{
 			LE::writeUnsignedInt($out, $this->value);
 		}
 	}
 
-	public static function decode(ByteBufferReader $in, bool $isPlayerModifiable, bool $isStartGame) : self{
-		return new self($isStartGame ? VarInt::readUnsignedInt($in) : LE::readUnsignedInt($in), $isPlayerModifiable);
+	public static function decode(ByteBufferReader $in, int $protocolId, bool $isPlayerModifiable, bool $isStartGame) : self{
+		return new self(($isStartGame || $protocolId < ProtocolInfo::PROTOCOL_1_21_111) ? VarInt::readUnsignedInt($in) : LE::readUnsignedInt($in), $isPlayerModifiable);
 	}
 }
diff --git a/src/types/LevelSettings.php b/src/types/LevelSettings.php
@@ -129,7 +129,7 @@ private function internalRead(ByteBufferReader $in, int $protocolId) : void{
 		$this->platformBroadcastMode = VarInt::readSignedInt($in);
 		$this->commandsEnabled = CommonTypes::getBool($in);
 		$this->isTexturePacksRequired = CommonTypes::getBool($in);
-		$this->gameRules = CommonTypes::getGameRules($in, true);
+		$this->gameRules = CommonTypes::getGameRules($in, $protocolId, true);
 		$this->experiments = Experiments::read($in);
 		$this->hasBonusChestEnabled = CommonTypes::getBool($in);
 		$this->hasStartWithMapEnabled = CommonTypes::getBool($in);
@@ -194,7 +194,7 @@ public function write(ByteBufferWriter $out, int $protocolId) : void{
 		VarInt::writeSignedInt($out, $this->platformBroadcastMode);
 		CommonTypes::putBool($out, $this->commandsEnabled);
 		CommonTypes::putBool($out, $this->isTexturePacksRequired);
-		CommonTypes::putGameRules($out, $this->gameRules, true);
+		CommonTypes::putGameRules($out, $protocolId, $this->gameRules, true);
 		$this->experiments->write($out);
 		CommonTypes::putBool($out, $this->hasBonusChestEnabled);
 		CommonTypes::putBool($out, $this->hasStartWithMapEnabled);
diff --git a/src/types/PlayerAuthInputVehicleInfo.php b/src/types/PlayerAuthInputVehicleInfo.php
@@ -17,6 +17,7 @@
 use pmmp\encoding\ByteBufferReader;
 use pmmp\encoding\ByteBufferWriter;
 use pmmp\encoding\LE;
+use pocketmine\network\mcpe\protocol\ProtocolInfo;
 use pocketmine\network\mcpe\protocol\serializer\CommonTypes;
 
 final class PlayerAuthInputVehicleInfo{
diff --git a/src/types/biome/BiomeDefinitionData.php b/src/types/biome/BiomeDefinitionData.php
@@ -35,6 +35,10 @@ public function __construct(
 		private int $id,
 		private float $temperature,
 		private float $downfall,
+		private float $redSporeDensity,
+		private float $blueSporeDensity,
+		private float $ashDensity,
+		private float $whiteAshDensity,
 		private float $foliageSnow,
 		private float $depth,
 		private float $scale,
@@ -52,6 +56,14 @@ public function getTemperature() : float{ return $this->temperature; }
 
 	public function getDownfall() : float{ return $this->downfall; }
 
+	public function getRedSporeDensity() : float{ return $this->redSporeDensity; }
+
+	public function getBlueSporeDensity() : float{ return $this->blueSporeDensity; }
+
+	public function getAshDensity() : float{ return $this->ashDensity; }
+
+	public function getWhiteAshDensity() : float{ return $this->whiteAshDensity; }
+
 	public function getFoliageSnow() : float{ return $this->foliageSnow; }
 
 	public function getDepth() : float{ return $this->depth; }
@@ -75,7 +87,14 @@ public static function read(ByteBufferReader $in, int $protocolId) : self{
 		$id = $protocolId >= ProtocolInfo::PROTOCOL_1_21_100 ? LE::readUnsignedShort($in) : CommonTypes::readOptional($in, LE::readUnsignedShort(...)) ?? 65535;
 		$temperature = LE::readFloat($in);
 		$downfall = LE::readFloat($in);
-		$foliageSnow = LE::readFloat($in);
+		if($protocolId >= ProtocolInfo::PROTOCOL_1_21_111){
+			$foliageSnow = LE::readFloat($in);
+		}else{
+			$redSporeDensity = LE::readFloat($in);
+			$blueSporeDensity = LE::readFloat($in);
+			$ashDensity = LE::readFloat($in);
+			$whiteAshDensity = LE::readFloat($in);
+		}
 		$depth = LE::readFloat($in);
 		$scale = LE::readFloat($in);
 		$mapWaterColor = Color::fromARGB(LE::readUnsignedInt($in));
@@ -89,14 +108,18 @@ public static function read(ByteBufferReader $in, int $protocolId) : self{
 
 			return $tagIndexes;
 		});
-		$chunkGenData = CommonTypes::readOptional($in, fn() => BiomeDefinitionChunkGenData::read($in));
+		$chunkGenData = CommonTypes::readOptional($in, fn() => BiomeDefinitionChunkGenData::read($in, $protocolId));
 
 		return new self(
 			$nameIndex,
 			$id,
 			$temperature,
 			$downfall,
-			$foliageSnow,
+			$redSporeDensity ?? 0.0,
+			$blueSporeDensity ?? 0.0,
+			$ashDensity ?? 0.0,
+			$whiteAshDensity ?? 0.0,
+			$foliageSnow ?? 0.0,
 			$depth,
 			$scale,
 			$mapWaterColor,
@@ -115,7 +138,14 @@ public function write(ByteBufferWriter $out, int $protocolId) : void{
 		}
 		LE::writeFloat($out, $this->temperature);
 		LE::writeFloat($out, $this->downfall);
-		LE::writeFloat($out, $this->foliageSnow);
+		if($protocolId >= ProtocolInfo::PROTOCOL_1_21_111){
+			LE::writeFloat($out, $this->foliageSnow);
+		}else{
+			LE::writeFloat($out, $this->redSporeDensity);
+			LE::writeFloat($out, $this->blueSporeDensity);
+			LE::writeFloat($out, $this->ashDensity);
+			LE::writeFloat($out, $this->whiteAshDensity);
+		}
 		LE::writeFloat($out, $this->depth);
 		LE::writeFloat($out, $this->scale);
 		LE::writeUnsignedInt($out, $this->mapWaterColor->toARGB());
@@ -126,6 +156,6 @@ public function write(ByteBufferWriter $out, int $protocolId) : void{
 				LE::writeUnsignedShort($out, $tag);
 			}
 		});
-		CommonTypes::writeOptional($out, $this->chunkGenData, fn(ByteBufferWriter $out, BiomeDefinitionChunkGenData $v) => $v->write($out));
+		CommonTypes::writeOptional($out, $this->chunkGenData, fn(ByteBufferWriter $out, BiomeDefinitionChunkGenData $v) => $v->write($out, $protocolId));
 	}
 }
diff --git a/src/types/biome/BiomeDefinitionEntry.php b/src/types/biome/BiomeDefinitionEntry.php
@@ -28,6 +28,10 @@ public function __construct(
 		private int $id,
 		private float $temperature,
 		private float $downfall,
+		private float $redSporeDensity,
+		private float $blueSporeDensity,
+		private float $ashDensity,
+		private float $whiteAshDensity,
 		private float $foliageSnow,
 		private float $depth,
 		private float $scale,
@@ -45,6 +49,14 @@ public function getTemperature() : float{ return $this->temperature; }
 
 	public function getDownfall() : float{ return $this->downfall; }
 
+	public function getRedSporeDensity() : float{ return $this->redSporeDensity; }
+
+	public function getBlueSporeDensity() : float{ return $this->blueSporeDensity; }
+
+	public function getAshDensity() : float{ return $this->ashDensity; }
+
+	public function getWhiteAshDensity() : float{ return $this->whiteAshDensity; }
+
 	public function getFoliageSnow() : float{ return $this->foliageSnow; }
 
 	public function getDepth() : float{ return $this->depth; }
diff --git a/src/types/biome/chunkgen/BiomeClimateData.php b/src/types/biome/chunkgen/BiomeClimateData.php
diff --git a/src/types/biome/chunkgen/BiomeDefinitionChunkGenData.php b/src/types/biome/chunkgen/BiomeDefinitionChunkGenData.php

Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,11 @@ public function getValue() : bool{`
`34`	`34`	`return $this->value;`
`35`	`35`	`}`
`36`	`36`
`37`		`- public function encode(ByteBufferWriter $out, bool $isStartGame) : void{`
	`37`	`+ public function encode(ByteBufferWriter $out, int $protocolId, bool $isStartGame) : void{`
`38`	`38`	`CommonTypes::putBool($out, $this->value);`
`39`	`39`	`}`
`40`	`40`
`41`		`- public static function decode(ByteBufferReader $in, bool $isPlayerModifiable) : self{`
	`41`	`+ public static function decode(ByteBufferReader $in, int $protocolId, bool $isPlayerModifiable) : self{`
`42`	`42`	`return new self(CommonTypes::getBool($in), $isPlayerModifiable);`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,5 @@ public function isPlayerModifiable() : bool{ return $this->isPlayerModifiable; }`
`25`	`25`
`26`	`26`	`abstract public function getTypeId() : int;`
`27`	`27`
`28`		`- abstract public function encode(ByteBufferWriter $out, bool $isStartGame) : void;`
	`28`	`+ abstract public function encode(ByteBufferWriter $out, int $protocolId, bool $isStartGame) : void;`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`use pmmp\encoding\ByteBufferWriter;`
`19`	`19`	`use pmmp\encoding\LE;`
`20`	`20`	`use pmmp\encoding\VarInt;`
	`21`	`+use pocketmine\network\mcpe\protocol\ProtocolInfo;`
`21`	`22`
`22`	`23`	`final class IntGameRule extends GameRule{`
`23`	`24`	`use GetTypeIdFromConstTrait;`
`@@ -35,15 +36,15 @@ public function getValue() : int{`
`35`	`36`	`return $this->value;`
`36`	`37`	`}`
`37`	`38`
`38`		`- public function encode(ByteBufferWriter $out, bool $isStartGame) : void{`
`39`		`- if($isStartGame){`
	`39`	`+ public function encode(ByteBufferWriter $out, int $protocolId, bool $isStartGame) : void{`
	`40`	`+ if($isStartGame \|\| $protocolId < ProtocolInfo::PROTOCOL_1_21_111){`
`40`	`41`	`VarInt::writeUnsignedInt($out, $this->value);`
`41`	`42`	`}else{`
`42`	`43`	`LE::writeUnsignedInt($out, $this->value);`
`43`	`44`	`}`
`44`	`45`	`}`
`45`	`46`
`46`		`- public static function decode(ByteBufferReader $in, bool $isPlayerModifiable, bool $isStartGame) : self{`
`47`		`- return new self($isStartGame ? VarInt::readUnsignedInt($in) : LE::readUnsignedInt($in), $isPlayerModifiable);`
	`47`	`+ public static function decode(ByteBufferReader $in, int $protocolId, bool $isPlayerModifiable, bool $isStartGame) : self{`
	`48`	`+ return new self(($isStartGame \|\| $protocolId < ProtocolInfo::PROTOCOL_1_21_111) ? VarInt::readUnsignedInt($in) : LE::readUnsignedInt($in), $isPlayerModifiable);`
`48`	`49`	`}`
`49`	`50`	`}`