diff --git a/src/main/java/forestry/api/multiblock/IMultiblockComponent.java b/src/main/java/forestry/api/multiblock/IMultiblockComponent.java index ef5e5b705..f05d93843 100644 --- a/src/main/java/forestry/api/multiblock/IMultiblockComponent.java +++ b/src/main/java/forestry/api/multiblock/IMultiblockComponent.java @@ -9,6 +9,8 @@ import net.minecraft.util.ChunkCoordinates; import com.mojang.authlib.GameProfile; +import forestry.core.inventory.IInventoryAdapter; + /** * Basic interface for a multiblock machine component. Implemented by TileEntities. */ @@ -45,4 +47,15 @@ public interface IMultiblockComponent { * Called when the machine is broken for game reasons, e.g. a player removed a block or an explosion occurred. */ void onMachineBroken(); + + /** + * A component with a separate inventory, like the Alveary Swarmer or Alveary Sieve. + */ + interface HasInventory { + + /** + * Called when this part is destroyed to drop its contents. + */ + IInventoryAdapter getInternalInventory(); + } } diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java index 02a577929..695beec56 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java @@ -19,6 +19,7 @@ import net.minecraftforge.fluids.IFluidHandler; import forestry.api.core.IClimateControlled; import forestry.api.multiblock.IAlvearyComponent; +import forestry.api.multiblock.IMultiblockComponent; import forestry.apiculture.blocks.BlockAlveary; import forestry.apiculture.gui.ContainerAlvearyHygroregulator; import forestry.apiculture.gui.GuiAlvearyHygroregulator; @@ -31,8 +32,8 @@ import forestry.core.fluids.tanks.FilteredTank; import forestry.core.inventory.IInventoryAdapter; import forestry.core.tiles.ILiquidTankTile; -public class TileAlvearyHygroregulator extends TileAlveary - implements IInventory, ILiquidTankTile, IFluidHandler, IAlvearyComponent.Climatiser { +public class TileAlvearyHygroregulator extends TileAlveary implements IInventory, ILiquidTankTile, IFluidHandler, + IAlvearyComponent.Climatiser, IMultiblockComponent.HasInventory { private final HygroregulatorRecipe[] recipes; diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java index 017aa7689..e197f64a2 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java @@ -18,6 +18,7 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; import forestry.api.multiblock.IAlvearyComponent; +import forestry.api.multiblock.IMultiblockComponent; import forestry.apiculture.blocks.BlockAlveary; import forestry.apiculture.gui.ContainerAlvearySieve; import forestry.apiculture.gui.GuiAlvearySieve; @@ -25,7 +26,8 @@ import forestry.apiculture.inventory.InventoryAlvearySieve; import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.watchers.ISlotPickupWatcher; -public class TileAlvearySieve extends TileAlveary implements IAlvearyComponent.BeeListener { +public class TileAlvearySieve extends TileAlveary + implements IAlvearyComponent.BeeListener, IMultiblockComponent.HasInventory { private final IBeeListener beeListener; private final InventoryAlvearySieve inventory; diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java index f18602120..398ea4d65 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java @@ -22,6 +22,7 @@ import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IBee; import forestry.api.multiblock.IAlvearyComponent; +import forestry.api.multiblock.IMultiblockComponent; import forestry.apiculture.blocks.BlockAlveary; import forestry.apiculture.gui.ContainerAlvearySwarmer; import forestry.apiculture.gui.GuiAlvearySwarmer; @@ -37,7 +38,8 @@ import forestry.core.proxy.Proxies; import forestry.core.tiles.IActivatable; import forestry.core.utils.ItemStackUtil; -public class TileAlvearySwarmer extends TileAlveary implements ISidedInventory, IActivatable, IAlvearyComponent.Active { +public class TileAlvearySwarmer extends TileAlveary + implements ISidedInventory, IActivatable, IAlvearyComponent.Active, IMultiblockComponent.HasInventory { private final InventorySwarmer inventory; private final Deque pendingSpawns = new ArrayDeque<>(); diff --git a/src/main/java/forestry/core/blocks/BlockStructure.java b/src/main/java/forestry/core/blocks/BlockStructure.java index c17dd23d5..59eac4862 100644 --- a/src/main/java/forestry/core/blocks/BlockStructure.java +++ b/src/main/java/forestry/core/blocks/BlockStructure.java @@ -116,6 +116,12 @@ public abstract class BlockStructure extends BlockForestry { InventoryUtil.dropSockets((ISocketable) tile, world, x, y, z); } } + + if (tile instanceof IMultiblockComponent.HasInventory) { + IMultiblockComponent.HasInventory hasInventory = (IMultiblockComponent.HasInventory) tile; + + InventoryUtil.dropInventory(hasInventory.getInternalInventory(), world, x, y, z); + } } super.breakBlock(world, x, y, z, block, meta); }