From 1b5807790416b05848dbe124c718be7174e85529 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 1 May 2016 14:46:12 -0700 Subject: [PATCH] Cleanup --- .../java/forestry/core/inventory/ItemInventory.java | 10 ++++++---- src/main/java/forestry/core/tiles/TileForestry.java | 5 +++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/forestry/core/inventory/ItemInventory.java b/src/main/java/forestry/core/inventory/ItemInventory.java index 386389d63..54e69ea7a 100755 --- a/src/main/java/forestry/core/inventory/ItemInventory.java +++ b/src/main/java/forestry/core/inventory/ItemInventory.java @@ -19,10 +19,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; + import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; + import forestry.core.tiles.IFilterSlotDelegate; public abstract class ItemInventory implements IInventory, IFilterSlotDelegate, ICapabilityProvider { @@ -30,6 +32,7 @@ public abstract class ItemInventory implements IInventory, IFilterSlotDelegate, private static final String KEY_UID = "UID"; private static final Random rand = new Random(); + private final IItemHandler capabilityHandler = new ItemHandlerItemInventory<>(this); private final EntityPlayer player; private final ItemStack parent; private final ItemStack[] inventoryStacks; @@ -292,12 +295,11 @@ public abstract class ItemInventory implements IInventory, IFilterSlotDelegate, public void setField(int id, int value) { } - IItemHandler handler = new ItemHandlerItemInventory(this); - @Override public T getCapability(Capability capability, EnumFacing facing) { - if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY){ - return (T) handler; + if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { + //noinspection unchecked + return (T) capabilityHandler; } return null; } diff --git a/src/main/java/forestry/core/tiles/TileForestry.java b/src/main/java/forestry/core/tiles/TileForestry.java index f9bd4ab06..336b7c202 100644 --- a/src/main/java/forestry/core/tiles/TileForestry.java +++ b/src/main/java/forestry/core/tiles/TileForestry.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.core.tiles; +import javax.annotation.Nonnull; import java.io.IOException; import java.util.Collection; import java.util.Random; @@ -28,10 +29,12 @@ 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; @@ -62,6 +65,7 @@ public abstract class TileForestry extends TileEntity implements IStreamable, IE private final AccessHandler accessHandler = new AccessHandler(this); private final ErrorLogic errorHandler = new ErrorLogic(); private final AdjacentTileCache tileCache = new AdjacentTileCache(this); + @Nonnull private IInventoryAdapter inventory = FakeInventoryAdapter.instance(); private int tickCount = rand.nextInt(256); @@ -393,6 +397,7 @@ public abstract class TileForestry extends TileEntity implements IStreamable, IE @Override public T getCapability(Capability capability, EnumFacing facing) { if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && inventory != null){ + //noinspection unchecked return (T) new SidedInvWrapper(inventory, facing); } return super.getCapability(capability, facing);