Fix ServerJoinInformation

Author: dries-c

src/types/GatheringJoinInfo.php

@@ -22,24 +22,21 @@
 final class GatheringJoinInfo{
 
 	public function __construct(
-		private string $experienceId,
+		private UuidInterface $experienceId,
 		private string $experienceName,
-		private string $experienceWorldId,
+		private UuidInterface $experienceWorldId,
 		private string $experienceWorldName,
 		private string $creatorId,
 		private UuidInterface $targetId,
 		private string $scenarioId,
 		private string $serverId,
-		private string $storeId,
-		private string $storeName,
-		private bool $presenceConfiguration
 	){}
 
-	public function getExperienceId() : string{ return $this->experienceId; }
+	public function getExperienceId() : UuidInterface{ return $this->experienceId; }
 
 	public function getExperienceName() : string{ return $this->experienceName; }
 
-	public function getExperienceWorldId() : string{ return $this->experienceWorldId; }
+	public function getExperienceWorldId() : UuidInterface{ return $this->experienceWorldId; }
 
 	public function getExperienceWorldName() : string{ return $this->experienceWorldName; }
 
@@ -51,26 +48,16 @@ public function getScenarioId() : string{ return $this->scenarioId; }
 
 	public function getServerId() : string{ return $this->serverId; }
 
-	public function getStoreId() : string{ return $this->storeId; }
-
-	public function getStoreName() : string{ return $this->storeName; }
-
-	public function isPresenceConfiguration() : bool{ return $this->presenceConfiguration; }
-
 	public static function read(ByteBufferReader $in) : self{
-		$experienceId = CommonTypes::getString($in);
+		$experienceId = CommonTypes::getUUID($in);
 		$experienceName = CommonTypes::getString($in);
-		$experienceWorldId = CommonTypes::getString($in);
+		$experienceWorldId = CommonTypes::getUUID($in);
 		$experienceWorldName = CommonTypes::getString($in);
 		$creatorId = CommonTypes::getString($in);
 		$targetId = CommonTypes::getUUID($in);
 		$scenarioId = CommonTypes::getString($in);
 		$serverId = CommonTypes::getString($in);
 
-		$storeId = CommonTypes::getString($in);
-		$storeName = CommonTypes::getString($in);
-		$presenceConfiguration = CommonTypes::getBool($in);
-
 		return new self(
 			$experienceId,
 			$experienceName,
@@ -80,24 +67,17 @@ public static function read(ByteBufferReader $in) : self{
 			$targetId,
 			$scenarioId,
 			$serverId,
-			$storeId,
-			$storeName,
-			$presenceConfiguration
 		);
 	}
 
 	public function write(ByteBufferWriter $out) : void{
-		CommonTypes::putString($out, $this->experienceId);
+		CommonTypes::putUUID($out, $this->experienceId);
 		CommonTypes::putString($out, $this->experienceName);
-		CommonTypes::putString($out, $this->experienceWorldId);
+		CommonTypes::putUUID($out, $this->experienceWorldId);
 		CommonTypes::putString($out, $this->experienceWorldName);
 		CommonTypes::putString($out, $this->creatorId);
 		CommonTypes::putUUID($out, $this->targetId);
 		CommonTypes::putString($out, $this->scenarioId);
 		CommonTypes::putString($out, $this->serverId);
-
-		CommonTypes::putString($out, $this->storeId);
-		CommonTypes::putString($out, $this->storeName);
-		CommonTypes::putBool($out, $this->presenceConfiguration);
 	}
 }

src/types/PresenceInfo.php

@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of BedrockProtocol.
+ * Copyright (C) 2014-2022 PocketMine Team <https://github.com/pmmp/BedrockProtocol>
+ *
+ * BedrockProtocol is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\network\mcpe\protocol\types;
+
+use pmmp\encoding\ByteBufferReader;
+use pmmp\encoding\ByteBufferWriter;
+use pocketmine\network\mcpe\protocol\serializer\CommonTypes;
+
+final class PresenceInfo{
+
+	public function __construct(
+		private string $experienceName,
+		private string $worldName,
+	){}
+
+	public function getExperienceName() : string{ return $this->experienceName; }
+
+	public function getWorldName() : string{ return $this->worldName; }
+
+	public static function read(ByteBufferReader $in) : self{
+		$experienceName = CommonTypes::getString($in);
+		$worldName = CommonTypes::getString($in);
+
+		return new self(
+			$experienceName,
+			$worldName,
+		);
+	}
+
+	public function write(ByteBufferWriter $out) : void{
+		CommonTypes::putString($out, $this->experienceName);
+		CommonTypes::putString($out, $this->worldName);
+	}
+}

src/types/ServerJoinInformation.php

@@ -22,19 +22,31 @@ final class ServerJoinInformation{
 
 	public function __construct(
 		private ?GatheringJoinInfo $gatheringJoinInfo,
+		private ?StoreEntryPointInfo $storeEntryPointInfo,
+		private ?PresenceInfo $presenceInfo,
 	){}
 
 	public function getGatheringJoinInfo() : ?GatheringJoinInfo{ return $this->gatheringJoinInfo; }
 
+	public function getStoreEntryPointInfo() : ?StoreEntryPointInfo{ return $this->storeEntryPointInfo; }
+
+	public function getPresenceInfo() : ?PresenceInfo{ return $this->presenceInfo; }
+
 	public static function read(ByteBufferReader $in) : self{
 		$gatheringJoinInfo = CommonTypes::readOptional($in, GatheringJoinInfo::read(...));
+		$storeEntryPointInfo = CommonTypes::readOptional($in, StoreEntryPointInfo::read(...));
+		$presenceInfo = CommonTypes::readOptional($in, PresenceInfo::read(...));
 
 		return new self(
-			$gatheringJoinInfo
+			$gatheringJoinInfo,
+			$storeEntryPointInfo,
+			$presenceInfo,
 		);
 	}
 
 	public function write(ByteBufferWriter $out) : void{
 		CommonTypes::writeOptional($out, $this->gatheringJoinInfo, fn(ByteBufferWriter $out, GatheringJoinInfo $info) => $info->write($out));
+		CommonTypes::writeOptional($out, $this->storeEntryPointInfo, fn(ByteBufferWriter $out, StoreEntryPointInfo $info) => $info->write($out));
+		CommonTypes::writeOptional($out, $this->presenceInfo, fn(ByteBufferWriter $out, PresenceInfo $info) => $info->write($out));
 	}
 }

src/types/StoreEntryPointInfo.php

@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of BedrockProtocol.
+ * Copyright (C) 2014-2022 PocketMine Team <https://github.com/pmmp/BedrockProtocol>
+ *
+ * BedrockProtocol is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\network\mcpe\protocol\types;
+
+use pmmp\encoding\ByteBufferReader;
+use pmmp\encoding\ByteBufferWriter;
+use pocketmine\network\mcpe\protocol\serializer\CommonTypes;
+
+final class StoreEntryPointInfo{
+
+	public function __construct(
+		private string $id,
+		private string $name,
+	){}
+
+	public function getId() : string{ return $this->id; }
+
+	public function getName() : string{ return $this->name; }
+
+	public static function read(ByteBufferReader $in) : self{
+		$storeId = CommonTypes::getString($in);
+		$storeName = CommonTypes::getString($in);
+
+		return new self(
+			$storeId,
+			$storeName,
+		);
+	}
+
+	public function write(ByteBufferWriter $out) : void{
+		CommonTypes::putString($out, $this->id);
+		CommonTypes::putString($out, $this->name);
+	}
+}