From 65bd93749cf60e2c5fc79c5fb6df873b912d5982 Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 28 Sep 2016 21:49:58 -0700 Subject: [PATCH] Fix missing itemHandler capability for Farm hatch --- .../forestry/farming/tiles/TileFarmHatch.java | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/src/main/java/forestry/farming/tiles/TileFarmHatch.java b/src/main/java/forestry/farming/tiles/TileFarmHatch.java index 89fd4dc7d..afa963d6d 100644 --- a/src/main/java/forestry/farming/tiles/TileFarmHatch.java +++ b/src/main/java/forestry/farming/tiles/TileFarmHatch.java @@ -10,18 +10,21 @@ ******************************************************************************/ package forestry.farming.tiles; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; - -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.wrapper.InvWrapper; +import javax.annotation.Nonnull; import forestry.api.multiblock.IFarmComponent; import forestry.core.inventory.AdjacentInventoryCache; import forestry.core.tiles.AdjacentTileCache; import forestry.core.utils.InventoryUtil; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.wrapper.InvWrapper; +import net.minecraftforge.items.wrapper.SidedInvWrapper; // TODO: Buildcraft for 1.9 //@Optional.Interface(iface = "buildcraft.api.statements.ITriggerProvider", modid = "BuildCraftAPI|statements") @@ -64,6 +67,20 @@ public class TileFarmHatch extends TileFarm implements ISidedInventory, IFarmCom } + @Override + public boolean hasCapability(@Nonnull Capability capability, @Nonnull EnumFacing facing) { + return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing); + } + + @Override + public T getCapability(@Nonnull Capability capability, @Nonnull EnumFacing facing) { + if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { + SidedInvWrapper sidedInvWrapper = new SidedInvWrapper(this, facing); + return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(sidedInvWrapper); + } + return super.getCapability(capability, facing); + } + // TODO: Buildcraft for 1.9 // @Optional.Method(modid = "BuildCraftAPI|statements") // @Override