From 4b50c6c2b9dc2666c0d61ccce0c730d7f7acb329 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Sun, 12 Nov 2017 17:55:48 +1000 Subject: $ fixed item push/pull for Modularity Table. + Added some new MT textures. --- .../core/inventories/modulartable/InventoryModularMain.java | 7 ++++--- .../core/inventories/modulartable/InventoryModularOutput.java | 6 +++++- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'src/Java/gtPlusPlus/core/inventories') diff --git a/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularMain.java b/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularMain.java index 5b7d85335b..590286a923 100644 --- a/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularMain.java +++ b/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularMain.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.inventories.modulartable; +import gtPlusPlus.core.slots.SlotModularBauble; +import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable; import gtPlusPlus.core.util.Utils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -191,12 +193,11 @@ public class InventoryModularMain implements IInventory{ * even when this returns false */ @Override - public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) - { + public boolean isItemValidForSlot(final int slot, final ItemStack itemstack){ // Don't want to be able to store the inventory item within itself // Bad things will happen, like losing your inventory // Actually, this needs a custom Slot to work - return true; + return TileEntityModularityTable.isValidUpgrade(itemstack); } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java b/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java index 3501b7ae47..998750e3e3 100644 --- a/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java +++ b/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.inventories.modulartable; +import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -181,7 +182,10 @@ public class InventoryModularOutput implements IInventory { // Don't want to be able to store the inventory item within itself // Bad things will happen, like losing your inventory // Actually, this needs a custom Slot to work - return true; + if (slot == 0){ + return TileEntityModularityTable.isValidUpgrade(itemstack); + } + return TileEntityModularityTable.isValidModularPiece(itemstack); } } \ No newline at end of file -- cgit