From b2b13b5176347e2df6460ec96537a35aba8e62f6 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Wed, 18 May 2016 23:32:22 +0200 Subject: [PATCH] Fix issue #56 --- .../ContainerWirelessTransmitter.java | 2 +- .../refinedstorage/tile/TileDiskDrive.java | 3 +- .../tile/TileWirelessTransmitter.java | 90 +------------------ .../tile/autocrafting/TileCrafter.java | 4 +- .../TileProcessingPatternEncoder.java | 4 +- .../tile/solderer/TileSolderer.java | 2 +- 6 files changed, 11 insertions(+), 94 deletions(-) diff --git a/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java b/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java index d6af2240a..05fcfeca6 100755 --- a/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java +++ b/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java @@ -13,7 +13,7 @@ public class ContainerWirelessTransmitter extends ContainerBase { super(player); for (int i = 0; i < 4; ++i) { - addSlotToContainer(new SlotFiltered(wirelessTransmitter, i, 187, 6 + (i * 18), new UpgradeItemValidator(ItemUpgrade.TYPE_RANGE))); + addSlotToContainer(new SlotFiltered(wirelessTransmitter.getDroppedInventory(), i, 187, 6 + (i * 18), new UpgradeItemValidator(ItemUpgrade.TYPE_RANGE))); } addPlayerInventory(8, 55); diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java index 5a9ca3a99..815afe481 100755 --- a/src/main/java/refinedstorage/tile/TileDiskDrive.java +++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java @@ -8,6 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.ITextComponent; import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageItems; import refinedstorage.RefinedStorageUtils; import refinedstorage.block.EnumStorageType; import refinedstorage.container.ContainerDiskDrive; @@ -273,7 +274,7 @@ public class TileDiskDrive extends TileMachine implements IStorageProvider, ISto @Override public boolean isItemValidForSlot(int slot, ItemStack stack) { - return inventory.isItemValidForSlot(slot, stack); + return stack.getItem() == RefinedStorageItems.STORAGE_DISK; } @Override diff --git a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java index cbd9938cc..0c830bcc2 100755 --- a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java +++ b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java @@ -1,16 +1,13 @@ package refinedstorage.tile; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.text.ITextComponent; import refinedstorage.RefinedStorageUtils; import refinedstorage.inventory.InventorySimple; import refinedstorage.item.ItemUpgrade; -public class TileWirelessTransmitter extends TileMachine implements IInventory { +public class TileWirelessTransmitter extends TileMachine { public static final int RANGE_PER_UPGRADE = 8; private InventorySimple inventory = new InventorySimple("upgrades", 4, this); @@ -51,89 +48,4 @@ public class TileWirelessTransmitter extends TileMachine implements IInventory { public IInventory getDroppedInventory() { return inventory; } - - @Override - public int getSizeInventory() { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int count) { - return inventory.decrStackSize(slot, count); - } - - @Override - public ItemStack removeStackFromSlot(int slot) { - return inventory.removeStackFromSlot(slot); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) { - inventory.setInventorySlotContents(slot, stack); - } - - @Override - public int getInventoryStackLimit() { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return inventory.isUseableByPlayer(player); - } - - @Override - public void openInventory(EntityPlayer player) { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) { - inventory.closeInventory(player); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) { - return inventory.isItemValidForSlot(slot, stack); - } - - @Override - public int getField(int id) { - return inventory.getField(id); - } - - @Override - public void setField(int id, int value) { - inventory.setField(id, value); - } - - @Override - public int getFieldCount() { - return inventory.getFieldCount(); - } - - @Override - public void clear() { - inventory.clear(); - } - - @Override - public String getName() { - return inventory.getName(); - } - - @Override - public boolean hasCustomName() { - return inventory.hasCustomName(); - } - - @Override - public ITextComponent getDisplayName() { - return inventory.getDisplayName(); - } } diff --git a/src/main/java/refinedstorage/tile/autocrafting/TileCrafter.java b/src/main/java/refinedstorage/tile/autocrafting/TileCrafter.java index 2f01d9857..91bc63ce7 100755 --- a/src/main/java/refinedstorage/tile/autocrafting/TileCrafter.java +++ b/src/main/java/refinedstorage/tile/autocrafting/TileCrafter.java @@ -7,9 +7,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; +import refinedstorage.RefinedStorageItems; import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerCrafter; import refinedstorage.inventory.InventorySimple; +import refinedstorage.item.ItemPattern; import refinedstorage.item.ItemUpgrade; import refinedstorage.tile.TileMachine; import refinedstorage.tile.autocrafting.task.ICraftingTask; @@ -109,7 +111,7 @@ public class TileCrafter extends TileMachine implements IInventory { @Override public boolean isItemValidForSlot(int slot, ItemStack stack) { - return inventory.isItemValidForSlot(slot, stack); + return stack.getItem() == RefinedStorageItems.PATTERN && ItemPattern.isValid(stack); } @Override diff --git a/src/main/java/refinedstorage/tile/autocrafting/TileProcessingPatternEncoder.java b/src/main/java/refinedstorage/tile/autocrafting/TileProcessingPatternEncoder.java index 4a52a1be2..3d6ad8bea 100755 --- a/src/main/java/refinedstorage/tile/autocrafting/TileProcessingPatternEncoder.java +++ b/src/main/java/refinedstorage/tile/autocrafting/TileProcessingPatternEncoder.java @@ -87,7 +87,7 @@ public class TileProcessingPatternEncoder extends TileBase implements ISidedInve @Override public boolean isItemValidForSlot(int slot, ItemStack stack) { - return inventory.isItemValidForSlot(slot, stack); + return stack.getItem() == RefinedStorageItems.PATTERN; } @Override @@ -165,6 +165,8 @@ public class TileProcessingPatternEncoder extends TileBase implements ISidedInve } } + decrStackSize(0, 1); + setInventorySlotContents(1, pattern); } } diff --git a/src/main/java/refinedstorage/tile/solderer/TileSolderer.java b/src/main/java/refinedstorage/tile/solderer/TileSolderer.java index 0363e2207..2114ab430 100755 --- a/src/main/java/refinedstorage/tile/solderer/TileSolderer.java +++ b/src/main/java/refinedstorage/tile/solderer/TileSolderer.java @@ -17,7 +17,7 @@ import refinedstorage.item.ItemUpgrade; import refinedstorage.network.MessageSoldererWorkingUpdate; import refinedstorage.tile.TileMachine; -public class TileSolderer extends TileMachine implements IInventory, ISidedInventory { +public class TileSolderer extends TileMachine implements ISidedInventory { public static final String NBT_WORKING = "Working"; public static final String NBT_PROGRESS = "Progress";