From bb0338dd551a0be84cfba16f54ba8b0b7fea1ecd Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 25 Jan 2016 19:05:01 +0100 Subject: [PATCH] //TODO make this work for the stupid new system --- .../mod/tile/TileEntityInputter.java | 23 +++++++++++++++++-- .../actuallyadditions/mod/util/WorldUtil.java | 1 + 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java index 70f672209..b63b9cec8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java @@ -82,10 +82,24 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt this.markDirty(); } + private boolean newPull(){ + //TODO make this work for the stupid new system + return false; + } + + private boolean newPut(){ + //TODO make this work for the stupid new system + return false; + } + /** * Pulls Items from the specified Slots on the specified Side */ - public void pull(){ + private void pull(){ + if(this.newPull()){ + return; + } + //The Inventory to pull from IInventory theInventory = (IInventory)placeToPull; //Does the Inventory even have Slots!? @@ -184,7 +198,11 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt * Puts Items into the specified Slots at the specified Side * (Check pull() for Description, similar to this) */ - public void put(){ + private void put(){ + if(this.newPut()){ + return; + } + IInventory theInventory = (IInventory)placeToPut; if(theInventory.getSizeInventory() > 0){ int theSlotToPut = this.slotToPutStart; @@ -229,6 +247,7 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt } } if(can){ + System.out.println("Putting old"); if(theStack != null){ ItemStack copiedStack = theStack.copy(); if(copiedStack.isItemEqual(this.slots[0])){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java index 642563d5b..1026607b4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java @@ -243,6 +243,7 @@ public class WorldUtil{ return blocks; } + //TODO make this work for the stupid new system /** * Add an ArrayList of ItemStacks to an Array of slots *