Address #207 by replacing existing chest blocks with barrier blocks

Author: Muqsit

src/muqsit/invmenu/type/BlockActorFixedInvMenuType.php

@@ -7,12 +7,17 @@
 use muqsit\invmenu\inventory\InvMenuInventory;
 use muqsit\invmenu\InvMenu;
 use muqsit\invmenu\type\graphic\BlockActorInvMenuGraphic;
+use muqsit\invmenu\type\graphic\BlockInvMenuGraphic;
 use muqsit\invmenu\type\graphic\InvMenuGraphic;
+use muqsit\invmenu\type\graphic\MultiBlockInvMenuGraphic;
 use muqsit\invmenu\type\graphic\network\InvMenuGraphicNetworkTranslator;
 use muqsit\invmenu\type\util\InvMenuTypeHelper;
 use pocketmine\block\Block;
+use pocketmine\block\VanillaBlocks;
 use pocketmine\inventory\Inventory;
+use pocketmine\math\Facing;
 use pocketmine\player\Player;
+use function count;
 
 final class BlockActorFixedInvMenuType implements FixedInvMenuType{
 
@@ -29,12 +34,18 @@ public function getSize() : int{
 	}
 
 	public function createGraphic(InvMenu $menu, Player $player) : ?InvMenuGraphic{
-		$origin = $player->getPosition()->addVector(InvMenuTypeHelper::getBehindPositionOffset($player))->floor();
+		$position = $player->getPosition();
+		$origin = $position->addVector(InvMenuTypeHelper::getBehindPositionOffset($player))->floor();
 		if(!InvMenuTypeHelper::isValidYCoordinate($origin->y)){
 			return null;
 		}
 
-		return new BlockActorInvMenuGraphic($this->block, $origin, BlockActorInvMenuGraphic::createTile($this->tile_id, $menu->getName()), $this->network_translator, $this->animation_duration);
+		$graphics = [new BlockActorInvMenuGraphic($this->block, $origin, BlockActorInvMenuGraphic::createTile($this->tile_id, $menu->getName()), $this->network_translator, $this->animation_duration)];
+		foreach(InvMenuTypeHelper::findConnectedBlocks("Chest", $position->getWorld(), $origin, Facing::HORIZONTAL) as $side){
+			$graphics[] = new BlockInvMenuGraphic(VanillaBlocks::BARRIER(), $side);
+		}
+
+		return count($graphics) > 1 ? new MultiBlockInvMenuGraphic($graphics) : $graphics[0];
 	}
 
 	public function createInventory() : Inventory{

src/muqsit/invmenu/type/DoublePairableBlockActorFixedInvMenuType.php

@@ -7,13 +7,16 @@
 use muqsit\invmenu\inventory\InvMenuInventory;
 use muqsit\invmenu\InvMenu;
 use muqsit\invmenu\type\graphic\BlockActorInvMenuGraphic;
+use muqsit\invmenu\type\graphic\BlockInvMenuGraphic;
 use muqsit\invmenu\type\graphic\InvMenuGraphic;
 use muqsit\invmenu\type\graphic\MultiBlockInvMenuGraphic;
 use muqsit\invmenu\type\graphic\network\InvMenuGraphicNetworkTranslator;
 use muqsit\invmenu\type\util\InvMenuTypeHelper;
 use pocketmine\block\Block;
 use pocketmine\block\tile\Chest;
+use pocketmine\block\VanillaBlocks;
 use pocketmine\inventory\Inventory;
+use pocketmine\math\Facing;
 use pocketmine\player\Player;
 
 final class DoublePairableBlockActorFixedInvMenuType implements FixedInvMenuType{
@@ -31,17 +34,19 @@ public function getSize() : int{
 	}
 
 	public function createGraphic(InvMenu $menu, Player $player) : ?InvMenuGraphic{
-		$origin = $player->getPosition()->addVector(InvMenuTypeHelper::getBehindPositionOffset($player))->floor();
+		$position = $player->getPosition();
+		$origin = $position->addVector(InvMenuTypeHelper::getBehindPositionOffset($player))->floor();
 		if(!InvMenuTypeHelper::isValidYCoordinate($origin->y)){
 			return null;
 		}
 
 		$graphics = [];
 		$menu_name = $menu->getName();
+		$world = $position->getWorld();
 		foreach([
-			[$origin, $origin->east()],
-			[$origin->east(), $origin]
-		] as [$origin_pos, $pair_pos]){
+			[$origin, $origin->east(), [Facing::NORTH, Facing::SOUTH, Facing::WEST]],
+			[$origin->east(), $origin, [Facing::NORTH, Facing::SOUTH, Facing::EAST]]
+		] as [$origin_pos, $pair_pos, $connected_sides]){
 			$graphics[] = new BlockActorInvMenuGraphic(
 				$this->block,
 				$origin_pos,
@@ -51,6 +56,9 @@ public function createGraphic(InvMenu $menu, Player $player) : ?InvMenuGraphic{
 				$this->network_translator,
 				$this->animation_duration
 			);
+			foreach(InvMenuTypeHelper::findConnectedBlocks("Chest", $world, $origin_pos, $connected_sides) as $side){
+				$graphics[] = new BlockInvMenuGraphic(VanillaBlocks::BARRIER(), $side);
+			}
 		}
 
 		return count($graphics) > 1 ? new MultiBlockInvMenuGraphic($graphics) : $graphics[0];

src/muqsit/invmenu/type/util/InvMenuTypeHelper.php

@@ -4,8 +4,12 @@
 
 namespace muqsit\invmenu\type\util;
 
+use Generator;
+use pocketmine\block\tile\Chest;
+use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
+use pocketmine\world\World;
 
 final class InvMenuTypeHelper{
 
@@ -24,4 +28,25 @@ public static function getBehindPositionOffset(Player $player) : Vector3{
 	public static function isValidYCoordinate(float $y) : bool{
 		return $y >= self::NETWORK_WORLD_Y_MIN && $y <= self::NETWORK_WORLD_Y_MAX;
 	}
+
+	/**
+	 * @param string $tile_id
+	 * @param World $world
+	 * @param Vector3 $position
+	 * @param list<Facing::DOWN|Facing::UP|Facing::NORTH|Facing::SOUTH|Facing::WEST|Facing::EAST> $sides
+	 * @return Generator<Vector3>
+	 */
+	public static function findConnectedBlocks(string $tile_id, World $world, Vector3 $position, array $sides) : Generator{
+		if($tile_id === "Chest"){
+			// setting a single chest at the spot of a pairable chest sends the client a double chest
+			// https://github.com/Muqsit/InvMenu/issues/207
+			foreach($sides as $side){
+				$pos = $position->getSide($side);
+				$tile = $world->getTileAt($pos->x, $pos->y, $pos->z);
+				if($tile instanceof Chest && $tile->getPair() !== null){
+					yield $pos;
+				}
+			}
+		}
+	}
 }