diff --git a/src/main/java/forestry/core/inventory/wrappers/InvWrapperBase.java b/src/main/java/forestry/core/inventory/wrappers/InvWrapperBase.java index 530bcfff0..9cdecb202 100644 --- a/src/main/java/forestry/core/inventory/wrappers/InvWrapperBase.java +++ b/src/main/java/forestry/core/inventory/wrappers/InvWrapperBase.java @@ -8,7 +8,6 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ - package forestry.core.inventory.wrappers; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/forestry/core/inventory/wrappers/InventoryMapper.java b/src/main/java/forestry/core/inventory/wrappers/InventoryMapper.java index 60e2f6571..a70f164e6 100755 --- a/src/main/java/forestry/core/inventory/wrappers/InventoryMapper.java +++ b/src/main/java/forestry/core/inventory/wrappers/InventoryMapper.java @@ -1,11 +1,13 @@ -/* - * Copyright (c) CovertJaguar, 2014 http://railcraft.info - * - * This code is the property of CovertJaguar - * and may only be used with explicit written - * permission unless otherwise specified on the - * license page at http://railcraft.info/wiki/info:license. - */ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ package forestry.core.inventory.wrappers; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/forestry/core/tiles/TileForestry.java b/src/main/java/forestry/core/tiles/TileForestry.java index 3d608b201..f9bd4ab06 100644 --- a/src/main/java/forestry/core/tiles/TileForestry.java +++ b/src/main/java/forestry/core/tiles/TileForestry.java @@ -28,9 +28,10 @@ import net.minecraft.util.IChatComponent; import net.minecraft.util.ITickable; import net.minecraft.util.MathHelper; import net.minecraft.world.World; - +import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.Optional; - +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.wrapper.SidedInvWrapper; import forestry.api.core.IErrorLogic; import forestry.api.core.IErrorLogicSource; import forestry.core.access.AccessHandler; @@ -388,4 +389,20 @@ public abstract class TileForestry extends TileEntity implements IStreamable, IE @Override public void clear() { } + + @Override + public T getCapability(Capability capability, EnumFacing facing) { + if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && inventory != null){ + return (T) new SidedInvWrapper(inventory, facing); + } + return super.getCapability(capability, facing); + } + + @Override + public boolean hasCapability(Capability capability, EnumFacing facing) { + if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && inventory != null){ + return true; + } + return super.hasCapability(capability, facing); + } }