Merge addon sources

7 files changed, 1188 insertions, 0 deletions

diff --git a/src/main/java/gtPlusPlus/core/container/Container_CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/container/Container_CircuitProgrammer.java
new file mode 100644
index 0000000000..f1e84f439f
--- /dev/null
+++ b/src/main/java/gtPlusPlus/core/container/Container_CircuitProgrammer.java
@@ -0,0 +1,176 @@
+package gtPlusPlus.core.container;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.inventories.InventoryCircuitProgrammer;
+import gtPlusPlus.core.slots.SlotIntegratedCircuit;
+import gtPlusPlus.core.slots.SlotNoInput;
+import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer;
+
+public class Container_CircuitProgrammer extends Container {
+
+    protected TileEntityCircuitProgrammer tile_entity;
+    public final InventoryCircuitProgrammer inventoryChest;
+
+    private final World worldObj;
+    private final int posX;
+    private final int posY;
+    private final int posZ;
+
+    public static final int SLOT_OUTPUT = 25;
+
+    public static int StorageSlotNumber = 26; // Number of slots in storage area
+    public static int InventorySlotNumber = 36; // Inventory Slots (Inventory
+    // and Hotbar)
+    public static int FullSlotNumber = InventorySlotNumber + StorageSlotNumber; // All
+    // slots
+
+    public Container_CircuitProgrammer(final InventoryPlayer inventory, final TileEntityCircuitProgrammer te) {
+        this.tile_entity = te;
+        this.inventoryChest = te.getInventory();
+
+        int var6;
+        int var7;
+        this.worldObj = te.getWorldObj();
+        this.posX = te.xCoord;
+        this.posY = te.yCoord;
+        this.posZ = te.zCoord;
+        Logger.INFO("1");
+
+        int o = 0;
+
+        // Storage Side
+        /*
+         * for (var6 = 0; var6 < 3; var6++) { for (var7 = 0; var7 < 5; var7++) { this.addSlotToContainer(new
+         * SlotIntegratedCircuit(o, this.inventoryChest, o, 44 + (var7 * 18), 15 + (var6 * 18))); o++; } }
+         */
+
+        int xStart = 8;
+        int yStart = 5;
+
+        try {
+            // 0
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart, yStart));
+            // 1-10
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 18, yStart));
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 36, yStart));
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 54, yStart));
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 72, yStart));
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 90, yStart));
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 108, yStart));
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 18, yStart + 18));
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 36, yStart + 18));
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 54, yStart + 18));
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 72, yStart + 18));
+            // 11-20
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 90, yStart + 18));
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 108, yStart + 18));
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 18, yStart + 36));
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 36, yStart + 36));
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 54, yStart + 36));
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 72, yStart + 36));
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 90, yStart + 36));
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 108, yStart + 36));
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 18, yStart + 54));
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 36, yStart + 54));
+            // 21-24
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 54, yStart + 54));
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 72, yStart + 54));
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 90, yStart + 54));
+            this.addSlotToContainer(new SlotIntegratedCircuit(this.inventoryChest, o++, xStart + 108, yStart + 54));
+            Logger.INFO("2");
+
+            // Add Output
+            this.addSlotToContainer(new SlotNoInput(this.inventoryChest, SLOT_OUTPUT, xStart + (8 * 18), yStart + 54));
+            o++;
+            Logger.INFO("3");
+
+            // Player Inventory
+            for (var6 = 0; var6 < 3; ++var6) {
+                for (var7 = 0; var7 < 9; ++var7) {
+                    this.addSlotToContainer(
+                        new Slot(inventory, var7 + (var6 * 9) + 9, 8 + (var7 * 18), 84 + (var6 * 18)));
+                }
+            }
+            // Player Hotbar
+            for (var6 = 0; var6 < 9; ++var6) {
+                this.addSlotToContainer(new Slot(inventory, var6, 8 + (var6 * 18), 142));
+            }
+
+            Logger.INFO("4");
+        } catch (Throwable t) {}
+    }
+
+    @Override
+    public ItemStack slotClick(final int aSlotIndex, final int aMouseclick, final int aShifthold,
+        final EntityPlayer aPlayer) {
+
+        if (!aPlayer.worldObj.isRemote) {
+            if ((aSlotIndex == 999) || (aSlotIndex == -999)) {
+                // Utils.LOG_WARNING("??? - "+aSlotIndex);
+            }
+        }
+        return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
+    }
+
+    @Override
+    public void onContainerClosed(final EntityPlayer par1EntityPlayer) {
+        super.onContainerClosed(par1EntityPlayer);
+    }
+
+    @Override
+    public boolean canInteractWith(final EntityPlayer par1EntityPlayer) {
+        if (this.worldObj.getBlock(this.posX, this.posY, this.posZ) != ModBlocks.blockCircuitProgrammer) {
+            return false;
+        }
+
+        return par1EntityPlayer.getDistanceSq(this.posX + 0.5D, this.posY + 0.5D, this.posZ + 0.5D) <= 64D;
+    }
+
+    @Override
+    public ItemStack transferStackInSlot(final EntityPlayer par1EntityPlayer, final int par2) {
+        ItemStack var3 = null;
+        final Slot var4 = (Slot) this.inventorySlots.get(par2);
+
+        if ((var4 != null) && var4.getHasStack()) {
+            final ItemStack var5 = var4.getStack();
+            var3 = var5.copy();
+
+            /*
+             * if (par2 == 0) { if (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, true)) { return null;
+             * } var4.onSlotChange(var5, var3); } else if (par2 >= InOutputSlotNumber && par2 < InventoryOutSlotNumber)
+             * { if (!this.mergeItemStack(var5, InventoryOutSlotNumber, FullSlotNumber, false)) { return null; } } else
+             * if (par2 >= InventoryOutSlotNumber && par2 < FullSlotNumber) { if (!this.mergeItemStack(var5,
+             * InOutputSlotNumber, InventoryOutSlotNumber, false)) { return null; } } else if
+             * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, false)) { return null; }
+             */
+
+            if (var5.stackSize == 0) {
+                var4.putStack((ItemStack) null);
+            } else {
+                var4.onSlotChanged();
+            }
+
+            if (var5.stackSize == var3.stackSize) {
+                return null;
+            }
+
+            var4.onPickupFromSlot(par1EntityPlayer, var5);
+        }
+
+        return var3;
+    }
+
+    // Can merge Slot
+    @Override
+    public boolean func_94530_a(final ItemStack p_94530_1_, final Slot p_94530_2_) {
+        return super.func_94530_a(p_94530_1_, p_94530_2_);
+    }
+}
diff --git a/src/main/java/gtPlusPlus/core/container/Container_DecayablesChest.java b/src/main/java/gtPlusPlus/core/container/Container_DecayablesChest.java
new file mode 100644
index 0000000000..d8bab9395a
--- /dev/null
+++ b/src/main/java/gtPlusPlus/core/container/Container_DecayablesChest.java
@@ -0,0 +1,133 @@
+package gtPlusPlus.core.container;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.inventories.Inventory_DecayablesChest;
+import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest;
+
+public class Container_DecayablesChest extends Container {
+
+    protected TileEntityDecayablesChest tile_entity;
+    public final Inventory_DecayablesChest inventoryChest;
+
+    private final World worldObj;
+    private final int posX;
+    private final int posY;
+    private final int posZ;
+
+    public static int StorageSlotNumber = 15; // Number of slots in storage area
+    public static int InventorySlotNumber = 36; // Inventory Slots (Inventory
+    // and Hotbar)
+    public static int FullSlotNumber = InventorySlotNumber + StorageSlotNumber; // All
+    // slots
+
+    private final int[] slotStorage = new int[15];
+
+    public Container_DecayablesChest(final InventoryPlayer inventory, final TileEntityDecayablesChest te) {
+        this.tile_entity = te;
+        this.inventoryChest = te.getInventory();
+        te.openInventory();
+
+        int var6;
+        int var7;
+        this.worldObj = te.getWorldObj();
+        this.posX = te.xCoord;
+        this.posY = te.yCoord;
+        this.posZ = te.zCoord;
+
+        int o = 0;
+
+        // Storage Side
+        for (var6 = 0; var6 < 3; var6++) {
+            for (var7 = 0; var7 < 5; var7++) {
+                this.slotStorage[o] = o;
+                this.addSlotToContainer(new Slot(this.inventoryChest, o++, 44 + (var7 * 18), 15 + (var6 * 18)));
+            }
+        }
+
+        // Player Inventory
+        for (var6 = 0; var6 < 3; ++var6) {
+            for (var7 = 0; var7 < 9; ++var7) {
+                this.addSlotToContainer(new Slot(inventory, var7 + (var6 * 9) + 9, 8 + (var7 * 18), 84 + (var6 * 18)));
+            }
+        }
+
+        // Player Hotbar
+        for (var6 = 0; var6 < 9; ++var6) {
+            this.addSlotToContainer(new Slot(inventory, var6, 8 + (var6 * 18), 142));
+        }
+    }
+
+    @Override
+    public ItemStack slotClick(final int aSlotIndex, final int aMouseclick, final int aShifthold,
+        final EntityPlayer aPlayer) {
+
+        if (!aPlayer.worldObj.isRemote) {
+            if ((aSlotIndex == 999) || (aSlotIndex == -999)) {
+                // Utils.LOG_WARNING("??? - "+aSlotIndex);
+            }
+        }
+        return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
+    }
+
+    @Override
+    public void onContainerClosed(final EntityPlayer par1EntityPlayer) {
+        super.onContainerClosed(par1EntityPlayer);
+        tile_entity.closeInventory();
+    }
+
+    @Override
+    public boolean canInteractWith(final EntityPlayer par1EntityPlayer) {
+        if (this.worldObj.getBlock(this.posX, this.posY, this.posZ) != ModBlocks.blockDecayablesChest) {
+            return false;
+        }
+
+        return par1EntityPlayer.getDistanceSq(this.posX + 0.5D, this.posY + 0.5D, this.posZ + 0.5D) <= 64D;
+    }
+
+    @Override
+    public ItemStack transferStackInSlot(final EntityPlayer par1EntityPlayer, final int par2) {
+        ItemStack var3 = null;
+        final Slot var4 = (Slot) this.inventorySlots.get(par2);
+
+        if ((var4 != null) && var4.getHasStack()) {
+            final ItemStack var5 = var4.getStack();
+            var3 = var5.copy();
+
+            /*
+             * if (par2 == 0) { if (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, true)) { return null;
+             * } var4.onSlotChange(var5, var3); } else if (par2 >= InOutputSlotNumber && par2 < InventoryOutSlotNumber)
+             * { if (!this.mergeItemStack(var5, InventoryOutSlotNumber, FullSlotNumber, false)) { return null; } } else
+             * if (par2 >= InventoryOutSlotNumber && par2 < FullSlotNumber) { if (!this.mergeItemStack(var5,
+             * InOutputSlotNumber, InventoryOutSlotNumber, false)) { return null; } } else if
+             * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, false)) { return null; }
+             */
+
+            if (var5.stackSize == 0) {
+                var4.putStack((ItemStack) null);
+            } else {
+                var4.onSlotChanged();
+            }
+
+            if (var5.stackSize == var3.stackSize) {
+                return null;
+            }
+
+            var4.onPickupFromSlot(par1EntityPlayer, var5);
+        }
+
+        return var3;
+    }
+
+    // Can merge Slot
+    @Override
+    public boolean func_94530_a(final ItemStack p_94530_1_, final Slot p_94530_2_) {
+        return super.func_94530_a(p_94530_1_, p_94530_2_);
+    }
+}
diff --git a/src/main/java/gtPlusPlus/core/container/Container_FishTrap.java b/src/main/java/gtPlusPlus/core/container/Container_FishTrap.java
new file mode 100644
index 0000000000..881311897f
--- /dev/null
+++ b/src/main/java/gtPlusPlus/core/container/Container_FishTrap.java
@@ -0,0 +1,134 @@
+package gtPlusPlus.core.container;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.inventories.InventoryFishTrap;
+import gtPlusPlus.core.slots.SlotNoInput;
+import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
+
+public class Container_FishTrap extends Container {
+
+    protected TileEntityFishTrap tile_entity;
+    public final InventoryFishTrap inventoryChest;
+
+    private final World worldObj;
+    private final int posX;
+    private final int posY;
+    private final int posZ;
+
+    public static int StorageSlotNumber = 15; // Number of slots in storage area
+    public static int InventorySlotNumber = 36; // Inventory Slots (Inventory
+    // and Hotbar)
+    public static int FullSlotNumber = InventorySlotNumber + StorageSlotNumber; // All
+    // slots
+
+    private final int[] slotStorage = new int[15];
+
+    public Container_FishTrap(final InventoryPlayer inventory, final TileEntityFishTrap te) {
+        this.tile_entity = te;
+        this.inventoryChest = te.getInventory();
+
+        te.openInventory();
+        int var6;
+        int var7;
+        this.worldObj = te.getWorldObj();
+        this.posX = te.xCoord;
+        this.posY = te.yCoord;
+        this.posZ = te.zCoord;
+
+        int o = 0;
+
+        // Storage Side
+        for (var6 = 0; var6 < 3; var6++) {
+            for (var7 = 0; var7 < 5; var7++) {
+                this.slotStorage[o] = o;
+                this.addSlotToContainer(new SlotNoInput(this.inventoryChest, o++, 44 + (var7 * 18), 15 + (var6 * 18)));
+            }
+        }
+
+        // Player Inventory
+        for (var6 = 0; var6 < 3; ++var6) {
+            for (var7 = 0; var7 < 9; ++var7) {
+                this.addSlotToContainer(new Slot(inventory, var7 + (var6 * 9) + 9, 8 + (var7 * 18), 84 + (var6 * 18)));
+            }
+        }
+
+        // Player Hotbar
+        for (var6 = 0; var6 < 9; ++var6) {
+            this.addSlotToContainer(new Slot(inventory, var6, 8 + (var6 * 18), 142));
+        }
+    }
+
+    @Override
+    public ItemStack slotClick(final int aSlotIndex, final int aMouseclick, final int aShifthold,
+        final EntityPlayer aPlayer) {
+
+        if (!aPlayer.worldObj.isRemote) {
+            if ((aSlotIndex == 999) || (aSlotIndex == -999)) {
+                // Utils.LOG_WARNING("??? - "+aSlotIndex);
+            }
+        }
+        return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
+    }
+
+    @Override
+    public void onContainerClosed(final EntityPlayer par1EntityPlayer) {
+        super.onContainerClosed(par1EntityPlayer);
+        tile_entity.closeInventory();
+    }
+
+    @Override
+    public boolean canInteractWith(final EntityPlayer par1EntityPlayer) {
+        if (this.worldObj.getBlock(this.posX, this.posY, this.posZ) != ModBlocks.blockFishTrap) {
+            return false;
+        }
+
+        return par1EntityPlayer.getDistanceSq(this.posX + 0.5D, this.posY + 0.5D, this.posZ + 0.5D) <= 64D;
+    }
+
+    @Override
+    public ItemStack transferStackInSlot(final EntityPlayer par1EntityPlayer, final int par2) {
+        ItemStack var3 = null;
+        final Slot var4 = (Slot) this.inventorySlots.get(par2);
+
+        if ((var4 != null) && var4.getHasStack()) {
+            final ItemStack var5 = var4.getStack();
+            var3 = var5.copy();
+
+            /*
+             * if (par2 == 0) { if (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, true)) { return null;
+             * } var4.onSlotChange(var5, var3); } else if (par2 >= InOutputSlotNumber && par2 < InventoryOutSlotNumber)
+             * { if (!this.mergeItemStack(var5, InventoryOutSlotNumber, FullSlotNumber, false)) { return null; } } else
+             * if (par2 >= InventoryOutSlotNumber && par2 < FullSlotNumber) { if (!this.mergeItemStack(var5,
+             * InOutputSlotNumber, InventoryOutSlotNumber, false)) { return null; } } else if
+             * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, false)) { return null; }
+             */
+
+            if (var5.stackSize == 0) {
+                var4.putStack((ItemStack) null);
+            } else {
+                var4.onSlotChanged();
+            }
+
+            if (var5.stackSize == var3.stackSize) {
+                return null;
+            }
+
+            var4.onPickupFromSlot(par1EntityPlayer, var5);
+        }
+
+        return var3;
+    }
+
+    // Can merge Slot
+    @Override
+    public boolean func_94530_a(final ItemStack p_94530_1_, final Slot p_94530_2_) {
+        return super.func_94530_a(p_94530_1_, p_94530_2_);
+    }
+}
diff --git a/src/main/java/gtPlusPlus/core/container/Container_PestKiller.java b/src/main/java/gtPlusPlus/core/container/Container_PestKiller.java
new file mode 100644
index 0000000000..d6afa0d68f
--- /dev/null
+++ b/src/main/java/gtPlusPlus/core/container/Container_PestKiller.java
@@ -0,0 +1,147 @@
+package gtPlusPlus.core.container;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import net.minecraftforge.fluids.FluidStack;
+
+import gregtech.api.gui.GT_Slot_Render;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.inventories.InventoryPestKiller;
+import gtPlusPlus.core.slots.SlotGeneric;
+import gtPlusPlus.core.slots.SlotNoInput;
+import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller;
+
+public class Container_PestKiller extends Container {
+
+    public TileEntityPestKiller tile_entity;
+    public final InventoryPestKiller inventoryChest;
+
+    private final World worldObj;
+    private final int posX;
+    private final int posY;
+    private final int posZ;
+
+    public static int StorageSlotNumber = 3; // Number of slots in storage area
+    public static int InventorySlotNumber = 36; // Inventory Slots (Inventory
+    // and Hotbar)
+    public static int FullSlotNumber = InventorySlotNumber + StorageSlotNumber; // All
+    // slots
+
+    public Container_PestKiller(final InventoryPlayer inventory, final TileEntityPestKiller te) {
+        this.tile_entity = te;
+        this.inventoryChest = te.getInventory();
+        te.openInventory();
+        int var6;
+        int var7;
+        this.worldObj = te.getWorldObj();
+        this.posX = te.xCoord;
+        this.posY = te.yCoord;
+        this.posZ = te.zCoord;
+        int o = 0;
+
+        int aSlotX = 134;
+
+        this.addSlotToContainer(new SlotGeneric(this.inventoryChest, o++, aSlotX, 10));
+        this.addSlotToContainer(new SlotNoInput(this.inventoryChest, o++, aSlotX, 60));
+        addSlotToContainer(new GT_Slot_Render(tile_entity, o++, aSlotX, 35));
+
+        // Player Inventory
+        for (var6 = 0; var6 < 3; ++var6) {
+            for (var7 = 0; var7 < 9; ++var7) {
+                this.addSlotToContainer(new Slot(inventory, var7 + (var6 * 9) + 9, 8 + (var7 * 18), 84 + (var6 * 18)));
+            }
+        }
+
+        // Player Hotbar
+        for (var6 = 0; var6 < 9; ++var6) {
+            this.addSlotToContainer(new Slot(inventory, var6, 8 + (var6 * 18), 142));
+        }
+    }
+
+    public FluidStack getFluidOfStoredTank() {
+        if (tile_entity != null) {
+            if (tile_entity.getTank() != null) {
+                return tile_entity.getTank()
+                    .getFluid();
+            }
+        }
+        return null;
+    }
+
+    public int getFluidStoredAmount() {
+        FluidStack f = getFluidOfStoredTank();
+        return f == null ? 0 : f.amount;
+    }
+
+    @Override
+    public ItemStack slotClick(final int aSlotIndex, final int aMouseclick, final int aShifthold,
+        final EntityPlayer aPlayer) {
+        boolean fluid = false;
+        if (aSlotIndex == 2) {
+            fluid = true;
+        }
+        if (!fluid) {
+            return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public void onContainerClosed(final EntityPlayer par1EntityPlayer) {
+        super.onContainerClosed(par1EntityPlayer);
+        tile_entity.closeInventory();
+    }
+
+    @Override
+    public boolean canInteractWith(final EntityPlayer par1EntityPlayer) {
+        if (this.worldObj.getBlock(this.posX, this.posY, this.posZ) != ModBlocks.blockPestKiller) {
+            return false;
+        }
+        return par1EntityPlayer.getDistanceSq(this.posX + 0.5D, this.posY + 0.5D, this.posZ + 0.5D) <= 64D;
+    }
+
+    @Override
+    public ItemStack transferStackInSlot(final EntityPlayer par1EntityPlayer, final int par2) {
+        ItemStack var3 = null;
+        final Slot var4 = (Slot) this.inventorySlots.get(par2);
+
+        if ((var4 != null) && var4.getHasStack()) {
+            final ItemStack var5 = var4.getStack();
+            var3 = var5.copy();
+
+            /*
+             * if (par2 == 0) { if (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, true)) { return null;
+             * } var4.onSlotChange(var5, var3); } else if (par2 >= InOutputSlotNumber && par2 < InventoryOutSlotNumber)
+             * { if (!this.mergeItemStack(var5, InventoryOutSlotNumber, FullSlotNumber, false)) { return null; } } else
+             * if (par2 >= InventoryOutSlotNumber && par2 < FullSlotNumber) { if (!this.mergeItemStack(var5,
+             * InOutputSlotNumber, InventoryOutSlotNumber, false)) { return null; } } else if
+             * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, false)) { return null; }
+             */
+
+            if (var5.stackSize == 0) {
+                var4.putStack((ItemStack) null);
+            } else {
+                var4.onSlotChanged();
+            }
+
+            if (var5.stackSize == var3.stackSize) {
+                return null;
+            }
+
+            var4.onPickupFromSlot(par1EntityPlayer, var5);
+        }
+
+        return var3;
+    }
+
+    // Can merge Slot
+    @Override
+    public boolean func_94530_a(final ItemStack p_94530_1_, final Slot p_94530_2_) {
+        return super.func_94530_a(p_94530_1_, p_94530_2_);
+    }
+}
diff --git a/src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java b/src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java
new file mode 100644
index 0000000000..1702be19ab
--- /dev/null
+++ b/src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java
@@ -0,0 +1,196 @@
+package gtPlusPlus.core.container;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.InventoryCraftResult;
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.CraftingManager;
+import net.minecraft.world.World;
+
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.inventories.projecttable.InventoryProjectMain;
+import gtPlusPlus.core.inventories.projecttable.InventoryProjectOutput;
+import gtPlusPlus.core.slots.SlotCraftingNoCollect;
+import gtPlusPlus.core.slots.SlotDataStick;
+import gtPlusPlus.core.slots.SlotNoInput;
+import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable;
+
+public class Container_ProjectTable extends Container {
+
+    /** The crafting matrix inventory (3x3). */
+    public InventoryCrafting craftMatrix = new InventoryCrafting(this, 3, 3);
+
+    public IInventory craftResult = new InventoryCraftResult();
+
+    protected TileEntityProjectTable tile_entity;
+    public final InventoryProjectMain inventoryGrid;
+    public final InventoryProjectOutput inventoryOutputs;
+
+    private final World worldObj;
+    private final int posX;
+    private final int posY;
+    private final int posZ;
+
+    private final int[] slotOutputs = new int[2];
+    private final int[] slotGrid = new int[9];
+
+    public Container_ProjectTable(final InventoryPlayer inventory, final TileEntityProjectTable tile) {
+        this.tile_entity = tile;
+        this.inventoryGrid = tile.inventoryGrid;
+        this.inventoryOutputs = tile.inventoryOutputs;
+        this.tile_entity.setContainer(this);
+
+        int var6;
+        int var7;
+        this.worldObj = tile.getWorldObj();
+        this.posX = tile.xCoord;
+        this.posY = tile.yCoord;
+        this.posZ = tile.zCoord;
+
+        int nextFreeSlot = 0;
+
+        // Output slots
+        this.addSlotToContainer(new SlotDataStick(this.inventoryOutputs, 0, 26 + (18 * 6), 8));
+        this.addSlotToContainer(new SlotNoInput(this.inventoryOutputs, 1, 26 + (18 * 6), 44));
+
+        this.addSlotToContainer(
+            new SlotCraftingNoCollect(inventory.player, this.craftMatrix, this.craftResult, 0, 26 + (18 * 4), 25));
+
+        int o = 0;
+        // Storage Side
+        for (var6 = 0; var6 < 3; ++var6) {
+            for (var7 = 0; var7 < 3; ++var7) {
+                this.addSlotToContainer(
+                    new Slot(this.craftMatrix, nextFreeSlot, 8 + 18 + (var7 * 18), 8 + (var6 * 18)));
+                this.slotGrid[o] = nextFreeSlot;
+                nextFreeSlot++;
+                o++;
+            }
+        }
+
+        // Player Inventory
+        for (var6 = 0; var6 < 3; ++var6) {
+            for (var7 = 0; var7 < 9; ++var7) {
+                this.addSlotToContainer(new Slot(inventory, var7 + (var6 * 9) + 9, 8 + (var7 * 18), 84 + (var6 * 18)));
+            }
+        }
+
+        // Player Hotbar
+        for (var6 = 0; var6 < 9; ++var6) {
+            this.addSlotToContainer(new Slot(inventory, var6, 8 + (var6 * 18), 142));
+        }
+
+        this.onCraftMatrixChanged(this.craftMatrix);
+    }
+
+    /**
+     * Callback for when the crafting matrix is changed.
+     */
+    @Override
+    public void onCraftMatrixChanged(IInventory p_75130_1_) {
+        this.craftResult.setInventorySlotContents(
+            0,
+            CraftingManager.getInstance()
+                .findMatchingRecipe(this.craftMatrix, this.worldObj));
+    }
+
+    /**
+     * Called when the container is closed.
+     */
+    @Override
+    public void onContainerClosed(EntityPlayer p_75134_1_) {
+        super.onContainerClosed(p_75134_1_);
+        if (!this.worldObj.isRemote) {
+            for (int i = 0; i < 9; ++i) {
+                ItemStack itemstack = this.craftMatrix.getStackInSlotOnClosing(i);
+                if (itemstack != null) {
+                    p_75134_1_.dropPlayerItemWithRandomChoice(itemstack, false);
+                }
+            }
+        }
+    }
+
+    @Override
+    public ItemStack slotClick(final int aSlotIndex, final int aMouseclick, final int aShifthold,
+        final EntityPlayer aPlayer) {
+
+        if (!aPlayer.worldObj.isRemote) {
+            if ((aSlotIndex == 999) || (aSlotIndex == -999)) {
+                // Utils.LOG_WARNING("??? - "+aSlotIndex);
+            }
+
+            if (aSlotIndex == 0) {
+                Logger.INFO("Player Clicked on the Data Stick slot");
+                // TODO
+            }
+            if (aSlotIndex == 1) {
+                Logger.INFO("Player Clicked on the output slot");
+                // TODO
+            }
+
+            for (final int x : this.slotGrid) {
+                if (aSlotIndex == x) {
+                    Logger.INFO("Player Clicked slot " + aSlotIndex + " in the crafting Grid");
+                }
+            }
+        }
+        // Utils.LOG_WARNING("Player Clicked slot "+aSlotIndex+" in the Grid");
+        return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
+    }
+
+    @Override
+    public boolean canInteractWith(final EntityPlayer par1EntityPlayer) {
+        if (this.worldObj.getBlock(this.posX, this.posY, this.posZ) != ModBlocks.blockProjectTable) {
+            return false;
+        }
+
+        return par1EntityPlayer.getDistanceSq(this.posX + 0.5D, this.posY + 0.5D, this.posZ + 0.5D) <= 64D;
+    }
+
+    @Override
+    public ItemStack transferStackInSlot(final EntityPlayer par1EntityPlayer, final int par2) {
+
+        return null;
+
+        /*
+         * ItemStack var3 = null; final Slot var4 = (Slot)this.inventorySlots.get(par2); if ((var4 != null) &&
+         * var4.getHasStack()) { final ItemStack var5 = var4.getStack(); var3 = var5.copy(); if (par2 == 0) { if
+         * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, true)) { return null; }
+         * var4.onSlotChange(var5, var3); } else if ((par2 >= InOutputSlotNumber) && (par2 < InventoryOutSlotNumber)) {
+         * if (!this.mergeItemStack(var5, InventoryOutSlotNumber, FullSlotNumber, false)) { return null; } } else if
+         * ((par2 >= InventoryOutSlotNumber) && (par2 < FullSlotNumber)) { if (!this.mergeItemStack(var5,
+         * InOutputSlotNumber, InventoryOutSlotNumber, false)) { return null; } } else if (!this.mergeItemStack(var5,
+         * InOutputSlotNumber, FullSlotNumber, false)) { return null; } if (var5.stackSize == 0) {
+         * var4.putStack((ItemStack)null); } else { var4.onSlotChanged(); } if (var5.stackSize == var3.stackSize) {
+         * return null; } var4.onPickupFromSlot(par1EntityPlayer, var5); } return var3;
+         */
+    }
+
+    // Can merge Slot
+    @Override
+    public boolean func_94530_a(ItemStack p_94530_1_, Slot p_94530_2_) {
+        return p_94530_2_.inventory != this.craftResult && super.func_94530_a(p_94530_1_, p_94530_2_);
+    }
+
+    public ItemStack getOutputContent() {
+        ItemStack output = this.craftResult.getStackInSlot(0);
+        if (output != null) {
+            return output;
+        }
+        return null;
+    }
+
+    public ItemStack[] getInputComponents() {
+        ItemStack inputs[] = new ItemStack[9];
+        for (int r = 0; r < this.craftMatrix.getSizeInventory(); r++) {
+            ItemStack temp = this.craftMatrix.getStackInSlot(r);
+            inputs[r] = temp;
+        }
+        return inputs;
+    }
+}
diff --git a/src/main/java/gtPlusPlus/core/container/Container_SuperJukebox.java b/src/main/java/gtPlusPlus/core/container/Container_SuperJukebox.java
new file mode 100644
index 0000000000..ab7525c897
--- /dev/null
+++ b/src/main/java/gtPlusPlus/core/container/Container_SuperJukebox.java
@@ -0,0 +1,232 @@
+package gtPlusPlus.core.container;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.block.machine.Machine_SuperJukebox.TileEntitySuperJukebox;
+import gtPlusPlus.core.inventories.Inventory_SuperJukebox;
+import gtPlusPlus.core.slots.SlotJukebox;
+import gtPlusPlus.core.slots.SlotNoInput;
+
+public class Container_SuperJukebox extends Container {
+
+    protected TileEntitySuperJukebox tile_entity;
+    public final Inventory_SuperJukebox inventoryChest;
+
+    private final World worldObj;
+    private final int posX;
+    private final int posY;
+    private final int posZ;
+
+    public static final int SLOT_HOLO_PLAY = 18;
+    public static final int SLOT_HOLO_LOOP = 19;
+    public static final int SLOT_OUTPUT = 20;
+
+    public static int StorageSlotNumber = 26; // Number of slots in storage area
+    public static int InventorySlotNumber = 36; // Inventory Slots (Inventory
+    // and Hotbar)
+    public static int FullSlotNumber = InventorySlotNumber + StorageSlotNumber; // All
+    // slots
+
+    public Container_SuperJukebox(final InventoryPlayer inventory, final TileEntitySuperJukebox te) {
+        this.tile_entity = te;
+        this.inventory