diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java index 46ed829f7..ec102229d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java @@ -15,6 +15,12 @@ import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.common.block.tile.TileSimpleInventory; public abstract class TileCorporeaBase extends TileSimpleInventory { + // These TE's only extend TileSimpleInventory to give sparks an inventory to attach to + // TODO make sparks able to detect corporea blocks and not require them to have an inventory + @Override + public final int getSizeInventory() { + return 0; + } public ICorporeaSpark getSpark() { return CorporeaHelper.getSparkForBlock(world, getPos()); diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index d6dba98d0..1f8877ee4 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -132,22 +132,12 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor itemCount = par1nbtTagCompound.getInteger(TAG_ITEM_COUNT); } - @Override - public int getSizeInventory() { - return 1; - } - public int getComparatorValue() { if(itemCount == 0) return 0; return Math.min(15, (int) Math.floor(Math.log(itemCount) / LOG_2) + 1); } - @Override - protected SimpleItemStackHandler createItemHandler() { - return new SimpleItemStackHandler(this, false); - } - @Override public void doCorporeaRequest(Object request, int count, ICorporeaSpark spark) { if(!(request instanceof ItemStack)) diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java index e7a57eef0..daa1958aa 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -66,16 +66,6 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq return filter; } - @Override - public int getSizeInventory() { - return 1; - } - - @Override - protected SimpleItemStackHandler createItemHandler() { - return new SimpleItemStackHandler(this, false); - } - @Override public void doCorporeaRequest(Object request, int count, ICorporeaSpark spark) { if(!(request instanceof ItemStack)) diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index d95a01aa0..b7cba96f5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -190,11 +190,6 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ removeIndex(this); } - @Override - public int getSizeInventory() { - return 0; - } - @Override public void doCorporeaRequest(Object request, int count, ICorporeaSpark spark) { if(!(request instanceof String)) diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index ca700d743..1d02bb82b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -26,16 +26,6 @@ import java.util.List; public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorporeaInterceptor { - @Override - protected SimpleItemStackHandler createItemHandler() { - return new SimpleItemStackHandler(this, false); - } - - @Override - public int getSizeInventory() { - return 1; - } - @Override public void interceptRequest(Object request, int count, ICorporeaSpark spark, ICorporeaSpark source, List stacks, List inventories, boolean doit) {}