Add support for Forge's new IItemHandler to inventory tiles

Author: rubensworks

build.properties

@@ -1,5 +1,5 @@
 mod_version=0.1.1
 minecraft_version=1.8.9
-forge_version=11.15.0.1661
-cyclopscore_version=0.4.3-203
+forge_version=11.15.0.1716
+cyclopscore_version=0.4.3-217
 release_type=release

src/main/java/org/cyclops/structuredcrafting/Reference.java

@@ -19,7 +19,7 @@ public final class Reference {
     // MOD ID's
     public static final String MOD_FORGE = "Forge";
     public static final String MOD_FORGE_VERSION = "@FORGE_VERSION@";
-    public static final String MOD_FORGE_VERSION_MIN = "11.14.3.1487";
+    public static final String MOD_FORGE_VERSION_MIN = "11.15.0.1716";
     public static final String MOD_CYCLOPSCORE = "cyclopscore";
     public static final String MOD_CYCLOPSCORE_MINVERSION = "@CYCLOPSCORE_VERSION@";
     public static final String MOD_CYCLOPSCORE_VERSION_MIN = "0.1.1";

src/main/java/org/cyclops/structuredcrafting/craft/provider/InventoryItemStackProvider.java

@@ -2,9 +2,13 @@
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.items.CapabilityItemHandler;
+import net.minecraftforge.items.IItemHandler;
 import org.apache.commons.lang3.tuple.Pair;
 import org.cyclops.cyclopscore.helper.InventoryHelpers;
 import org.cyclops.cyclopscore.helper.TileHelpers;
@@ -25,54 +29,95 @@ protected Pair<Integer, ItemStack> getFirstItem(IInventory inventory, EnumFacing
         return null;
     }
 
+    protected Pair<Integer, ItemStack> getFirstItem(IItemHandler itemHandler, EnumFacing side) {
+        for(int slot = 0; slot < itemHandler.getSlots(); slot++) {
+            ItemStack itemStack = itemHandler.getStackInSlot(slot);
+            if(itemStack != null) {
+                return Pair.of(slot, itemStack);
+            }
+        }
+        return null;
+    }
+
     @Override
     public boolean isValidForResults(World world, BlockPos pos, EnumFacing side) {
+        IItemHandler itemHandler = TileHelpers.getCapability(world, pos, side, CapabilityItemHandler.ITEM_HANDLER_CAPABILITY);
         IInventory inventory = TileHelpers.getSafeTile(world, pos, IInventory.class);
-        return inventory != null;
+        return itemHandler != null || inventory != null;
     }
 
     @Override
     public boolean hasItemStack(World world, BlockPos pos, EnumFacing side) {
         IInventory inventory = TileHelpers.getSafeTile(world, pos, IInventory.class);
-        return inventory != null && getFirstItem(inventory, side) != null;
+        IItemHandler itemHandler = TileHelpers.getCapability(world, pos, side, CapabilityItemHandler.ITEM_HANDLER_CAPABILITY);
+        return (itemHandler != null && getFirstItem(itemHandler, side) != null)
+                || (inventory != null && getFirstItem(inventory, side) != null);
     }
 
     @Override
     public ItemStack getItemStack(World world, BlockPos pos, EnumFacing side) {
+        IItemHandler itemHandler = TileHelpers.getCapability(world, pos, side, CapabilityItemHandler.ITEM_HANDLER_CAPABILITY);
         IInventory inventory = TileHelpers.getSafeTile(world, pos, IInventory.class);
-        return getFirstItem(inventory, side).getRight();
+        return itemHandler != null ? getFirstItem(itemHandler, side).getRight() : getFirstItem(inventory, side).getRight();
     }
 
     @Override
     public void reduceItemStack(World world, BlockPos pos, EnumFacing side) {
-        IInventory inventory = TileHelpers.getSafeTile(world, pos, IInventory.class);
-        Pair<Integer, ItemStack> result = getFirstItem(inventory, side);
-        ItemStack newItemStack = result.getRight().copy();
-        newItemStack.stackSize--;
-        if(newItemStack.stackSize <= 0) {
-            newItemStack = null;
+        IItemHandler itemHandler = TileHelpers.getCapability(world, pos, side, CapabilityItemHandler.ITEM_HANDLER_CAPABILITY);
+        if(itemHandler != null) {
+            for(int slot = 0; slot < itemHandler.getSlots(); slot++) {
+                if(itemHandler.extractItem(slot, 1, false) != null) {
+                    break;
+                }
+            }
+        } else {
+            IInventory inventory = TileHelpers.getSafeTile(world, pos, IInventory.class);
+            Pair<Integer, ItemStack> result = getFirstItem(inventory, side);
+            ItemStack newItemStack = result.getRight().copy();
+            newItemStack.stackSize--;
+            if (newItemStack.stackSize <= 0) {
+                newItemStack = null;
+            }
+            inventory.setInventorySlotContents(result.getLeft(), newItemStack);
         }
-        inventory.setInventorySlotContents(result.getLeft(), newItemStack);
     }
 
     @Override
     public boolean addItemStack(World world, BlockPos pos, EnumFacing side, ItemStack itemStack) {
-        IInventory inventory = TileHelpers.getSafeTile(world, pos, IInventory.class);
-        for(int slot = 0; slot < inventory.getSizeInventory(); slot++) {
-            if(InventoryHelpers.addToSlot(inventory, slot, itemStack)) {
-                return true;
+        IItemHandler itemHandler = TileHelpers.getCapability(world, pos, side, CapabilityItemHandler.ITEM_HANDLER_CAPABILITY);
+        if(itemHandler != null) {
+            for(int slot = 0; slot < itemHandler.getSlots(); slot++) {
+                if(itemHandler.insertItem(slot, itemStack, false) == null) {
+                    return true;
+                }
+            }
+        } else {
+            IInventory inventory = TileHelpers.getSafeTile(world, pos, IInventory.class);
+            for (int slot = 0; slot < inventory.getSizeInventory(); slot++) {
+                if (InventoryHelpers.addToSlot(inventory, slot, itemStack)) {
+                    return true;
+                }
             }
         }
         return false;
     }
 
     @Override
     public boolean setItemStack(World world, BlockPos pos, EnumFacing side, ItemStack itemStack) {
-        IInventory inventory = TileHelpers.getSafeTile(world, pos, IInventory.class);
-        Pair<Integer, ItemStack> result = getFirstItem(inventory, side);
-        if(result != null) {
-            inventory.setInventorySlotContents(result.getLeft(), itemStack);
-            return true;
+        IItemHandler itemHandler = TileHelpers.getCapability(world, pos, side, CapabilityItemHandler.ITEM_HANDLER_CAPABILITY);
+        if(itemHandler != null) {
+            for(int slot = 0; slot < itemHandler.getSlots(); slot++) {
+                if(itemHandler.insertItem(slot, itemStack, false) == null) {
+                    return true;
+                }
+            }
+        } else {
+            IInventory inventory = TileHelpers.getSafeTile(world, pos, IInventory.class);
+            Pair<Integer, ItemStack> result = getFirstItem(inventory, side);
+            if (result != null) {
+                inventory.setInventorySlotContents(result.getLeft(), itemStack);
+                return true;
+            }
         }
         return false;
     }