Include more item containers to be dropped upon destroy

pmmp · Aug 24, 2024 · 9628fbf · 9628fbf
1 parent 6d47810
commit 9628fbf
Show file tree

Hide file tree

Showing 16 changed files with 109 additions and 11 deletions.
diff --git a/src/block/Barrel.php b/src/block/Barrel.php
@@ -25,6 +25,7 @@
 
 use pocketmine\block\tile\Barrel as TileBarrel;
 use pocketmine\block\utils\AnyFacingTrait;
+use pocketmine\block\utils\ContainerTrait;
 use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
 use pocketmine\math\Facing;
@@ -35,6 +36,7 @@
 
 class Barrel extends Opaque{
 	use AnyFacingTrait;
+	use ContainerTrait;
 
 	protected bool $open = false;
 

diff --git a/src/block/BrewingStand.php b/src/block/BrewingStand.php
@@ -25,6 +25,7 @@
 
 use pocketmine\block\tile\BrewingStand as TileBrewingStand;
 use pocketmine\block\utils\BrewingStandSlot;
+use pocketmine\block\utils\ContainerTrait;
 use pocketmine\block\utils\SupportType;
 use pocketmine\data\runtime\RuntimeDataDescriber;
 use pocketmine\item\Item;
@@ -37,6 +38,7 @@
 use function spl_object_id;
 
 class BrewingStand extends Transparent{
+	use ContainerTrait;
 
 	/**
 	 * @var BrewingStandSlot[]

diff --git a/src/block/Chest.php b/src/block/Chest.php
@@ -24,6 +24,7 @@
 namespace pocketmine\block;
 
 use pocketmine\block\tile\Chest as TileChest;
+use pocketmine\block\utils\ContainerTrait;
 use pocketmine\block\utils\FacesOppositePlacingPlayerTrait;
 use pocketmine\block\utils\SupportType;
 use pocketmine\event\block\ChestPairEvent;
@@ -35,6 +36,7 @@
 
 class Chest extends Transparent{
 	use FacesOppositePlacingPlayerTrait;
+	use ContainerTrait;
 
 	/**
 	 * @return AxisAlignedBB[]

diff --git a/src/block/ChiseledBookshelf.php b/src/block/ChiseledBookshelf.php
@@ -25,6 +25,7 @@
 
 use pocketmine\block\tile\ChiseledBookshelf as TileChiseledBookshelf;
 use pocketmine\block\utils\ChiseledBookshelfSlot;
+use pocketmine\block\utils\ContainerTrait;
 use pocketmine\block\utils\FacesOppositePlacingPlayerTrait;
 use pocketmine\block\utils\HorizontalFacingTrait;
 use pocketmine\data\runtime\RuntimeDataDescriber;
@@ -41,6 +42,7 @@
 class ChiseledBookshelf extends Opaque{
 	use HorizontalFacingTrait;
 	use FacesOppositePlacingPlayerTrait;
+	use ContainerTrait;
 
 	/**
 	 * @var ChiseledBookshelfSlot[]

diff --git a/src/block/Furnace.php b/src/block/Furnace.php
@@ -24,6 +24,7 @@
 namespace pocketmine\block;
 
 use pocketmine\block\tile\Furnace as TileFurnace;
+use pocketmine\block\utils\ContainerTrait;
 use pocketmine\block\utils\FacesOppositePlacingPlayerTrait;
 use pocketmine\block\utils\LightableTrait;
 use pocketmine\crafting\FurnaceType;
@@ -36,6 +37,7 @@
 class Furnace extends Opaque{
 	use FacesOppositePlacingPlayerTrait;
 	use LightableTrait;
+	use ContainerTrait;
 
 	protected FurnaceType $furnaceType;
 

diff --git a/src/block/Hopper.php b/src/block/Hopper.php
@@ -24,6 +24,7 @@
 namespace pocketmine\block;
 
 use pocketmine\block\tile\Hopper as TileHopper;
+use pocketmine\block\utils\ContainerTrait;
 use pocketmine\block\utils\PoweredByRedstoneTrait;
 use pocketmine\block\utils\SupportType;
 use pocketmine\data\runtime\RuntimeDataDescriber;
@@ -36,6 +37,7 @@
 
 class Hopper extends Transparent{
 	use PoweredByRedstoneTrait;
+	use ContainerTrait;
 
 	private int $facing = Facing::DOWN;
 

diff --git a/src/block/ShulkerBox.php b/src/block/ShulkerBox.php
@@ -68,10 +68,7 @@ public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Blo
 	}
 
 	private function addDataFromTile(TileShulkerBox $tile, Item $item) : void{
-		$shulkerNBT = $tile->getCleanedNBT();
-		if($shulkerNBT !== null){
-			$item->setNamedTag($shulkerNBT);
-		}
+		$item->setContainedItems($tile->getRealInventory()->getContents());
 		if($tile->hasName()){
 			$item->setCustomName($tile->getName());
 		}

diff --git a/src/block/tile/Barrel.php b/src/block/tile/Barrel.php
@@ -24,12 +24,15 @@
 namespace pocketmine\block\tile;
 
 use pocketmine\block\inventory\BarrelInventory;
+use pocketmine\item\Item;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\world\World;
 
 class Barrel extends Spawnable implements Container, Nameable{
-	use NameableTrait;
+	use NameableTrait {
+		copyDataFromItem as copyNameFromItem;
+	}
 	use ContainerTrait;
 
 	protected BarrelInventory $inventory;
@@ -49,6 +52,11 @@ protected function writeSaveData(CompoundTag $nbt) : void{
 		$this->saveItems($nbt);
 	}
 
+	public function copyDataFromItem(Item $item) : void{
+		$this->copyNameFromItem($item);
+		$this->copyContentsFromItem($item);
+	}
+
 	public function close() : void{
 		if(!$this->closed){
 			$this->inventory->removeAllViewers();

diff --git a/src/block/tile/BrewingStand.php b/src/block/tile/BrewingStand.php
@@ -43,6 +43,7 @@
 class BrewingStand extends Spawnable implements Container, Nameable{
 	use NameableTrait {
 		addAdditionalSpawnData as addNameSpawnData;
+		copyDataFromItem as copyNameFromItem;
 	}
 	use ContainerTrait;
 
@@ -92,6 +93,11 @@ protected function writeSaveData(CompoundTag $nbt) : void{
 		$nbt->setShort(self::TAG_REMAINING_FUEL_TIME_PE, $this->remainingFuelTime);
 	}
 
+	public function copyDataFromItem(Item $item) : void{
+		$this->copyNameFromItem($item);
+		$this->copyContentsFromItem($item);
+	}
+
 	protected function addAdditionalSpawnData(CompoundTag $nbt) : void{
 		$this->addNameSpawnData($nbt);
 

diff --git a/src/block/tile/Chest.php b/src/block/tile/Chest.php
@@ -25,6 +25,7 @@
 
 use pocketmine\block\inventory\ChestInventory;
 use pocketmine\block\inventory\DoubleChestInventory;
+use pocketmine\item\Item;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\IntTag;
@@ -35,8 +36,10 @@
 class Chest extends Spawnable implements Container, Nameable{
 	use NameableTrait {
 		addAdditionalSpawnData as addNameSpawnData;
+		copyDataFromItem as copyNameFromItem;
 	}
 	use ContainerTrait {
+		getCleanedNBT as getContainerNBT;
 		onBlockDestroyedHook as containerTraitBlockDestroyedHook;
 	}
 
@@ -83,14 +86,19 @@ protected function writeSaveData(CompoundTag $nbt) : void{
 	}
 
 	public function getCleanedNBT() : ?CompoundTag{
-		$tag = parent::getCleanedNBT();
+		$tag = $this->getContainerNBT();
 		if($tag !== null){
 			//TODO: replace this with a purpose flag on writeSaveData()
 			$tag->removeTag(self::TAG_PAIRX, self::TAG_PAIRZ);
 		}
 		return $tag;
 	}
 
+	public function copyDataFromItem(Item $item) : void{
+		$this->copyNameFromItem($item);
+		$this->copyContentsFromItem($item);
+	}
+
 	public function close() : void{
 		if(!$this->closed){
 			$this->inventory->removeAllViewers();

diff --git a/src/block/tile/ChiseledBookshelf.php b/src/block/tile/ChiseledBookshelf.php
@@ -114,4 +114,9 @@ protected function saveItems(CompoundTag $tag) : void{
 			$tag->setString(Container::TAG_LOCK, $this->lock);
 		}
 	}
+
+	public function copyDataFromItem(Item $item) : void{
+		parent::copyDataFromItem($item);
+		$this->copyContentsFromItem($item);
+	}
 }
diff --git a/src/block/tile/ContainerTrait.php b/src/block/tile/ContainerTrait.php
@@ -25,6 +25,7 @@
 
 use pocketmine\block\tile\util\ContainerHelper;
 use pocketmine\inventory\Inventory;
+use pocketmine\item\Item;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\StringTag;
 use pocketmine\world\Position;
@@ -63,6 +64,30 @@ protected function saveItems(CompoundTag $tag) : void{
 		}
 	}
 
+	/**
+	 * @see Tile::getCleanedNBT()
+	 */
+	public function getCleanedNBT() : ?CompoundTag{
+		$tag = parent::getCleanedNBT();
+		if($tag !== null){
+			$tag->removeTag(Container::TAG_ITEMS);
+		}
+		return $tag;
+	}
+
+	/**
+	 * @see Tile::copyDataFromItem()
+	 */
+	public function copyContentsFromItem(Item $item) : void{
+		$inventory = $this->getRealInventory();
+		$listeners = $inventory->getListeners()->toArray();
+		$inventory->getListeners()->remove(...$listeners); //prevent any events being fired by initialization
+
+		$inventory->setContents($item->getContainedItems());
+
+		$inventory->getListeners()->add(...$listeners);
+	}
+
 	/**
 	 * @see Container::canOpenWith()
 	 */

diff --git a/src/block/tile/Furnace.php b/src/block/tile/Furnace.php
@@ -41,7 +41,9 @@
 use function max;
 
 abstract class Furnace extends Spawnable implements Container, Nameable{
-	use NameableTrait;
+	use NameableTrait {
+		copyDataFromItem as copyNameFromItem;
+	}
 	use ContainerTrait;
 
 	public const TAG_BURN_TIME = "BurnTime";
@@ -84,6 +86,11 @@ public function readSaveData(CompoundTag $nbt) : void{
 		}
 	}
 
+	public function copyDataFromItem(Item $item) : void{
+		$this->copyNameFromItem($item);
+		$this->copyContentsFromItem($item);
+	}
+
 	protected function writeSaveData(CompoundTag $nbt) : void{
 		$nbt->setShort(self::TAG_BURN_TIME, $this->remainingFuelTime);
 		$nbt->setShort(self::TAG_COOK_TIME, $this->cookTime);

diff --git a/src/block/tile/Hopper.php b/src/block/tile/Hopper.php
@@ -24,14 +24,17 @@
 namespace pocketmine\block\tile;
 
 use pocketmine\block\inventory\HopperInventory;
+use pocketmine\item\Item;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\world\World;
 
 class Hopper extends Spawnable implements Container, Nameable{
 
+	use NameableTrait {
+		copyDataFromItem as copyNameFromItem;
+	}
 	use ContainerTrait;
-	use NameableTrait;
 
 	private const TAG_TRANSFER_COOLDOWN = "TransferCooldown";
 
@@ -57,6 +60,11 @@ protected function writeSaveData(CompoundTag $nbt) : void{
 		$nbt->setInt(self::TAG_TRANSFER_COOLDOWN, $this->transferCooldown);
 	}
 
+	public function copyDataFromItem(Item $item) : void{
+		$this->copyNameFromItem($item);
+		$this->copyContentsFromItem($item);
+	}
+
 	public function close() : void{
 		if(!$this->closed){
 			$this->inventory->removeAllViewers();

diff --git a/src/block/tile/ShulkerBox.php b/src/block/tile/ShulkerBox.php
@@ -34,7 +34,9 @@ class ShulkerBox extends Spawnable implements Container, Nameable{
 	use NameableTrait {
 		addAdditionalSpawnData as addNameSpawnData;
 	}
-	use ContainerTrait;
+	use ContainerTrait {
+		getCleanedNBT as getContainerNBT;
+	}
 
 	public const TAG_FACING = "facing";
 
@@ -60,7 +62,7 @@ protected function writeSaveData(CompoundTag $nbt) : void{
 	}
 
 	public function copyDataFromItem(Item $item) : void{
-		$this->readSaveData($item->getNamedTag());
+		$this->copyContentsFromItem($item);
 		if($item->hasCustomName()){
 			$this->setName($item->getCustomName());
 		}
@@ -78,7 +80,7 @@ protected function onBlockDestroyedHook() : void{
 	}
 
 	public function getCleanedNBT() : ?CompoundTag{
-		$nbt = parent::getCleanedNBT();
+		$nbt = $this->getContainerNBT();
 		if($nbt !== null){
 			$nbt->removeTag(self::TAG_FACING);
 		}

diff --git a/src/block/utils/ContainerTrait.php b/src/block/utils/ContainerTrait.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace pocketmine\block\utils;
+
+use pocketmine\block\tile\Container;
+use pocketmine\item\Item;
+
+trait ContainerTrait{
+
+	public function getPickedItem(bool $addUserData = false) : Item{
+		$item = parent::getPickedItem($addUserData);
+		if($addUserData){
+			$tile = $this->position->getWorld()->getTile($this->position);
+			if($tile instanceof Container){
+				$item->setContainedItems($tile->getRealInventory()->getContents());
+			}
+		}
+		return $item;
+	}
+}