Fix issue #56

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);

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

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();
-    }
 }

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

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);
         }
     }

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";