OSDN Git Service

Gui系統全部作りなおすためファイル一新
authormozipi <mozipi@users.sourceforge.jp>
Sun, 30 Dec 2012 07:02:01 +0000 (16:02 +0900)
committermozipi <mozipi@users.sourceforge.jp>
Sun, 30 Dec 2012 07:02:01 +0000 (16:02 +0900)
一応レシピ追加は可能

48 files changed:
common/chemicraft/ChemiCraft.java
common/chemicraft/ChemiCraftAPI.java
common/chemicraft/block/BlockChemicalCombinationTable.java
common/chemicraft/block/BlockDecompositionTable.java
common/chemicraft/block/BlockToolAndWeaponCraftingTable.java
common/chemicraft/container/ContainerChemicalCombinationTable.java
common/chemicraft/container/ContainerChemicalCraftingTable.java
common/chemicraft/container/ContainerDecompositionTable.java
common/chemicraft/container/ContainerToolAndWeaponCraftingTable.java
common/chemicraft/debug/CommandDeleteItem.java
common/chemicraft/debug/SetBlockSupport.java
common/chemicraft/entity/EntityAtomGrenade.java
common/chemicraft/gui/GuiChemicalCombinationTable.java
common/chemicraft/gui/GuiChemicalCraftingTable.java
common/chemicraft/gui/GuiDecompositionTable.java
common/chemicraft/gui/GuiToolAndWeaponCraftingTable.java
common/chemicraft/inventory/InventoryChemicalCombination.java [deleted file]
common/chemicraft/inventory/InventoryChemicalCombinationTableMaterial.java [new file with mode: 0644]
common/chemicraft/inventory/InventoryChemicalCombinationTableResult.java [new file with mode: 0644]
common/chemicraft/inventory/InventoryDecomposition.java [deleted file]
common/chemicraft/inventory/InventoryDecompositionTableMaterial.java [new file with mode: 0644]
common/chemicraft/inventory/InventoryDecompositionTableResult.java [new file with mode: 0644]
common/chemicraft/inventory/InventoryToolAndWeaponCrafting.java [deleted file]
common/chemicraft/inventory/InventoryToolAndWeaponCraftingTableMaterial.java [new file with mode: 0644]
common/chemicraft/inventory/InventoryToolAndWeaponCraftingTableResult.java [new file with mode: 0644]
common/chemicraft/item/ItemAtomGrenade.java
common/chemicraft/item/ItemAtoms.java
common/chemicraft/item/ItemCompounds.java
common/chemicraft/slot/SlotChemicalCombinationResult.java [deleted file]
common/chemicraft/slot/SlotChemicalCombinationTableMaterial.java [new file with mode: 0644]
common/chemicraft/slot/SlotChemicalCombinationTableResult.java [new file with mode: 0644]
common/chemicraft/slot/SlotChemicalCraftingResult.java [deleted file]
common/chemicraft/slot/SlotChemicalCraftingTableResult.java [moved from common/chemicraft/slot/SlotToolAndWeaponCraftingResult.java with 70% similarity]
common/chemicraft/slot/SlotDecompositionResult.java [deleted file]
common/chemicraft/slot/SlotDecompositionTableMaterial.java [new file with mode: 0644]
common/chemicraft/slot/SlotDecompositionTableResult.java [new file with mode: 0644]
common/chemicraft/slot/SlotToolAndWeaponCraftingTableResult.java [new file with mode: 0644]
common/chemicraft/system/ChemiCraftCraftingManager.java
common/chemicraft/system/CommonProxy.java
common/chemicraft/system/PacketHandler.java
common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java
common/chemicraft/tileentity/TileEntityDecompositionTable.java
common/chemicraft/tileentity/TileEntityToolAndWeaponCraftingTable.java [deleted file]
common/chemicraft/tileentity/TileEntityToolAndWeaponTable.java [new file with mode: 0644]
common/chemicraft/util/AtomInfo.java
common/chemicraft/util/Auxiliary.java
common/chemicraft/util/MaterialRecipe.java
src/chemicraft/client/ClientProxy.java

index f390430..05d3b38 100644 (file)
@@ -7,23 +7,16 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.Material;\r
 import net.minecraftforge.common.Configuration;\r
 import net.minecraftforge.common.Property;\r
-import chemicraft.block.BlockChemicalCombinationTable;\r
 import chemicraft.block.BlockChemicalCraftingTable;\r
-import chemicraft.block.BlockDecompositionTable;\r
-import chemicraft.block.BlockToolAndWeaponCraftingTable;\r
 import chemicraft.debug.CommandDeleteItem;\r
 import chemicraft.debug.CommandSetTile;\r
-import chemicraft.debug.CompoundHandlerTest;\r
 import chemicraft.item.ItemAtomGrenade;\r
 import chemicraft.item.ItemAtoms;\r
 import chemicraft.item.ItemCompounds;\r
 import chemicraft.item.ItemGasCollectingBottle;\r
 import chemicraft.system.CommonProxy;\r
 import chemicraft.system.PacketHandler;\r
-import chemicraft.tileentity.TileEntityChemicalCombinationTable;\r
 import chemicraft.tileentity.TileEntityChemicalCraftingTable;\r
-import chemicraft.tileentity.TileEntityDecompositionTable;\r
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;\r
 import chemicraft.util.Auxiliary;\r
 import chemicraft.util.Auxiliary.ArrayAuxiliary;\r
 import chemicraft.util.Auxiliary.NameAuxiliary;\r
@@ -97,7 +90,7 @@ public class ChemiCraft {
        public int decompositionTableID;\r
        public int chemicalConbinationTableID;\r
        public int toolAndWeaponCraftingTableID;\r
-       public int ChemicalCraftingTableID;\r
+       public int chemicalCraftingTableID;\r
 \r
        /**\r
         * GUIID\r
@@ -110,18 +103,18 @@ public class ChemiCraft {
        /**\r
         * Block型変数\r
         */\r
-       public static Block blockDecompositionTable;\r
-       public static Block blockChemicalCombinationTable;\r
-       public static Block blockToolAndWeaponCraftingTable;\r
-       public static Block blockChemicalCraftingTable;\r
+       public Block blockDecompositionTable;\r
+       public Block blockChemicalCombinationTable;\r
+       public Block blockToolAndWeaponCraftingTable;\r
+       public Block blockChemicalCraftingTable;\r
 \r
        /**\r
         * Item型変数\r
         */\r
-       public static Item itemAtoms;\r
-       public static Item itemCompounds;\r
-       public static Item itemGasCollectingBottle;\r
-       public static Item itemAtomGrenade;\r
+       public Item itemAtoms;\r
+       public Item itemCompounds;\r
+       public Item itemGasCollectingBottle;\r
+       public Item itemAtomGrenade;\r
 \r
        /**\r
         * このmodで使用するTextureのパス\r
@@ -139,8 +132,8 @@ public class ChemiCraft {
         * このmodに必要な補助クラスのインスタンス\r
         */\r
        public Auxiliary auxiliary = new Auxiliary();\r
-       public NameAuxiliary nameAuxiliary = auxiliary.new NameAuxiliary();\r
-       public ArrayAuxiliary arrayAuxiliary = auxiliary.new ArrayAuxiliary();\r
+       public NameAuxiliary nameAuxiliary = new NameAuxiliary();\r
+       public ArrayAuxiliary arrayAuxiliary = new ArrayAuxiliary();\r
 \r
        private ChemiCraftAPI api = ChemiCraftAPI.instance;\r
 \r
@@ -168,7 +161,7 @@ public class ChemiCraft {
                this.decompositionTableID = decompositionTableIDProp.getInt();\r
                this.chemicalConbinationTableID = chemicalCombinationTableIDProp.getInt();\r
                this.toolAndWeaponCraftingTableID = toolAndWeaponCraftingTableIDProp.getInt();\r
-               this.ChemicalCraftingTableID = ChemicalCraftingTableIDProp.getInt();\r
+               this.chemicalCraftingTableID = ChemicalCraftingTableIDProp.getInt();\r
                this.atomsID = atomsIDProp.getInt();\r
                this.compoundsID = compoundsIDProp.getInt();\r
                this.gasCollectingBottleID = gasCollectingBottleIDProp.getInt();\r
@@ -199,10 +192,13 @@ public class ChemiCraft {
        private void settingProcessing(FMLPostInitializationEvent event){\r
 \r
                // Blockを追加します\r
+               /*\r
+                * Commented by mozipi.\r
                this.blockDecompositionTable = new BlockDecompositionTable(this.decompositionTableID, 0, Material.ground).setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("DecompositionTable");\r
                this.blockChemicalCombinationTable = new BlockChemicalCombinationTable(this.chemicalConbinationTableID, 0, Material.ground).setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("ChemicalCombinationTable");\r
                this.blockToolAndWeaponCraftingTable = new BlockToolAndWeaponCraftingTable(this.toolAndWeaponCraftingTableID, 0, Material.ground).setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("ToolAndWeaponCraftingTable");\r
-               this.blockChemicalCraftingTable = new BlockChemicalCraftingTable(ChemicalCraftingTableID, 0, Material.ground).setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("ChemicalCraftingTable");\r
+                */\r
+               this.blockChemicalCraftingTable = new BlockChemicalCraftingTable(chemicalCraftingTableID, 0, Material.ground).setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("ChemicalCraftingTable");\r
 \r
 \r
                // Itemを追加します\r
@@ -237,9 +233,12 @@ public class ChemiCraft {
                this.nameAuxiliary.addName(this.itemAtomGrenade, "元素手榴弾");\r
 \r
                // TileEntityを追加します\r
+               /*\r
+                * Commented by mozipi.\r
                GameRegistry.registerTileEntity(TileEntityDecompositionTable.class, "DecompositionTable");\r
                GameRegistry.registerTileEntity(TileEntityChemicalCombinationTable.class, "TileEntityChemicalCombinationTable");\r
                GameRegistry.registerTileEntity(TileEntityToolAndWeaponCraftingTable.class, "TileEntityToolAndWeaponCraftingTable");\r
+                */\r
                GameRegistry.registerTileEntity(TileEntityChemicalCraftingTable.class, "TileEntityChemicalCraftingTable");\r
 \r
                // GUIを追加します\r
@@ -252,34 +251,34 @@ public class ChemiCraft {
                GameRegistry.addRecipe(new ItemStack(this.blockDecompositionTable),\r
                                new Object[]{\r
                        "XYX", "ZAZ", "ZZZ",\r
-                       new Character('X'), new ItemStack(Item.ingotIron),\r
-                       new Character('Y'), new ItemStack(Block.workbench),\r
-                       new Character('Z'), new ItemStack(Block.stone),\r
-                       new Character('A'), new ItemStack(Block.tnt),\r
+                       Character.valueOf('X'), new ItemStack(Item.ingotIron),\r
+                       Character.valueOf('Y'), new ItemStack(Block.workbench),\r
+                       Character.valueOf('Z'), new ItemStack(Block.stone),\r
+                       Character.valueOf('A'), new ItemStack(Block.tnt),\r
                });\r
                GameRegistry.addRecipe(new ItemStack(this.blockChemicalCombinationTable),\r
                                new Object[]{\r
                        "XYX", "ZAZ", "ZZZ",\r
-                       new Character('X'), new ItemStack(Item.ingotIron),\r
-                       new Character('Y'), new ItemStack(Block.workbench),\r
-                       new Character('Z'), new ItemStack(Block.stone),\r
-                       new Character('A'), new ItemStack(Block.obsidian),\r
+                       Character.valueOf('X'), new ItemStack(Item.ingotIron),\r
+                       Character.valueOf('Y'), new ItemStack(Block.workbench),\r
+                       Character.valueOf('Z'), new ItemStack(Block.stone),\r
+                       Character.valueOf('A'), new ItemStack(Block.obsidian),\r
                });\r
                GameRegistry.addRecipe(new ItemStack(this.blockToolAndWeaponCraftingTable),\r
                                new Object[]{\r
                        "XYX", "ZAZ", "ZZZ",\r
-                       new Character('X'), new ItemStack(Item.ingotIron),\r
-                       new Character('Y'), new ItemStack(Block.workbench),\r
-                       new Character('Z'), new ItemStack(Block.stone),\r
-                       new Character('A'), new ItemStack(Item.pickaxeSteel),\r
+                       Character.valueOf('X'), new ItemStack(Item.ingotIron),\r
+                       Character.valueOf('Y'), new ItemStack(Block.workbench),\r
+                       Character.valueOf('Z'), new ItemStack(Block.stone),\r
+                       Character.valueOf('A'), new ItemStack(Item.pickaxeSteel),\r
                });\r
                GameRegistry.addRecipe(new ItemStack(this.blockChemicalCraftingTable),\r
                                new Object[]{\r
                        "XYX", "ZAZ", "ZZZ",\r
-                       new Character('X'), new ItemStack(Item.ingotIron),\r
-                       new Character('Y'), new ItemStack(Block.workbench),\r
-                       new Character('Z'), new ItemStack(Block.stone),\r
-                       new Character('A'), new ItemStack(this.itemAtoms, 1, 0),\r
+                       Character.valueOf('X'), new ItemStack(Item.ingotIron),\r
+                       Character.valueOf('Y'), new ItemStack(Block.workbench),\r
+                       Character.valueOf('Z'), new ItemStack(Block.stone),\r
+                       Character.valueOf('A'), new ItemStack(this.itemAtoms, 1, 0),\r
                });\r
 \r
                //\r
index e265a09..6499720 100644 (file)
@@ -2,12 +2,11 @@ package chemicraft;
 
 import java.util.ArrayList;
 
-import net.minecraft.src.CraftingManager;
 import net.minecraft.src.ItemStack;
 import chemicraft.system.ChemiCraftCraftingManager;
+import chemicraft.util.ChemicalNBTRecipe;
 import chemicraft.util.ICompoundHandler;
 import chemicraft.util.MaterialRecipe;
-import chemicraft.util.ChemicalNBTRecipe;
 
 /**
  * ChemiCraftのAPI
@@ -20,25 +19,25 @@ public class ChemiCraftAPI {
        /**
         * Instance of the ChemiCraftAPI.
         */
-       public static ChemiCraftAPI instance = new ChemiCraftAPI();
+       public static final ChemiCraftAPI instance = new ChemiCraftAPI();
 
 
        /**
         * List of compounds names.
         */
-       private ArrayList<String> compoundsNameList = new ArrayList();
+       private ArrayList<String> compoundsNameList = new ArrayList<String>();
 
 
        /**
         * List of compounds names(Some kind of language).
         */
-       private ArrayList<String> compoundsLangNameList = new ArrayList();
+       private ArrayList<String> compoundsLangNameList = new ArrayList<String>();
 
 
        /**
         * List of compounds the language names.
         */
-       private ArrayList<String> compoundsLangList = new ArrayList();
+       private ArrayList<String> compoundsLangList = new ArrayList<String>();
 
 
        /**
index 714f6e0..1551f48 100644 (file)
@@ -1,18 +1,17 @@
 package chemicraft.block;
 
+import chemicraft.ChemiCraft;
+import chemicraft.tileentity.TileEntityChemicalCombinationTable;
 import net.minecraft.src.BlockContainer;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import chemicraft.ChemiCraft;
-import chemicraft.tileentity.TileEntityChemicalCombinationTable;
 
 public class BlockChemicalCombinationTable extends BlockContainer {
 
        public BlockChemicalCombinationTable(int par1, int par2, Material par3Material) {
                super(par1, par2, par3Material);
-               this.setCreativeTab(ChemiCraft.instance.creativeTab);
        }
 
        @Override
@@ -36,13 +35,12 @@ public class BlockChemicalCombinationTable extends BlockContainer {
                if(par1 == 0){
                        return 17;
                }else if(par1 == 1){
-                       return 1;
+                       return 3;
                }else{
                        return 16;
                }
        }
 
-
        @Override
        public TileEntity createNewTileEntity(World var1) {
                return new TileEntityChemicalCombinationTable();
index c58a585..18460cb 100644 (file)
@@ -1,22 +1,19 @@
 package chemicraft.block;
 
+import chemicraft.ChemiCraft;
+import chemicraft.tileentity.TileEntityDecompositionTable;
 import net.minecraft.src.BlockContainer;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import chemicraft.ChemiCraft;
-import chemicraft.tileentity.TileEntityDecompositionTable;
 
 public class BlockDecompositionTable extends BlockContainer {
 
-       public BlockDecompositionTable(int par1, int par2, Material par3Material){
+       public BlockDecompositionTable(int par1, int par2, Material par3Material) {
                super(par1, par2, par3Material);
-               this.setCreativeTab(ChemiCraft.instance.creativeTab);
        }
 
-
-
        @Override
        public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9){
                par5EntityPlayer.openGui(ChemiCraft.instance, ChemiCraft.instance.guiDecompositionTableID, par1World, par2, par3, par4);
@@ -38,16 +35,14 @@ public class BlockDecompositionTable extends BlockContainer {
                if(par1 == 0){
                        return 17;
                }else if(par1 == 1){
-                       return 0;
+                       return 3;
                }else{
                        return 16;
                }
        }
 
-
-
        @Override
-       public TileEntity createNewTileEntity(World var1){
+       public TileEntity createNewTileEntity(World var1) {
                return new TileEntityDecompositionTable();
        }
 
index b2723c2..fc70311 100644 (file)
@@ -1,22 +1,19 @@
 package chemicraft.block;
 
+import chemicraft.ChemiCraft;
+import chemicraft.tileentity.TileEntityToolAndWeaponTable;
 import net.minecraft.src.BlockContainer;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import chemicraft.ChemiCraft;
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 
 public class BlockToolAndWeaponCraftingTable extends BlockContainer {
 
        public BlockToolAndWeaponCraftingTable(int par1, int par2, Material par3Material) {
                super(par1, par2, par3Material);
-               this.setCreativeTab(ChemiCraft.instance.creativeTab);
        }
 
-
-
        @Override
        public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9){
                par5EntityPlayer.openGui(ChemiCraft.instance, ChemiCraft.instance.guiToolAndWeaponCraftingTableID, par1World, par2, par3, par4);
@@ -38,17 +35,15 @@ public class BlockToolAndWeaponCraftingTable extends BlockContainer {
                if(par1 == 0){
                        return 17;
                }else if(par1 == 1){
-                       return 2;
+                       return 3;
                }else{
                        return 16;
                }
        }
 
-
-
        @Override
        public TileEntity createNewTileEntity(World var1) {
-               return new TileEntityToolAndWeaponCraftingTable();
+               return new TileEntityToolAndWeaponTable();
        }
 
 }
index 68a2cc4..882226e 100644 (file)
@@ -2,134 +2,15 @@ package chemicraft.container;
 
 import net.minecraft.src.Container;
 import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.Slot;
-import net.minecraft.src.World;
-import chemicraft.ChemiCraft;
-import chemicraft.ChemiCraftAPI;
-import chemicraft.inventory.InventoryChemicalCombination;
-import chemicraft.slot.SlotChemicalCombinationResult;
-import chemicraft.tileentity.TileEntityChemicalCombinationTable;
 
 public class ContainerChemicalCombinationTable extends Container {
 
-       /**
-        * Worldのインスタンス
-        */
-       private World worldObj;
-
-
-       /**
-        * BlockのX, Y, Z座標
-        */
-       private int posX;
-       private int posY;
-       private int posZ;
-
-
-       /**
-        * the TileEntity.
-        */
-       private TileEntityChemicalCombinationTable tileEntity;
-
-
-       /**
-        * the inventory.
-        */
-       private IInventory inv;
-
-
-
-       public ContainerChemicalCombinationTable(EntityPlayer par1EntityPlayer, TileEntityChemicalCombinationTable par2)
-       {
-               super();
-               this.worldObj = par2.worldObj;
-               this.posX = par2.xCoord;
-               this.posY = par2.yCoord;
-               this.posZ = par2.zCoord;
-               this.tileEntity = par2;
-               this.inv = par2.getInventorys();
-               //GenerateInventory
-               this.generateSlots("ChemicalCombination", par2.getInventorys());
-               //GeneratePlayerInventory
-               int var3;
-
-               for (var3 = 0; var3 < 3; ++var3)
-               {
-                       for (int var4 = 0; var4 < 9; ++var4)
-                       {
-                               this.addSlotToContainer(new Slot(par1EntityPlayer.inventory, var4 + var3 * 9 + 9, 8 + var4 * 18, 85 + var3 * 18));
-                       }
-               }
-
-               for (var3 = 0; var3 < 9; ++var3)
-               {
-                       this.addSlotToContainer(new Slot(par1EntityPlayer.inventory, var3, 8 + var3 * 18, 143));
-               }
-
-               this.tileEntity.getInventorys().setEventHandler(this);
-
-       }
-
-
-
-       @Override
-       public void onCraftMatrixChanged(IInventory par1IInventory){
-               this.putStackInSlot(16, ChemiCraftAPI.instance.getCraftingManager().getChemicalCombinationResult(par1IInventory));
-               ((InventoryChemicalCombination) par1IInventory).setFlag(true);
+       public ContainerChemicalCombinationTable() {
        }
 
-
-
-       @Override
-       public void onCraftGuiClosed(EntityPlayer par1EntityPlayer){
-               super.onCraftGuiClosed(par1EntityPlayer);
-       }
-
-
-
-       @Override
-       public boolean canInteractWith(EntityPlayer par1EntityPlayer){
-               return this.worldObj.getBlockId(this.posX, this.posY, this.posZ) != ChemiCraft.instance.chemicalConbinationTableID ? false : par1EntityPlayer.getDistanceSq((double)this.posX + 0.5D, (double)this.posY + 0.5D, (double)this.posZ + 0.5D) <= 64.0D;
-       }
-
-
-
        @Override
-       public ItemStack transferStackInSlot(int par1){
-               return null;
+       public boolean canInteractWith(EntityPlayer var1) {
+               return false;
        }
 
-       @Override
-       public ItemStack slotClick(int par1, int par2, boolean par3, EntityPlayer par4EntityPlayer)
-       {
-               super.slotClick(par1, par2, par3, par4EntityPlayer);
-               if(par1 == 16){
-                       if(this.inv.getStackInSlot(16) == null) return super.slotClick(par1, par2, par3, par4EntityPlayer);
-                       for(int i = 0;i < 16;i++){
-                               if(this.inv.getStackInSlot(i) != null){
-                                       if(this.inv.getStackInSlot(i).stackSize > 1){
-                                               this.putStackInSlot(i, new ItemStack(this.inv.getStackInSlot(i).itemID, --this.inv.getStackInSlot(i).stackSize, this.inv.getStackInSlot(i).getItemDamage()));
-                                       }else{
-                                               this.putStackInSlot(i, null);
-                                       }
-                               }
-                       }
-               }
-               return null;
-       }
-
-
-
-       private void generateSlots(String activeTabs, IInventory inventorys){
-               int count = 0;
-               for(int i = 0;i < 4;i++){
-                       for(int j = 0;j < 4;j++){
-                               this.addSlotToContainer(new Slot(inventorys, count, 16 + 18 * j, 8 + 18 * i));
-                               count++;
-                       }
-               }
-               this.addSlotToContainer(new SlotChemicalCombinationResult(inventorys, count, 123, 33));
-       }
 }
index 2205736..3598a74 100644 (file)
@@ -11,7 +11,7 @@ import chemicraft.ChemiCraftAPI;
 import chemicraft.inventory.InventoryChemicalCraftingMaterial;
 import chemicraft.inventory.InventoryChemicalCraftingNBT;
 import chemicraft.inventory.InventoryChemicalCraftingResult;
-import chemicraft.slot.SlotChemicalCraftingResult;
+import chemicraft.slot.SlotChemicalCraftingTableResult;
 import chemicraft.tileentity.TileEntityChemicalCraftingTable;
 import chemicraft.util.ChemicalNBTRecipe;
 
@@ -117,10 +117,8 @@ public class ContainerChemicalCraftingTable extends Container {
                        if(this.useNBT == null) return super.slotClick(par1, par2, par3, par4EntityPlayer);
                        ItemStack[] useItems = this.useNBT.getMatchItems(matchNBT);
                        for(int i = 0;i < useItems.length;i++){
-                               if(useItems != null){
-                                       if(useItems[i] != null){
-                                               this.invn.setInventorySlotContents(i, null);
-                                       }
+                               if(useItems[i] != null){
+                                       this.invn.setInventorySlotContents(i, null);
                                }
                        }
                }
@@ -129,7 +127,7 @@ public class ContainerChemicalCraftingTable extends Container {
 
        @Override
        public boolean canInteractWith(EntityPlayer par1EntityPlayer){
-               return this.worldObj.getBlockId(this.posX, this.posY, this.posZ) != ChemiCraft.instance.ChemicalCraftingTableID ? false : par1EntityPlayer.getDistanceSq((double)this.posX + 0.5D, (double)this.posY + 0.5D, (double)this.posZ + 0.5D) <= 64.0D;
+               return this.worldObj.getBlockId(this.posX, this.posY, this.posZ) != ChemiCraft.instance.chemicalCraftingTableID ? false : par1EntityPlayer.getDistanceSq((double)this.posX + 0.5D, (double)this.posY + 0.5D, (double)this.posZ + 0.5D) <= 64.0D;
        }
 
 
@@ -150,6 +148,6 @@ public class ContainerChemicalCraftingTable extends Container {
                                this.addSlotToContainer(new Slot(invm, i * 3 + j, 30 + 18 * j, 27 + 18 * i));
                        }
                }
-               this.addSlotToContainer(new SlotChemicalCraftingResult(invr, 0, 123, 33));
+               this.addSlotToContainer(new SlotChemicalCraftingTableResult(invr, 0, 123, 33));
        }
 }
index 8e63b8c..572c830 100644 (file)
@@ -2,171 +2,16 @@ package chemicraft.container;
 
 import net.minecraft.src.Container;
 import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.InventoryPlayer;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.Slot;
-import net.minecraft.src.World;
-import chemicraft.ChemiCraft;
-import chemicraft.ChemiCraftAPI;
-import chemicraft.inventory.InventoryDecomposition;
-import chemicraft.slot.SlotDecompositionResult;
-import chemicraft.tileentity.TileEntityDecompositionTable;
-import cpw.mods.fml.common.network.PacketDispatcher;
 
 public class ContainerDecompositionTable extends Container {
 
-       /**
-        * Worldのインスタンス
-        */
-       private World worldObj;
+       public ContainerDecompositionTable(){
 
-
-       /**
-        * BlockのX, Y, Z座標
-        */
-       private int posX;
-       private int posY;
-       private int posZ;
-
-
-       /**
-        * the TileEntity.
-        */
-       private TileEntityDecompositionTable tileEntity;
-
-
-       /**
-        * the inventory.
-        */
-       private InventoryDecomposition inv;
-
-
-
-       /**
-        * the inventoryPlayer.
-        */
-       private InventoryPlayer invp;
-
-
-
-       public ContainerDecompositionTable(EntityPlayer par1EntityPlayer, TileEntityDecompositionTable par2)
-       {
-               super();
-               this.worldObj = par2.worldObj;
-               this.posX = par2.xCoord;
-               this.posY = par2.yCoord;
-               this.posZ = par2.zCoord;
-               this.tileEntity = par2;
-               this.inv = par2.getInventorys();
-               this.invp = par1EntityPlayer.inventory;
-               //GenerateInventory
-               this.generateSlots("Decomposition", par2.getInventorys());
-               //GeneratePlayerInventory
-               int var3;
-
-               for (var3 = 0; var3 < 3; ++var3)
-               {
-                       for (int var4 = 0; var4 < 9; ++var4)
-                       {
-                               this.addSlotToContainer(new Slot(par1EntityPlayer.inventory, var4 + var3 * 9 + 9, 8 + var4 * 18, 85 + var3 * 18));
-                       }
-               }
-
-               for (var3 = 0; var3 < 9; ++var3)
-               {
-                       this.addSlotToContainer(new Slot(par1EntityPlayer.inventory, var3, 8 + var3 * 18, 143));
-               }
-
-               this.tileEntity.getInventorys().setEventHandler(this);
-       }
-
-
-
-       @Override
-       public void onCraftMatrixChanged(IInventory par1IInventory){
-               if(ChemiCraftAPI.instance.getCraftingManager().getDecompositionResults(this.inv) != null){
-                       for(int i = 0;i < ChemiCraftAPI.instance.getCraftingManager().getDecompositionResults(this.inv).length;i++){
-                               this.inv.setInventorySlotContents(i, ChemiCraftAPI.instance.getCraftingManager().getDecompositionResults(this.inv)[i]);
-                       }
-               }
-               this.inv.setFlag(true);
        }
 
-
-
        @Override
-       public void updateCraftingResults(){
-               super.updateCraftingResults();
-       }
-
-
-
-       @Override
-       public void onCraftGuiClosed(EntityPlayer par1EntityPlayer){
-               super.onCraftGuiClosed(par1EntityPlayer);
-       }
-
-
-
-       @Override
-       public boolean canInteractWith(EntityPlayer par1EntityPlayer){
-               return this.worldObj.getBlockId(this.posX, this.posY, this.posZ) != ChemiCraft.instance.decompositionTableID ? false : par1EntityPlayer.getDistanceSq((double)this.posX + 0.5D, (double)this.posY + 0.5D, (double)this.posZ + 0.5D) <= 64.0D;
-       }
-
-
-
-       @Override
-       public ItemStack slotClick(int par1, int par2, boolean par3, EntityPlayer par4EntityPlayer)
-       {
-               if(par1 < 16){
-                       return null;
-               }else{
-                       super.slotClick(par1, par2, par3, par4EntityPlayer);
-               }
-               return null;
-       }
-
-
-
-       @Override
-       public ItemStack transferStackInSlot(int par1){
-               return null;
-       }
-
-
-
-       public void onButtonClick(int par1){
-               if(par1 == 0){
-                       if(this.inv.getStackInSlot(16) != null && this.inv.getStackInSlot(0) != null){
-                               for(int loop = 0;loop < this.inv.getStackInSlot(16).stackSize;loop++){
-                                       if(this.invp.player.inventory.getFirstEmptyStack() != -1){
-                                               this.tileEntity.setItemDrop(false);
-                                               this.tileEntity.setButtonClick(true);
-                                               PacketDispatcher.sendPacketToServer(this.tileEntity.getDescriptionPacket());
-                                               this.tileEntity.setButtonClick(false);
-                                       }else{
-                                               this.tileEntity.setItemDrop(true);
-                                               this.tileEntity.setButtonClick(true);
-                                               PacketDispatcher.sendPacketToServer(this.tileEntity.getDescriptionPacket());
-                                               this.tileEntity.setButtonClick(false);
-                                       }
-                               }
-                       }
-               }
-       }
-
-
-
-       private void generateSlots(String activeTabs, IInventory inventorys){
-               int count = 0;
-               for(int i = 0;i < 4;i++){
-                       for(int j = 0;j < 4;j++){
-                               this.addSlotToContainer(new SlotDecompositionResult(inventorys, count, 90 + 18 * j, 8 + 18 * i));
-                               count++;
-                       }
-               }
-               this.addSlotToContainer(new Slot(inventorys, count, 28, 30));
+       public boolean canInteractWith(EntityPlayer var1) {
+               return false;
        }
 
 }
index 9c4aa96..44b03fa 100644 (file)
@@ -2,101 +2,16 @@ package chemicraft.container;
 
 import net.minecraft.src.Container;
 import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.Slot;
-import net.minecraft.src.World;
-import chemicraft.ChemiCraft;
-import chemicraft.slot.SlotToolAndWeaponCraftingResult;
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 
 public class ContainerToolAndWeaponCraftingTable extends Container {
 
-       /**
-        * Worldのインスタンス
-        */
-       private World worldObj;
+       public ContainerToolAndWeaponCraftingTable(){
 
-
-       /**
-        * BlockのX, Y, Z座標
-        */
-       private int posX;
-       private int posY;
-       private int posZ;
-
-
-       /**
-        * the TileEntity.
-        */
-       private TileEntityToolAndWeaponCraftingTable tileEntity;
-
-
-
-       public ContainerToolAndWeaponCraftingTable(EntityPlayer par1EntityPlayer, TileEntityToolAndWeaponCraftingTable par2)
-       {
-               super();
-               this.worldObj = par2.worldObj;
-               this.posX = par2.xCoord;
-               this.posY = par2.yCoord;
-               this.posZ = par2.zCoord;
-               this.tileEntity = par2;
-               //GenerateInventory
-               this.generateSlots("Decomposition", par2.getInventorys());
-               //GeneratePlayerInventory
-               int var3;
-
-               for (var3 = 0; var3 < 3; ++var3)
-               {
-                       for (int var4 = 0; var4 < 9; ++var4)
-                       {
-                               this.addSlotToContainer(new Slot(par1EntityPlayer.inventory, var4 + var3 * 9 + 9, 8 + var4 * 18, 85 + var3 * 18));
-                       }
-               }
-
-               for (var3 = 0; var3 < 9; ++var3)
-               {
-                       this.addSlotToContainer(new Slot(par1EntityPlayer.inventory, var3, 8 + var3 * 18, 143));
-               }
-       }
-
-
-
-       @Override
-       public void onCraftMatrixChanged(IInventory par1IInventory){}
-
-
-
-       @Override
-       public void onCraftGuiClosed(EntityPlayer par1EntityPlayer){
-               super.onCraftGuiClosed(par1EntityPlayer);
-       }
-
-
-
-       @Override
-       public boolean canInteractWith(EntityPlayer par1EntityPlayer){
-               return this.worldObj.getBlockId(this.posX, this.posY, this.posZ) != ChemiCraft.instance.toolAndWeaponCraftingTableID ? false : par1EntityPlayer.getDistanceSq((double)this.posX + 0.5D, (double)this.posY + 0.5D, (double)this.posZ + 0.5D) <= 64.0D;
        }
 
-
-
        @Override
-       public ItemStack transferStackInSlot(int par1){
-               return null;
-       }
-
-
-
-       private void generateSlots(String activeTabs, IInventory[] inventorys){
-               int count = 0;
-               for(int i = 0;i < 3;i++){
-                       for(int j = 0;j < 3;j++){
-                               this.addSlotToContainer(new Slot(inventorys[0], count, 30 + 18 * j, 17 + 18 * i));
-                               count++;
-                       }
-               }
-               this.addSlotToContainer(new SlotToolAndWeaponCraftingResult(inventorys[0], count, 125, 37));
+       public boolean canInteractWith(EntityPlayer var1) {
+               return false;
        }
 
 }
index c756818..83c4251 100644 (file)
@@ -18,6 +18,7 @@ public class CommandDeleteItem extends CommandBase {
                return "delItem";
        }
 
+       @SuppressWarnings("unchecked")
        @Override
        public void processCommand(ICommandSender var1, String[] var2) {
                MinecraftServer server = null;
@@ -26,8 +27,8 @@ public class CommandDeleteItem extends CommandBase {
                try{ player = (EntityPlayerMP)var1;} catch(ClassCastException e) {}
 
                World world;
-               List list;
-               Iterator itr;
+               List<Entity> list;
+               Iterator<Entity> itr;
 
                if(server != null){
                        if(var2.length > 0){
@@ -35,7 +36,7 @@ public class CommandDeleteItem extends CommandBase {
                                list = world.loadedEntityList;
                                itr = list.iterator();
                                while(itr.hasNext()){
-                                       Entity entity = (Entity) itr.next();
+                                       Entity entity = itr.next();
                                        if(entity instanceof EntityItem){
                                                entity.setDead();
                                        }
@@ -48,7 +49,7 @@ public class CommandDeleteItem extends CommandBase {
                        list = world.loadedEntityList;
                        itr = list.iterator();
                        while(itr.hasNext()){
-                               Entity entity = (Entity) itr.next();
+                               Entity entity = itr.next();
                                if(entity instanceof EntityItem){
                                        entity.setDead();
                                }
index 92df462..6017990 100644 (file)
@@ -30,12 +30,17 @@ public class SetBlockSupport
                {\r
                        switch(Direction)\r
                        {\r
+                       default:\r
+\r
                        case -1:\r
                                DataBox = par1World.setBlockAndMetadataWithNotify(X, Y, Z, Block, meta);\r
+                               break;\r
                        case 0:\r
                                DataBox = par1World.setBlockAndMetadataWithNotify(X-(Length-1)+loop2,Y,Z,Block,meta);\r
+                               break;\r
                        case 1:\r
                                DataBox = par1World.setBlockAndMetadataWithNotify(X+loop2, Y, Z, Block,meta);\r
+                               break;\r
                        }\r
                }\r
                return DataBox;\r
@@ -63,12 +68,17 @@ public class SetBlockSupport
                {\r
                        switch(Direction)\r
                        {\r
+                       default:\r
+\r
                        case -1:\r
                                DataBox = par1World.setBlockAndMetadataWithNotify(X, Y-loop2, Z, Block,meta);\r
+                               break;\r
                        case 0:\r
                                DataBox = par1World.setBlockAndMetadataWithNotify(X,Y-(Length-1)+loop2,Z,Block,meta);\r
+                               break;\r
                        case 1:\r
                                DataBox = par1World.setBlockAndMetadataWithNotify(X, Y+loop2, Z, Block,meta);\r
+                               break;\r
                        }\r
                }\r
                return DataBox;\r
@@ -96,12 +106,17 @@ public class SetBlockSupport
                {\r
                        switch(Direction)\r
                        {\r
+                       default:\r
+\r
                        case -1:\r
                                DataBox = par1World.setBlockAndMetadataWithNotify(X, Y, Z-loop2, Block,meta);\r
+                               break;\r
                        case 0:\r
                                DataBox = par1World.setBlockAndMetadataWithNotify(X,Y,Z-(Length-1)+loop2,Block,meta);\r
+                               break;\r
                        case 1:\r
                                DataBox = par1World.setBlockAndMetadataWithNotify(X, Y, Z+loop2, Block,meta);\r
+                               break;\r
                        }\r
                }\r
                return DataBox;\r
@@ -426,8 +441,8 @@ public class SetBlockSupport
         * @param height 高さ\r
         * @return Object\r
         */\r
-       public static Object TrapezoidX(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){\r
-               Object DataBox = null;\r
+       public static Object trapezoidX(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){\r
+               Object dataBox = null;\r
                int Rate=0;\r
                int Math=0;\r
                int XRate=0;\r
@@ -450,9 +465,9 @@ public class SetBlockSupport
                                }\r
                        }\r
 \r
-                       DataBox=lineZ(par1World, X+XRate-1, Y+YRate, Z, Block, meta, upperSide+Rate, 0);\r
+                       dataBox=lineZ(par1World, X+XRate-1, Y+YRate, Z, Block, meta, upperSide+Rate, 0);\r
                }\r
-               return DataBox;\r
+               return dataBox;\r
        }\r
 \r
        /**\r
@@ -469,8 +484,8 @@ public class SetBlockSupport
         * @param height 高さ\r
         * @return Object\r
         */\r
-       public static Object TrapezoidY_X(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){\r
-               Object DataBox = null;\r
+       public static Object trapezoidY_X(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){\r
+               Object dataBox = null;\r
                int Rate=0;\r
                int Math=0;\r
                int YRate = 0;\r
@@ -491,9 +506,9 @@ public class SetBlockSupport
                                }\r
                        }\r
 \r
-                       DataBox=lineZ(par1World, X, Y+YRate, Z, Block, meta, upperSide+Rate, 0);\r
+                       dataBox=lineZ(par1World, X, Y+YRate, Z, Block, meta, upperSide+Rate, 0);\r
                }\r
-               return DataBox;\r
+               return dataBox;\r
        }\r
 \r
        /**\r
@@ -510,8 +525,8 @@ public class SetBlockSupport
         * @param height 高さ\r
         * @return Object\r
         */\r
-       public static Object TrapezoidY_Z(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){\r
-               Object DataBox = null;\r
+       public static Object trapezoidY_Z(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){\r
+               Object dataBox = null;\r
                int Rate=0;\r
                int Math=0;\r
                int YRate = 0;\r
@@ -532,9 +547,9 @@ public class SetBlockSupport
                                }\r
                        }\r
 \r
-                       DataBox=lineX(par1World, X, Y+YRate, Z, Block, meta, upperSide+Rate, 0);\r
+                       dataBox=lineX(par1World, X, Y+YRate, Z, Block, meta, upperSide+Rate, 0);\r
                }\r
-               return DataBox;\r
+               return dataBox;\r
        }\r
 \r
        /**\r
@@ -552,7 +567,7 @@ public class SetBlockSupport
         * @return Object\r
         */\r
        public static Object TrapezoidZ(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){\r
-               Object DataBox = null;\r
+               Object dataBox = null;\r
                int Rate=0;\r
                int Math=0;\r
                int ZRate=0;\r
@@ -573,9 +588,9 @@ public class SetBlockSupport
                                }\r
                        }\r
 \r
-                       DataBox=lineX(par1World, X, Y, Z+ZRate, Block, meta, upperSide+Rate, 0);\r
+                       dataBox=lineX(par1World, X, Y, Z+ZRate, Block, meta, upperSide+Rate, 0);\r
                }\r
-               return DataBox;\r
+               return dataBox;\r
        }\r
 \r
 }
\ No newline at end of file
index ad7e9fa..e68b8a2 100644 (file)
@@ -30,6 +30,7 @@ public class EntityAtomGrenade extends EntityThrowable
                super.onUpdate();
        }
 
+       @SuppressWarnings("unchecked")
        @Override
        protected void onImpact(MovingObjectPosition par1MovingObjectPosition)
        {
@@ -52,9 +53,9 @@ public class EntityAtomGrenade extends EntityThrowable
                        this.isDead = true;
                }else if(!this.worldObj.isRemote && isNuke){
                        this.worldObj.newExplosion((Entity)null, this.posX, this.posY, this.posZ, explodeSize, onFire);
-                       Iterator itr = this.worldObj.getEntitiesWithinAABB(EntityLiving.class, this.boundingBox.expand(30, 30, 30)).iterator();
+                       Iterator<EntityLiving> itr = this.worldObj.getEntitiesWithinAABB(EntityLiving.class, this.boundingBox.expand(30, 30, 30)).iterator();
                        while(itr.hasNext()){
-                               EntityLiving entity = (EntityLiving) itr.next();
+                               EntityLiving entity = itr.next();
                                double dx = Math.abs(entity.posX - this.posX);
                                double dy = Math.abs(entity.posY - this.posY);
                                double dz = Math.abs(entity.posZ - this.posZ);
index fb2164f..f7e39df 100644 (file)
@@ -1,49 +1,11 @@
 package chemicraft.gui;
 
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.GuiContainer;
-import net.minecraft.src.InventoryPlayer;
-import chemicraft.ChemiCraft;
-import chemicraft.container.ContainerChemicalCombinationTable;
-import chemicraft.tileentity.TileEntityChemicalCombinationTable;
-import cpw.mods.fml.common.Side;
-import cpw.mods.fml.common.asm.SideOnly;
+import net.minecraft.src.Gui;
 
-@SideOnly(Side.CLIENT)
-public class GuiChemicalCombinationTable extends GuiContainer {
+public class GuiChemicalCombinationTable extends Gui {
 
-       /**
-        * the TileEntity.
-        */
-       private TileEntityChemicalCombinationTable tileEntity;
+       public GuiChemicalCombinationTable(){
 
-
-       /**
-        * the InventoryPlayer.
-        */
-       private InventoryPlayer inventoryPlayer;
-
-
-       /**
-        * the Container
-        */
-       private ContainerChemicalCombinationTable container;
-
-
-
-       public GuiChemicalCombinationTable(EntityPlayer par1EntityPlayer, TileEntityChemicalCombinationTable par2){
-               super(new ContainerChemicalCombinationTable(par1EntityPlayer, par2));
-               this.inventoryPlayer = par1EntityPlayer.inventory;
-               this.tileEntity = par2;
-               this.container = (ContainerChemicalCombinationTable) this.inventorySlots;
-       }
-
-
-
-       @Override
-       protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3){
-               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.guiChemicalCombinationTexture));
-               this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
        }
 
 }
index c1f6c43..76f533b 100644 (file)
@@ -2,7 +2,6 @@ package chemicraft.gui;
 
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.GuiContainer;
-import net.minecraft.src.InventoryPlayer;
 import chemicraft.ChemiCraft;
 import chemicraft.container.ContainerChemicalCraftingTable;
 import chemicraft.tileentity.TileEntityChemicalCraftingTable;
@@ -12,30 +11,8 @@ import cpw.mods.fml.common.asm.SideOnly;
 @SideOnly(Side.CLIENT)
 public class GuiChemicalCraftingTable extends GuiContainer {
 
-       /**
-        * the TileEntity.
-        */
-       private TileEntityChemicalCraftingTable tileEntity;
-
-
-       /**
-        * the InventoryPlayer.
-        */
-       private InventoryPlayer inventoryPlayer;
-
-
-       /**
-        * the Container
-        */
-       private ContainerChemicalCraftingTable container;
-
-
-
        public GuiChemicalCraftingTable(EntityPlayer par1EntityPlayer, TileEntityChemicalCraftingTable par2){
                super(new ContainerChemicalCraftingTable(par1EntityPlayer, par2));
-               this.inventoryPlayer = par1EntityPlayer.inventory;
-               this.tileEntity = par2;
-               this.container = (ContainerChemicalCraftingTable) this.inventorySlots;
        }
 
 
index 87ae20a..a8ecca4 100644 (file)
@@ -1,73 +1,8 @@
 package chemicraft.gui;
 
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.GuiButton;
-import net.minecraft.src.GuiContainer;
-import net.minecraft.src.InventoryPlayer;
-import chemicraft.ChemiCraft;
-import chemicraft.container.ContainerDecompositionTable;
-import chemicraft.tileentity.TileEntityDecompositionTable;
-import cpw.mods.fml.common.Side;
-import cpw.mods.fml.common.asm.SideOnly;
+public class GuiDecompositionTable {
 
-@SideOnly(Side.CLIENT)
-public class GuiDecompositionTable extends GuiContainer {
-
-       /**
-        * the TileEntity.
-        */
-       private TileEntityDecompositionTable tileEntity;
-
-
-       /**
-        * the InventoryPlayer.
-        */
-       private InventoryPlayer inventoryPlayer;
-
-
-       /**
-        * the Container
-        */
-       private ContainerDecompositionTable container;
-
-
-
-       public GuiDecompositionTable(EntityPlayer par1EntityPlayer, TileEntityDecompositionTable par2){
-               super(new ContainerDecompositionTable(par1EntityPlayer, par2));
-               this.inventoryPlayer = par1EntityPlayer.inventory;
-               this.tileEntity = par2;
-               this.container = (ContainerDecompositionTable) this.inventorySlots;
-       }
-
-
-
-       @Override
-       public void initGui(){
-               super.initGui();
-               this.controlList.add(new GuiButton(0, this.guiLeft + 17, this.guiTop+4, 60, 16,"TakeOut"));
-       }
-
-
-
-
-       @Override
-       protected void drawGuiContainerForegroundLayer()
-       {
-       }
-
-
-
-       @Override
-       protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3){
-               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.guiDecompositionTexture));
-               this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
-       }
-
-
-
-       @Override
-       protected void actionPerformed(GuiButton par1GuiButton){
-               this.container.onButtonClick(par1GuiButton.id);
+       public GuiDecompositionTable() {
        }
 
 }
index a13d628..2167218 100644 (file)
@@ -1,46 +1,9 @@
 package chemicraft.gui;
 
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.GuiContainer;
-import net.minecraft.src.InventoryPlayer;
-import chemicraft.ChemiCraft;
-import chemicraft.container.ContainerToolAndWeaponCraftingTable;
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
+public class GuiToolAndWeaponCraftingTable {
 
-public class GuiToolAndWeaponCraftingTable extends GuiContainer {
+       public GuiToolAndWeaponCraftingTable(){
 
-       /**
-        * the TileEntity.
-        */
-       private TileEntityToolAndWeaponCraftingTable tileEntity;
-
-
-       /**
-        * the InventoryPlayer.
-        */
-       private InventoryPlayer inventoryPlayer;
-
-
-       /**
-        * the Container
-        */
-       private ContainerToolAndWeaponCraftingTable container;
-
-
-
-       public GuiToolAndWeaponCraftingTable(EntityPlayer par1EntityPlayer, TileEntityToolAndWeaponCraftingTable par2){
-               super(new ContainerToolAndWeaponCraftingTable(par1EntityPlayer, par2));
-               this.inventoryPlayer = par1EntityPlayer.inventory;
-               this.tileEntity = par2;
-               this.container = (ContainerToolAndWeaponCraftingTable) this.inventorySlots;
-       }
-
-
-
-       @Override
-       protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3){
-               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.guiToolAndWeaponCraftingTexture));
-               this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
        }
 
 }
diff --git a/common/chemicraft/inventory/InventoryChemicalCombination.java b/common/chemicraft/inventory/InventoryChemicalCombination.java
deleted file mode 100644 (file)
index 8d0bc56..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.src.Container;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-
-public class InventoryChemicalCombination implements IInventory {
-
-       private ItemStack[] inventory = new ItemStack[16+1];
-
-       private Container eventHandler;
-
-       private boolean flag;
-
-       public void setEventHandler(Container par1Container){
-               this.eventHandler = par1Container;
-               this.flag = true;
-       }
-
-       public void setFlag(boolean par1){
-               this.flag = par1;
-       }
-
-       @Override
-       public int getSizeInventory() {
-               return inventory.length;
-       }
-
-       @Override
-       public ItemStack getStackInSlot(int var1) {
-               return inventory[var1];
-       }
-
-       @Override
-       public ItemStack decrStackSize(int par1, int par2)
-       {
-               if (this.inventory[par1] != null)
-               {
-                       ItemStack var3 = this.inventory[par1];
-                       this.inventory[par1] = null;
-                       return var3;
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public ItemStack getStackInSlotOnClosing(int par1)
-       {
-               if (this.inventory[par1] != null)
-               {
-                       ItemStack var2 = this.inventory[par1];
-                       this.inventory[par1] = null;
-                       return var2;
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public void setInventorySlotContents(int var1, ItemStack var2) {
-               inventory[var1] = var2;
-       }
-
-       @Override
-       public String getInvName() {
-               return "ChemicalCombinationInventory";
-       }
-
-       @Override
-       public int getInventoryStackLimit() {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged() {
-               if(flag){
-                       this.eventHandler.onCraftMatrixChanged(this);
-               }
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1) {
-               return true;
-       }
-
-       @Override
-       public void openChest() {
-
-       }
-
-       @Override
-       public void closeChest() {
-
-       }
-
-}
diff --git a/common/chemicraft/inventory/InventoryChemicalCombinationTableMaterial.java b/common/chemicraft/inventory/InventoryChemicalCombinationTableMaterial.java
new file mode 100644 (file)
index 0000000..f241e59
--- /dev/null
@@ -0,0 +1,60 @@
+package chemicraft.inventory;
+
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.IInventory;
+import net.minecraft.src.ItemStack;
+
+public class InventoryChemicalCombinationTableMaterial implements IInventory {
+
+       @Override
+       public int getSizeInventory() {
+               return 0;
+       }
+
+       @Override
+       public ItemStack getStackInSlot(int var1) {
+               return null;
+       }
+
+       @Override
+       public ItemStack decrStackSize(int var1, int var2) {
+               return null;
+       }
+
+       @Override
+       public ItemStack getStackInSlotOnClosing(int var1) {
+               return null;
+       }
+
+       @Override
+       public void setInventorySlotContents(int var1, ItemStack var2) {
+       }
+
+       @Override
+       public String getInvName() {
+               return null;
+       }
+
+       @Override
+       public int getInventoryStackLimit() {
+               return 0;
+       }
+
+       @Override
+       public void onInventoryChanged() {
+       }
+
+       @Override
+       public boolean isUseableByPlayer(EntityPlayer var1) {
+               return false;
+       }
+
+       @Override
+       public void openChest() {
+       }
+
+       @Override
+       public void closeChest() {
+       }
+
+}
diff --git a/common/chemicraft/inventory/InventoryChemicalCombinationTableResult.java b/common/chemicraft/inventory/InventoryChemicalCombinationTableResult.java
new file mode 100644 (file)
index 0000000..ef019c8
--- /dev/null
@@ -0,0 +1,60 @@
+package chemicraft.inventory;
+
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.IInventory;
+import net.minecraft.src.ItemStack;
+
+public class InventoryChemicalCombinationTableResult implements IInventory {
+
+       @Override
+       public int getSizeInventory() {
+               return 0;
+       }
+
+       @Override
+       public ItemStack getStackInSlot(int var1) {
+               return null;
+       }
+
+       @Override
+       public ItemStack decrStackSize(int var1, int var2) {
+               return null;
+       }
+
+       @Override
+       public ItemStack getStackInSlotOnClosing(int var1) {
+               return null;
+       }
+
+       @Override
+       public void setInventorySlotContents(int var1, ItemStack var2) {
+       }
+
+       @Override
+       public String getInvName() {
+               return null;
+       }
+
+       @Override
+       public int getInventoryStackLimit() {
+               return 0;
+       }
+
+       @Override
+       public void onInventoryChanged() {
+       }
+
+       @Override
+       public boolean isUseableByPlayer(EntityPlayer var1) {
+               return false;
+       }
+
+       @Override
+       public void openChest() {
+       }
+
+       @Override
+       public void closeChest() {
+       }
+
+}
diff --git a/common/chemicraft/inventory/InventoryDecomposition.java b/common/chemicraft/inventory/InventoryDecomposition.java
deleted file mode 100644 (file)
index 2bc9ea2..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.src.Container;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-
-public class InventoryDecomposition implements IInventory {
-
-       private ItemStack[] inventory = new ItemStack[16+1];
-
-       private Container eventHandler;
-
-       private boolean flag;
-
-       public void setEventHandler(Container par1Container){
-               this.eventHandler = par1Container;
-               this.flag = true;
-       }
-
-       public void setFlag(boolean par1){
-               this.flag = par1;
-       }
-
-       @Override
-       public int getSizeInventory() {
-               return inventory.length;
-       }
-
-       @Override
-       public ItemStack getStackInSlot(int var1) {
-               return inventory[var1];
-       }
-
-       @Override
-       public ItemStack decrStackSize(int par1, int par2)
-       {
-               if (this.inventory[par1] != null)
-               {
-                       ItemStack var3 = this.inventory[par1];
-                       this.inventory[par1] = null;
-                       return var3;
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public ItemStack getStackInSlotOnClosing(int par1)
-       {
-               if (this.inventory[par1] != null)
-               {
-                       ItemStack var2 = this.inventory[par1];
-                       this.inventory[par1] = null;
-                       return var2;
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public void setInventorySlotContents(int var1, ItemStack var2) {
-               inventory[var1] = var2;
-               if(flag){
-                       this.eventHandler.onCraftMatrixChanged(this);
-               }
-       }
-
-       @Override
-       public String getInvName() {
-               return "DecompositionInventory";
-       }
-
-       @Override
-       public int getInventoryStackLimit() {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged() {
-               if(flag){
-                       this.eventHandler.onCraftMatrixChanged(this);
-               }
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1) {
-               return true;
-       }
-
-       @Override
-       public void openChest() {
-
-       }
-
-       @Override
-       public void closeChest() {
-       }
-
-}
diff --git a/common/chemicraft/inventory/InventoryDecompositionTableMaterial.java b/common/chemicraft/inventory/InventoryDecompositionTableMaterial.java
new file mode 100644 (file)
index 0000000..83e0891
--- /dev/null
@@ -0,0 +1,64 @@
+package chemicraft.inventory;
+
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.IInventory;
+import net.minecraft.src.ItemStack;
+
+public class InventoryDecompositionTableMaterial implements IInventory {
+
+       @Override
+       public int getSizeInventory() {
+               return 0;
+       }
+
+       @Override
+       public ItemStack getStackInSlot(int var1) {
+               return null;
+       }
+
+       @Override
+       public ItemStack decrStackSize(int var1, int var2) {
+               return null;
+       }
+
+       @Override
+       public ItemStack getStackInSlotOnClosing(int var1) {
+               return null;
+       }
+
+       @Override
+       public void setInventorySlotContents(int var1, ItemStack var2) {
+
+       }
+
+       @Override
+       public String getInvName() {
+               return null;
+       }
+
+       @Override
+       public int getInventoryStackLimit() {
+               return 0;
+       }
+
+       @Override
+       public void onInventoryChanged() {
+
+       }
+
+       @Override
+       public boolean isUseableByPlayer(EntityPlayer var1) {
+               return false;
+       }
+
+       @Override
+       public void openChest() {
+
+       }
+
+       @Override
+       public void closeChest() {
+
+       }
+
+}
diff --git a/common/chemicraft/inventory/InventoryDecompositionTableResult.java b/common/chemicraft/inventory/InventoryDecompositionTableResult.java
new file mode 100644 (file)
index 0000000..9347580
--- /dev/null
@@ -0,0 +1,60 @@
+package chemicraft.inventory;
+
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.IInventory;
+import net.minecraft.src.ItemStack;
+
+public class InventoryDecompositionTableResult implements IInventory {
+
+       @Override
+       public int getSizeInventory() {
+               return 0;
+       }
+
+       @Override
+       public ItemStack getStackInSlot(int var1) {
+               return null;
+       }
+
+       @Override
+       public ItemStack decrStackSize(int var1, int var2) {
+               return null;
+       }
+
+       @Override
+       public ItemStack getStackInSlotOnClosing(int var1) {
+               return null;
+       }
+
+       @Override
+       public void setInventorySlotContents(int var1, ItemStack var2) {
+       }
+
+       @Override
+       public String getInvName() {
+               return null;
+       }
+
+       @Override
+       public int getInventoryStackLimit() {
+               return 0;
+       }
+
+       @Override
+       public void onInventoryChanged() {
+       }
+
+       @Override
+       public boolean isUseableByPlayer(EntityPlayer var1) {
+               return false;
+       }
+
+       @Override
+       public void openChest() {
+       }
+
+       @Override
+       public void closeChest() {
+       }
+
+}
diff --git a/common/chemicraft/inventory/InventoryToolAndWeaponCrafting.java b/common/chemicraft/inventory/InventoryToolAndWeaponCrafting.java
deleted file mode 100644 (file)
index 83f63ea..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-
-public class InventoryToolAndWeaponCrafting implements IInventory {
-
-       private ItemStack[] inventory = new ItemStack[9+1];
-
-       @Override
-       public int getSizeInventory() {
-               return inventory.length;
-       }
-
-       @Override
-       public ItemStack getStackInSlot(int var1) {
-               return inventory[var1];
-       }
-
-       @Override
-       public ItemStack decrStackSize(int par1, int par2)
-       {
-               if (this.inventory[par1] != null)
-               {
-                       ItemStack var3 = this.inventory[par1];
-                       this.inventory[par1] = null;
-                       return var3;
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public ItemStack getStackInSlotOnClosing(int par1)
-       {
-               if (this.inventory[par1] != null)
-               {
-                       ItemStack var2 = this.inventory[par1];
-                       this.inventory[par1] = null;
-                       return var2;
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public void setInventorySlotContents(int var1, ItemStack var2) {
-               inventory[var1] = var2;
-       }
-
-       @Override
-       public String getInvName() {
-               return "ToolAndWeaponCraftingInventory";
-       }
-
-       @Override
-       public int getInventoryStackLimit() {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged() {
-
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1) {
-               return true;
-       }
-
-       @Override
-       public void openChest() {
-
-       }
-
-       @Override
-       public void closeChest() {
-
-       }
-
-}
diff --git a/common/chemicraft/inventory/InventoryToolAndWeaponCraftingTableMaterial.java b/common/chemicraft/inventory/InventoryToolAndWeaponCraftingTableMaterial.java
new file mode 100644 (file)
index 0000000..3162c4d
--- /dev/null
@@ -0,0 +1,60 @@
+package chemicraft.inventory;
+
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.IInventory;
+import net.minecraft.src.ItemStack;
+
+public class InventoryToolAndWeaponCraftingTableMaterial implements IInventory {
+
+       @Override
+       public int getSizeInventory() {
+               return 0;
+       }
+
+       @Override
+       public ItemStack getStackInSlot(int var1) {
+               return null;
+       }
+
+       @Override
+       public ItemStack decrStackSize(int var1, int var2) {
+               return null;
+       }
+
+       @Override
+       public ItemStack getStackInSlotOnClosing(int var1) {
+               return null;
+       }
+
+       @Override
+       public void setInventorySlotContents(int var1, ItemStack var2) {
+       }
+
+       @Override
+       public String getInvName() {
+               return null;
+       }
+
+       @Override
+       public int getInventoryStackLimit() {
+               return 0;
+       }
+
+       @Override
+       public void onInventoryChanged() {
+       }
+
+       @Override
+       public boolean isUseableByPlayer(EntityPlayer var1) {
+               return false;
+       }
+
+       @Override
+       public void openChest() {
+       }
+
+       @Override
+       public void closeChest() {
+       }
+
+}
diff --git a/common/chemicraft/inventory/InventoryToolAndWeaponCraftingTableResult.java b/common/chemicraft/inventory/InventoryToolAndWeaponCraftingTableResult.java
new file mode 100644 (file)
index 0000000..b1ded32
--- /dev/null
@@ -0,0 +1,60 @@
+package chemicraft.inventory;
+
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.IInventory;
+import net.minecraft.src.ItemStack;
+
+public class InventoryToolAndWeaponCraftingTableResult implements IInventory {
+
+       @Override
+       public int getSizeInventory() {
+               return 0;
+       }
+
+       @Override
+       public ItemStack getStackInSlot(int var1) {
+               return null;
+       }
+
+       @Override
+       public ItemStack decrStackSize(int var1, int var2) {
+               return null;
+       }
+
+       @Override
+       public ItemStack getStackInSlotOnClosing(int var1) {
+               return null;
+       }
+
+       @Override
+       public void setInventorySlotContents(int var1, ItemStack var2) {
+       }
+
+       @Override
+       public String getInvName() {
+               return null;
+       }
+
+       @Override
+       public int getInventoryStackLimit() {
+               return 0;
+       }
+
+       @Override
+       public void onInventoryChanged() {
+       }
+
+       @Override
+       public boolean isUseableByPlayer(EntityPlayer var1) {
+               return false;
+       }
+
+       @Override
+       public void openChest() {
+       }
+
+       @Override
+       public void closeChest() {
+       }
+
+}
index 4ea937d..a751f94 100644 (file)
@@ -48,6 +48,7 @@ public class ItemAtomGrenade extends Item {
                return par1ItemStack;
        }
 
+       @SuppressWarnings({ "unchecked", "rawtypes" })
        @Override
        public void addInformation(ItemStack par1ItemStack, List par2List) {
                if(par1ItemStack.getTagCompound() != null){
index 06eaec9..3d175a8 100644 (file)
@@ -21,6 +21,7 @@ public class ItemAtoms extends Item {
 
 
 
+       @SuppressWarnings({ "unchecked", "rawtypes" })
        @SideOnly(Side.CLIENT)
        @Override
        public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List){
index e9112e7..1f6d205 100644 (file)
@@ -17,7 +17,6 @@ public class ItemCompounds extends Item {
 
        public ItemCompounds(int par1){
                super(par1);
-               this.maxStackSize = 1;
                this.setHasSubtypes(true);
                this.setMaxDamage(0);
                this.setCreativeTab(ChemiCraft.instance.creativeTab);
@@ -58,6 +57,7 @@ public class ItemCompounds extends Item {
 
 
 
+       @SuppressWarnings({ "unchecked", "rawtypes" })
        @SideOnly(Side.CLIENT)
        @Override
        public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List){
diff --git a/common/chemicraft/slot/SlotChemicalCombinationResult.java b/common/chemicraft/slot/SlotChemicalCombinationResult.java
deleted file mode 100644 (file)
index da00e67..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-package chemicraft.slot;
-
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.Slot;
-
-public class SlotChemicalCombinationResult extends Slot {
-
-       public SlotChemicalCombinationResult(IInventory par1iInventory, int par2, int par3, int par4) {
-               super(par1iInventory, par2, par3, par4);
-       }
-
-       @Override
-       public boolean isItemValid(ItemStack par1ItemStack)
-       {
-               return false;
-       }
-
-}
diff --git a/common/chemicraft/slot/SlotChemicalCombinationTableMaterial.java b/common/chemicraft/slot/SlotChemicalCombinationTableMaterial.java
new file mode 100644 (file)
index 0000000..308ed99
--- /dev/null
@@ -0,0 +1,12 @@
+package chemicraft.slot;
+
+import net.minecraft.src.IInventory;
+import net.minecraft.src.Slot;
+
+public class SlotChemicalCombinationTableMaterial extends Slot {
+
+       public SlotChemicalCombinationTableMaterial(IInventory par1iInventory, int par2, int par3, int par4) {
+               super(par1iInventory, par2, par3, par4);
+       }
+
+}
diff --git a/common/chemicraft/slot/SlotChemicalCombinationTableResult.java b/common/chemicraft/slot/SlotChemicalCombinationTableResult.java
new file mode 100644 (file)
index 0000000..9e7ae64
--- /dev/null
@@ -0,0 +1,12 @@
+package chemicraft.slot;
+
+import net.minecraft.src.IInventory;
+import net.minecraft.src.Slot;
+
+public class SlotChemicalCombinationTableResult extends Slot {
+
+       public SlotChemicalCombinationTableResult(IInventory par1iInventory, int par2, int par3, int par4) {
+               super(par1iInventory, par2, par3, par4);
+       }
+
+}
diff --git a/common/chemicraft/slot/SlotChemicalCraftingResult.java b/common/chemicraft/slot/SlotChemicalCraftingResult.java
deleted file mode 100644 (file)
index 22991a2..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-package chemicraft.slot;
-
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.Slot;
-
-public class SlotChemicalCraftingResult extends Slot {
-
-       public SlotChemicalCraftingResult(IInventory par1iInventory, int par2, int par3, int par4) {
-               super(par1iInventory, par2, par3, par4);
-       }
-
-       @Override
-       public boolean isItemValid(ItemStack par1ItemStack)
-       {
-               return false;
-       }
-
-}
@@ -4,9 +4,9 @@ import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.Slot;
 
-public class SlotToolAndWeaponCraftingResult extends Slot {
+public class SlotChemicalCraftingTableResult extends Slot {
 
-       public SlotToolAndWeaponCraftingResult(IInventory par1iInventory, int par2, int par3, int par4) {
+       public SlotChemicalCraftingTableResult(IInventory par1iInventory, int par2, int par3, int par4) {
                super(par1iInventory, par2, par3, par4);
        }
 
diff --git a/common/chemicraft/slot/SlotDecompositionResult.java b/common/chemicraft/slot/SlotDecompositionResult.java
deleted file mode 100644 (file)
index 9bd3a96..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-package chemicraft.slot;
-
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.Slot;
-
-public class SlotDecompositionResult extends Slot {
-
-       public SlotDecompositionResult(IInventory par1iInventory, int par2, int par3, int par4) {
-               super(par1iInventory, par2, par3, par4);
-       }
-
-       @Override
-       public boolean isItemValid(ItemStack par1ItemStack)
-       {
-               return false;
-       }
-
-}
diff --git a/common/chemicraft/slot/SlotDecompositionTableMaterial.java b/common/chemicraft/slot/SlotDecompositionTableMaterial.java
new file mode 100644 (file)
index 0000000..b1041d5
--- /dev/null
@@ -0,0 +1,12 @@
+package chemicraft.slot;
+
+import net.minecraft.src.IInventory;
+import net.minecraft.src.Slot;
+
+public class SlotDecompositionTableMaterial extends Slot {
+
+       public SlotDecompositionTableMaterial(IInventory par1iInventory, int par2, int par3, int par4) {
+               super(par1iInventory, par2, par3, par4);
+       }
+
+}
diff --git a/common/chemicraft/slot/SlotDecompositionTableResult.java b/common/chemicraft/slot/SlotDecompositionTableResult.java
new file mode 100644 (file)
index 0000000..e836ff3
--- /dev/null
@@ -0,0 +1,12 @@
+package chemicraft.slot;
+
+import net.minecraft.src.IInventory;
+import net.minecraft.src.Slot;
+
+public class SlotDecompositionTableResult extends Slot {
+
+       public SlotDecompositionTableResult(IInventory par1iInventory, int par2,        int par3, int par4) {
+               super(par1iInventory, par2, par3, par4);
+       }
+
+}
diff --git a/common/chemicraft/slot/SlotToolAndWeaponCraftingTableResult.java b/common/chemicraft/slot/SlotToolAndWeaponCraftingTableResult.java
new file mode 100644 (file)
index 0000000..57e2f76
--- /dev/null
@@ -0,0 +1,12 @@
+package chemicraft.slot;
+
+import net.minecraft.src.IInventory;
+import net.minecraft.src.Slot;
+
+public class SlotToolAndWeaponCraftingTableResult extends Slot {
+
+       public SlotToolAndWeaponCraftingTableResult(IInventory par1iInventory, int par2, int par3, int par4) {
+               super(par1iInventory, par2, par3, par4);
+       }
+
+}
index 903c7f3..d4ce381 100644 (file)
@@ -6,18 +6,19 @@ import java.util.Collections;
 import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
 import chemicraft.ChemiCraftAPI;
-import chemicraft.inventory.InventoryChemicalCombination;
 import chemicraft.inventory.InventoryChemicalCraftingMaterial;
 import chemicraft.inventory.InventoryChemicalCraftingNBT;
 import chemicraft.inventory.InventoryChemicalCraftingResult;
-import chemicraft.inventory.InventoryDecomposition;
 import chemicraft.util.ChemicalNBTRecipe;
 
 public class ChemiCraftCraftingManager {
 
        public ItemStack[] getDecompositionResults(IInventory par1IInventory){
                //Setting to Flag.
+               /*
+                * Commented by mozipi.
                ((InventoryDecomposition)par1IInventory).setFlag(false);
+               */
 
                //variable of results.
                ItemStack[] results = null;
@@ -65,7 +66,10 @@ public class ChemiCraftCraftingManager {
 
        public ItemStack getChemicalCombinationResult(IInventory par1IInventory){
                //Setting to flag.
+               /*
+                * Commented by mozipi.
                ((InventoryChemicalCombination) par1IInventory).setFlag(false);
+               */
 
                //variable of result.
                ItemStack result = null;
@@ -163,7 +167,10 @@ public class ChemiCraftCraftingManager {
 
 
        private void clearResults(IInventory par1IInventory, int par2){
+               /*
+                * Commented by mozipi.
                ((InventoryDecomposition)par1IInventory).setFlag(false);
+               */
                for(int i = 0;i < par2;i++){
                        par1IInventory.setInventorySlotContents(i, null);
                }
index 76a792c..a9bc77c 100644 (file)
@@ -3,14 +3,8 @@ package chemicraft.system;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import chemicraft.container.ContainerChemicalCombinationTable;
-import chemicraft.container.ContainerDecompositionTable;
 import chemicraft.container.ContainerChemicalCraftingTable;
-import chemicraft.container.ContainerToolAndWeaponCraftingTable;
-import chemicraft.tileentity.TileEntityChemicalCombinationTable;
-import chemicraft.tileentity.TileEntityDecompositionTable;
 import chemicraft.tileentity.TileEntityChemicalCraftingTable;
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 import cpw.mods.fml.common.network.IGuiHandler;
 
 public class CommonProxy implements IGuiHandler {
@@ -29,6 +23,8 @@ public class CommonProxy implements IGuiHandler {
                        return null;
 
                TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
+               /*
+                * Commented by mozipi.
                if (tileEntity instanceof TileEntityDecompositionTable) {
                        return new ContainerDecompositionTable(player, (TileEntityDecompositionTable) tileEntity);
                }else if(tileEntity instanceof TileEntityChemicalCombinationTable){
@@ -38,6 +34,10 @@ public class CommonProxy implements IGuiHandler {
                }else if(tileEntity instanceof TileEntityChemicalCraftingTable){
                        return new ContainerChemicalCraftingTable(player, (TileEntityChemicalCraftingTable) tileEntity);
                }
+                */
+               if (tileEntity instanceof TileEntityChemicalCraftingTable) {
+                       return new ContainerChemicalCraftingTable(player, (TileEntityChemicalCraftingTable) tileEntity);
+               }
                return null;
        }
 
index 608b1bc..7f13fdd 100644 (file)
@@ -11,10 +11,7 @@ import net.minecraft.src.Packet250CustomPayload;
 import net.minecraft.src.TileEntity;\r
 import net.minecraft.src.World;\r
 import chemicraft.ChemiCraft;\r
-import chemicraft.tileentity.TileEntityChemicalCombinationTable;\r
-import chemicraft.tileentity.TileEntityDecompositionTable;\r
 import chemicraft.tileentity.TileEntityChemicalCraftingTable;\r
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;\r
 \r
 import com.google.common.io.ByteArrayDataInput;\r
 import com.google.common.io.ByteStreams;\r
@@ -38,7 +35,6 @@ public class PacketHandler implements IPacketHandler {
                        World worldClient;\r
                        World worldServer;\r
                        TileEntity var1;\r
-                       TileEntityDecompositionTable var2;\r
 \r
                        // TileEntityのx, y, z座標\r
                        int x, y, z;\r
@@ -48,28 +44,22 @@ public class PacketHandler implements IPacketHandler {
                        y = badi.readInt();\r
                        z = badi.readInt();\r
 \r
-                       worldClient = ChemiCraft.instance.proxy.getClientWorld();\r
+                       worldClient = ChemiCraft.proxy.getClientWorld();\r
                        worldServer = ((EntityPlayer)player).worldObj;\r
                        if(worldClient != null && worldServer == null){\r
                                var1 = worldClient.getBlockTileEntity(x, y, z);\r
-                               if (var1 instanceof TileEntityDecompositionTable) {\r
-                                       var2 = (TileEntityDecompositionTable) var1;\r
-                                       var2.readPacket(badi, (EntityPlayer)player);\r
-                               }\r
                                return;\r
                        }\r
                        if(worldServer != null){\r
                                var1 = worldServer.getBlockTileEntity(x, y, z);\r
-                               if (var1 instanceof TileEntityDecompositionTable) {\r
-                                       var2 = (TileEntityDecompositionTable) var1;\r
-                                       var2.readPacket(badi, (EntityPlayer)player);\r
-                               }\r
-                               return;\r
                        }\r
+                       return;\r
                }\r
        }\r
 \r
 \r
+       /*\r
+        * Commented by mozipi.\r
        public static Packet getPacket(TileEntityDecompositionTable tileEntity) {\r
                ByteArrayOutputStream var1 = new ByteArrayOutputStream(128);\r
                DataOutputStream var2 = new DataOutputStream(var1);\r
@@ -77,9 +67,6 @@ public class PacketHandler implements IPacketHandler {
                // Blockのx, y, z座標\r
                int x, y, z;\r
 \r
-               // activeTab\r
-               String activeTab;\r
-\r
                // x, y, z座標を代入\r
                x = tileEntity.xCoord;\r
                y = tileEntity.yCoord;\r
@@ -111,9 +98,6 @@ public class PacketHandler implements IPacketHandler {
                // Blockのx, y, z座標\r
                int x, y, z;\r
 \r
-               // activeTab\r
-               String activeTab;\r
-\r
                // x, y, z座標を代入\r
                x = tileEntity.xCoord;\r
                y = tileEntity.yCoord;\r
@@ -145,9 +129,6 @@ public class PacketHandler implements IPacketHandler {
                // Blockのx, y, z座標\r
                int x, y, z;\r
 \r
-               // activeTab\r
-               String activeTab;\r
-\r
                // x, y, z座標を代入\r
                x = tileEntity.xCoord;\r
                y = tileEntity.yCoord;\r
@@ -171,7 +152,7 @@ public class PacketHandler implements IPacketHandler {
                packet.isChunkDataPacket = true;\r
                return packet;\r
        }\r
-\r
+        */\r
        public static Packet getPacket(TileEntityChemicalCraftingTable tileEntity) {\r
                ByteArrayOutputStream var1 = new ByteArrayOutputStream(128);\r
                DataOutputStream var2 = new DataOutputStream(var1);\r
@@ -179,9 +160,6 @@ public class PacketHandler implements IPacketHandler {
                // Blockのx, y, z座標\r
                int x, y, z;\r
 \r
-               // activeTab\r
-               String activeTab;\r
-\r
                // x, y, z座標を代入\r
                x = tileEntity.xCoord;\r
                y = tileEntity.yCoord;\r
index 1627027..c8dfc44 100644 (file)
@@ -1,97 +1,7 @@
 package chemicraft.tileentity;
 
-import java.io.DataOutputStream;
-
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.NBTTagCompound;
-import net.minecraft.src.NBTTagList;
-import net.minecraft.src.Packet;
 import net.minecraft.src.TileEntity;
-import chemicraft.inventory.InventoryChemicalCombination;
-import chemicraft.system.PacketHandler;
-
-import com.google.common.io.ByteArrayDataInput;
 
 public class TileEntityChemicalCombinationTable extends TileEntity {
 
-       /**
-        * DecompositionのInventory
-        */
-       public IInventory chemicalCombinationInv = new InventoryChemicalCombination();
-
-
-       public TileEntityChemicalCombinationTable() {
-               super();
-       }
-
-       @Override
-       public void updateEntity() {
-               super.updateEntity();
-       }
-
-
-       @Override
-       public void readFromNBT(NBTTagCompound par1) {
-               super.readFromNBT(par1);
-
-               NBTTagList var2 = par1.getTagList("Items");
-               for (int var3 = 0; var3 < var2.tagCount(); ++var3)
-               {
-                       NBTTagCompound var4 = (NBTTagCompound)var2.tagAt(var3);
-                       int var5 = var4.getByte("Slot") & 255;
-
-                       if (var5 >= 0 && var5 < this.chemicalCombinationInv.getSizeInventory())
-                       {
-                               this.chemicalCombinationInv.setInventorySlotContents(var5, ItemStack.loadItemStackFromNBT(var4));
-                       }
-               }
-       }
-
-
-       @Override
-       public void writeToNBT(NBTTagCompound par1) {
-               super.writeToNBT(par1);
-
-               NBTTagList var2 = new NBTTagList();
-               for (int var3 = 0; var3 < this.chemicalCombinationInv.getSizeInventory(); ++var3)
-               {
-                       if (this.chemicalCombinationInv.getStackInSlot(var3) != null)
-                       {
-                               NBTTagCompound var4 = new NBTTagCompound();
-                               var4.setByte("Slot", (byte)var3);
-                               this.chemicalCombinationInv.getStackInSlot(var3).writeToNBT(var4);
-                               var2.appendTag(var4);
-                       }
-               }
-               par1.setTag("Items", var2);
-       }
-
-
-       public InventoryChemicalCombination getInventorys(){
-               return (InventoryChemicalCombination) this.chemicalCombinationInv;
-       }
-
-
-       @Override
-       public Packet getDescriptionPacket() {
-               return PacketHandler.getPacket(this);
-       }
-
-
-       public void readPacket(ByteArrayDataInput data) {
-               try {
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       }
-
-
-       public void writePacket(DataOutputStream dos){
-               try {
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       }
-
 }
index b29ed97..edc8a5c 100644 (file)
@@ -1,160 +1,7 @@
 package chemicraft.tileentity;
 
-import java.io.DataOutputStream;
-
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.NBTTagCompound;
-import net.minecraft.src.NBTTagList;
-import net.minecraft.src.Packet;
 import net.minecraft.src.TileEntity;
-import chemicraft.inventory.InventoryDecomposition;
-import chemicraft.system.PacketHandler;
-
-import com.google.common.io.ByteArrayDataInput;
 
 public class TileEntityDecompositionTable extends TileEntity {
 
-       private IInventory decompositionInv = new InventoryDecomposition();
-
-       private boolean isItemDrop = false;
-
-       private boolean isButtonClick = false;
-
-       private boolean isEndPutItems = false;
-
-       public TileEntityDecompositionTable() {
-               super();
-       }
-
-       @Override
-       public void updateEntity() {
-               super.updateEntity();
-       }
-
-
-       @Override
-       public void readFromNBT(NBTTagCompound par1) {
-               super.readFromNBT(par1);
-
-               NBTTagList var2 = par1.getTagList("Items");
-               for (int var3 = 0; var3 < var2.tagCount(); ++var3)
-               {
-                       NBTTagCompound var4 = (NBTTagCompound)var2.tagAt(var3);
-                       int var5 = var4.getByte("Slot") & 255;
-
-                       if (var5 >= 0 && var5 < this.decompositionInv.getSizeInventory())
-                       {
-                               this.decompositionInv.setInventorySlotContents(var5, ItemStack.loadItemStackFromNBT(var4));
-                       }
-               }
-       }
-
-
-       @Override
-       public void writeToNBT(NBTTagCompound par1) {
-               super.writeToNBT(par1);
-
-               NBTTagList var2 = new NBTTagList();
-               for (int var3 = 0; var3 < this.decompositionInv.getSizeInventory(); ++var3)
-               {
-                       if (this.decompositionInv.getStackInSlot(var3) != null)
-                       {
-                               NBTTagCompound var4 = new NBTTagCompound();
-                               var4.setByte("Slot", (byte)var3);
-                               this.decompositionInv.getStackInSlot(var3).writeToNBT(var4);
-                               var2.appendTag(var4);
-                       }
-               }
-               par1.setTag("Items", var2);
-       }
-
-
-       public InventoryDecomposition getInventorys(){
-               return (InventoryDecomposition) this.decompositionInv;
-       }
-
-
-       public void setItemDrop(boolean par1){
-               this.isItemDrop = par1;
-       }
-
-
-       public void setButtonClick(boolean par1){
-               this.isButtonClick = par1;
-       }
-
-
-       public void setEndPutItems(boolean par1){
-               this.isEndPutItems = par1;
-       }
-
-
-       @Override
-       public Packet getDescriptionPacket() {
-               return PacketHandler.getPacket(this);
-       }
-
-
-       public void readPacket(ByteArrayDataInput data, EntityPlayer entityPlayer) {
-               int id;
-               int damage;
-               int size;
-               try {
-
-                       this.isItemDrop = data.readBoolean();
-                       this.isButtonClick = data.readBoolean();
-                       this.isEndPutItems = data.readBoolean();
-
-                       if(isButtonClick){
-                               for(int i = 0;i < this.decompositionInv.getSizeInventory();i++){
-                                       id = data.readInt();
-                                       damage = data.readInt();
-                                       size = data.readInt();
-                                       if(id != 0){
-                                               if(i != 16){
-                                                       this.setItemDrop(entityPlayer.inventory.getFirstEmptyStack() == -1);
-                                                       if(!this.isItemDrop){
-                                                               entityPlayer.inventory.addItemStackToInventory(new ItemStack(id, size, damage));
-                                                       }else{
-                                                               entityPlayer.dropPlayerItem(new ItemStack(id, size, damage));
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-
-                       this.decompositionInv.setInventorySlotContents(16, null);
-
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       }
-
-
-       public void writePacket(DataOutputStream dos){
-               try {
-
-                       dos.writeBoolean(this.isItemDrop);
-                       dos.writeBoolean(this.isButtonClick);
-                       dos.writeBoolean(this.isEndPutItems);
-
-                       for(int i = 0;i < this.decompositionInv.getSizeInventory();i++){
-                               if(this.decompositionInv.getStackInSlot(i) != null){
-                                       dos.writeInt(this.decompositionInv.getStackInSlot(i).itemID);
-                                       dos.writeInt(this.decompositionInv.getStackInSlot(i).getItemDamage());
-                                       dos.writeInt(this.decompositionInv.getStackInSlot(i).stackSize);
-                               }else{
-                                       dos.writeInt(0);
-                                       dos.writeInt(0);
-                                       dos.writeInt(0);
-                               }
-                       }
-
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       }
-
 }
diff --git a/common/chemicraft/tileentity/TileEntityToolAndWeaponCraftingTable.java b/common/chemicraft/tileentity/TileEntityToolAndWeaponCraftingTable.java
deleted file mode 100644 (file)
index 758ce2a..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-package chemicraft.tileentity;
-
-import java.io.DataOutputStream;
-import java.util.ArrayList;
-
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.NBTTagCompound;
-import net.minecraft.src.NBTTagList;
-import net.minecraft.src.Packet;
-import net.minecraft.src.TileEntity;
-import chemicraft.inventory.InventoryToolAndWeaponCrafting;
-import chemicraft.system.PacketHandler;
-
-import com.google.common.io.ByteArrayDataInput;
-
-public class TileEntityToolAndWeaponCraftingTable extends TileEntity {
-
-       /**
-        * DecompositionのInventory
-        */
-       public IInventory toolAndCraftingInv = new InventoryToolAndWeaponCrafting();
-
-
-       public TileEntityToolAndWeaponCraftingTable() {
-               super();
-       }
-
-       @Override
-       public void updateEntity() {
-               super.updateEntity();
-       }
-
-
-       @Override
-       public void readFromNBT(NBTTagCompound par1) {
-               super.readFromNBT(par1);
-
-               NBTTagList var2 = par1.getTagList("Items");
-               for (int var3 = 0; var3 < var2.tagCount(); ++var3)
-               {
-                       NBTTagCompound var4 = (NBTTagCompound)var2.tagAt(var3);
-                       int var5 = var4.getByte("Slot") & 255;
-
-                       if (var5 >= 0 && var5 < this.toolAndCraftingInv.getSizeInventory())
-                       {
-                               this.toolAndCraftingInv.setInventorySlotContents(var5, ItemStack.loadItemStackFromNBT(var4));
-                       }
-               }
-       }
-
-
-       @Override
-       public void writeToNBT(NBTTagCompound par1) {
-               super.writeToNBT(par1);
-
-               NBTTagList var2 = new NBTTagList();
-               for (int var3 = 0; var3 < this.toolAndCraftingInv.getSizeInventory(); ++var3)
-               {
-                       if (this.toolAndCraftingInv.getStackInSlot(var3) != null)
-                       {
-                               NBTTagCompound var4 = new NBTTagCompound();
-                               var4.setByte("Slot", (byte)var3);
-                               this.toolAndCraftingInv.getStackInSlot(var3).writeToNBT(var4);
-                               var2.appendTag(var4);
-                       }
-               }
-               par1.setTag("Items", var2);
-       }
-
-
-       public IInventory[] getInventorys(){
-               ArrayList<IInventory> inventorys = new ArrayList<IInventory>();
-               inventorys.add(this.toolAndCraftingInv);
-               return inventorys.toArray(new IInventory[1]);
-       }
-
-
-       @Override
-       public Packet getDescriptionPacket() {
-               return PacketHandler.getPacket(this);
-       }
-
-
-       public void readPacket(ByteArrayDataInput data) {
-               try {
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       }
-
-
-       public void writePacket(DataOutputStream dos){
-               try {
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       }
-
-}
diff --git a/common/chemicraft/tileentity/TileEntityToolAndWeaponTable.java b/common/chemicraft/tileentity/TileEntityToolAndWeaponTable.java
new file mode 100644 (file)
index 0000000..bf2deec
--- /dev/null
@@ -0,0 +1,7 @@
+package chemicraft.tileentity;
+
+import net.minecraft.src.TileEntity;
+
+public class TileEntityToolAndWeaponTable extends TileEntity {
+
+}
index 2473ff9..0cb377a 100644 (file)
@@ -52,8 +52,8 @@ public class AtomInfo {
         * @param par2EntityPlayer EntityPlayerのインスタンス\r
         */\r
        public void update(World par1World, EntityPlayer par2EntityPlayer){\r
-               this.world = par1World;\r
-               this.entityPlayer = par2EntityPlayer;\r
+               //this.world = par1World;\r
+               //this.entityPlayer = par2EntityPlayer;\r
 \r
                this.posX = (int) par2EntityPlayer.posX;\r
                this.posY = (int) par2EntityPlayer.posY;\r
@@ -79,7 +79,7 @@ public class AtomInfo {
         */\r
        public boolean isEquivalentBiome(String biomeName){\r
                if(this.biomeName != null){\r
-                       if(this.biomeName == biomeName){\r
+                       if(this.biomeName.equals(biomeName)){\r
                                return true;\r
                        }else{\r
                                return false;\r
@@ -100,7 +100,7 @@ public class AtomInfo {
         */\r
        public boolean isEquivalentWeather(String weather){\r
                if(this.weather != null){\r
-                       if(this.weather == weather){\r
+                       if(this.weather.equals(weather)){\r
                                return true;\r
                        }else{\r
                                return false;\r
index 8ae33f9..3f33d48 100644 (file)
@@ -12,7 +12,7 @@ public class Auxiliary {
         * @author mozipi\r
         *\r
         */\r
-       public class NameAuxiliary {\r
+       public static class NameAuxiliary {\r
 \r
                /**\r
                 * 名前を設定します\r
@@ -165,7 +165,7 @@ public class Auxiliary {
 \r
        }\r
 \r
-       public class ArrayAuxiliary{\r
+       public static class ArrayAuxiliary{\r
 \r
                public ItemStack[] deleteNull(ItemStack[] array){\r
                        int count = 0;\r
@@ -181,7 +181,6 @@ public class Auxiliary {
                        for(int i = 0;i < arrayCopy.length;i++){\r
                                arrayCopy[i] = array[i];\r
                        }\r
-                       array = null;\r
                        array = arrayCopy.clone();\r
                        return array;\r
                }\r
index 38561cf..2c734ca 100644 (file)
@@ -6,7 +6,6 @@ import java.util.Arrays;
 import net.minecraft.src.ItemStack;
 import chemicraft.ChemiCraft;
 import chemicraft.inventory.InventoryChemicalCraftingMaterial;
-import chemicraft.inventory.InventoryChemicalCraftingNBT;
 
 public class MaterialRecipe {
 
@@ -17,11 +16,12 @@ public class MaterialRecipe {
 
        public MaterialRecipe(ItemStack par1ItemStack, ItemStack[] par2ItemStacks, ChemicalNBTRecipe par3NBTRecipe, boolean par4){
                this.result = par1ItemStack;
-               this.material = par2ItemStacks;
+               this.material = par2ItemStacks.clone();
                this.nbtRecipe = par3NBTRecipe;
                this.isSharpless = par4;
        }
 
+       @SuppressWarnings("unchecked")
        public ItemStack match(InventoryChemicalCraftingMaterial par1IInventory){
                ArrayList<ItemStack> invItemsArray = new ArrayList<ItemStack>();
                ItemStack[] invItems;
@@ -54,6 +54,7 @@ public class MaterialRecipe {
                }
        }
 
+       @SuppressWarnings("unchecked")
        public ChemicalNBTRecipe nbtMatch(InventoryChemicalCraftingMaterial par1IInventory){
                ArrayList<ItemStack> invItemsArray = new ArrayList<ItemStack>();
                ItemStack[] invItems;
index eca9e9d..d613ebd 100644 (file)
@@ -5,15 +5,9 @@ import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 import net.minecraftforge.client.MinecraftForgeClient;
 import chemicraft.ChemiCraft;
-import chemicraft.gui.GuiChemicalCombinationTable;
-import chemicraft.gui.GuiDecompositionTable;
 import chemicraft.gui.GuiChemicalCraftingTable;
-import chemicraft.gui.GuiToolAndWeaponCraftingTable;
 import chemicraft.system.CommonProxy;
-import chemicraft.tileentity.TileEntityChemicalCombinationTable;
-import chemicraft.tileentity.TileEntityDecompositionTable;
 import chemicraft.tileentity.TileEntityChemicalCraftingTable;
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 import cpw.mods.fml.client.FMLClientHandler;
 
 public class ClientProxy extends CommonProxy {
@@ -37,6 +31,8 @@ public class ClientProxy extends CommonProxy {
                        return null;
 
                TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
+               /*
+                * Commented by mozipi.
                if (tileEntity instanceof TileEntityDecompositionTable) {
                        return new GuiDecompositionTable(player, (TileEntityDecompositionTable) tileEntity);
                }else if(tileEntity instanceof TileEntityChemicalCombinationTable){
@@ -46,6 +42,10 @@ public class ClientProxy extends CommonProxy {
                }else if(tileEntity instanceof TileEntityChemicalCraftingTable){
                        return new GuiChemicalCraftingTable(player, (TileEntityChemicalCraftingTable) tileEntity);
                }
+                */
+               if (tileEntity instanceof TileEntityChemicalCraftingTable) {
+                       return new GuiChemicalCraftingTable(player, (TileEntityChemicalCraftingTable) tileEntity);
+               }
                return null;
        }