OSDN Git Service

Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft
authormozipi <mozipi@users.sourceforge.jp>
Mon, 4 Feb 2013 09:29:19 +0000 (18:29 +0900)
committermozipi <mozipi@users.sourceforge.jp>
Mon, 4 Feb 2013 09:29:19 +0000 (18:29 +0900)
Conflicts:
common/chemicraft/ChemiCraft.java

75 files changed:
common/chemicraft/block/BlockElectrolysisTable.java [moved from src/chemicraft/block/BlockElectrolysisTable.java with 89% similarity]
common/chemicraft/container/ContainerElectrolysis.java [moved from src/chemicraft/container/ContainerElectrolysisTable.java with 92% similarity]
common/chemicraft/debug/CommandSetTile.java
common/chemicraft/debug/SetBlockSupport.java
common/chemicraft/item/ItemAtomInfoContainer.java
common/chemicraft/item/ItemGasCollectingBottle.java
common/chemicraft/system/PacketHandler.java
common/chemicraft/util/AtomInfo.java
common/chemicraft/util/Auxiliary.java
common/chemicraft/util/ICompoundHandler.java
src/chemicraft/ChemiCraft.java [deleted file]
src/chemicraft/block/BlockDecompositionTable.java [deleted file]
src/chemicraft/client/ClientProxy.java [deleted file]
src/chemicraft/compounds/CompoundWater.java [deleted file]
src/chemicraft/container/ContainerChemicalCombinationTable.java [deleted file]
src/chemicraft/container/ContainerChemicalCraftingTable.java [deleted file]
src/chemicraft/container/ContainerDecompositionTable.java [deleted file]
src/chemicraft/container/ContainerToolAndWeaponCraftingTable.java [deleted file]
src/chemicraft/debug/CommandDeleteItem.java [deleted file]
src/chemicraft/debug/CommandGenDebugRoom.java [deleted file]
src/chemicraft/debug/CommandSetTile.java [deleted file]
src/chemicraft/debug/CompoundHandlerTest.java [deleted file]
src/chemicraft/debug/SetBlockSupport.java [deleted file]
src/chemicraft/entity/EntityAtomsGrenade.java [deleted file]
src/chemicraft/gui/GuiChemicalCombinationTable.java [deleted file]
src/chemicraft/gui/GuiChemicalCraftingTable.java [deleted file]
src/chemicraft/gui/GuiDecompositionTable.java [deleted file]
src/chemicraft/gui/GuiElectrolysisTable.java [deleted file]
src/chemicraft/gui/GuiToolAndWeaponCraftingTable.java [deleted file]
src/chemicraft/inventory/InventoryChemicalCombinationTableMaterial.java [deleted file]
src/chemicraft/inventory/InventoryChemicalCombinationTableResult.java [deleted file]
src/chemicraft/inventory/InventoryChemicalCraftingMaterial.java [deleted file]
src/chemicraft/inventory/InventoryChemicalCraftingNBT.java [deleted file]
src/chemicraft/inventory/InventoryChemicalCraftingResult.java [deleted file]
src/chemicraft/inventory/InventoryDecompositionTableMaterial.java [deleted file]
src/chemicraft/inventory/InventoryDecompositionTableResult.java [deleted file]
src/chemicraft/inventory/InventoryElectrolysisFuel.java [deleted file]
src/chemicraft/inventory/InventoryElectrolysisMaterial.java [deleted file]
src/chemicraft/inventory/InventoryElectrolysisResult.java [deleted file]
src/chemicraft/inventory/InventoryToolAndWeaponCraftingTableMaterial.java [deleted file]
src/chemicraft/inventory/InventoryToolAndWeaponCraftingTableResult.java [deleted file]
src/chemicraft/item/ItemAtomInfoContainer.java [deleted file]
src/chemicraft/item/ItemAtoms.java [deleted file]
src/chemicraft/item/ItemAtomsGrenade.java [deleted file]
src/chemicraft/item/ItemCompounds.java [deleted file]
src/chemicraft/item/ItemGasCollectingBottle.java [deleted file]
src/chemicraft/render/RenderAtomsGrenade.java [deleted file]
src/chemicraft/slot/SlotChemicalCombinationTableMaterial.java [deleted file]
src/chemicraft/slot/SlotChemicalCombinationTableResult.java [deleted file]
src/chemicraft/slot/SlotChemicalCraftingTableResult.java [deleted file]
src/chemicraft/slot/SlotDecompositionTableMaterial.java [deleted file]
src/chemicraft/slot/SlotDecompositionTableResult.java [deleted file]
src/chemicraft/slot/SlotElectrolysisFuel.java [deleted file]
src/chemicraft/slot/SlotElectrolysisMaterial.java [deleted file]
src/chemicraft/slot/SlotElectrolysisResult.java [deleted file]
src/chemicraft/slot/SlotToolAndWeaponCraftingTableResult.java [deleted file]
src/chemicraft/system/ChemiCraftCraftingManager.java [deleted file]
src/chemicraft/system/CommonProxy.java [deleted file]
src/chemicraft/system/PacketHandler.java [deleted file]
src/chemicraft/tileentity/TileEntityChemicalCombinationTable.java [deleted file]
src/chemicraft/tileentity/TileEntityChemicalCraftingTable.java [deleted file]
src/chemicraft/tileentity/TileEntityDecompositionTable.java [deleted file]
src/chemicraft/tileentity/TileEntityElectrolysisTable.java [deleted file]
src/chemicraft/tileentity/TileEntityToolAndWeaponCraftingTable.java [deleted file]
src/chemicraft/util/AtomInfo.java [deleted file]
src/chemicraft/util/Auxiliary.java [deleted file]
src/chemicraft/util/ChemicalNBTRecipe.java [deleted file]
src/chemicraft/util/ComparatorFormulaPart.java [deleted file]
src/chemicraft/util/ComparatorItemStack.java [deleted file]
src/chemicraft/util/CreativeTabAtoms.java [deleted file]
src/chemicraft/util/FormulaPart.java [deleted file]
src/chemicraft/util/ICompoundHandler.java [deleted file]
src/chemicraft/util/MaterialRecipe.java [deleted file]
src/chemicraft/util/MathHelperPlus.java [deleted file]
src/chemicraft/util/NBTRecipeGrenade.java [deleted file]

@@ -1,12 +1,12 @@
 package chemicraft.block;
 
-import chemicraft.ChemiCraft;
-import chemicraft.tileentity.TileEntityElectrolysisTable;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+import chemicraft.ChemiCraft;
+import chemicraft.tileentity.TileEntityElectrolysisTable;
 
 public class BlockElectrolysisTable extends BlockContainer
 {
@@ -23,6 +23,11 @@ public class BlockElectrolysisTable extends BlockContainer
        }
 
        @Override
+       public String getTextureFile(){
+               return ChemiCraft.instance.BLOCKCHEMICALCRAFTINGTABLETEXTURE;
+       }
+
+       @Override
        public TileEntity createNewTileEntity(World var1)
        {
                return new TileEntityElectrolysisTable();
@@ -12,7 +12,7 @@ import chemicraft.slot.SlotElectrolysisMaterial;
 import chemicraft.slot.SlotElectrolysisResult;
 import chemicraft.tileentity.TileEntityElectrolysisTable;
 
-public class ContainerElectrolysisTable extends Container
+public class ContainerElectrolysis extends Container
 {
 
        private World worldObj;
@@ -27,7 +27,7 @@ public class ContainerElectrolysisTable extends Container
        private InventoryElectrolysisResult invr;
        private InventoryElectrolysisFuel invf;
 
-       public ContainerElectrolysisTable(EntityPlayer par1EntityPlayer, TileEntityElectrolysisTable par2) {
+       public ContainerElectrolysis(EntityPlayer par1EntityPlayer, TileEntityElectrolysisTable par2) {
                super();
                this.worldObj = par2.worldObj;
                this.posX = par2.xCoord;
index d7b4bfa..6f649fa 100644 (file)
@@ -1,45 +1,45 @@
-package chemicraft.debug;\r
-\r
-import net.minecraft.block.Block;\r
-import net.minecraft.command.CommandBase;\r
-import net.minecraft.command.ICommandSender;\r
-import net.minecraft.entity.player.EntityPlayer;\r
-import net.minecraft.world.World;\r
-\r
-public class CommandSetTile extends CommandBase {\r
-\r
-       @Override\r
-       public String getCommandName() {\r
-               return "setTile";\r
-       }\r
-\r
-       @Override\r
-       public void processCommand(ICommandSender var1, String[] var2) {\r
-               try{\r
-                       EntityPlayer player = (EntityPlayer)var1;\r
-                       World wolrd = player.worldObj;\r
-                       if(var2.length > 0){\r
-                               try{\r
-                                       if(Integer.parseInt(var2[0]) < 4096 && Block.blocksList[Integer.parseInt(var2[0])] != null || Integer.parseInt(var2[0]) == 0){\r
-                                               if(var2.length == 1){\r
-                                                       SetBlockSupport.square(wolrd, (int)player.posX, (int)player.posY, (int)player.posZ, Integer.parseInt(var2[0]), Integer.parseInt(var2[1]), 12, 12);\r
-                                               }else if(var2.length > 2){\r
-                                                       SetBlockSupport.square(wolrd, (int)player.posX, (int)player.posY, (int)player.posZ, Integer.parseInt(var2[0]), Integer.parseInt(var2[1]), Integer.parseInt(var2[2]), Integer.parseInt(var2[2]));\r
-                                               }else{\r
-                                                       SetBlockSupport.square(wolrd, (int)player.posX, (int)player.posY, (int)player.posZ, Integer.parseInt(var2[0]), 0, 12, 12);\r
-                                               }\r
-                                       }else{\r
-                                               var1.sendChatToPlayer("\u00a7cBlockが存在しないか指定された数が4096を超えています。");\r
-                                       }\r
-                               }catch(NumberFormatException e){\r
-                                       var1.sendChatToPlayer("\u00a7c指定された文字は数値ではありません。");\r
-                               }\r
-                       }else{\r
-                               var1.sendChatToPlayer("\u00a7cBlockIDを指定してください。(Metadata, Sizeも可能)");\r
-                       }\r
-               }catch(ClassCastException e){\r
-\r
-               }\r
-       }\r
-\r
-}\r
+package chemicraft.debug;
+
+import net.minecraft.block.Block;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
+
+public class CommandSetTile extends CommandBase {
+
+       @Override
+       public String getCommandName() {
+               return "setTile";
+       }
+
+       @Override
+       public void processCommand(ICommandSender var1, String[] var2) {
+               try{
+                       EntityPlayer player = (EntityPlayer)var1;
+                       World wolrd = player.worldObj;
+                       if(var2.length > 0){
+                               try{
+                                       if(Integer.parseInt(var2[0]) < 4096 && Block.blocksList[Integer.parseInt(var2[0])] != null || Integer.parseInt(var2[0]) == 0){
+                                               if(var2.length == 1){
+                                                       SetBlockSupport.square(wolrd, (int)player.posX, (int)player.posY, (int)player.posZ, Integer.parseInt(var2[0]), Integer.parseInt(var2[1]), 12, 12);
+                                               }else if(var2.length > 2){
+                                                       SetBlockSupport.square(wolrd, (int)player.posX, (int)player.posY, (int)player.posZ, Integer.parseInt(var2[0]), Integer.parseInt(var2[1]), Integer.parseInt(var2[2]), Integer.parseInt(var2[2]));
+                                               }else{
+                                                       SetBlockSupport.square(wolrd, (int)player.posX, (int)player.posY, (int)player.posZ, Integer.parseInt(var2[0]), 0, 12, 12);
+                                               }
+                                       }else{
+                                               var1.sendChatToPlayer("\u00a7cBlockが存在しないか指定された数が4096を超えています。");
+                                       }
+                               }catch(NumberFormatException e){
+                                       var1.sendChatToPlayer("\u00a7c指定された文字は数値ではありません。");
+                               }
+                       }else{
+                               var1.sendChatToPlayer("\u00a7cBlockIDを指定してください。(Metadata, Sizeも可能)");
+                       }
+               }catch(ClassCastException e){
+
+               }
+       }
+
+}
index d9aded8..2663d5d 100644 (file)
-package chemicraft.debug;\r
-import java.util.Random;\r
-\r
-import net.minecraft.world.World;\r
-\r
-public class SetBlockSupport\r
-{\r
-\r
-       static Random rand = new Random();\r
-\r
-       /**\r
-        * X方向に線状にBlockを配置します。\r
-        * Directionが0の場合、特殊な計算式で\r
-        * +,-方向:loop-1の長さになります。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param Length 長さ\r
-        * @param Direction 方向(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @return Object\r
-        */\r
-       public static Object lineX(World par1World,int X,int Y,int Z,int Block,int meta,int Length,int Direction)\r
-       {\r
-               int loop2=0;\r
-               Object DataBox=null;\r
-               for(loop2=0;loop2 < Length;loop2++)\r
-               {\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
-       }\r
-\r
-       /**\r
-        * Y方向に線状にBlockを配置します。\r
-        * Directionが0の場合、特殊な計算式で\r
-        * +,-方向:loop-1の長さになります。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param Length 長さ\r
-        * @param Direction 方向(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @return Object\r
-        */\r
-       public static Object lineY(World par1World,int X,int Y,int Z,int Block,int meta,int Length,int Direction)\r
-       {\r
-               int loop2=0;\r
-               Object DataBox=null;\r
-               for(loop2=0;loop2 < Length;loop2++)\r
-               {\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
-       }\r
-\r
-       /**\r
-        * Z方向に線状にBlockを配置します。\r
-        * Directionが0の場合、特殊な計算式で\r
-        * +,-方向:loop-1の長さになります。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param Length 長さ\r
-        * @param Direction 方向指定(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @return Object\r
-        */\r
-       public static Object lineZ(World par1World,int X,int Y,int Z,int Block,int meta,int Length,int Direction)\r
-       {\r
-               int loop2=0;\r
-               Object DataBox=null;\r
-               for(loop2=0;loop2 < Length;loop2++)\r
-               {\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
-       }\r
-\r
-       /**\r
-        * XY方向に線状にBlockを配置します。\r
-        * Directionが0の場合、特殊な計算式で\r
-        * +,-方向:loop-1の長さになります。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param XLength X方向の長さ\r
-        * @param YLength Y方向の長さ\r
-        * @param XDirection X方向指定(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @param YDirection Y方向指定(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @return Object\r
-        */\r
-       public static Object  lineXY(World par1World,int X,int Y,int Z,int Block,int meta,int XLength,int YLength,int XDirection,int YDirection)\r
-       {\r
-               Object DataBox=null;\r
-               DataBox = lineX(par1World,X,Y,Z,Block,meta,XLength,XDirection);\r
-               DataBox = lineY(par1World,X,Y,Z,Block,YLength,meta,YDirection);\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * XZ方向に線状にBlockを配置します。\r
-        * Directionが0の場合、特殊な計算式で\r
-        * +,-方向:loop-1の長さになります。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param XLength X方向の長さ\r
-        * @param ZLength Y方向の長さ\r
-        * @param XDirection X方向指定(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @param ZDirection Z方向指定(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @return Object\r
-        */\r
-       public static Object  lineXZ(World par1World,int X,int Y,int Z,int Block,int meta,int XLength,int ZLength,int XDirection,int ZDirection)\r
-       {\r
-               Object DataBox=null;\r
-               DataBox = lineX(par1World,X,Y,Z,Block,meta,XLength,XDirection);\r
-               DataBox = lineZ(par1World,X,Y,Z,Block,meta,ZLength,ZDirection);\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * YZ方向に線状にBlockを配置します。\r
-        * Directionが0の場合、特殊な計算式で\r
-        * +,-方向:loop-1の長さになります。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param YLength X方向の長さ\r
-        * @param ZLength Y方向の長さ\r
-        * @param YDirection Y方向指定(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @param ZDirection Z方向指定(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @return Object\r
-        */\r
-       public static Object  lineYZ(World par1World,int X,int Y,int Z,int Block,int meta,int YLength,int ZLength,int YDirection,int ZDirection)\r
-       {\r
-               Object DataBox=null;\r
-               DataBox = lineY(par1World,X,Y,Z,Block,meta,YLength,YDirection);\r
-               DataBox = lineZ(par1World,X,Y,Z,Block,meta,ZLength,ZDirection);\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * XYZ方向に線状にBlockを配置します。\r
-        * Directionが0の場合、特殊な計算式で\r
-        * +,-方向:loop-1の長さになります。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param XLength X方向の長さ\r
-        * @param YLength Y方向の長さ\r
-        * @param ZLength Z方向の長さ\r
-        * @param XDirection X方向指定(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @param YDirection Y方向指定(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @param ZDirection Z方向指定(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @return Object\r
-        */\r
-       public static Object  lineXYZ(World par1World,int X,int Y,int Z,int Block,int meta,int XLength,int YLength,int ZLength,int XDirection,int YDirection,int ZDirection)\r
-       {\r
-               Object DataBox=null;\r
-               DataBox = lineX(par1World,X,Y,Z,Block,meta,XLength,XDirection);\r
-               DataBox = lineY(par1World,X,Y,Z,Block,meta,YLength,YDirection);\r
-               DataBox = lineZ(par1World,X,Y,Z,Block,meta,ZLength,ZDirection);\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * X方向の壁を作成します。\r
-        * Directionは1で固定です。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param Length 幅\r
-        * @param height 高さ\r
-        * @return Object\r
-        */\r
-       public static Object wallX(World par1World,int X,int Y,int Z,int Block,int meta,int Length,int height)\r
-       {\r
-               Object DataBox = null;\r
-               for(int loop = 0;loop < Length;loop++){\r
-                       lineY(par1World, X - (Length/2) + loop, Y, Z, Block,meta, height, 1);\r
-               }\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * Z方向の壁を作成します。\r
-        * Directionは1で固定です。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param Length 幅\r
-        * @param height 高さ\r
-        * @return Object\r
-        */\r
-       public static Object wallZ(World par1World,int X,int Y,int Z,int Block,int meta,int Length,int height)\r
-       {\r
-               Object DataBox = null;\r
-               for(int loop = 0;loop < Length;loop++){\r
-                       lineY(par1World, X, Y, Z - (Length/2) + loop, Block,meta, height, 1);\r
-               }\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * 辺だけの四角を作成します。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param LengthX X方向の長さ\r
-        * @param LengthZ  Z方向の長さ\r
-        * @return Object\r
-        */\r
-       public static Object spuareFrame(World par1World,int X,int Y,int Z,int Block,int meta,int LengthX,int LengthZ)\r
-       {\r
-               Object DataBox = null;\r
-               DataBox = lineX(par1World, X, Y, Z + (LengthZ/2), Block,meta, LengthX/2+1, 0);\r
-               DataBox = lineX(par1World, X, Y, Z - (LengthZ/2), Block,meta, LengthX/2+1, 0);\r
-               DataBox = lineZ(par1World, X + (LengthX/2), Y, Z, Block,meta, LengthZ/2+1, 0);\r
-               DataBox = lineZ(par1World, X - (LengthX/2), Y, Z, Block,meta, LengthZ/2+1, 0);\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * 辺だけの箱を作成します。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param LengthX X方向の長さ\r
-        * @param LengthZ  Z方向の長さ\r
-        * @param height 高さ\r
-        * @return Object\r
-        */\r
-       public static Object boxFrame(World par1World,int X,int Y,int Z,int Block,int meta,int LengthX,int LengthZ,int height)\r
-       {\r
-               Object DataBox=null;\r
-               DataBox = lineX(par1World, X, Y, Z + (LengthZ/2), Block,meta, LengthX/2, 0);\r
-               DataBox = lineX(par1World, X, Y, Z - (LengthZ/2), Block,meta, LengthX/2, 0);\r
-               DataBox = lineX(par1World, X, Y + height-1, Z + (LengthZ/2), Block,meta, LengthX/2, 0);\r
-               DataBox = lineX(par1World, X, Y + height-1, Z - (LengthZ/2), Block,meta, LengthX/2, 0);\r
-\r
-               DataBox = lineY(par1World,X +(LengthX/2),Y,Z +(LengthZ/2),Block,meta,height,1);\r
-               DataBox = lineY(par1World,X -(LengthX/2),Y,Z +(LengthZ/2),Block,meta,height,1);\r
-               DataBox = lineY(par1World,X +(LengthX/2),Y,Z - (LengthZ/2),Block,meta,height,1);\r
-               DataBox = lineY(par1World,X -(LengthX/2),Y,Z - (LengthZ/2),Block,meta,height,1);\r
-\r
-               DataBox = lineZ(par1World, X + (LengthX/2), Y, Z, Block,meta, LengthZ/2, 0);\r
-               DataBox = lineZ(par1World, X - (LengthX/2), Y, Z, Block,meta, LengthZ/2, 0);\r
-               DataBox = lineZ(par1World, X + (LengthX/2), Y + height-1, Z, Block,meta, LengthZ/2, 0);\r
-               DataBox = lineZ(par1World, X - (LengthX/2), Y + height-1, Z, Block,meta, LengthZ/2, 0);\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * 四角を作成します。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param LengthX X方向の長さ\r
-        * @param LengthZ  Z方向の長さ\r
-        * @return Object\r
-        */\r
-       public static Object square(World par1World,int X,int Y,int Z,int Block,int meta,int LengthX,int LengthZ)\r
-       {\r
-               Object DataBox = null;\r
-               int loop1 = 0;\r
-               for(loop1=0; loop1 < LengthZ; loop1++){\r
-                       DataBox = lineX(par1World,X - (LengthX/2),Y,Z - (LengthZ/2) + loop1,Block,meta,LengthX,1);\r
-               }\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * 箱を生成します。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param LengthX X方向の長さ\r
-        * @param LengthZ  Z方向の長さ\r
-        * @param height 高さ\r
-        * @return Object\r
-        */\r
-       public static Object box(World par1World,int X,int Y,int Z,int Block,int meta,int LengthX,int LengthZ,int height)\r
-       {\r
-               Object DataBox = null;\r
-               DataBox = square(par1World, X, Y, Z, Block, meta,LengthX,LengthZ);\r
-               DataBox = square(par1World,X,Y+height,Z,Block,meta,LengthX,LengthZ);\r
-               DataBox = wallX(par1World,X,Y,Z-(LengthZ/2),Block,meta,LengthX,height);\r
-               DataBox = wallZ(par1World,X-(LengthX/2),Y,Z,Block,meta,LengthZ,height);\r
-               DataBox = wallX(par1World,X,Y,Z+(LengthZ/2),Block,meta,LengthX,height);\r
-               DataBox = wallZ(par1World,X+(LengthX/2),Y,Z,Block,meta,LengthZ,height);\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * Blockで埋め尽くされた箱を生成します。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param LengthX X方向の長さ\r
-        * @param LengthZ  Z方向の長さ\r
-        * @param height 高さ\r
-        * @return Object\r
-        */\r
-       public static Object fillBox(World par1World , int X,int Y,int Z,int Block,int meta,int LengthX,int LengthZ,int height)\r
-       {\r
-               Object DataBox = null;\r
-               DataBox = square(par1World, X, Y, Z, Block,meta, LengthX,LengthZ);\r
-               DataBox = square(par1World,X,Y+height,Z,Block,meta,LengthX,LengthZ);\r
-               DataBox = wallX(par1World,X,Y,Z-(LengthZ/2),Block,meta,LengthX,height);\r
-               DataBox = wallZ(par1World,X-(LengthX/2),Y,Z,Block,meta,LengthZ,height);\r
-               DataBox = wallX(par1World,X,Y,Z+(LengthZ/2),Block,meta,LengthX,height);\r
-               DataBox = wallZ(par1World,X+(LengthX/2),Y,Z,Block,meta,LengthZ,height);\r
-\r
-               for(int i = 0; i < LengthX - 1; i++)\r
-               {\r
-                       DataBox = wallZ(par1World,X + 1 - LengthX / 2 + i, Y , Z , Block ,meta,LengthZ, height);\r
-               }\r
-\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * 座標ごとにデータを指定して配置します。\r
-        * 配列になっているので、順番に指定してください。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param XPosition 配置する相対X座標\r
-        * @param YPosition 配置する相対Y座標\r
-        * @param ZPosition 配置する相対Z座標\r
-        * @param Option\r
-        * @return Object\r
-        */\r
-       public static Object fineSetBlock(World par1World,int X,int Y,int Z,int[] Block,int[] meta,int[] XPosition,int[] YPosition,int[] ZPosition,Object[] Option){\r
-               Object DataBox = null;\r
-               for(int i=0;i<Block.length;i++){\r
-                       DataBox = par1World.setBlockAndMetadata(X+XPosition[i], Y+YPosition[i], Z+ZPosition[i], Block[i],meta[i]);\r
-               }\r
-\r
-               if(Option!=null){\r
-                       for(int j=0;j<Option.length;j++){\r
-                               DataBox = Option[j];\r
-                       }\r
-               }\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * X方向に台形を作成します。\r
-        * 必ずbottom/(upper*3)*(height/upper)かupper/(bottom*3)*(height/buttom)が整数になるようにしてください。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param upperSide 上辺の長さ\r
-        * @param bottomSide 下辺の長さ\r
-        * @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
-               int Rate=0;\r
-               int Math=0;\r
-               int XRate=0;\r
-               int YRate = 0;\r
-               for(int i=0;i<height;i++){\r
-                       YRate++;\r
-                       Math++;\r
-                       XRate++;\r
-                       if(upperSide < bottomSide){\r
-                               if(Math == bottomSide/(upperSide*3)*(height/upperSide)){\r
-                                       Rate++;\r
-                                       Math=0;\r
-                               }\r
-                       }\r
-\r
-                       if(bottomSide < upperSide){\r
-                               if(Math == upperSide/(bottomSide*3)*(height/bottomSide)){\r
-                                       Rate--;\r
-                                       Math=0;\r
-                               }\r
-                       }\r
-\r
-                       dataBox=lineZ(par1World, X+XRate-1, Y+YRate, Z, Block, meta, upperSide+Rate, 0);\r
-               }\r
-               return dataBox;\r
-       }\r
-\r
-       /**\r
-        * Y方向のXラインに台形を作成します。\r
-        * 必ずbottom/(upper*3)*(height/upper)かupper/(bottom*3)*(height/buttom)が整数になるようにしてください。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param upperSide 上辺の長さ\r
-        * @param bottomSide 下辺の長さ\r
-        * @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
-               int Rate=0;\r
-               int Math=0;\r
-               int YRate = 0;\r
-               for(int i=0;i<height;i++){\r
-                       YRate++;\r
-                       Math++;\r
-                       if(upperSide < bottomSide){\r
-                               if(Math == bottomSide/(upperSide*3)*(height/upperSide)){\r
-                                       Rate++;\r
-                                       Math=0;\r
-                               }\r
-                       }\r
-\r
-                       if(bottomSide < upperSide){\r
-                               if(Math == upperSide/(bottomSide*3)*(height/bottomSide)){\r
-                                       Rate--;\r
-                                       Math=0;\r
-                               }\r
-                       }\r
-\r
-                       dataBox=lineZ(par1World, X, Y+YRate, Z, Block, meta, upperSide+Rate, 0);\r
-               }\r
-               return dataBox;\r
-       }\r
-\r
-       /**\r
-        * Y方向のZラインに台形を作成します。\r
-        * 必ずbottom/(upper*3)*(height/upper)かupper/(bottom*3)*(height/buttom)が整数になるようにしてください。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param upperSide 上辺の長さ\r
-        * @param bottomSide 下辺の長さ\r
-        * @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
-               int Rate=0;\r
-               int Math=0;\r
-               int YRate = 0;\r
-               for(int i=0;i<height;i++){\r
-                       YRate++;\r
-                       Math++;\r
-                       if(upperSide < bottomSide){\r
-                               if(Math == bottomSide/(upperSide*3)*(height/upperSide)){\r
-                                       Rate++;\r
-                                       Math=0;\r
-                               }\r
-                       }\r
-\r
-                       if(bottomSide < upperSide){\r
-                               if(Math == upperSide/(bottomSide*3)*(height/bottomSide)){\r
-                                       Rate--;\r
-                                       Math=0;\r
-                               }\r
-                       }\r
-\r
-                       dataBox=lineX(par1World, X, Y+YRate, Z, Block, meta, upperSide+Rate, 0);\r
-               }\r
-               return dataBox;\r
-       }\r
-\r
-       /**\r
-        * Z方向に台形を作成します。\r
-        * 必ずbottom/(upper*3)*(height/upper)かupper/(bottom*3)*(height/buttom)が整数になるようにしてください。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param upperSide 上辺の長さ\r
-        * @param bottomSide 下辺の長さ\r
-        * @param height 高さ\r
-        * @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
-               int Rate=0;\r
-               int Math=0;\r
-               int ZRate=0;\r
-               for(int i=0;i<height;i++){\r
-                       Math++;\r
-                       ZRate++;\r
-                       if(upperSide < bottomSide){\r
-                               if(Math == bottomSide/(upperSide*3)*(height/upperSide)){\r
-                                       Rate++;\r
-                                       Math=0;\r
-                               }\r
-                       }\r
-\r
-                       if(bottomSide < upperSide){\r
-                               if(Math == upperSide/(bottomSide*3)*(height/bottomSide)){\r
-                                       Rate--;\r
-                                       Math=0;\r
-                               }\r
-                       }\r
-\r
-                       dataBox=lineX(par1World, X, Y, Z+ZRate, Block, meta, upperSide+Rate, 0);\r
-               }\r
-               return dataBox;\r
-       }\r
-\r
+package chemicraft.debug;
+import java.util.Random;
+
+import net.minecraft.world.World;
+
+public class SetBlockSupport
+{
+
+       static Random rand = new Random();
+
+       /**
+        * X方向に線状にBlockを配置します。
+        * Directionが0の場合、特殊な計算式で
+        * +,-方向:loop-1の長さになります。
+        * @param par1World
+        * @param X 基準X座標
+        * @param Y 基準Y座標
+        * @param Z 基準Z座標
+        * @param Block 配置するBlock
+        * @param meta 配置するMetadata
+        * @param Length 長さ
+        * @param Direction 方向(+方向:1,-方向:-1,中心から-+の方向:0)
+        * @return Object
+        */
+       public static Object lineX(World par1World,int X,int Y,int Z,int Block,int meta,int Length,int Direction)
+       {
+               int loop2=0;
+               Object DataBox=null;
+               for(loop2=0;loop2 < Length;loop2++)
+               {
+                       switch(Direction)
+                       {
+                       default:
+
+                       case -1:
+                               DataBox = par1World.setBlockAndMetadataWithNotify(X, Y, Z, Block, meta);
+                               break;
+                       case 0:
+                               DataBox = par1World.setBlockAndMetadataWithNotify(X-(Length-1)+loop2,Y,Z,Block,meta);
+                               break;
+                       case 1:
+                               DataBox = par1World.setBlockAndMetadataWithNotify(X+loop2, Y, Z, Block,meta);
+                               break;
+                       }
+               }
+               return DataBox;
+       }
+
+       /**
+        * Y方向に線状にBlockを配置します。
+        * Directionが0の場合、特殊な計算式で
+        * +,-方向:loop-1の長さになります。
+        * @param par1World
+        * @param X 基準X座標
+        * @param Y 基準Y座標
+        * @param Z 基準Z座標
+        * @param Block 配置するBlock
+        * @param meta 配置するMetadata
+        * @param Length 長さ
+        * @param Direction 方向(+方向:1,-方向:-1,中心から-+の方向:0)
+        * @return Object
+        */
+       public static Object lineY(World par1World,int X,int Y,int Z,int Block,int meta,int Length,int Direction)
+       {
+               int loop2=0;
+               Object DataBox=null;
+               for(loop2=0;loop2 < Length;loop2++)
+               {
+                       switch(Direction)
+                       {
+                       default:
+
+                       case -1:
+                               DataBox = par1World.setBlockAndMetadataWithNotify(X, Y-loop2, Z, Block,meta);
+                               break;
+                       case 0:
+                               DataBox = par1World.setBlockAndMetadataWithNotify(X,Y-(Length-1)+loop2,Z,Block,meta);
+                               break;
+                       case 1:
+                               DataBox = par1World.setBlockAndMetadataWithNotify(X, Y+loop2, Z, Block,meta);
+                               break;
+                       }
+               }
+               return DataBox;
+       }
+
+       /**
+        * Z方向に線状にBlockを配置します。
+        * Directionが0の場合、特殊な計算式で
+        * +,-方向:loop-1の長さになります。
+        * @param par1World
+        * @param X 基準X座標
+        * @param Y 基準Y座標
+        * @param Z 基準Z座標
+        * @param Block 配置するBlock
+        * @param meta 配置するMetadata
+        * @param Length 長さ
+        * @param Direction 方向指定(+方向:1,-方向:-1,中心から-+の方向:0)
+        * @return Object
+        */
+       public static Object lineZ(World par1World,int X,int Y,int Z,int Block,int meta,int Length,int Direction)
+       {
+               int loop2=0;
+               Object DataBox=null;
+               for(loop2=0;loop2 < Length;loop2++)
+               {
+                       switch(Direction)
+                       {
+                       default:
+
+                       case -1:
+                               DataBox = par1World.setBlockAndMetadataWithNotify(X, Y, Z-loop2, Block,meta);
+                               break;
+                       case 0:
+                               DataBox = par1World.setBlockAndMetadataWithNotify(X,Y,Z-(Length-1)+loop2,Block,meta);
+                               break;
+                       case 1:
+                               DataBox = par1World.setBlockAndMetadataWithNotify(X, Y, Z+loop2, Block,meta);
+                               break;
+                       }
+               }
+               return DataBox;
+       }
+
+       /**
+        * XY方向に線状にBlockを配置します。
+        * Directionが0の場合、特殊な計算式で
+        * +,-方向:loop-1の長さになります。
+        * @param par1World
+        * @param X 基準X座標
+        * @param Y 基準Y座標
+        * @param Z 基準Z座標
+        * @param Block 配置するBlock
+        * @param meta 配置するMetadata
+        * @param XLength X方向の長さ
+        * @param YLength Y方向の長さ
+        * @param XDirection X方向指定(+方向:1,-方向:-1,中心から-+の方向:0)
+        * @param YDirection Y方向指定(+方向:1,-方向:-1,中心から-+の方向:0)
+        * @return Object
+        */
+       public static Object  lineXY(World par1World,int X,int Y,int Z,int Block,int meta,int XLength,int YLength,int XDirection,int YDirection)
+       {
+               Object DataBox=null;
+               DataBox = lineX(par1World,X,Y,Z,Block,meta,XLength,XDirection);
+               DataBox = lineY(par1World,X,Y,Z,Block,YLength,meta,YDirection);
+               return DataBox;
+       }
+
+       /**
+        * XZ方向に線状にBlockを配置します。
+        * Directionが0の場合、特殊な計算式で
+        * +,-方向:loop-1の長さになります。
+        * @param par1World
+        * @param X 基準X座標
+        * @param Y 基準Y座標
+        * @param Z 基準Z座標
+        * @param Block 配置するBlock
+        * @param meta 配置するMetadata
+        * @param XLength X方向の長さ
+        * @param ZLength Y方向の長さ
+        * @param XDirection X方向指定(+方向:1,-方向:-1,中心から-+の方向:0)
+        * @param ZDirection Z方向指定(+方向:1,-方向:-1,中心から-+の方向:0)
+        * @return Object
+        */
+       public static Object  lineXZ(World par1World,int X,int Y,int Z,int Block,int meta,int XLength,int ZLength,int XDirection,int ZDirection)
+       {
+               Object DataBox=null;
+               DataBox = lineX(par1World,X,Y,Z,Block,meta,XLength,XDirection);
+               DataBox = lineZ(par1World,X,Y,Z,Block,meta,ZLength,ZDirection);
+               return DataBox;
+       }
+
+       /**
+        * YZ方向に線状にBlockを配置します。
+        * Directionが0の場合、特殊な計算式で
+        * +,-方向:loop-1の長さになります。
+        * @param par1World
+        * @param X 基準X座標
+        * @param Y 基準Y座標
+        * @param Z 基準Z座標
+        * @param Block 配置するBlock
+        * @param meta 配置するMetadata
+        * @param YLength X方向の長さ
+        * @param ZLength Y方向の長さ
+        * @param YDirection Y方向指定(+方向:1,-方向:-1,中心から-+の方向:0)
+        * @param ZDirection Z方向指定(+方向:1,-方向:-1,中心から-+の方向:0)
+        * @return Object
+        */
+       public static Object  lineYZ(World par1World,int X,int Y,int Z,int Block,int meta,int YLength,int ZLength,int YDirection,int ZDirection)
+       {
+               Object DataBox=null;
+               DataBox = lineY(par1World,X,Y,Z,Block,meta,YLength,YDirection);
+               DataBox = lineZ(par1World,X,Y,Z,Block,meta,ZLength,ZDirection);
+               return DataBox;
+       }
+
+       /**
+        * XYZ方向に線状にBlockを配置します。
+        * Directionが0の場合、特殊な計算式で
+        * +,-方向:loop-1の長さになります。
+        * @param par1World
+        * @param X 基準X座標
+        * @param Y 基準Y座標
+        * @param Z 基準Z座標
+        * @param Block 配置するBlock
+        * @param meta 配置するMetadata
+        * @param XLength X方向の長さ
+        * @param YLength Y方向の長さ
+        * @param ZLength Z方向の長さ
+        * @param XDirection X方向指定(+方向:1,-方向:-1,中心から-+の方向:0)
+        * @param YDirection Y方向指定(+方向:1,-方向:-1,中心から-+の方向:0)
+        * @param ZDirection Z方向指定(+方向:1,-方向:-1,中心から-+の方向:0)
+        * @return Object
+        */
+       public static Object  lineXYZ(World par1World,int X,int Y,int Z,int Block,int meta,int XLength,int YLength,int ZLength,int XDirection,int YDirection,int ZDirection)
+       {
+               Object DataBox=null;
+               DataBox = lineX(par1World,X,Y,Z,Block,meta,XLength,XDirection);
+               DataBox = lineY(par1World,X,Y,Z,Block,meta,YLength,YDirection);
+               DataBox = lineZ(par1World,X,Y,Z,Block,meta,ZLength,ZDirection);
+               return DataBox;
+       }
+
+       /**
+        * X方向の壁を作成します。
+        * Directionは1で固定です。
+        * @param par1World
+        * @param X 基準X座標
+        * @param Y 基準Y座標
+        * @param Z 基準Z座標
+        * @param Block 配置するBlock
+        * @param meta 配置するMetadata
+        * @param Length 幅
+        * @param height 高さ
+        * @return Object
+        */
+       public static Object wallX(World par1World,int X,int Y,int Z,int Block,int meta,int Length,int height)
+       {
+               Object DataBox = null;
+               for(int loop = 0;loop < Length;loop++){
+                       lineY(par1World, X - (Length/2) + loop, Y, Z, Block,meta, height, 1);
+               }
+               return DataBox;
+       }
+
+       /**
+        * Z方向の壁を作成します。
+        * Directionは1で固定です。
+        * @param par1World
+        * @param X 基準X座標
+        * @param Y 基準Y座標
+        * @param Z 基準Z座標
+        * @param Block 配置するBlock
+        * @param meta 配置するMetadata
+        * @param Length 幅
+        * @param height 高さ
+        * @return Object
+        */
+       public static Object wallZ(World par1World,int X,int Y,int Z,int Block,int meta,int Length,int height)
+       {
+               Object DataBox = null;
+               for(int loop = 0;loop < Length;loop++){
+                       lineY(par1World, X, Y, Z - (Length/2) + loop, Block,meta, height, 1);
+               }
+               return DataBox;
+       }
+
+       /**
+        * 辺だけの四角を作成します。
+        * @param par1World
+        * @param X 基準X座標
+        * @param Y 基準Y座標
+        * @param Z 基準Z座標
+        * @param Block 配置するBlock
+        * @param meta 配置するMetadata
+        * @param LengthX X方向の長さ
+        * @param LengthZ  Z方向の長さ
+        * @return Object
+        */
+       public static Object spuareFrame(World par1World,int X,int Y,int Z,int Block,int meta,int LengthX,int LengthZ)
+       {
+               Object DataBox = null;
+               DataBox = lineX(par1World, X, Y, Z + (LengthZ/2), Block,meta, LengthX/2+1, 0);
+               DataBox = lineX(par1World, X, Y, Z - (LengthZ/2), Block,meta, LengthX/2+1, 0);
+               DataBox = lineZ(par1World, X + (LengthX/2), Y, Z, Block,meta, LengthZ/2+1, 0);
+               DataBox = lineZ(par1World, X - (LengthX/2), Y, Z, Block,meta, LengthZ/2+1, 0);
+               return DataBox;
+       }
+
+       /**
+        * 辺だけの箱を作成します。
+        * @param par1World
+        * @param X 基準X座標
+        * @param Y 基準Y座標
+        * @param Z 基準Z座標
+        * @param Block 配置するBlock
+        * @param meta 配置するMetadata
+        * @param LengthX X方向の長さ
+        * @param LengthZ  Z方向の長さ
+        * @param height 高さ
+        * @return Object
+        */
+       public static Object boxFrame(World par1World,int X,int Y,int Z,int Block,int meta,int LengthX,int LengthZ,int height)
+       {
+               Object DataBox=null;
+               DataBox = lineX(par1World, X, Y, Z + (LengthZ/2), Block,meta, LengthX/2, 0);
+               DataBox = lineX(par1World, X, Y, Z - (LengthZ/2), Block,meta, LengthX/2, 0);
+               DataBox = lineX(par1World, X, Y + height-1, Z + (LengthZ/2), Block,meta, LengthX/2, 0);
+               DataBox = lineX(par1World, X, Y + height-1, Z - (LengthZ/2), Block,meta, LengthX/2, 0);
+
+               DataBox = lineY(par1World,X +(LengthX/2),Y,Z +(LengthZ/2),Block,meta,height,1);
+               DataBox = lineY(par1World,X -(LengthX/2),Y,Z +(LengthZ/2),Block,meta,height,1);
+               DataBox = lineY(par1World,X +(LengthX/2),Y,Z - (LengthZ/2),Block,meta,height,1);
+               DataBox = lineY(par1World,X -(LengthX/2),Y,Z - (LengthZ/2),Block,meta,height,1);
+
+               DataBox = lineZ(par1World, X + (LengthX/2), Y, Z, Block,meta, LengthZ/2, 0);
+               DataBox = lineZ(par1World, X - (LengthX/2), Y, Z, Block,meta, LengthZ/2, 0);
+               DataBox = lineZ(par1World, X + (LengthX/2), Y + height-1, Z, Block,meta, LengthZ/2, 0);
+               DataBox = lineZ(par1World, X - (LengthX/2), Y + height-1, Z, Block,meta, LengthZ/2, 0);
+               return DataBox;
+       }
+
+       /**
+        * 四角を作成します。
+        * @param par1World
+        * @param X 基準X座標
+        * @param Y 基準Y座標
+        * @param Z 基準Z座標
+        * @param Block 配置するBlock
+        * @param meta 配置するMetadata
+        * @param LengthX X方向の長さ
+        * @param LengthZ  Z方向の長さ
+        * @return Object
+        */
+       public static Object square(World par1World,int X,int Y,int Z,int Block,int meta,int LengthX,int LengthZ)
+       {
+               Object DataBox = null;
+               int loop1 = 0;
+               for(loop1=0; loop1 < LengthZ; loop1++){
+                       DataBox = lineX(par1World,X - (LengthX/2),Y,Z - (LengthZ/2) + loop1,Block,meta,LengthX,1);
+               }
+               return DataBox;
+       }
+
+       /**
+        * 箱を生成します。
+        * @param par1World
+        * @param X 基準X座標
+        * @param Y 基準Y座標
+        * @param Z 基準Z座標
+        * @param Block 配置するBlock
+        * @param meta 配置するMetadata
+        * @param LengthX X方向の長さ
+        * @param LengthZ  Z方向の長さ
+        * @param height 高さ
+        * @return Object
+        */
+       public static Object box(World par1World,int X,int Y,int Z,int Block,int meta,int LengthX,int LengthZ,int height)
+       {
+               Object DataBox = null;
+               DataBox = square(par1World, X, Y, Z, Block, meta,LengthX,LengthZ);
+               DataBox = square(par1World,X,Y+height,Z,Block,meta,LengthX,LengthZ);
+               DataBox = wallX(par1World,X,Y,Z-(LengthZ/2),Block,meta,LengthX,height);
+               DataBox = wallZ(par1World,X-(LengthX/2),Y,Z,Block,meta,LengthZ,height);
+               DataBox = wallX(par1World,X,Y,Z+(LengthZ/2),Block,meta,LengthX,height);
+               DataBox = wallZ(par1World,X+(LengthX/2),Y,Z,Block,meta,LengthZ,height);
+               return DataBox;
+       }
+
+       /**
+        * Blockで埋め尽くされた箱を生成します。
+        * @param par1World
+        * @param X 基準X座標
+        * @param Y 基準Y座標
+        * @param Z 基準Z座標
+        * @param Block 配置するBlock
+        * @param meta 配置するMetadata
+        * @param LengthX X方向の長さ
+        * @param LengthZ  Z方向の長さ
+        * @param height 高さ
+        * @return Object
+        */
+       public static Object fillBox(World par1World , int X,int Y,int Z,int Block,int meta,int LengthX,int LengthZ,int height)
+       {
+               Object DataBox = null;
+               DataBox = square(par1World, X, Y, Z, Block,meta, LengthX,LengthZ);
+               DataBox = square(par1World,X,Y+height,Z,Block,meta,LengthX,LengthZ);
+               DataBox = wallX(par1World,X,Y,Z-(LengthZ/2),Block,meta,LengthX,height);
+               DataBox = wallZ(par1World,X-(LengthX/2),Y,Z,Block,meta,LengthZ,height);
+               DataBox = wallX(par1World,X,Y,Z+(LengthZ/2),Block,meta,LengthX,height);
+               DataBox = wallZ(par1World,X+(LengthX/2),Y,Z,Block,meta,LengthZ,height);
+
+               for(int i = 0; i < LengthX - 1; i++)
+               {
+                       DataBox = wallZ(par1World,X + 1 - LengthX / 2 + i, Y , Z , Block ,meta,LengthZ, height);
+               }
+
+               return DataBox;
+       }
+
+       /**
+        * 座標ごとにデータを指定して配置します。
+        * 配列になっているので、順番に指定してください。
+        * @param par1World
+        * @param X 基準X座標
+        * @param Y 基準Y座標
+        * @param Z 基準Z座標
+        * @param Block 配置するBlock
+        * @param meta 配置するMetadata
+        * @param XPosition 配置する相対X座標
+        * @param YPosition 配置する相対Y座標
+        * @param ZPosition 配置する相対Z座標
+        * @param Option
+        * @return Object
+        */
+       public static Object fineSetBlock(World par1World,int X,int Y,int Z,int[] Block,int[] meta,int[] XPosition,int[] YPosition,int[] ZPosition,Object[] Option){
+               Object DataBox = null;
+               for(int i=0;i<Block.length;i++){
+                       DataBox = par1World.setBlockAndMetadata(X+XPosition[i], Y+YPosition[i], Z+ZPosition[i], Block[i],meta[i]);
+               }
+
+               if(Option!=null){
+                       for(int j=0;j<Option.length;j++){
+                               DataBox = Option[j];
+                       }
+               }
+               return DataBox;
+       }
+
+       /**
+        * X方向に台形を作成します。
+        * 必ずbottom/(upper*3)*(height/upper)かupper/(bottom*3)*(height/buttom)が整数になるようにしてください。
+        * @param par1World
+        * @param X 基準X座標
+        * @param Y 基準Y座標
+        * @param Z 基準Z座標
+        * @param Block 配置するBlock
+        * @param meta 配置するMetadata
+        * @param upperSide 上辺の長さ
+        * @param bottomSide 下辺の長さ
+        * @param height 高さ
+        * @return Object
+        */
+       public static Object trapezoidX(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){
+               Object dataBox = null;
+               int Rate=0;
+               int Math=0;
+               int XRate=0;
+               int YRate = 0;
+               for(int i=0;i<height;i++){
+                       YRate++;
+                       Math++;
+                       XRate++;
+                       if(upperSide < bottomSide){
+                               if(Math == bottomSide/(upperSide*3)*(height/upperSide)){
+                                       Rate++;
+                                       Math=0;
+                               }
+                       }
+
+                       if(bottomSide < upperSide){
+                               if(Math == upperSide/(bottomSide*3)*(height/bottomSide)){
+                                       Rate--;
+                                       Math=0;
+                               }
+                       }
+
+                       dataBox=lineZ(par1World, X+XRate-1, Y+YRate, Z, Block, meta, upperSide+Rate, 0);
+               }
+               return dataBox;
+       }
+
+       /**
+        * Y方向のXラインに台形を作成します。
+        * 必ずbottom/(upper*3)*(height/upper)かupper/(bottom*3)*(height/buttom)が整数になるようにしてください。
+        * @param par1World
+        * @param X 基準X座標
+        * @param Y 基準Y座標
+        * @param Z 基準Z座標
+        * @param Block 配置するBlock
+        * @param meta 配置するMetadata
+        * @param upperSide 上辺の長さ
+        * @param bottomSide 下辺の長さ
+        * @param height 高さ
+        * @return Object
+        */
+       public static Object trapezoidY_X(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){
+               Object dataBox = null;
+               int Rate=0;
+               int Math=0;
+               int YRate = 0;
+               for(int i=0;i<height;i++){
+                       YRate++;
+                       Math++;
+                       if(upperSide < bottomSide){
+                               if(Math == bottomSide/(upperSide*3)*(height/upperSide)){
+                                       Rate++;
+                                       Math=0;
+                               }
+                       }
+
+                       if(bottomSide < upperSide){
+                               if(Math == upperSide/(bottomSide*3)*(height/bottomSide)){
+                                       Rate--;
+                                       Math=0;
+                               }
+                       }
+
+                       dataBox=lineZ(par1World, X, Y+YRate, Z, Block, meta, upperSide+Rate, 0);
+               }
+               return dataBox;
+       }
+
+       /**
+        * Y方向のZラインに台形を作成します。
+        * 必ずbottom/(upper*3)*(height/upper)かupper/(bottom*3)*(height/buttom)が整数になるようにしてください。
+        * @param par1World
+        * @param X 基準X座標
+        * @param Y 基準Y座標
+        * @param Z 基準Z座標
+        * @param Block 配置するBlock
+        * @param meta 配置するMetadata
+        * @param upperSide 上辺の長さ
+        * @param bottomSide 下辺の長さ
+        * @param height 高さ
+        * @return Object
+        */
+       public static Object trapezoidY_Z(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){
+               Object dataBox = null;
+               int Rate=0;
+               int Math=0;
+               int YRate = 0;
+               for(int i=0;i<height;i++){
+                       YRate++;
+                       Math++;
+                       if(upperSide < bottomSide){
+                               if(Math == bottomSide/(upperSide*3)*(height/upperSide)){
+                                       Rate++;
+                                       Math=0;
+                               }
+                       }
+
+                       if(bottomSide < upperSide){
+                               if(Math == upperSide/(bottomSide*3)*(height/bottomSide)){
+                                       Rate--;
+                                       Math=0;
+                               }
+                       }
+
+                       dataBox=lineX(par1World, X, Y+YRate, Z, Block, meta, upperSide+Rate, 0);
+               }
+               return dataBox;
+       }
+
+       /**
+        * Z方向に台形を作成します。
+        * 必ずbottom/(upper*3)*(height/upper)かupper/(bottom*3)*(height/buttom)が整数になるようにしてください。
+        * @param par1World
+        * @param X 基準X座標
+        * @param Y 基準Y座標
+        * @param Z 基準Z座標
+        * @param Block 配置するBlock
+        * @param meta 配置するMetadata
+        * @param upperSide 上辺の長さ
+        * @param bottomSide 下辺の長さ
+        * @param height 高さ
+        * @return Object
+        */
+       public static Object TrapezoidZ(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){
+               Object dataBox = null;
+               int Rate=0;
+               int Math=0;
+               int ZRate=0;
+               for(int i=0;i<height;i++){
+                       Math++;
+                       ZRate++;
+                       if(upperSide < bottomSide){
+                               if(Math == bottomSide/(upperSide*3)*(height/upperSide)){
+                                       Rate++;
+                                       Math=0;
+                               }
+                       }
+
+                       if(bottomSide < upperSide){
+                               if(Math == upperSide/(bottomSide*3)*(height/bottomSide)){
+                                       Rate--;
+                                       Math=0;
+                               }
+                       }
+
+                       dataBox=lineX(par1World, X, Y, Z+ZRate, Block, meta, upperSide+Rate, 0);
+               }
+               return dataBox;
+       }
+
 }
\ No newline at end of file
index 2c2894e..b5aec03 100644 (file)
@@ -1,19 +1,19 @@
-package chemicraft.item;\r
-\r
-import net.minecraft.item.Item;\r
-import chemicraft.util.AtomInfo;\r
-\r
-public class ItemAtomInfoContainer extends Item {\r
-\r
-       /**\r
-        * AtonInfoのインスタンス\r
-        */\r
-       public AtomInfo atomInfo = new AtomInfo();\r
-\r
-\r
-\r
-       public ItemAtomInfoContainer(int par1){\r
-               super(par1);\r
-       }\r
-\r
-}\r
+package chemicraft.item;
+
+import net.minecraft.item.Item;
+import chemicraft.util.AtomInfo;
+
+public class ItemAtomInfoContainer extends Item {
+
+       /**
+        * AtonInfoのインスタンス
+        */
+       public AtomInfo atomInfo = new AtomInfo();
+
+
+
+       public ItemAtomInfoContainer(int par1){
+               super(par1);
+       }
+
+}
index ee8d2a4..fd8cca2 100644 (file)
-package chemicraft.item;\r
-\r
-import net.minecraft.block.Block;\r
-import net.minecraft.block.BlockFire;\r
-import net.minecraft.entity.player.EntityPlayer;\r
-import net.minecraft.item.ItemStack;\r
-import net.minecraft.world.World;\r
-import chemicraft.ChemiCraft;\r
-import chemicraft.ChemiCraftAPI;\r
-import chemicraft.util.MathHelperPlus;\r
-\r
-public class ItemGasCollectingBottle extends ItemAtomInfoContainer\r
-{\r
-\r
-       public ItemGasCollectingBottle(int id) {\r
-               super(id);\r
-               this.setMaxStackSize(1);\r
-               this.setMaxDamage(2);\r
-               this.setCreativeTab(ChemiCraft.instance.creativeTab);\r
-       }\r
-\r
-       @Override\r
-       public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)\r
-       {\r
-               par1ItemStack.damageItem(1, par3EntityPlayer);\r
-\r
-               this.atomInfo.update(par2World, par3EntityPlayer);\r
-\r
-               int heightValue = par2World.getHeightValue((int) par3EntityPlayer.posX, (int) par3EntityPlayer.posZ);\r
-\r
-               int result1 = MathHelperPlus.probability(99, 1);\r
-               int result2 = MathHelperPlus.probability(78, 21, 1);\r
-               int result3 = MathHelperPlus.probability(0.032, 0.0018, 0.000012, 0.00052);\r
-               if (this.atomInfo.isOverY(heightValue)) {\r
-                       if (result1 == 0) {\r
-                               if (result2 == 0) {\r
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 6), par3EntityPlayer);\r
-                               } else if (result2 == 1) {\r
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 7), par3EntityPlayer);\r
-                               } else {\r
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 17), par3EntityPlayer);\r
-                               }\r
-                       } else {\r
-                               if (result3 == 0) {\r
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemCompounds, 1, ChemiCraftAPI.getInstance().getCompound("CarbonDioxide")), par3EntityPlayer);\r
-                               } else if (result3 == 1) {\r
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 9), par3EntityPlayer);\r
-                               } else if (result3 == 2) {\r
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemCompounds, 1, 1), par3EntityPlayer);\r
-                               } else {\r
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 1), par3EntityPlayer);\r
-                               }\r
-                       }\r
-               }\r
-\r
-               // デバッグ用\r
-               if (par2World.isRemote) {\r
-                       par3EntityPlayer.addChatMessage("result1=" + result1 + " result2=" + result2 + " result3=" + result3);\r
-                       par3EntityPlayer.addChatMessage("このメッセージは開発版のみの表示ですが、もし製品版で表示されていた場合はご連絡ください。");\r
-               }\r
-\r
-               return par1ItemStack;\r
-       }\r
-\r
-       protected void isStackOrDrop(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer)\r
-       {\r
-               if (!par2EntityPlayer.inventory.addItemStackToInventory(par1ItemStack)) {\r
-                       par2EntityPlayer.dropPlayerItem(par1ItemStack);\r
-               }\r
-       }\r
-\r
-       @Override\r
-       public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10)\r
-       {\r
-               int blockID = par3World.getBlockId(par4, par5, par6);\r
-               Block block = Block.blocksList[blockID];\r
-\r
-               int uniqueBlockID = par3World.getBlockId(par4, par5 + 1, par6);\r
-               Block uniqueBlock = Block.blocksList[uniqueBlockID];\r
-\r
-               if (uniqueBlock instanceof BlockFire){\r
-                       par1ItemStack.damageItem(1, par2EntityPlayer);\r
-\r
-                       int result1 = MathHelperPlus.probability(90, 10);\r
-\r
-                       if (result1 == 0) {\r
-                               this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemCompounds, 1, ChemiCraftAPI.getInstance().getCompound("CarbonDioxide")), par2EntityPlayer);\r
-                       } else {\r
-                               this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemCompounds, 1, ChemiCraftAPI.getInstance().getCompound("CarbonMonoxide")), par2EntityPlayer);\r
-                       }\r
-\r
-                       return true;\r
-               }\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public String getTextureFile()\r
-       {\r
-               return "/chemicraft/items/items.png";\r
-       }\r
-\r
-}\r
+package chemicraft.item;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockFire;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import chemicraft.ChemiCraft;
+import chemicraft.ChemiCraftAPI;
+import chemicraft.util.MathHelperPlus;
+
+public class ItemGasCollectingBottle extends ItemAtomInfoContainer
+{
+
+       public ItemGasCollectingBottle(int id) {
+               super(id);
+               this.setMaxStackSize(1);
+               this.setMaxDamage(2);
+               this.setCreativeTab(ChemiCraft.instance.creativeTab);
+       }
+
+       @Override
+       public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
+       {
+               par1ItemStack.damageItem(1, par3EntityPlayer);
+
+               this.atomInfo.update(par2World, par3EntityPlayer);
+
+               int heightValue = par2World.getHeightValue((int) par3EntityPlayer.posX, (int) par3EntityPlayer.posZ);
+
+               int result1 = MathHelperPlus.probability(99, 1);
+               int result2 = MathHelperPlus.probability(78, 21, 1);
+               int result3 = MathHelperPlus.probability(0.032, 0.0018, 0.000012, 0.00052);
+               if (this.atomInfo.isOverY(heightValue)) {
+                       if (result1 == 0) {
+                               if (result2 == 0) {
+                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 6), par3EntityPlayer);
+                               } else if (result2 == 1) {
+                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 7), par3EntityPlayer);
+                               } else {
+                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 17), par3EntityPlayer);
+                               }
+                       } else {
+                               if (result3 == 0) {
+                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemCompounds, 1, ChemiCraftAPI.getInstance().getCompound("CarbonDioxide")), par3EntityPlayer);
+                               } else if (result3 == 1) {
+                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 9), par3EntityPlayer);
+                               } else if (result3 == 2) {
+                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemCompounds, 1, 1), par3EntityPlayer);
+                               } else {
+                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 1), par3EntityPlayer);
+                               }
+                       }
+               }
+
+               // デバッグ用
+               if (par2World.isRemote) {
+                       par3EntityPlayer.addChatMessage("result1=" + result1 + " result2=" + result2 + " result3=" + result3);
+                       par3EntityPlayer.addChatMessage("このメッセージは開発版のみの表示ですが、もし製品版で表示されていた場合はご連絡ください。");
+               }
+
+               return par1ItemStack;
+       }
+
+       protected void isStackOrDrop(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer)
+       {
+               if (!par2EntityPlayer.inventory.addItemStackToInventory(par1ItemStack)) {
+                       par2EntityPlayer.dropPlayerItem(par1ItemStack);
+               }
+       }
+
+       @Override
+       public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10)
+       {
+               int blockID = par3World.getBlockId(par4, par5, par6);
+               Block block = Block.blocksList[blockID];
+
+               int uniqueBlockID = par3World.getBlockId(par4, par5 + 1, par6);
+               Block uniqueBlock = Block.blocksList[uniqueBlockID];
+
+               if (uniqueBlock instanceof BlockFire){
+                       par1ItemStack.damageItem(1, par2EntityPlayer);
+
+                       int result1 = MathHelperPlus.probability(90, 10);
+
+                       if (result1 == 0) {
+                               this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemCompounds, 1, ChemiCraftAPI.getInstance().getCompound("CarbonDioxide")), par2EntityPlayer);
+                       } else {
+                               this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemCompounds, 1, ChemiCraftAPI.getInstance().getCompound("CarbonMonoxide")), par2EntityPlayer);
+                       }
+
+                       return true;
+               }
+               return false;
+       }
+
+       @Override
+       public String getTextureFile()
+       {
+               return "/chemicraft/items/items.png";
+       }
+
+}
index fa6d9ae..b7c7b1a 100644 (file)
-package chemicraft.system;\r
-\r
-import java.io.ByteArrayOutputStream;\r
-import java.io.DataOutputStream;\r
-import java.io.IOException;\r
-\r
-import net.minecraft.entity.player.EntityPlayer;\r
-import net.minecraft.network.INetworkManager;\r
-import net.minecraft.network.packet.Packet;\r
-import net.minecraft.network.packet.Packet250CustomPayload;\r
-import net.minecraft.tileentity.TileEntity;\r
-import net.minecraft.world.World;\r
-import chemicraft.ChemiCraft;\r
-import chemicraft.tileentity.TileEntityChemicalCombinationTable;\r
-import chemicraft.tileentity.TileEntityChemicalCraftingTable;\r
-import chemicraft.tileentity.TileEntityPyrolysisTable;\r
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;\r
-\r
-import com.google.common.io.ByteArrayDataInput;\r
-import com.google.common.io.ByteStreams;\r
-\r
-import cpw.mods.fml.common.network.IPacketHandler;\r
-import cpw.mods.fml.common.network.Player;\r
-\r
-/**\r
- * サーバーとクライアントのデータの同期に必要なクラス\r
- *\r
- * @author Lilly\r
- *\r
- */\r
-public class PacketHandler implements IPacketHandler {\r
-\r
-       @Override\r
-       public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player) {\r
-               if (packet.channel.equals("chemicraft")) {\r
-                       ByteArrayDataInput badi = ByteStreams.newDataInput(packet.data);\r
-\r
-                       World worldClient;\r
-                       World worldServer;\r
-                       TileEntity var1;\r
-\r
-                       // TileEntityのx, y, z座標\r
-                       int x, y, z;\r
-\r
-                       // 座標読み込み\r
-                       x = badi.readInt();\r
-                       y = badi.readInt();\r
-                       z = badi.readInt();\r
-\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 TileEntityChemicalCombinationTable) ((TileEntityChemicalCombinationTable)var1).readPacket(badi);\r
-                               if(var1 instanceof TileEntityChemicalCraftingTable) ((TileEntityChemicalCraftingTable)var1).readPacket(badi);\r
-                               if(var1 instanceof TileEntityPyrolysisTable) ((TileEntityPyrolysisTable)var1).readPacket(badi);\r
-                               if(var1 instanceof TileEntityToolAndWeaponCraftingTable) ((TileEntityToolAndWeaponCraftingTable)var1).readPacket(badi);\r
-                               return;\r
-                       }\r
-                       if(worldServer != null){\r
-                               var1 = worldServer.getBlockTileEntity(x, y, z);\r
-                               if(var1 instanceof TileEntityChemicalCombinationTable) ((TileEntityChemicalCombinationTable)var1).readPacket(badi);\r
-                               if(var1 instanceof TileEntityChemicalCraftingTable) ((TileEntityChemicalCraftingTable)var1).readPacket(badi);\r
-                               if(var1 instanceof TileEntityPyrolysisTable) ((TileEntityPyrolysisTable)var1).readPacket(badi);\r
-                               if(var1 instanceof TileEntityToolAndWeaponCraftingTable) ((TileEntityToolAndWeaponCraftingTable)var1).readPacket(badi);\r
-                       }\r
-                       return;\r
-               }\r
-       }\r
-\r
-\r
-       public static Packet getPacket(TileEntityPyrolysisTable tileEntity) {\r
-               ByteArrayOutputStream var1 = new ByteArrayOutputStream(128);\r
-               DataOutputStream var2 = new DataOutputStream(var1);\r
-\r
-               // Blockのx, y, z座標\r
-               int x, y, z;\r
-\r
-               // x, y, z座標を代入\r
-               x = tileEntity.xCoord;\r
-               y = tileEntity.yCoord;\r
-               z = tileEntity.zCoord;\r
-\r
-               try {\r
-                       // 座標書き込み\r
-                       var2.writeInt(x);\r
-                       var2.writeInt(y);\r
-                       var2.writeInt(z);\r
-                       tileEntity.writePacket(var2);\r
-               } catch (IOException e) {\r
-                       e.printStackTrace();\r
-               }\r
-\r
-               // パケットの作成\r
-               Packet250CustomPayload packet = new Packet250CustomPayload();\r
-               packet.channel = "chemicraft";\r
-               packet.data = var1.toByteArray();\r
-               packet.length = var1.size();\r
-               packet.isChunkDataPacket = true;\r
-               return packet;\r
-       }\r
-\r
-       public static Packet getPacket(TileEntityChemicalCombinationTable tileEntity) {\r
-               ByteArrayOutputStream var1 = new ByteArrayOutputStream(128);\r
-               DataOutputStream var2 = new DataOutputStream(var1);\r
-\r
-               // Blockのx, y, z座標\r
-               int x, y, z;\r
-\r
-               // x, y, z座標を代入\r
-               x = tileEntity.xCoord;\r
-               y = tileEntity.yCoord;\r
-               z = tileEntity.zCoord;\r
-\r
-               try {\r
-                       // 座標書き込み\r
-                       var2.writeInt(x);\r
-                       var2.writeInt(y);\r
-                       var2.writeInt(z);\r
-                       tileEntity.writePacket(var2);\r
-               } catch (IOException e) {\r
-                       e.printStackTrace();\r
-               }\r
-\r
-               // パケットの作成\r
-               Packet250CustomPayload packet = new Packet250CustomPayload();\r
-               packet.channel = "chemicraft";\r
-               packet.data = var1.toByteArray();\r
-               packet.length = var1.size();\r
-               packet.isChunkDataPacket = true;\r
-               return packet;\r
-       }\r
-\r
-       public static Packet getPacket(TileEntityToolAndWeaponCraftingTable tileEntity) {\r
-               ByteArrayOutputStream var1 = new ByteArrayOutputStream(128);\r
-               DataOutputStream var2 = new DataOutputStream(var1);\r
-\r
-               // Blockのx, y, z座標\r
-               int x, y, z;\r
-\r
-               // x, y, z座標を代入\r
-               x = tileEntity.xCoord;\r
-               y = tileEntity.yCoord;\r
-               z = tileEntity.zCoord;\r
-\r
-               try {\r
-                       // 座標書き込み\r
-                       var2.writeInt(x);\r
-                       var2.writeInt(y);\r
-                       var2.writeInt(z);\r
-                       tileEntity.writePacket(var2);\r
-               } catch (IOException e) {\r
-                       e.printStackTrace();\r
-               }\r
-\r
-               // パケットの作成\r
-               Packet250CustomPayload packet = new Packet250CustomPayload();\r
-               packet.channel = "chemicraft";\r
-               packet.data = var1.toByteArray();\r
-               packet.length = var1.size();\r
-               packet.isChunkDataPacket = true;\r
-               return packet;\r
-       }\r
-\r
-       public static Packet getPacket(TileEntityChemicalCraftingTable tileEntity) {\r
-               ByteArrayOutputStream var1 = new ByteArrayOutputStream(128);\r
-               DataOutputStream var2 = new DataOutputStream(var1);\r
-\r
-               // Blockのx, y, z座標\r
-               int x, y, z;\r
-\r
-               // x, y, z座標を代入\r
-               x = tileEntity.xCoord;\r
-               y = tileEntity.yCoord;\r
-               z = tileEntity.zCoord;\r
-\r
-               try {\r
-                       // 座標書き込み\r
-                       var2.writeInt(x);\r
-                       var2.writeInt(y);\r
-                       var2.writeInt(z);\r
-                       tileEntity.writePacket(var2);\r
-               } catch (IOException e) {\r
-                       e.printStackTrace();\r
-               }\r
-\r
-               // パケットの作成\r
-               Packet250CustomPayload packet = new Packet250CustomPayload();\r
-               packet.channel = "chemicraft";\r
-               packet.data = var1.toByteArray();\r
-               packet.length = var1.size();\r
-               packet.isChunkDataPacket = true;\r
-               return packet;\r
-       }\r
-\r
-}\r
+package chemicraft.system;
+
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.network.INetworkManager;
+import net.minecraft.network.packet.Packet;
+import net.minecraft.network.packet.Packet250CustomPayload;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import chemicraft.ChemiCraft;
+import chemicraft.tileentity.TileEntityChemicalCombinationTable;
+import chemicraft.tileentity.TileEntityChemicalCraftingTable;
+import chemicraft.tileentity.TileEntityPyrolysisTable;
+import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
+
+import com.google.common.io.ByteArrayDataInput;
+import com.google.common.io.ByteStreams;
+
+import cpw.mods.fml.common.network.IPacketHandler;
+import cpw.mods.fml.common.network.Player;
+
+/**
+ * サーバーとクライアントのデータの同期に必要なクラス
+ *
+ * @author Lilly
+ *
+ */
+public class PacketHandler implements IPacketHandler {
+
+       @Override
+       public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player) {
+               if (packet.channel.equals("chemicraft")) {
+                       ByteArrayDataInput badi = ByteStreams.newDataInput(packet.data);
+
+                       World worldClient;
+                       World worldServer;
+                       TileEntity var1;
+
+                       // TileEntityのx, y, z座標
+                       int x, y, z;
+
+                       // 座標読み込み
+                       x = badi.readInt();
+                       y = badi.readInt();
+                       z = badi.readInt();
+
+                       worldClient = ChemiCraft.proxy.getClientWorld();
+                       worldServer = ((EntityPlayer)player).worldObj;
+                       if(worldClient != null && worldServer == null){
+                               var1 = worldClient.getBlockTileEntity(x, y, z);
+                               if(var1 instanceof TileEntityChemicalCombinationTable) ((TileEntityChemicalCombinationTable)var1).readPacket(badi);
+                               if(var1 instanceof TileEntityChemicalCraftingTable) ((TileEntityChemicalCraftingTable)var1).readPacket(badi);
+                               if(var1 instanceof TileEntityPyrolysisTable) ((TileEntityPyrolysisTable)var1).readPacket(badi);
+                               if(var1 instanceof TileEntityToolAndWeaponCraftingTable) ((TileEntityToolAndWeaponCraftingTable)var1).readPacket(badi);
+                               return;
+                       }
+                       if(worldServer != null){
+                               var1 = worldServer.getBlockTileEntity(x, y, z);
+                               if(var1 instanceof TileEntityChemicalCombinationTable) ((TileEntityChemicalCombinationTable)var1).readPacket(badi);
+                               if(var1 instanceof TileEntityChemicalCraftingTable) ((TileEntityChemicalCraftingTable)var1).readPacket(badi);
+                               if(var1 instanceof TileEntityPyrolysisTable) ((TileEntityPyrolysisTable)var1).readPacket(badi);
+                               if(var1 instanceof TileEntityToolAndWeaponCraftingTable) ((TileEntityToolAndWeaponCraftingTable)var1).readPacket(badi);
+                       }
+                       return;
+               }
+       }
+
+
+       public static Packet getPacket(TileEntityPyrolysisTable tileEntity) {
+               ByteArrayOutputStream var1 = new ByteArrayOutputStream(128);
+               DataOutputStream var2 = new DataOutputStream(var1);
+
+               // Blockのx, y, z座標
+               int x, y, z;
+
+               // x, y, z座標を代入
+               x = tileEntity.xCoord;
+               y = tileEntity.yCoord;
+               z = tileEntity.zCoord;
+
+               try {
+                       // 座標書き込み
+                       var2.writeInt(x);
+                       var2.writeInt(y);
+                       var2.writeInt(z);
+                       tileEntity.writePacket(var2);
+               } catch (IOException e) {
+                       e.printStackTrace();
+               }
+
+               // パケットの作成
+               Packet250CustomPayload packet = new Packet250CustomPayload();
+               packet.channel = "chemicraft";
+               packet.data = var1.toByteArray();
+               packet.length = var1.size();
+               packet.isChunkDataPacket = true;
+               return packet;
+       }
+
+       public static Packet getPacket(TileEntityChemicalCombinationTable tileEntity) {
+               ByteArrayOutputStream var1 = new ByteArrayOutputStream(128);
+               DataOutputStream var2 = new DataOutputStream(var1);
+
+               // Blockのx, y, z座標
+               int x, y, z;
+
+               // x, y, z座標を代入
+               x = tileEntity.xCoord;
+               y = tileEntity.yCoord;
+               z = tileEntity.zCoord;
+
+               try {
+                       // 座標書き込み
+                       var2.writeInt(x);
+                       var2.writeInt(y);
+                       var2.writeInt(z);
+                       tileEntity.writePacket(var2);
+               } catch (IOException e) {
+                       e.printStackTrace();
+               }
+
+               // パケットの作成
+               Packet250CustomPayload packet = new Packet250CustomPayload();
+               packet.channel = "chemicraft";
+               packet.data = var1.toByteArray();
+               packet.length = var1.size();
+               packet.isChunkDataPacket = true;
+               return packet;
+       }
+
+       public static Packet getPacket(TileEntityToolAndWeaponCraftingTable tileEntity) {
+               ByteArrayOutputStream var1 = new ByteArrayOutputStream(128);
+               DataOutputStream var2 = new DataOutputStream(var1);
+
+               // Blockのx, y, z座標
+               int x, y, z;
+
+               // x, y, z座標を代入
+               x = tileEntity.xCoord;
+               y = tileEntity.yCoord;
+               z = tileEntity.zCoord;
+
+               try {
+                       // 座標書き込み
+                       var2.writeInt(x);
+                       var2.writeInt(y);
+                       var2.writeInt(z);
+                       tileEntity.writePacket(var2);
+               } catch (IOException e) {
+                       e.printStackTrace();
+               }
+
+               // パケットの作成
+               Packet250CustomPayload packet = new Packet250CustomPayload();
+               packet.channel = "chemicraft";
+               packet.data = var1.toByteArray();
+               packet.length = var1.size();
+               packet.isChunkDataPacket = true;
+               return packet;
+       }
+
+       public static Packet getPacket(TileEntityChemicalCraftingTable tileEntity) {
+               ByteArrayOutputStream var1 = new ByteArrayOutputStream(128);
+               DataOutputStream var2 = new DataOutputStream(var1);
+
+               // Blockのx, y, z座標
+               int x, y, z;
+
+               // x, y, z座標を代入
+               x = tileEntity.xCoord;
+               y = tileEntity.yCoord;
+               z = tileEntity.zCoord;
+
+               try {
+                       // 座標書き込み
+                       var2.writeInt(x);
+                       var2.writeInt(y);
+                       var2.writeInt(z);
+                       tileEntity.writePacket(var2);
+               } catch (IOException e) {
+                       e.printStackTrace();
+               }
+
+               // パケットの作成
+               Packet250CustomPayload packet = new Packet250CustomPayload();
+               packet.channel = "chemicraft";
+               packet.data = var1.toByteArray();
+               packet.length = var1.size();
+               packet.isChunkDataPacket = true;
+               return packet;
+       }
+
+}
index 484fef1..ccc5f01 100644 (file)
-package chemicraft.util;\r
-\r
-import net.minecraft.entity.player.EntityPlayer;\r
-import net.minecraft.world.World;\r
-import cpw.mods.fml.relauncher.Side;\r
-import cpw.mods.fml.relauncher.SideOnly;\r
-\r
-/**\r
- * いろいろなデータを格納しメソッドによってチェックするクラス\r
- * 使用する場合はItemAtomInfoContainerを継承することを推奨\r
- * @author ponkotate\r
- *\r
- */\r
-public class AtomInfo {\r
-\r
-       /**\r
-        * X, Y, Z座標\r
-        */\r
-       private  int posX;\r
-       private  int posY;\r
-       private  int posZ;\r
-\r
-\r
-       /**\r
-        * biomeの名前\r
-        */\r
-       private  String biomeName;\r
-\r
-\r
-       /**\r
-        * 天候\r
-        */\r
-       private  String weather;\r
-\r
-\r
-       /**\r
-        * EntityPlayerのインスタンス\r
-        */\r
-       private EntityPlayer entityPlayer;\r
-\r
-\r
-       /**\r
-        * Worldのインスタンス\r
-        */\r
-       private World world;\r
-\r
-\r
-\r
-       /**\r
-        * AtomInfoのデータをupdateします\r
-        * @param par1World Worldのインスタンス\r
-        * @param par2EntityPlayer EntityPlayerのインスタンス\r
-        */\r
-       public void update(World par1World, EntityPlayer par2EntityPlayer){\r
-               //this.world = par1World;\r
-               //this.entityPlayer = par2EntityPlayer;\r
-\r
-               this.posX = (int) par2EntityPlayer.posX;\r
-               this.posY = (int) par2EntityPlayer.posY;\r
-               this.posZ = (int) par2EntityPlayer.posZ;\r
-\r
-               this.biomeName = par1World.getBiomeGenForCoords(posX, posZ).biomeName;\r
-\r
-               if (par1World.isThundering()){\r
-                       this.weather = "Thunder";\r
-               }else if(par1World.isRaining()){\r
-                       this.weather = "Rain";\r
-               }else{\r
-                       this.weather = "Sun";\r
-               }\r
-       }\r
-\r
-\r
-\r
-       /**\r
-        * 引数に指定されたBiomeと同等か比較します\r
-        * @param biomeName 比較するBiomeの名前\r
-        * @return Biomeが一致しているか\r
-        */\r
-       public boolean isEquivalentBiome(String biomeName){\r
-               if(this.biomeName != null){\r
-                       if(this.biomeName.equals(biomeName)){\r
-                               return true;\r
-                       }else{\r
-                               return false;\r
-                       }\r
-               }else{\r
-                       System.err.println("AtonInfo:データが入っていません。updateメソッドでデータを入れてください");\r
-                       return false;\r
-               }\r
-       }\r
-\r
-\r
-\r
-       /**\r
-        * 引数に指定された天候と同等か比較します\r
-        * 晴れ:Sun, 雨:Rain, 雷雨:Thunder\r
-        * @param weather 比較する天候\r
-        * @return 天候が一致しているか\r
-        */\r
-       public boolean isEquivalentWeather(String weather){\r
-               if(this.weather != null){\r
-                       if(this.weather.equals(weather)){\r
-                               return true;\r
-                       }else{\r
-                               return false;\r
-                       }\r
-               }else{\r
-                       System.err.println("AtonInfo:データが入っていません。updateメソッドでデータを入れてください");\r
-                       return false;\r
-               }\r
-       }\r
-\r
-\r
-\r
-       /**\r
-        * 引数に指定されたY軸より高いか判定します\r
-        * @param par1\r
-        * @return 指定されたY軸より高いか\r
-        */\r
-       @SideOnly(Side.CLIENT)\r
-       public boolean isOverY(int par1){\r
-               if(this.posY >= par1){\r
-                       return true;\r
-               }else{\r
-                       return false;\r
-               }\r
-       }\r
-\r
-\r
-\r
-       /**\r
-        * 引数に指定されたY軸と同等か判定します\r
-        * @param par1\r
-        * @return 指定されたY軸と同等かどうか\r
-        */\r
-       @SideOnly(Side.CLIENT)\r
-       public boolean isEquivalentY(int par1){\r
-               if(this.posY == par1){\r
-                       return true;\r
-               }else{\r
-                       return false;\r
-               }\r
-       }\r
-\r
-\r
-\r
-       /**\r
-        * 引数に指定されたY軸より低いか判定します\r
-        * @param par1\r
-        * @return 指定されたY軸より低いか\r
-        */\r
-       @SideOnly(Side.CLIENT)\r
-       public boolean isBelowY(int par1){\r
-               if(this.posY <= par1){\r
-                       return true;\r
-               }else{\r
-                       return false;\r
-               }\r
-       }\r
-\r
-}\r
+package chemicraft.util;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+/**
+ * いろいろなデータを格納しメソッドによってチェックするクラス
+ * 使用する場合はItemAtomInfoContainerを継承することを推奨
+ * @author ponkotate
+ *
+ */
+public class AtomInfo {
+
+       /**
+        * X, Y, Z座標
+        */
+       private  int posX;
+       private  int posY;
+       private  int posZ;
+
+
+       /**
+        * biomeの名前
+        */
+       private  String biomeName;
+
+
+       /**
+        * 天候
+        */
+       private  String weather;
+
+
+       /**
+        * EntityPlayerのインスタンス
+        */
+       private EntityPlayer entityPlayer;
+
+
+       /**
+        * Worldのインスタンス
+        */
+       private World world;
+
+
+
+       /**
+        * AtomInfoのデータをupdateします
+        * @param par1World Worldのインスタンス
+        * @param par2EntityPlayer EntityPlayerのインスタンス
+        */
+       public void update(World par1World, EntityPlayer par2EntityPlayer){
+               //this.world = par1World;
+               //this.entityPlayer = par2EntityPlayer;
+
+               this.posX = (int) par2EntityPlayer.posX;
+               this.posY = (int) par2EntityPlayer.posY;
+               this.posZ = (int) par2EntityPlayer.posZ;
+
+               this.biomeName = par1World.getBiomeGenForCoords(posX, posZ).biomeName;
+
+               if (par1World.isThundering()){
+                       this.weather = "Thunder";
+               }else if(par1World.isRaining()){
+                       this.weather = "Rain";
+               }else{
+                       this.weather = "Sun";
+               }
+       }
+
+
+
+       /**
+        * 引数に指定されたBiomeと同等か比較します
+        * @param biomeName 比較するBiomeの名前
+        * @return Biomeが一致しているか
+        */
+       public boolean isEquivalentBiome(String biomeName){
+               if(this.biomeName != null){
+                       if(this.biomeName.equals(biomeName)){
+                               return true;
+                       }else{
+                               return false;
+                       }
+               }else{
+                       System.err.println("AtonInfo:データが入っていません。updateメソッドでデータを入れてください");
+                       return false;
+               }
+       }
+
+
+
+       /**
+        * 引数に指定された天候と同等か比較します
+        * 晴れ:Sun, 雨:Rain, 雷雨:Thunder
+        * @param weather 比較する天候
+        * @return 天候が一致しているか
+        */
+       public boolean isEquivalentWeather(String weather){
+               if(this.weather != null){
+                       if(this.weather.equals(weather)){
+                               return true;
+                       }else{
+                               return false;
+                       }
+               }else{
+                       System.err.println("AtonInfo:データが入っていません。updateメソッドでデータを入れてください");
+                       return false;
+               }
+       }
+
+
+
+       /**
+        * 引数に指定されたY軸より高いか判定します
+        * @param par1
+        * @return 指定されたY軸より高いか
+        */
+       @SideOnly(Side.CLIENT)
+       public boolean isOverY(int par1){
+               if(this.posY >= par1){
+                       return true;
+               }else{
+                       return false;
+               }
+       }
+
+
+
+       /**
+        * 引数に指定されたY軸と同等か判定します
+        * @param par1
+        * @return 指定されたY軸と同等かどうか
+        */
+       @SideOnly(Side.CLIENT)
+       public boolean isEquivalentY(int par1){
+               if(this.posY == par1){
+                       return true;
+               }else{
+                       return false;
+               }
+       }
+
+
+
+       /**
+        * 引数に指定されたY軸より低いか判定します
+        * @param par1
+        * @return 指定されたY軸より低いか
+        */
+       @SideOnly(Side.CLIENT)
+       public boolean isBelowY(int par1){
+               if(this.posY <= par1){
+                       return true;
+               }else{
+                       return false;
+               }
+       }
+
+}
index 7560c60..fbd32a4 100644 (file)
-package chemicraft.util;\r
-\r
-import net.minecraft.block.Block;\r
-import net.minecraft.item.Item;\r
-import net.minecraft.item.ItemStack;\r
-import cpw.mods.fml.common.registry.LanguageRegistry;\r
-\r
-public class Auxiliary {\r
-\r
-       /**\r
-        * 補助クラス\r
-        * @author mozipi\r
-        *\r
-        */\r
-       public static class NameAuxiliary {\r
-\r
-               /**\r
-                * 名前を設定します\r
-                * @param object\r
-                * @param Name\r
-                */\r
-               public void addName(Object object,Object name){\r
-                       LanguageRegistry.addName(object, (String) name);\r
-               }\r
-\r
-\r
-\r
-               /**\r
-                * 名前を設定します(ItemStack版)\r
-                * @param object\r
-                * @param name\r
-                * @param meta\r
-                */\r
-               public void addName(ItemStack itemstack,Object name){\r
-                       LanguageRegistry.addName(itemstack, (String) name);\r
-               }\r
-\r
-\r
-\r
-               /**\r
-                * 指定言語にそって名前を追加します\r
-                * @param object\r
-                * @param lang\r
-                * @param name\r
-                */\r
-               public void addName(Object object,String lang,Object name){\r
-                       LanguageRegistry.instance().addNameForObject(object, lang, (String) name);\r
-               }\r
-\r
-\r
-\r
-               /**\r
-                * 指定言語にそって名前を追加します(ItemStack版)\r
-                * @param object\r
-                * @param lang\r
-                * @param name\r
-                */\r
-               public void addName(ItemStack object,String lang,Object name){\r
-                       LanguageRegistry.instance().addNameForObject(object, lang, (String) name);\r
-               }\r
-\r
-\r
-\r
-               /**\r
-                * メタデータごとに名前を追加します(Block版)\r
-                * @param object\r
-                * @param name\r
-                */\r
-               public void addName(Block object,Object[] name){\r
-                       for(int i=0;i<name.length;i++){\r
-                               LanguageRegistry.addName(new ItemStack(object,0,i), (String) name[i]);\r
-                       }\r
-               }\r
-\r
-\r
-\r
-               /**\r
-                * メタデータごとに名前を追加します(Item版)\r
-                * @param object\r
-                * @param name\r
-                */\r
-               public void addName(Item object,Object[] name){\r
-                       for(int i=0;i<name.length;i++){\r
-                               LanguageRegistry.addName(new ItemStack(object,0,i), (String) name[i]);\r
-                       }\r
-               }\r
-\r
-\r
-\r
-               /**\r
-                * 指定された言語にそってメタデータごとに名前を設定します(Block版)\r
-                * @param object\r
-                * @param name\r
-                */\r
-               public void addName(Block object,String lang,Object[] name){\r
-                       for(int i=0;i<name.length;i++){\r
-                               LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, (String) name[i]);\r
-                       }\r
-               }\r
-\r
-\r
-\r
-               /**\r
-                * 指定された言語にそってメタデータごとに名前を設定します(Item版)\r
-                * @param object\r
-                * @param name\r
-                */\r
-               public void addName(Item object,String lang, Object[] name){\r
-                       for(int i=0;i<name.length;i++){\r
-                               LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, (String) name[i]);\r
-                       }\r
-               }\r
-\r
-               /**\r
-                * 指定された言語にそってメタデータごとに名前を設定します(Block版)\r
-                * また、配列の前に任意の文字列を追加できます。\r
-                * @param object\r
-                * @param name\r
-                */\r
-               public void addName(Block object,String lang, String string, Object[] name){\r
-                       for(int i=0;i<name.length;i++){\r
-                               LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, string + (String) name[i]);\r
-                       }\r
-               }\r
-\r
-\r
-\r
-               /**\r
-                * 指定された言語にそってメタデータごとに名前を設定します(Item版)\r
-                * また、配列の前に任意の文字列を追加できます。\r
-                * @param object\r
-                * @param name\r
-                */\r
-               public void addName(Item object,String lang, String string, Object[] name){\r
-                       for(int i=0;i<name.length;i++){\r
-                               LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, string + (String) name[i]);\r
-                       }\r
-               }\r
-\r
-               /**\r
-                * 指定された言語にそってメタデータごとに名前を設定します(Block版)\r
-                * また、配列の後ろに任意の文字列を追加できます。\r
-                * @param object\r
-                * @param name\r
-                */\r
-               public void addName(Block object,String lang, Object[] name, String string){\r
-                       for(int i=0;i<name.length;i++){\r
-                               LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, (String) name[i] + string);\r
-                       }\r
-               }\r
-\r
-\r
-\r
-               /**\r
-                * 指定された言語にそってメタデータごとに名前を設定します(Item版)\r
-                * また、配列の後ろに任意の文字列を追加できます。\r
-                * @param object\r
-                * @param name\r
-                */\r
-               public void addName(Item object,String lang, Object[] name, String string){\r
-                       for(int i=0;i<name.length;i++){\r
-                               LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, (String) name[i] + string);\r
-                       }\r
-               }\r
-\r
-       }\r
-\r
-       public static class ArrayAuxiliary{\r
-\r
-               public ItemStack[] deleteNull(ItemStack[] array){\r
-                       int count = 0;\r
-                       ItemStack[] arrayCopy;\r
-                       for(int i = 0;i < array.length;i++){\r
-                               if(array[array.length - 1 - i] == null){\r
-                                       count++;\r
-                               }else{\r
-                                       break;\r
-                               }\r
-                       }\r
-                       arrayCopy = new ItemStack[array.length - count];\r
-                       for(int i = 0;i < arrayCopy.length;i++){\r
-                               arrayCopy[i] = array[i];\r
-                       }\r
-                       array = arrayCopy.clone();\r
-                       return array;\r
-               }\r
-\r
-       }\r
-\r
-}\r
+package chemicraft.util;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+
+public class Auxiliary {
+
+       /**
+        * 補助クラス
+        * @author mozipi
+        *
+        */
+       public static class NameAuxiliary {
+
+               /**
+                * 名前を設定します
+                * @param object
+                * @param Name
+                */
+               public void addName(Object object,Object name){
+                       LanguageRegistry.addName(object, (String) name);
+               }
+
+
+
+               /**
+                * 名前を設定します(ItemStack版)
+                * @param object
+                * @param name
+                * @param meta
+                */
+               public void addName(ItemStack itemstack,Object name){
+                       LanguageRegistry.addName(itemstack, (String) name);
+               }
+
+
+
+               /**
+                * 指定言語にそって名前を追加します
+                * @param object
+                * @param lang
+                * @param name
+                */
+               public void addName(Object object,String lang,Object name){
+                       LanguageRegistry.instance().addNameForObject(object, lang, (String) name);
+               }
+
+
+
+               /**
+                * 指定言語にそって名前を追加します(ItemStack版)
+                * @param object
+                * @param lang
+                * @param name
+                */
+               public void addName(ItemStack object,String lang,Object name){
+                       LanguageRegistry.instance().addNameForObject(object, lang, (String) name);
+               }
+
+
+
+               /**
+                * メタデータごとに名前を追加します(Block版)
+                * @param object
+                * @param name
+                */
+               public void addName(Block object,Object[] name){
+                       for(int i=0;i<name.length;i++){
+                               LanguageRegistry.addName(new ItemStack(object,0,i), (String) name[i]);
+                       }
+               }
+
+
+
+               /**
+                * メタデータごとに名前を追加します(Item版)
+                * @param object
+                * @param name
+                */
+               public void addName(Item object,Object[] name){
+                       for(int i=0;i<name.length;i++){
+                               LanguageRegistry.addName(new ItemStack(object,0,i), (String) name[i]);
+                       }
+               }
+
+
+
+               /**
+                * 指定された言語にそってメタデータごとに名前を設定します(Block版)
+                * @param object
+                * @param name
+                */
+               public void addName(Block object,String lang,Object[] name){
+                       for(int i=0;i<name.length;i++){
+                               LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, (String) name[i]);
+                       }
+               }
+
+
+
+               /**
+                * 指定された言語にそってメタデータごとに名前を設定します(Item版)
+                * @param object
+                * @param name
+                */
+               public void addName(Item object,String lang, Object[] name){
+                       for(int i=0;i<name.length;i++){
+                               LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, (String) name[i]);
+                       }
+               }
+
+               /**
+                * 指定された言語にそってメタデータごとに名前を設定します(Block版)
+                * また、配列の前に任意の文字列を追加できます。
+                * @param object
+                * @param name
+                */
+               public void addName(Block object,String lang, String string, Object[] name){
+                       for(int i=0;i<name.length;i++){
+                               LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, string + (String) name[i]);
+                       }
+               }
+
+
+
+               /**
+                * 指定された言語にそってメタデータごとに名前を設定します(Item版)
+                * また、配列の前に任意の文字列を追加できます。
+                * @param object
+                * @param name
+                */
+               public void addName(Item object,String lang, String string, Object[] name){
+                       for(int i=0;i<name.length;i++){
+                               LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, string + (String) name[i]);
+                       }
+               }
+
+               /**
+                * 指定された言語にそってメタデータごとに名前を設定します(Block版)
+                * また、配列の後ろに任意の文字列を追加できます。
+                * @param object
+                * @param name
+                */
+               public void addName(Block object,String lang, Object[] name, String string){
+                       for(int i=0;i<name.length;i++){
+                               LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, (String) name[i] + string);
+                       }
+               }
+
+
+
+               /**
+                * 指定された言語にそってメタデータごとに名前を設定します(Item版)
+                * また、配列の後ろに任意の文字列を追加できます。
+                * @param object
+                * @param name
+                */
+               public void addName(Item object,String lang, Object[] name, String string){
+                       for(int i=0;i<name.length;i++){
+                               LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, (String) name[i] + string);
+                       }
+               }
+
+       }
+
+       public static class ArrayAuxiliary{
+
+               public ItemStack[] deleteNull(ItemStack[] array){
+                       int count = 0;
+                       ItemStack[] arrayCopy;
+                       for(int i = 0;i < array.length;i++){
+                               if(array[array.length - 1 - i] == null){
+                                       count++;
+                               }else{
+                                       break;
+                               }
+                       }
+                       arrayCopy = new ItemStack[array.length - count];
+                       for(int i = 0;i < arrayCopy.length;i++){
+                               arrayCopy[i] = array[i];
+                       }
+                       array = arrayCopy.clone();
+                       return array;
+               }
+
+       }
+
+}
index 9e2ac27..745bc2c 100644 (file)
@@ -1,53 +1,53 @@
-package chemicraft.util;\r
-\r
-import net.minecraft.entity.Entity;\r
-import net.minecraft.entity.player.EntityPlayer;\r
-import net.minecraft.item.ItemStack;\r
-import net.minecraft.world.World;\r
-\r
-public interface ICompoundHandler {\r
-\r
-       /**\r
-        * 右クリック時のHandler\r
-        * @param par1ItemStack\r
-        * @param par2World\r
-        * @param par3EntityPlayer\r
-        * @return\r
-        */\r
-       public ItemStack onItemRightClickHandler(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer);\r
-\r
-\r
-       /**\r
-        * Itemを使用したときのHandler\r
-        * @param par1ItemStack\r
-        * @param par2EntityPlayer\r
-        * @param par3World\r
-        * @param par4\r
-        * @param par5\r
-        * @param par6\r
-        * @param par7\r
-        * @param par8\r
-        * @param par9\r
-        * @param par10\r
-        * @return\r
-        */\r
-       public boolean onItemUseHandler(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10);\r
-\r
-\r
-       /**\r
-        * 毎Tick呼ばれるHandler\r
-        * @param par1ItemStack\r
-        * @param par2World\r
-        * @param par3Entity\r
-        * @param par4\r
-        * @param par5\r
-        */\r
-       public void onUpdateHandler(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5);\r
-\r
-       /**\r
-        * iconIndexの指定\r
-        * @return iconIndex\r
-        */\r
-       public int getIconIndexHandler();\r
-\r
-}\r
+package chemicraft.util;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public interface ICompoundHandler {
+
+       /**
+        * 右クリック時のHandler
+        * @param par1ItemStack
+        * @param par2World
+        * @param par3EntityPlayer
+        * @return
+        */
+       public ItemStack onItemRightClickHandler(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer);
+
+
+       /**
+        * Itemを使用したときのHandler
+        * @param par1ItemStack
+        * @param par2EntityPlayer
+        * @param par3World
+        * @param par4
+        * @param par5
+        * @param par6
+        * @param par7
+        * @param par8
+        * @param par9
+        * @param par10
+        * @return
+        */
+       public boolean onItemUseHandler(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10);
+
+
+       /**
+        * 毎Tick呼ばれるHandler
+        * @param par1ItemStack
+        * @param par2World
+        * @param par3Entity
+        * @param par4
+        * @param par5
+        */
+       public void onUpdateHandler(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5);
+
+       /**
+        * iconIndexの指定
+        * @return iconIndex
+        */
+       public int getIconIndexHandler();
+
+}
diff --git a/src/chemicraft/ChemiCraft.java b/src/chemicraft/ChemiCraft.java
deleted file mode 100644 (file)
index 1766554..0000000
+++ /dev/null
@@ -1,712 +0,0 @@
-<<<<<<< HEAD:common/chemicraft/ChemiCraft.java
-package chemicraft;\r
-\r
-import net.minecraft.block.Block;\r
-import net.minecraft.block.material.Material;\r
-import net.minecraft.creativetab.CreativeTabs;\r
-import net.minecraft.item.Item;\r
-import net.minecraft.item.ItemStack;\r
-import net.minecraftforge.common.BiomeManager;\r
-import net.minecraftforge.common.Configuration;\r
-import net.minecraftforge.common.DimensionManager;\r
-import net.minecraftforge.common.Property;\r
-import chemicraft.block.BlockChemicalCombinationTable;\r
-import chemicraft.block.BlockChemicalCraftingTable;\r
-import chemicraft.block.BlockPyrolysisTable;\r
-import chemicraft.block.BlockToolAndWeaponCraftingTable;\r
-import chemicraft.compounds.CompoundWater;\r
-import chemicraft.debug.CommandDeleteItem;\r
-import chemicraft.debug.CommandGenDebugRoom;\r
-import chemicraft.debug.CommandSetTile;\r
-import chemicraft.item.ItemAtoms;\r
-import chemicraft.item.ItemAtomsGrenade;\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.TileEntityPyrolysisTable;\r
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;\r
-import chemicraft.util.Auxiliary;\r
-import chemicraft.util.Auxiliary.ArrayAuxiliary;\r
-import chemicraft.util.Auxiliary.NameAuxiliary;\r
-import chemicraft.util.CreativeTabAtoms;\r
-import chemicraft.util.NBTRecipeGrenade;\r
-import chemicraft.util.WorldProviderChemical;\r
-import cpw.mods.fml.common.Mod;\r
-import cpw.mods.fml.common.SidedProxy;\r
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;\r
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;\r
-import cpw.mods.fml.common.event.FMLServerStartingEvent;\r
-import cpw.mods.fml.common.network.NetworkMod;\r
-import cpw.mods.fml.common.network.NetworkRegistry;\r
-import cpw.mods.fml.common.registry.GameRegistry;\r
-\r
-/**\r
- * ChemiCraft本体\r
- * @author P.C.C.\r
- *\r
- */\r
-@Mod(modid = "chemiCraft", name = "ChemiCraft", version = "beta")\r
-@NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.4.6", channels = "chemicraft", packetHandler = PacketHandler.class)\r
-public class ChemiCraft {\r
-\r
-       public static final String[] ATOMSNAME = {\r
-               "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon",\r
-               "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium",\r
-               "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttorium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium",\r
-               "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium",\r
-               "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum",\r
-               "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium",\r
-               "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium",\r
-               "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Ununtrium", "Ununquadium", "Ununpentium", "Ununhexium", "Ununseptium", "Ununoctium" };\r
-\r
-       public static final String[] ATOMSNAMEJP = {\r
-               "水素", "ヘリウム", "リチウム", "ベリウム", "ホウ素", "炭素", "窒素", "酸素", "フッ素", "ネオン", "ナトリウム", "マグネシウム", "アルミニウム", "ケイ素", "リン", "硫黄", "塩素", "アルゴン", "カリウム", "カルシウム", "スカンジウム",\r
-               "チタン", "バナジウム", "クロム", "マンガン", "鉄", "コバルト", "ニッケル", "銅", "亜鉛", "ガリウム", "ゲルマニウム", "ヒ素", "セレン", "臭素", "クリプトン", "ルビジウム", "ストロンチウム", "イットリウム", "ジルコニウム", "ニオブ", "モリブデン", "テクネチウム", "ルテニウム",\r
-               "ロジウム", "パラジウム", "銀", "カドミウム", "インジウム", "スズ", "アンチモン", "テルル", "ヨウ素", "キセノン", "セシウム", "バリウム", "ランタン", "セリウム", "プラセオジム", "ネオジム", "プロメチウム", "サマリウム", "ユウロビウム", "ガドリニウム", "テルビウム", "ジスプロニウム",\r
-               "ホルミウム", "エルビウム", "ツリウム", "イッテルビウム", "ルテチウム", "ハフニウム", "タンタル", "タングステン", "レニウム", "オスミウム", "イリジウム", "白金", "金", "水銀", "タリウム", "鉛", "ビスマス", "ポロニウム", "アスタチン", "ラドン", "フランシウム", "ラジウム",\r
-               "アクチニウム", "トリウム", "プロトアクチウム", "ウラン", "ネプツニウム", "プルトニウム", "アメリシウム", "キュリウム", "バークリウム", "カルホルニウム", "アインスタイニウム", "フェルミウム", "メンデレビウム", "ノーベリウム", "ローレンシウム", "ラサホージウム", "ドブニウム", "シーボーギウム",\r
-               "ボーリウム", "ハッシウム", "マイトネリウム", "ダームスタチウム", "レントゲニウム", "コペルニシウム", "ウンウントリウム", "ウンウンクアジウム", "ウンウンペンチウム", "ウンウンヘキシウム", "ウンウンセプチウム", "ウンウンオクチウム" };\r
-\r
-       /**\r
-        * このmodのインスタンス\r
-        */\r
-       @Mod.Instance("chemiCraft")\r
-       public static ChemiCraft instance;\r
-\r
-       /**\r
-        * ChemiCraftのProxy.\r
-        */\r
-       @SidedProxy(clientSide = "chemicraft.client.ClientProxy", serverSide = "chemicraft.system.CommonProxy")\r
-       public static CommonProxy proxy;\r
-\r
-       /**\r
-        * ChemiCraftのCreativeTab.\r
-        */\r
-       public static final CreativeTabs creativeTab = new CreativeTabAtoms("ChemiCraft");\r
-\r
-       /**\r
-        * ItemID.\r
-        */\r
-       public int atomsID;\r
-       public int compoundsID;\r
-       public int gasCollectingBottleID;\r
-       public int atomGrenadeID;\r
-\r
-       /**\r
-        * BlockID.\r
-        */\r
-       public int pyrolysisTableID;\r
-       public int chemicalConbinationTableID;\r
-       public int toolAndWeaponCraftingTableID;\r
-       public int chemicalCraftingTableID;\r
-\r
-       /**\r
-        * GUIID.\r
-        */\r
-       public int guiPyrolysisTableID;\r
-       public int guiChemicalCombinationTableID;\r
-       public int guiToolAndWeaponCraftingTableID;\r
-       public int guiChemicalCraftingTableID;\r
-\r
-       /**\r
-        * Block型変数.\r
-        */\r
-       public Block blockPyrolysisTable;\r
-       public Block blockChemicalCombinationTable;\r
-       public Block blockToolAndWeaponCraftingTable;\r
-       public Block blockChemicalCraftingTable;\r
-\r
-       /**\r
-        * Item型変数.\r
-        */\r
-       public Item itemAtoms;\r
-       public Item itemCompounds;\r
-       public Item itemGasCollectingBottle;\r
-       public Item itemAtomGrenade;\r
-\r
-       /**\r
-        * このmodで使用するTextureのパス.\r
-        */\r
-       public String itemAtomsTexture = "/chemicraft/items/Atoms.png";\r
-       public String itemCompoundsTexture = "/chemicraft/items/Compounds.png";\r
-       public String itemTexture = "/chemicraft/items/items.png";\r
-       public String blockChemicalCraftingTableTexture = "/chemicraft/blocks/cctable.png";\r
-       public String guiPyrolysisTexture = "/chemicraft/guis/Pyrolysis.png";\r
-       public String guiChemicalCombinationTexture = "/chemicraft/guis/ChemicalCombination.png";\r
-       public String guiToolAndWeaponCraftingTexture = "/chemicraft/guis/ToolAndWeaponCrafting.png";\r
-       public String guiChemicalCraftingTexture = "/chemicraft/guis/MaterialCrafting.png";\r
-\r
-       /**\r
-        * このmodに必要な補助クラスのインスタンス.\r
-        */\r
-       public Auxiliary auxiliary = new Auxiliary();\r
-       public NameAuxiliary nameAuxiliary = new NameAuxiliary();\r
-       public ArrayAuxiliary arrayAuxiliary = new ArrayAuxiliary();\r
-\r
-       private ChemiCraftAPI api = ChemiCraftAPI.getInstance();\r
-       private ChemiCraftData chemicalData = new ChemiCraftData();\r
-\r
-       @Mod.PreInit\r
-       public void chemiPreLoadMethod(final FMLPreInitializationEvent event) {\r
-               Configuration cfg = new Configuration(event.getSuggestedConfigurationFile());\r
-               cfg.load();\r
-\r
-               Property pyrolysisTableIDProp = cfg.getBlock("PyrolysisTable", 2400);\r
-               Property chemicalCombinationTableIDProp = cfg.getBlock("ChemicalCombinationID", 2401);\r
-               Property toolAndWeaponCraftingTableIDProp = cfg.getBlock("ToolAndWeaponCraftingTableID", 2402);\r
-               Property chemicalCraftingTableIDProp = cfg.getBlock("ChemicalCraftingTableID", 2403);\r
-\r
-               Property atomsIDProp = cfg.getItem("AtomsID", 25000);\r
-               Property compoundsIDProp = cfg.getItem("CompoundsID", 25001);\r
-               Property gasCollectingBottleIDProp = cfg.getItem("gasCollectingBottleID", 25002);\r
-               Property atomGrenadeIDProp = cfg.getItem("AtomGrenadeID", 25003);\r
-\r
-               Property guiPyrolysisTableIDProp = cfg.get("GUI", "GUIPyrolysisID", 1000);\r
-               Property guiChemicalCombinationTableIDProp = cfg.get("GUI", "GUIChemicalCombinationTableID", 1001);\r
-               Property guiToolAndWeaponCraftingTableIDProp = cfg.get("GUI", "GUIToolAndWeaponCraftingTableID", 1002);\r
-               Property guiChemicalCraftingTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 1003);\r
-\r
-\r
-               this.pyrolysisTableID = pyrolysisTableIDProp.getInt();\r
-               this.chemicalConbinationTableID = chemicalCombinationTableIDProp.getInt();\r
-               this.toolAndWeaponCraftingTableID = toolAndWeaponCraftingTableIDProp.getInt();\r
-               this.chemicalCraftingTableID = chemicalCraftingTableIDProp.getInt();\r
-               this.atomsID = atomsIDProp.getInt();\r
-               this.compoundsID = compoundsIDProp.getInt();\r
-               this.gasCollectingBottleID = gasCollectingBottleIDProp.getInt();\r
-               this.atomGrenadeID = atomGrenadeIDProp.getInt();\r
-               this.guiPyrolysisTableID = guiPyrolysisTableIDProp.getInt();\r
-               this.guiChemicalCombinationTableID = guiChemicalCombinationTableIDProp.getInt();\r
-               this.guiToolAndWeaponCraftingTableID = guiToolAndWeaponCraftingTableIDProp.getInt();\r
-               this.guiChemicalCraftingTableID = guiChemicalCraftingTableIDProp.getInt();\r
-\r
-               cfg.save();\r
-       }\r
-\r
-       @Mod.ServerStarting\r
-       public void serverStarting(final FMLServerStartingEvent event) {\r
-               event.registerServerCommand(new CommandSetTile());\r
-               event.registerServerCommand(new CommandDeleteItem());\r
-               event.registerServerCommand(new CommandGenDebugRoom());\r
-       }\r
-\r
-       @Mod.PostInit\r
-       public void chemiPostLoadMethod(final FMLPostInitializationEvent event) {\r
-               this.settingProcessing(event);\r
-               this.apiProcessing(event);\r
-               this.debug(event);\r
-       }\r
-\r
-       private void settingProcessing(final FMLPostInitializationEvent event) {\r
-\r
-               // Blockを追加します\r
-               this.blockPyrolysisTable = new BlockPyrolysisTable(this.pyrolysisTableID, 0, Material.ground).\r
-                               setHardness(2.0F).\r
-                               setResistance(0.0F).\r
-                               setStepSound(Block.soundStoneFootstep).\r
-                               setBlockName("PyrolysisTable");\r
-               this.blockChemicalCombinationTable = new BlockChemicalCombinationTable(this.chemicalConbinationTableID, 0, Material.ground).\r
-                               setHardness(2.0F).\r
-                               setResistance(0.0F).\r
-                               setStepSound(Block.soundStoneFootstep).\r
-                               setBlockName("ChemicalCombinationTable");\r
-               this.blockToolAndWeaponCraftingTable = new BlockToolAndWeaponCraftingTable(this.toolAndWeaponCraftingTableID, 0, Material.ground).\r
-                               setHardness(2.0F).\r
-                               setResistance(0.0F).\r
-                               setStepSound(Block.soundStoneFootstep).\r
-                               setBlockName("ToolAndWeaponCraftingTable");\r
-               this.blockChemicalCraftingTable = new BlockChemicalCraftingTable(chemicalCraftingTableID, 0, Material.ground).\r
-                               setHardness(2.0F).\r
-                               setResistance(0.0F).\r
-                               setStepSound(Block.soundStoneFootstep).\r
-                               setBlockName("ChemicalCraftingTable");\r
-\r
-               // Itemを追加します\r
-               this.itemAtoms = new ItemAtoms(this.atomsID).setItemName("atoms");\r
-               this.itemCompounds = new ItemCompounds(this.compoundsID).setItemName("compounds");\r
-               this.itemGasCollectingBottle = new ItemGasCollectingBottle(this.gasCollectingBottleID).setItemName("gasCollectingBottle").setIconIndex(0);\r
-               this.itemAtomGrenade = new ItemAtomsGrenade(this.atomGrenadeID).setItemName("grenade").setIconIndex(1);\r
-\r
-               // BlockをMinecraftに登録します\r
-               GameRegistry.registerBlock(this.blockPyrolysisTable, "BlockPyrolysisTable");\r
-               GameRegistry.registerBlock(this.blockChemicalCombinationTable, "BlockChemicalCombinationTable");\r
-               GameRegistry.registerBlock(this.blockToolAndWeaponCraftingTable, "BlockToolAndWeaponCraftingTable");\r
-               GameRegistry.registerBlock(this.blockChemicalCraftingTable, "BlockMaterialCraftingTable");\r
-\r
-               // Blockの名前を設定します\r
-               this.nameAuxiliary.addName(this.blockPyrolysisTable, "PyrolysisTable");\r
-               this.nameAuxiliary.addName(this.blockPyrolysisTable, "ja_JP", "熱分解台");\r
-               this.nameAuxiliary.addName(this.blockChemicalCombinationTable, "ChemicalCombinationTable");\r
-               this.nameAuxiliary.addName(this.blockChemicalCombinationTable, "ja_JP", "化合台");\r
-               this.nameAuxiliary.addName(blockToolAndWeaponCraftingTable, "ToolAndWeaponCraftingTable");\r
-               this.nameAuxiliary.addName(blockToolAndWeaponCraftingTable, "ja_JP", "ツール&武器製作台");\r
-               this.nameAuxiliary.addName(blockChemicalCraftingTable, "ChemicalCraftingTable");\r
-               this.nameAuxiliary.addName(blockChemicalCraftingTable, "ja_JP", "素材製作台");\r
-\r
-               // Itemの名前を設定します\r
-               this.nameAuxiliary.addName(this.itemAtoms, ATOMSNAME);\r
-               this.nameAuxiliary.addName(this.itemAtoms, "ja_JP", ATOMSNAMEJP);\r
-               this.nameAuxiliary.addName(this.itemGasCollectingBottle, "GasCollectingBottle");\r
-               this.nameAuxiliary.addName(this.itemGasCollectingBottle, "ja_JP", "集気瓶");\r
-               this.nameAuxiliary.addName(this.itemAtomGrenade, "AtomGrenade");\r
-               this.nameAuxiliary.addName(this.itemAtomGrenade, "元素手榴弾");\r
-\r
-               // TileEntityを追加します\r
-               GameRegistry.registerTileEntity(TileEntityPyrolysisTable.class, "TileEntityPyrolysisTable");\r
-               GameRegistry.registerTileEntity(TileEntityChemicalCombinationTable.class, "TileEntityChemicalCombinationTable");\r
-               GameRegistry.registerTileEntity(TileEntityToolAndWeaponCraftingTable.class, "TileEntityToolAndWeaponCraftingTable");\r
-               GameRegistry.registerTileEntity(TileEntityChemicalCraftingTable.class, "TileEntityChemicalCraftingTable");\r
-\r
-               // GUIを追加します\r
-               NetworkRegistry.instance().registerGuiHandler(instance, proxy);\r
-\r
-               // 描画関係の読み込み\r
-               proxy.registerRenderInformation();\r
-\r
-               //化学作業台類のレシピを追加します\r
-               GameRegistry.addRecipe(new ItemStack(this.blockPyrolysisTable),\r
-                               new Object[]{\r
-                       "XYX", "ZAZ", "ZZZ",\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.bucketLava),\r
-               });\r
-               GameRegistry.addRecipe(new ItemStack(this.blockChemicalCombinationTable),\r
-                               new Object[]{\r
-                       "XYX", "ZAZ", "ZZZ",\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
-                       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
-                       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
-               api.addLangCompound("ja_JP", "CarbonMonoxide", "一酸化炭素");\r
-               api.addLangCompound("ja_JP", "CarbonDioxide", "二酸化炭素");\r
-               api.addLangCompound("ja_JP", "Water", "水");\r
-               api.addCompound("Test");\r
-
-\r
-               //化合物のHandlerを設定します\r
-               api.settingCompoundHandler("Water", new CompoundWater());\r
-\r
-               //化合物のレシピを追加します\r
-               api.addChemicalCombinationRecipe(new String[]{"H", "O"}, new Integer[]{2, 1}, new ItemStack(this.itemCompounds, 1, api.getCompound("Water")));\r
-\r
-               //手榴弾の追加\r
-               api.addMaterialRecipe(\r
-                               new ItemStack[]{\r
-                                               null,\r
-                                               new ItemStack(Block.stone),\r
-                                               null,\r
-                                               new ItemStack(Block.stone),\r
-                                               new ItemStack(Item.gunpowder),\r
-                                               new ItemStack(Block.stone),\r
-                                               null,\r
-                                               new ItemStack(Block.stone),\r
-                                               null\r
-                               },\r
-                               new ItemStack(this.itemAtomGrenade, 16, 0),\r
-                               new NBTRecipeGrenade()\r
-                               );\r
-               //Tickingの追加\r
-               this.proxy.registerTickHandler();\r
-       }\r
-\r
-       private void apiProcessing(final FMLPostInitializationEvent event) {\r
-               // API用の処理\r
-               this.nameAuxiliary.addName(itemCompounds, api.getInstance().getCompoundsName().toArray());\r
-               for (int i = 0; i < api.getCompoundsLang().size(); i++) {\r
-                       this.nameAuxiliary.addName(itemCompounds, api.getCompoundsLang().get(i), api.getInstance().getCompoundsLangName().toArray());\r
-               }\r
-       }\r
-\r
-       private void debug(final FMLPostInitializationEvent event) {\r
-       }\r
-\r
-}\r
-=======
-package chemicraft;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.Configuration;
-import net.minecraftforge.common.Property;
-import chemicraft.block.BlockChemicalCombinationTable;
-import chemicraft.block.BlockChemicalCraftingTable;
-import chemicraft.block.BlockDecompositionTable;
-import chemicraft.block.BlockElectrolysisTable;
-import chemicraft.block.BlockToolAndWeaponCraftingTable;
-import chemicraft.compounds.CompoundWater;
-import chemicraft.debug.CommandDeleteItem;
-import chemicraft.debug.CommandGenDebugRoom;
-import chemicraft.debug.CommandSetTile;
-import chemicraft.item.ItemAtoms;
-import chemicraft.item.ItemAtomsGrenade;
-import chemicraft.item.ItemCompounds;
-import chemicraft.item.ItemGasCollectingBottle;
-import chemicraft.system.CommonProxy;
-import chemicraft.system.PacketHandler;
-import chemicraft.tileentity.TileEntityChemicalCombinationTable;
-import chemicraft.tileentity.TileEntityChemicalCraftingTable;
-import chemicraft.tileentity.TileEntityDecompositionTable;
-import chemicraft.tileentity.TileEntityElectrolysisTable;
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
-import chemicraft.util.Auxiliary;
-import chemicraft.util.Auxiliary.ArrayAuxiliary;
-import chemicraft.util.Auxiliary.NameAuxiliary;
-import chemicraft.util.CreativeTabAtoms;
-import chemicraft.util.NBTRecipeGrenade;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerStartingEvent;
-import cpw.mods.fml.common.network.NetworkMod;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.common.registry.GameRegistry;
-
-/**
- * ChemiCraft本体
- * @author P.C.C.
- *
- */
-@Mod(modid = "chemiCraft", name = "ChemiCraft", version = "beta")
-// ID,名前,バージョン
-@NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.4.6", channels = "chemicraft", packetHandler = PacketHandler.class)
-// クライアント、サーバー共に必要 1.3.2用
-public class ChemiCraft {
-
-       public static final String[] ATOMSNAME = {
-               "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon",
-               "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium",
-               "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttorium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium",
-               "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium",
-               "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum",
-               "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium",
-               "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium",
-               "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Ununtrium", "Ununquadium", "Ununpentium", "Ununhexium", "Ununseptium", "Ununoctium" };
-
-       public static final String[] ATOMSNAMEJP = {
-               "水素", "ヘリウム", "リチウム", "ベリウム", "ホウ素", "炭素", "窒素", "酸素", "フッ素", "ネオン", "ナトリウム", "マグネシウム", "アルミニウム", "ケイ素", "リン", "硫黄", "塩素", "アルゴン", "カリウム", "カルシウム", "スカンジウム",
-               "チタン", "バナジウム", "クロム", "マンガン", "鉄", "コバルト", "ニッケル", "銅", "亜鉛", "ガリウム", "ゲルマニウム", "ヒ素", "セレン", "臭素", "クリプトン", "ルビジウム", "ストロンチウム", "イットリウム", "ジルコニウム", "ニオブ", "モリブデン", "テクネチウム", "ルテニウム",
-               "ロジウム", "パラジウム", "銀", "カドミウム", "インジウム", "スズ", "アンチモン", "テルル", "ヨウ素", "キセノン", "セシウム", "バリウム", "ランタン", "セリウム", "プラセオジム", "ネオジム", "プロメチウム", "サマリウム", "ユウロビウム", "ガドリニウム", "テルビウム", "ジスプロニウム",
-               "ホルミウム", "エルビウム", "ツリウム", "イッテルビウム", "ルテチウム", "ハフニウム", "タンタル", "タングステン", "レニウム", "オスミウム", "イリジウム", "白金", "金", "水銀", "タリウム", "鉛", "ビスマス", "ポロニウム", "アスタチン", "ラドン", "フランシウム", "ラジウム",
-               "アクチニウム", "トリウム", "プロトアクチウム", "ウラン", "ネプツニウム", "プルトニウム", "アメリシウム", "キュリウム", "バークリウム", "カルホルニウム", "アインスタイニウム", "フェルミウム", "メンデレビウム", "ノーベリウム", "ローレンシウム", "ラサホージウム", "ドブニウム", "シーボーギウム",
-               "ボーリウム", "ハッシウム", "マイトネリウム", "ダームスタチウム", "レントゲニウム", "コペルニシウム", "ウンウントリウム", "ウンウンクアジウム", "ウンウンペンチウム", "ウンウンヘキシウム", "ウンウンセプチウム", "ウンウンオクチウム" };
-
-       /**
-        * このmodのインスタンス
-        */
-       @Mod.Instance("chemiCraft")
-       public static ChemiCraft instance;
-
-       /**
-        * ChemiCraftのProxy.
-        */
-       @SidedProxy(clientSide = "chemicraft.client.ClientProxy", serverSide = "chemicraft.system.CommonProxy")
-       public static CommonProxy proxy;
-
-       /**
-        * ChemiCraftのCreativeTab.
-        */
-       public static final CreativeTabs creativeTab = new CreativeTabAtoms("ChemiCraft");
-
-       /**
-        * ItemID.
-        */
-       public int atomsID;
-       public int compoundsID;
-       public int gasCollectingBottleID;
-       public int atomGrenadeID;
-
-       /**
-        * BlockID.
-        */
-       public int decompositionTableID;
-       public int chemicalConbinationTableID;
-       public int toolAndWeaponCraftingTableID;
-       public int chemicalCraftingTableID;
-       public int electrolysisTableID;
-
-       /**
-        * GUIID.
-        */
-       public int guiDecompositionTableID;
-       public int guiChemicalCombinationTableID;
-       public int guiToolAndWeaponCraftingTableID;
-       public int guiChemicalCraftingTableID;
-       public int guiElectrolysisTableID;
-
-       /**
-        * Block型変数.
-        */
-       public Block blockDecompositionTable;
-       public Block blockChemicalCombinationTable;
-       public Block blockToolAndWeaponCraftingTable;
-       public Block blockChemicalCraftingTable;
-       public Block blockElectrolysisTable;
-
-       /**
-        * Item型変数.
-        */
-       public Item itemAtoms;
-       public Item itemCompounds;
-       public Item itemGasCollectingBottle;
-       public Item itemAtomGrenade;
-
-       /**
-        * このmodで使用するTextureのパス.
-        */
-       public String itemAtomsTexture = "/chemicraft/items/Atoms.png";
-       public String itemCompoundsTexture = "/chemicraft/items/Compounds.png";
-       public String itemTexture = "/chemicraft/items/items.png";
-       public String blockChemicalCraftingTableTexture = "/chemicraft/blocks/CCTable.png";
-       public String guiDecompositionTexture = "/chemicraft/guis/Decomposition.png";
-       public String guiChemicalCombinationTexture = "/chemicraft/guis/ChemicalCombination.png";
-       public String guiToolAndWeaponCraftingTexture = "/chemicraft/guis/ToolAndWeaponCrafting.png";
-       public String guiChemicalCraftingTexture = "/chemicraft/guis/MaterialCrafting.png";
-       public String guiElectrolysisTableTexture = "/chemicraft/guis/ElectrolysisTable.png";
-
-       /**
-        * このmodに必要な補助クラスのインスタンス.
-        */
-       public Auxiliary auxiliary = new Auxiliary();
-       public NameAuxiliary nameAuxiliary = new NameAuxiliary();
-       public ArrayAuxiliary arrayAuxiliary = new ArrayAuxiliary();
-
-       private ChemiCraftAPI api = ChemiCraftAPI.getInstance();
-       private ChemiCraftData chemicalData = new ChemiCraftData();
-
-       @Mod.PreInit
-       public void chemiPreLoadMethod(final FMLPreInitializationEvent event) {
-               Configuration cfg = new Configuration(event.getSuggestedConfigurationFile());
-               cfg.load();
-
-               Property decompositionTableIDProp = cfg.getBlock("DecompositionTable", 2400);
-               Property chemicalCombinationTableIDProp = cfg.getBlock("ChemicalCombinationID", 2401);
-               Property toolAndWeaponCraftingTableIDProp = cfg.getBlock("ToolAndWeaponCraftingTableID", 2402);
-               Property chemicalCraftingTableIDProp = cfg.getBlock("ChemicalCraftingTableID", 2403);
-               Property electrolysisTableIDProp = cfg.getBlock("ElectrolysisTableID", 2404);
-
-               Property atomsIDProp = cfg.getItem("AtomsID", 25000);
-               Property compoundsIDProp = cfg.getItem("CompoundsID", 25001);
-               Property gasCollectingBottleIDProp = cfg.getItem("gasCollectingBottleID", 25002);
-               Property atomGrenadeIDProp = cfg.getItem("AtomGrenadeID", 25003);
-
-               Property guiDecompositionTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 1000);
-               Property guiChemicalCombinationTableIDProp = cfg.get("GUI", "GUIChemicalCombinationTableID", 1001);
-               Property guiToolAndWeaponCraftingTableIDProp = cfg.get("GUI", "GUIToolAndWeaponCraftingTableID", 1002);
-               Property guiChemicalCraftingTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 1003);
-               Property guiElectrolysisTableIDProp = cfg.get("GUI", "GUIElectrolysisTableID", 1004);
-
-
-               this.decompositionTableID = decompositionTableIDProp.getInt();
-               this.chemicalConbinationTableID = chemicalCombinationTableIDProp.getInt();
-               this.toolAndWeaponCraftingTableID = toolAndWeaponCraftingTableIDProp.getInt();
-               this.chemicalCraftingTableID = chemicalCraftingTableIDProp.getInt();
-               this.electrolysisTableID = electrolysisTableIDProp.getInt();
-               this.atomsID = atomsIDProp.getInt();
-               this.compoundsID = compoundsIDProp.getInt();
-               this.gasCollectingBottleID = gasCollectingBottleIDProp.getInt();
-               this.atomGrenadeID = atomGrenadeIDProp.getInt();
-               this.guiDecompositionTableID = guiDecompositionTableIDProp.getInt();
-               this.guiChemicalCombinationTableID = guiChemicalCombinationTableIDProp.getInt();
-               this.guiToolAndWeaponCraftingTableID = guiToolAndWeaponCraftingTableIDProp.getInt();
-               this.guiChemicalCraftingTableID = guiChemicalCraftingTableIDProp.getInt();
-               this.guiElectrolysisTableID = guiElectrolysisTableIDProp.getInt();
-
-               cfg.save();
-       }
-
-       @Mod.ServerStarting
-       public void serverStarting(final FMLServerStartingEvent event) {
-               event.registerServerCommand(new CommandSetTile());
-               event.registerServerCommand(new CommandDeleteItem());
-               event.registerServerCommand(new CommandGenDebugRoom());
-       }
-
-       @Mod.PostInit
-       public void chemiPostLoadMethod(final FMLPostInitializationEvent event) {
-               this.settingProcessing(event);
-               this.apiProcessing(event);
-               this.debug(event);
-       }
-
-       private void settingProcessing(final FMLPostInitializationEvent event) {
-
-               // Blockを追加します
-               this.blockDecompositionTable = new BlockDecompositionTable(this.decompositionTableID, 0, Material.ground).
-                               setHardness(2.0F).
-                               setResistance(0.0F).
-                               setStepSound(Block.soundStoneFootstep).
-                               setBlockName("DecompositionTable");
-               this.blockChemicalCombinationTable = new BlockChemicalCombinationTable(this.chemicalConbinationTableID, 0, Material.ground).
-                               setHardness(2.0F).
-                               setResistance(0.0F).
-                               setStepSound(Block.soundStoneFootstep).
-                               setBlockName("ChemicalCombinationTable");
-               this.blockToolAndWeaponCraftingTable = new BlockToolAndWeaponCraftingTable(this.toolAndWeaponCraftingTableID, 0, Material.ground).
-                               setHardness(2.0F).
-                               setResistance(0.0F).
-                               setStepSound(Block.soundStoneFootstep).
-                               setBlockName("ToolAndWeaponCraftingTable");
-               this.blockChemicalCraftingTable = new BlockChemicalCraftingTable(chemicalCraftingTableID, 0, Material.ground).
-                               setHardness(2.0F).
-                               setResistance(0.0F).
-                               setStepSound(Block.soundStoneFootstep).
-                               setBlockName("ChemicalCraftingTable");
-               this.blockElectrolysisTable = new BlockElectrolysisTable(electrolysisTableID, 0, Material.ground).
-                               setHardness(2.0F).
-                               setResistance(0.0F).
-                               setStepSound(Block.soundStoneFootstep).
-                               setBlockName("ElectrolysisTable");
-
-               // Itemを追加します
-               this.itemAtoms = new ItemAtoms(this.atomsID).setItemName("atoms");
-               this.itemCompounds = new ItemCompounds(this.compoundsID).setItemName("compounds");
-               this.itemGasCollectingBottle = new ItemGasCollectingBottle(this.gasCollectingBottleID).setItemName("gasCollectingBottle").setIconIndex(0);
-               this.itemAtomGrenade = new ItemAtomsGrenade(this.atomGrenadeID).setItemName("grenade").setIconIndex(1);
-
-               // BlockをMinecraftに登録します
-               GameRegistry.registerBlock(this.blockDecompositionTable, "BlockDecompositionTable");
-               GameRegistry.registerBlock(this.blockChemicalCombinationTable, "BlockChemicalCombinationTable");
-               GameRegistry.registerBlock(this.blockToolAndWeaponCraftingTable, "BlockToolAndWeaponCraftingTable");
-               GameRegistry.registerBlock(this.blockChemicalCraftingTable, "BlockMaterialCraftingTable");
-               GameRegistry.registerBlock(this.blockElectrolysisTable, "ElectrolysisTable");
-
-               // Blockの名前を設定します
-               this.nameAuxiliary.addName(this.blockDecompositionTable, "DecompositionTable");
-               this.nameAuxiliary.addName(this.blockDecompositionTable, "ja_JP", "分解台");
-               this.nameAuxiliary.addName(this.blockChemicalCombinationTable, "ChemicalCombinationTable");
-               this.nameAuxiliary.addName(this.blockChemicalCombinationTable, "ja_JP", "化合台");
-               this.nameAuxiliary.addName(blockToolAndWeaponCraftingTable, "ToolAndWeaponCraftingTable");
-               this.nameAuxiliary.addName(blockToolAndWeaponCraftingTable, "ja_JP", "ツール&武器製作台");
-               this.nameAuxiliary.addName(blockChemicalCraftingTable, "ChemicalCraftingTable");
-               this.nameAuxiliary.addName(blockChemicalCraftingTable, "ja_JP", "素材製作台");
-               this.nameAuxiliary.addName(this.blockElectrolysisTable, "ElectrolysisTable");
-               this.nameAuxiliary.addName(this.blockElectrolysisTable, "ja_JP", "電気分解台");
-
-               // Itemの名前を設定します
-               this.nameAuxiliary.addName(this.itemAtoms, ATOMSNAME);
-               this.nameAuxiliary.addName(this.itemAtoms, "ja_JP", ATOMSNAMEJP);
-               this.nameAuxiliary.addName(this.itemGasCollectingBottle, "GasCollectingBottle");
-               this.nameAuxiliary.addName(this.itemGasCollectingBottle, "ja_JP", "集気瓶");
-               this.nameAuxiliary.addName(this.itemAtomGrenade, "AtomGrenade");
-               this.nameAuxiliary.addName(this.itemAtomGrenade, "元素手榴弾");
-
-               // TileEntityを追加します
-               GameRegistry.registerTileEntity(TileEntityDecompositionTable.class, "DecompositionTable");
-               GameRegistry.registerTileEntity(TileEntityChemicalCombinationTable.class, "TileEntityChemicalCombinationTable");
-               GameRegistry.registerTileEntity(TileEntityToolAndWeaponCraftingTable.class, "TileEntityToolAndWeaponCraftingTable");
-               GameRegistry.registerTileEntity(TileEntityChemicalCraftingTable.class, "TileEntityChemicalCraftingTable");
-               GameRegistry.registerTileEntity(TileEntityElectrolysisTable.class, "TileEntityElectrolysisTable");
-
-               // GUIを追加します
-               NetworkRegistry.instance().registerGuiHandler(instance, proxy);
-
-               // 描画関係の読み込み
-               proxy.registerRenderInformation();
-
-               //化学作業台類のレシピを追加します
-               GameRegistry.addRecipe(new ItemStack(this.blockDecompositionTable),
-                               new Object[]{
-                       "XYX", "ZAZ", "ZZZ",
-                       Character.valueOf('X'), new ItemStack(Item.ingotIron),
-                       Character.valueOf('Y'), new ItemStack(Block.workbench),
-                       Character.valueOf('Z'), new ItemStack(Block.stone),
-                       Character.valueOf('A'), new ItemStack(Block.tnt),
-               });
-               GameRegistry.addRecipe(new ItemStack(this.blockChemicalCombinationTable),
-                               new Object[]{
-                       "XYX", "ZAZ", "ZZZ",
-                       Character.valueOf('X'), new ItemStack(Item.ingotIron),
-                       Character.valueOf('Y'), new ItemStack(Block.workbench),
-                       Character.valueOf('Z'), new ItemStack(Block.stone),
-                       Character.valueOf('A'), new ItemStack(Block.obsidian),
-               });
-               GameRegistry.addRecipe(new ItemStack(this.blockToolAndWeaponCraftingTable),
-                               new Object[]{
-                       "XYX", "ZAZ", "ZZZ",
-                       Character.valueOf('X'), new ItemStack(Item.ingotIron),
-                       Character.valueOf('Y'), new ItemStack(Block.workbench),
-                       Character.valueOf('Z'), new ItemStack(Block.stone),
-                       Character.valueOf('A'), new ItemStack(Item.pickaxeSteel),
-               });
-               GameRegistry.addRecipe(new ItemStack(this.blockChemicalCraftingTable),
-                               new Object[]{
-                       "XYX", "ZAZ", "ZZZ",
-                       Character.valueOf('X'), new ItemStack(Item.ingotIron),
-                       Character.valueOf('Y'), new ItemStack(Block.workbench),
-                       Character.valueOf('Z'), new ItemStack(Block.stone),
-                       Character.valueOf('A'), new ItemStack(this.itemAtoms, 1, 0),
-               });
-
-               // 化合物を追加します
-               api.addLangCompound("ja_JP", "CarbonMonoxide", "一酸化炭素");
-               api.addLangCompound("ja_JP", "CarbonDioxide", "二酸化炭素");
-               api.addLangCompound("ja_JP", "Water", "水");
-               api.addCompound("Test");
-
-
-               //化合物のHandlerを設定します
-               api.settingCompoundHandler("Water", new CompoundWater());
-
-               //化合物のレシピを追加します
-               api.addChemicalCombinationRecipe(new String[]{"C", "O"}, new Integer[]{1, 2}, new ItemStack(this.itemCompounds, 1, api.getCompound("CarbonDioxide")));
-               api.addChemicalCombinationRecipe(new String[]{"H", "O"}, new Integer[]{2, 1}, new ItemStack(this.itemCompounds, 1, api.getCompound("Water")));
-
-               //手榴弾の追加
-               api.addMaterialRecipe(
-                               new ItemStack[]{
-                                               null,
-                                               new ItemStack(Block.stone),
-                                               null,
-                                               new ItemStack(Block.stone),
-                                               new ItemStack(Item.gunpowder),
-                                               new ItemStack(Block.stone),
-                                               null,
-                                               new ItemStack(Block.stone),
-                                               null
-                               },
-                               new ItemStack(this.itemAtomGrenade, 16, 0),
-                               new NBTRecipeGrenade()
-                               );
-       }
-
-       private void apiProcessing(final FMLPostInitializationEvent event) {
-               // API用の処理
-               this.nameAuxiliary.addName(itemCompounds, api.getInstance().getCompoundsName().toArray());
-               for (int i = 0; i < api.getCompoundsLang().size(); i++) {
-                       this.nameAuxiliary.addName(itemCompounds, api.getCompoundsLang().get(i), api.getInstance().getCompoundsLangName().toArray());
-               }
-       }
-
-       private void debug(final FMLPostInitializationEvent event) {
-       }
-
-}
->>>>>>> cbf016a981df6758b057ca883a1527676a1a9ec3:src/chemicraft/ChemiCraft.java
diff --git a/src/chemicraft/block/BlockDecompositionTable.java b/src/chemicraft/block/BlockDecompositionTable.java
deleted file mode 100644 (file)
index 4594867..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-package chemicraft.block;
-
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.material.Material;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import chemicraft.ChemiCraft;
-<<<<<<< HEAD:common/chemicraft/block/BlockPyrolysisTable.java
-import chemicraft.debug.DebugTick;
-import chemicraft.tileentity.TileEntityPyrolysisTable;
-=======
-import chemicraft.tileentity.TileEntityDecompositionTable;
->>>>>>> cbf016a981df6758b057ca883a1527676a1a9ec3:src/chemicraft/block/BlockDecompositionTable.java
-
-public class BlockDecompositionTable extends BlockContainer {
-
-       public BlockDecompositionTable(int par1, int par2, Material par3Material) {
-               super(par1, par2, par3Material);
-               this.setCreativeTab(ChemiCraft.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);
-               return true;
-       }
-
-
-
-       @Override
-       public String getTextureFile(){
-               return ChemiCraft.instance.blockChemicalCraftingTableTexture;
-       }
-
-
-
-       @Override
-       public void breakBlock(World par1World, int par2, int par3, int par4, int par5, int par6) {
-               TileEntity tileentity = par1World.getBlockTileEntity(par2, par3, par4);
-               if (tileentity != null) {
-                       DebugTick.removeDebugData("PyrolysisTable" +
-                                       "(x:" + tileentity.xCoord +
-                                       " y:" + tileentity.yCoord +
-                                       " z:" + tileentity.zCoord + ")");
-               }
-               super.breakBlock(par1World, par2, par3, par4, par5, par6);
-       }
-
-
-
-       @Override
-       public int getBlockTextureFromSide(int par1)
-       {
-               if(par1 == 0){
-                       return 17;
-               }else if(par1 == 1){
-                       return 0;
-               }else{
-                       return 16;
-               }
-       }
-
-       @Override
-       public TileEntity createNewTileEntity(World var1) {
-               return new TileEntityDecompositionTable();
-       }
-
-}
diff --git a/src/chemicraft/client/ClientProxy.java b/src/chemicraft/client/ClientProxy.java
deleted file mode 100644 (file)
index c1cd215..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-package chemicraft.client;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.client.MinecraftForgeClient;
-import chemicraft.ChemiCraft;
-import chemicraft.debug.DebugTick;
-import chemicraft.entity.EntityAtomsGrenade;
-import chemicraft.gui.GuiChemicalCombinationTable;
-import chemicraft.gui.GuiChemicalCraftingTable;
-import chemicraft.gui.GuiPyrolysisTable;
-import chemicraft.gui.GuiToolAndWeaponCraftingTable;
-import chemicraft.render.RenderAtomsGrenade;
-import chemicraft.system.CommonProxy;
-import chemicraft.tileentity.TileEntityChemicalCombinationTable;
-import chemicraft.tileentity.TileEntityChemicalCraftingTable;
-import chemicraft.tileentity.TileEntityPyrolysisTable;
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
-import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-import cpw.mods.fml.common.registry.TickRegistry;
-import cpw.mods.fml.relauncher.Side;
-
-public class ClientProxy extends CommonProxy {
-
-       @Override
-       public void registerRenderInformation() {
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.blockChemicalCraftingTableTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.itemAtomsTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.itemCompoundsTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.itemTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiChemicalCombinationTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiPyrolysisTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiChemicalCraftingTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiToolAndWeaponCraftingTexture);
-               RenderingRegistry.registerEntityRenderingHandler(EntityAtomsGrenade.class, new RenderAtomsGrenade(0.5F));
-       }
-
-
-       @Override
-       public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
-               if (!world.blockExists(x, y, z))
-                       return null;
-
-               TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
-               if (tileEntity instanceof TileEntityPyrolysisTable) {
-                       return new GuiPyrolysisTable(player, (TileEntityPyrolysisTable) tileEntity);
-               }else if(tileEntity instanceof TileEntityChemicalCombinationTable){
-                       return new GuiChemicalCombinationTable(player, (TileEntityChemicalCombinationTable) tileEntity);
-               }else if(tileEntity instanceof TileEntityToolAndWeaponCraftingTable){
-                       return new GuiToolAndWeaponCraftingTable(player, (TileEntityToolAndWeaponCraftingTable) tileEntity);
-               }else if(tileEntity instanceof TileEntityChemicalCraftingTable){
-                       return new GuiChemicalCraftingTable(player, (TileEntityChemicalCraftingTable) tileEntity);
-               }
-               return null;
-       }
-
-
-       @Override
-       public World getClientWorld() {
-               return FMLClientHandler.instance().getClient().theWorld;
-       }
-
-       @Override
-       public void registerTickHandler() {
-               TickRegistry.registerTickHandler(new DebugTick(), Side.CLIENT);
-       }
-
-}
diff --git a/src/chemicraft/compounds/CompoundWater.java b/src/chemicraft/compounds/CompoundWater.java
deleted file mode 100644 (file)
index a009a6c..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-package chemicraft.compounds;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import chemicraft.util.ICompoundHandler;
-
-public class CompoundWater implements ICompoundHandler {
-
-       @Override
-       public ItemStack onItemRightClickHandler(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
-               return null;
-       }
-
-       @Override
-       public boolean onItemUseHandler(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) {
-               return false;
-       }
-
-       @Override
-       public void onUpdateHandler(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) {
-
-       }
-
-       @Override
-       public int getIconIndexHandler() {
-               return 1;
-       }
-
-}
diff --git a/src/chemicraft/container/ContainerChemicalCombinationTable.java b/src/chemicraft/container/ContainerChemicalCombinationTable.java
deleted file mode 100644 (file)
index 2244348..0000000
+++ /dev/null
@@ -1,157 +0,0 @@
-package chemicraft.container;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import chemicraft.ChemiCraft;
-import chemicraft.ChemiCraftAPI;
-import chemicraft.inventory.InventoryChemicalCombinationTableMaterial;
-import chemicraft.inventory.InventoryChemicalCombinationTableResult;
-import chemicraft.slot.SlotChemicalCombinationTableMaterial;
-import chemicraft.slot.SlotChemicalCombinationTableResult;
-import chemicraft.tileentity.TileEntityChemicalCombinationTable;
-import cpw.mods.fml.common.network.PacketDispatcher;
-
-public class ContainerChemicalCombinationTable extends Container {
-
-       /**
-        * the world.
-        */
-       private World worldObj;
-
-       /**
-        * the TileEntity of Position.
-        */
-       private int posX;
-       private int posY;
-       private int posZ;
-
-       /**
-        * the TileEntity.
-        */
-       private TileEntityChemicalCombinationTable tileentity;
-
-       /**
-        * the Inventory's.
-        */
-       private InventoryChemicalCombinationTableMaterial invm;
-       private InventoryChemicalCombinationTableResult invr;
-
-       /**
-        * the EntityPlayer.
-        */
-       private EntityPlayer entityplayer;
-
-       public ContainerChemicalCombinationTable(EntityPlayer par1EntityPlayer, TileEntityChemicalCombinationTable par2) {
-               super();
-               this.entityplayer = par1EntityPlayer;
-               this.tileentity = par2;
-               this.worldObj = tileentity.worldObj;
-               this.posX = tileentity.xCoord;
-               this.posY = tileentity.yCoord;
-               this.posZ = tileentity.zCoord;
-               this.invm = this.tileentity.getInvMaterial();
-               this.invr = this.tileentity.getInvResult();
-
-               for(int i = 0;i < 5;i++){
-                       for(int j = 0;j < 3;j++){
-                               this.addSlotToContainer(new SlotChemicalCombinationTableMaterial(this.invm, i * 3 + j, i * 18 + 16, j * 18 + 15));
-                       }
-               }
-               this.addSlotToContainer(new SlotChemicalCombinationTableResult(invr, 0, 123, 34));
-
-
-               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, 121 + var3 * 18));
-                       }
-               }
-
-               for (var3 = 0; var3 < 9; ++var3)
-               {
-                       this.addSlotToContainer(new Slot(par1EntityPlayer.inventory, var3, 8 + var3 * 18, 179));
-               }
-
-               this.invm.setEventHandler(this);
-               this.onCraftMatrixChanged(invm);
-       }
-
-
-
-       @Override
-       public void onCraftMatrixChanged(IInventory par1IInventory){
-               this.invr.setInventorySlotContents(0, ChemiCraftAPI.getInstance().getCraftingManager().getChemicalCombinationResult(this.tileentity.getAtomsList(), this.tileentity.getAtomsAmountList()));
-               if (par1IInventory instanceof InventoryChemicalCombinationTableResult) {
-                       PacketDispatcher.sendPacketToServer(this.tileentity.getDescriptionPacket());
-               }
-       }
-
-       @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(EntityPlayer par1EntityPlayer, int par2) {
-               ItemStack var3 = null;
-               Slot var4 = (Slot)this.inventorySlots.get(par2);
-               Slot var6 = (Slot)this.inventorySlots.get(0);
-
-               if (var4 != null && var4.getHasStack()) {
-                       ItemStack var5 = var4.getStack();
-                       var3 = var5.copy();
-                       if (par2 >= 0 && par2 < 16) {
-                               if (!this.mergeItemStack(var5, 16, 52, false)) {
-                                       return null;
-                               }
-                       } else if (par2 >= 16 && par2 < 53) {
-                               if (var6.isItemValid(var3)) {
-                                       if (!this.mergeItemStack(var5, 0, 15, false)) {
-                                               return null;
-                                       }
-                               }
-                       } else if(par2 == 16) {
-                               if (!this.mergeItemStack(var5, 16, 52, false)) {
-                                       return null;
-                               }
-                       }
-
-                       if (var5.stackSize == 0) {
-                               var4.putStack((ItemStack)null);
-                       } else {
-                               var4.onSlotChanged();
-                       }
-
-                       if (var5.stackSize == var3.stackSize) {
-                               return null;
-                       }
-
-                       var4.onPickupFromSlot(par1EntityPlayer, var5);
-               }
-
-               return var3;
-       }
-
-       @Override
-       public ItemStack slotClick(int par1, int par2, int par3, EntityPlayer par4EntityPlayer) {
-               if (par1 == 15) {
-                       if (this.invr.getStackInSlot(0) != null) {
-                               this.tileentity.emptytoAtomsList();
-                       }
-               }
-               return super.slotClick(par1, par2, par3, par4EntityPlayer);
-       }
-
-       @Override
-       public void onCraftGuiClosed(EntityPlayer par1EntityPlayer){
-               super.onCraftGuiClosed(par1EntityPlayer);
-       }
-
-}
diff --git a/src/chemicraft/container/ContainerChemicalCraftingTable.java b/src/chemicraft/container/ContainerChemicalCraftingTable.java
deleted file mode 100644 (file)
index 017066f..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-package chemicraft.container;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import chemicraft.ChemiCraft;
-import chemicraft.ChemiCraftAPI;
-import chemicraft.inventory.InventoryChemicalCraftingMaterial;
-import chemicraft.inventory.InventoryChemicalCraftingNBT;
-import chemicraft.inventory.InventoryChemicalCraftingResult;
-import chemicraft.slot.SlotChemicalCraftingTableResult;
-import chemicraft.tileentity.TileEntityChemicalCraftingTable;
-import chemicraft.util.ChemicalNBTRecipe;
-
-public class ContainerChemicalCraftingTable extends Container {
-
-       /**
-        * Worldのインスタンス
-        */
-       private World worldObj;
-
-
-       /**
-        * BlockのX, Y, Z座標
-        */
-       private int posX;
-       private int posY;
-       private int posZ;
-
-
-       /**
-        * the TileEntity.
-        */
-       private TileEntityChemicalCraftingTable tileEntity;
-
-
-       private InventoryChemicalCraftingMaterial invm;
-       private InventoryChemicalCraftingResult invr;
-       private InventoryChemicalCraftingNBT invn;
-
-       private ChemicalNBTRecipe useNBT;
-
-
-
-       public ContainerChemicalCraftingTable(EntityPlayer par1EntityPlayer, TileEntityChemicalCraftingTable par2)
-       {
-               super();
-               this.worldObj = par2.worldObj;
-               this.posX = par2.xCoord;
-               this.posY = par2.yCoord;
-               this.posZ = par2.zCoord;
-               this.tileEntity = par2;
-               this.invm = (InventoryChemicalCraftingMaterial) this.tileEntity.chemicalCraftingInvMaterial;
-               this.invr = (InventoryChemicalCraftingResult) this.tileEntity.chemicalCraftingInvResult;
-               this.invn = (InventoryChemicalCraftingNBT) this.tileEntity.chemicalCraftingInvNBT;
-               //GenerateInventory
-               this.generateSlots(this.invm, this.invr, this.invn);
-               //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.invm.setEventHandler(this);
-               this.invr.setEventHandler(this);
-               this.invn.setEventHandler(this);
-               this.onCraftMatrixChanged(invm);
-       }
-
-
-
-       @Override
-       public void onCraftMatrixChanged(IInventory par1IInventory){
-               this.useNBT = ChemiCraftAPI.getInstance().getCraftingManager().chemicalCrafting(this.invm, this.invr, this.invn);
-       }
-
-       @Override
-       public void onCraftGuiClosed(EntityPlayer par1EntityPlayer){
-               super.onCraftGuiClosed(par1EntityPlayer);
-       }
-
-       @Override
-       public ItemStack slotClick(int par1, int par2, int par3, EntityPlayer par4EntityPlayer)
-       {
-               if(par1 == 12){
-                       if(this.invr.getStackInSlot(0) == null) return super.slotClick(par1, par2, par3, par4EntityPlayer);
-                       ItemStack var1 = par4EntityPlayer.inventory.getItemStack();
-                       if(var1 != null){
-                               if(var1.stackSize + this.invr.getStackInSlot(0).stackSize >= var1.getMaxStackSize()) return super.slotClick(par1, par2, par3, par4EntityPlayer);
-                       }
-                       for(int i = 0;i < this.invm.getSizeInventory();i++){
-                               if(this.invm.getStackInSlot(i) != null){
-                                       if(this.invm.getStackInSlot(i).stackSize > 1){
-                                               this.invm.getStackInSlot(i).stackSize--;
-                                       }else{
-                                               this.invm.setInventorySlotContents(i, null);
-                                       }
-                               }
-                       }
-                       ItemStack[] matchNBT = new ItemStack[this.invn.getSizeInventory()];
-                       for(int i = 0;i < this.invn.getSizeInventory();i++){
-                               matchNBT[i] = this.invn.getStackInSlot(i);
-                       }
-                       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[i] != null){
-                                       this.invn.setInventorySlotContents(i, null);
-                               }
-                       }
-               }
-               return super.slotClick(par1, par2, par3, par4EntityPlayer);
-       }
-
-       @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;
-       }
-
-
-
-       @Override
-       public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2){
-               return null;
-       }
-
-
-
-       private void generateSlots(IInventory materialInv, IInventory resultInv, IInventory nbtInv){
-               for(int i = 0;i < 3;i++){
-                       this.addSlotToContainer(new Slot(invn, i, 30 + 18 * i, 7));
-               }
-               for(int i = 0;i < 3;i++){
-                       for(int j = 0;j < 3;j++){
-                               this.addSlotToContainer(new Slot(invm, i * 3 + j, 30 + 18 * j, 27 + 18 * i));
-                       }
-               }
-               this.addSlotToContainer(new SlotChemicalCraftingTableResult(invr, 0, 123, 33));
-       }
-}
diff --git a/src/chemicraft/container/ContainerDecompositionTable.java b/src/chemicraft/container/ContainerDecompositionTable.java
deleted file mode 100644 (file)
index 95a454a..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-package chemicraft.container;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.Slot;
-import net.minecraft.world.World;
-import chemicraft.ChemiCraft;
-<<<<<<< HEAD:common/chemicraft/container/ContainerPyrolysisTable.java
-import chemicraft.slot.SlotPyrolysisTableFuel;
-import chemicraft.slot.SlotPyrolysisTableMaterial;
-import chemicraft.slot.SlotPyrolysisTableResult;
-import chemicraft.tileentity.TileEntityPyrolysisTable;
-=======
-import chemicraft.tileentity.TileEntityDecompositionTable;
->>>>>>> cbf016a981df6758b057ca883a1527676a1a9ec3:src/chemicraft/container/ContainerDecompositionTable.java
-
-public class ContainerDecompositionTable extends Container {
-
-       private World worldObj;
-
-       private int posX;
-       private int posY;
-       private int posZ;
-
-<<<<<<< HEAD:common/chemicraft/container/ContainerPyrolysisTable.java
-       private TileEntityPyrolysisTable tileentity;
-
-       public ContainerPyrolysisTable(EntityPlayer par1EntityPlayer, TileEntityPyrolysisTable par2){
-=======
-       public ContainerDecompositionTable(EntityPlayer par1EntityPlayer, TileEntityDecompositionTable par2){
->>>>>>> cbf016a981df6758b057ca883a1527676a1a9ec3:src/chemicraft/container/ContainerDecompositionTable.java
-               super();
-               this.tileentity = par2;
-               this.worldObj = par2.worldObj;
-               this.posX = par2.xCoord;
-               this.posY = par2.yCoord;
-               this.posZ = par2.zCoord;
-
-               for (int i = 0; i < 4; i++) {
-                       for (int j = 0; j < 4; j++) {
-                               this.addSlotToContainer(new SlotPyrolysisTableResult(this.tileentity.getInvResult(), i*4 + j, 88+i*18, 17+j*18));
-                       }
-               }
-               this.addSlotToContainer(new SlotPyrolysisTableMaterial(this.tileentity.getInvMaterial(), 0, 27, 20));
-               this.addSlotToContainer(new SlotPyrolysisTableFuel(this.tileentity.getInvFuel(), 0, 27, 63));
-
-               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, 121 + var3 * 18));
-                       }
-               }
-
-               for (var3 = 0; var3 < 9; ++var3)
-               {
-                       this.addSlotToContainer(new Slot(par1EntityPlayer.inventory, var3, 8 + var3 * 18, 179));
-               }
-       }
-
-       @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;
-       }
-
-}
diff --git a/src/chemicraft/container/ContainerToolAndWeaponCraftingTable.java b/src/chemicraft/container/ContainerToolAndWeaponCraftingTable.java
deleted file mode 100644 (file)
index acadb79..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-package chemicraft.container;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
-
-public class ContainerToolAndWeaponCraftingTable extends Container {
-
-       public ContainerToolAndWeaponCraftingTable(EntityPlayer par1EntityPlayer, TileEntityToolAndWeaponCraftingTable par2){
-               super();
-       }
-
-       @Override
-       public boolean canInteractWith(EntityPlayer var1) {
-               return false;
-       }
-
-}
diff --git a/src/chemicraft/debug/CommandDeleteItem.java b/src/chemicraft/debug/CommandDeleteItem.java
deleted file mode 100644 (file)
index 50fa3d6..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-package chemicraft.debug;
-
-import java.util.Iterator;
-import java.util.List;
-
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.World;
-
-public class CommandDeleteItem extends CommandBase {
-
-       @Override
-       public String getCommandName() {
-               return "delItem";
-       }
-
-       @SuppressWarnings("unchecked")
-       @Override
-       public void processCommand(ICommandSender var1, String[] var2) {
-               MinecraftServer server = null;
-               EntityPlayerMP player = null;
-               try { server = (MinecraftServer)var1; } catch (ClassCastException e) {}
-               try{ player = (EntityPlayerMP)var1;} catch(ClassCastException e) {}
-
-               World world;
-               List<Entity> list;
-               Iterator<Entity> itr;
-
-               if(server != null){
-                       if(var2.length > 0){
-                               world = server.worldServerForDimension(Integer.parseInt(var2[0]));
-                               list = world.loadedEntityList;
-                               itr = list.iterator();
-                               while(itr.hasNext()){
-                                       Entity entity = itr.next();
-                                       if(entity instanceof EntityItem){
-                                               entity.setDead();
-                                       }
-                               }
-                       }else{
-                               var1.sendChatToPlayer("Please specify the World.");
-                       }
-               }else if(player != null){
-                       world = player.worldObj;
-                       list = world.loadedEntityList;
-                       itr = list.iterator();
-                       player.dimension = 128;
-                       while(itr.hasNext()){
-                               Entity entity = itr.next();
-                               if(entity instanceof EntityItem){
-                                       entity.setDead();
-                               }
-                       }
-               }else{
-                       var1.sendChatToPlayer("---Command Error---");
-               }
-
-       }
-
-}
diff --git a/src/chemicraft/debug/CommandGenDebugRoom.java b/src/chemicraft/debug/CommandGenDebugRoom.java
deleted file mode 100644 (file)
index 1d95976..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-package chemicraft.debug;
-
-import net.minecraft.block.Block;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.World;
-
-public class CommandGenDebugRoom extends CommandBase {
-
-       @Override
-       public String getCommandName() {
-               return "debugRoom";
-       }
-
-       @Override
-       public void processCommand(ICommandSender var1, String[] var2) {
-               try{
-                       EntityPlayer player = (EntityPlayer)var1;
-                       World wolrd = player.worldObj;
-
-                       SetBlockSupport.box(wolrd, (int)player.posX, (int)player.posY, (int)player.posZ, Block.bedrock.blockID, 0, 20, 20, 6);
-               }catch(ClassCastException e){
-
-               }
-       }
-
-}
diff --git a/src/chemicraft/debug/CommandSetTile.java b/src/chemicraft/debug/CommandSetTile.java
deleted file mode 100644 (file)
index 6f649fa..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-package chemicraft.debug;
-
-import net.minecraft.block.Block;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.World;
-
-public class CommandSetTile extends CommandBase {
-
-       @Override
-       public String getCommandName() {
-               return "setTile";
-       }
-
-       @Override
-       public void processCommand(ICommandSender var1, String[] var2) {
-               try{
-                       EntityPlayer player = (EntityPlayer)var1;
-                       World wolrd = player.worldObj;
-                       if(var2.length > 0){
-                               try{
-                                       if(Integer.parseInt(var2[0]) < 4096 && Block.blocksList[Integer.parseInt(var2[0])] != null || Integer.parseInt(var2[0]) == 0){
-                                               if(var2.length == 1){
-                                                       SetBlockSupport.square(wolrd, (int)player.posX, (int)player.posY, (int)player.posZ, Integer.parseInt(var2[0]), Integer.parseInt(var2[1]), 12, 12);
-                                               }else if(var2.length > 2){
-                                                       SetBlockSupport.square(wolrd, (int)player.posX, (int)player.posY, (int)player.posZ, Integer.parseInt(var2[0]), Integer.parseInt(var2[1]), Integer.parseInt(var2[2]), Integer.parseInt(var2[2]));
-                                               }else{
-                                                       SetBlockSupport.square(wolrd, (int)player.posX, (int)player.posY, (int)player.posZ, Integer.parseInt(var2[0]), 0, 12, 12);
-                                               }
-                                       }else{
-                                               var1.sendChatToPlayer("\u00a7cBlockが存在しないか指定された数が4096を超えています。");
-                                       }
-                               }catch(NumberFormatException e){
-                                       var1.sendChatToPlayer("\u00a7c指定された文字は数値ではありません。");
-                               }
-                       }else{
-                               var1.sendChatToPlayer("\u00a7cBlockIDを指定してください。(Metadata, Sizeも可能)");
-                       }
-               }catch(ClassCastException e){
-
-               }
-       }
-
-}
diff --git a/src/chemicraft/debug/CompoundHandlerTest.java b/src/chemicraft/debug/CompoundHandlerTest.java
deleted file mode 100644 (file)
index 3dbe818..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-package chemicraft.debug;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import chemicraft.util.ICompoundHandler;
-
-public class CompoundHandlerTest implements ICompoundHandler {
-
-       @Override
-       public ItemStack onItemRightClickHandler(ItemStack par1ItemStack, World par2World,
-                       EntityPlayer par3EntityPlayer) {
-               System.out.println("onRightClick");
-               return par1ItemStack;
-       }
-
-       @Override
-       public boolean onItemUseHandler(ItemStack par1ItemStack,
-                       EntityPlayer par2EntityPlayer, World par3World, int par4, int par5,
-                       int par6, int par7, float par8, float par9, float par10) {
-               System.out.println("onItemUse");
-               return true;
-       }
-
-       @Override
-       public void onUpdateHandler(ItemStack par1ItemStack, World par2World,
-                       Entity par3Entity, int par4, boolean par5) {
-               System.out.println("onUpdate");
-       }
-
-       @Override
-       public int getIconIndexHandler() {
-               return 0;
-       }
-
-}
diff --git a/src/chemicraft/debug/SetBlockSupport.java b/src/chemicraft/debug/SetBlockSupport.java
deleted file mode 100644 (file)
index 2663d5d..0000000
+++ /dev/null
@@ -1,596 +0,0 @@
-package chemicraft.debug;
-import java.util.Random;
-
-import net.minecraft.world.World;
-
-public class SetBlockSupport
-{
-
-       static Random rand = new Random();
-
-       /**
-        * X方向に線状にBlockを配置します。
-        * Directionが0の場合、特殊な計算式で
-        * +,-方向:loop-1の長さになります。
-        * @param par1World
-        * @param X 基準X座標
-        * @param Y 基準Y座標
-        * @param Z 基準Z座標
-        * @param Block 配置するBlock
-        * @param meta 配置するMetadata
-        * @param Length 長さ
-        * @param Direction 方向(+方向:1,-方向:-1,中心から-+の方向:0)
-        * @return Object
-        */
-       public static Object lineX(World par1World,int X,int Y,int Z,int Block,int meta,int Length,int Direction)
-       {
-               int loop2=0;
-               Object DataBox=null;
-               for(loop2=0;loop2 < Length;loop2++)
-               {
-                       switch(Direction)
-                       {
-                       default:
-
-                       case -1:
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X, Y, Z, Block, meta);
-                               break;
-                       case 0:
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X-(Length-1)+loop2,Y,Z,Block,meta);
-                               break;
-                       case 1:
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X+loop2, Y, Z, Block,meta);
-                               break;
-                       }
-               }
-               return DataBox;
-       }
-
-       /**
-        * Y方向に線状にBlockを配置します。
-        * Directionが0の場合、特殊な計算式で
-        * +,-方向:loop-1の長さになります。
-        * @param par1World
-        * @param X 基準X座標
-        * @param Y 基準Y座標
-        * @param Z 基準Z座標
-        * @param Block 配置するBlock
-        * @param meta 配置するMetadata
-        * @param Length 長さ
-        * @param Direction 方向(+方向:1,-方向:-1,中心から-+の方向:0)
-        * @return Object
-        */
-       public static Object lineY(World par1World,int X,int Y,int Z,int Block,int meta,int Length,int Direction)
-       {
-               int loop2=0;
-               Object DataBox=null;
-               for(loop2=0;loop2 < Length;loop2++)
-               {
-                       switch(Direction)
-                       {
-                       default:
-
-                       case -1:
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X, Y-loop2, Z, Block,meta);
-                               break;
-                       case 0:
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X,Y-(Length-1)+loop2,Z,Block,meta);
-                               break;
-                       case 1:
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X, Y+loop2, Z, Block,meta);
-                               break;
-                       }
-               }
-               return DataBox;
-       }
-
-       /**
-        * Z方向に線状にBlockを配置します。
-        * Directionが0の場合、特殊な計算式で
-        * +,-方向:loop-1の長さになります。
-        * @param par1World
-        * @param X 基準X座標
-        * @param Y 基準Y座標
-        * @param Z 基準Z座標
-        * @param Block 配置するBlock
-        * @param meta 配置するMetadata
-        * @param Length 長さ
-        * @param Direction 方向指定(+方向:1,-方向:-1,中心から-+の方向:0)
-        * @return Object
-        */
-       public static Object lineZ(World par1World,int X,int Y,int Z,int Block,int meta,int Length,int Direction)
-       {
-               int loop2=0;
-               Object DataBox=null;
-               for(loop2=0;loop2 < Length;loop2++)
-               {
-                       switch(Direction)
-                       {
-                       default:
-
-                       case -1:
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X, Y, Z-loop2, Block,meta);
-                               break;
-                       case 0:
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X,Y,Z-(Length-1)+loop2,Block,meta);
-                               break;
-                       case 1:
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X, Y, Z+loop2, Block,meta);
-                               break;
-                       }
-               }
-               return DataBox;
-       }
-
-       /**
-        * XY方向に線状にBlockを配置します。
-        * Directionが0の場合、特殊な計算式で
-        * +,-方向:loop-1の長さになります。
-        * @param par1World
-        * @param X 基準X座標
-        * @param Y 基準Y座標
-        * @param Z 基準Z座標
-        * @param Block 配置するBlock
-        * @param meta 配置するMetadata
-        * @param XLength X方向の長さ
-        * @param YLength Y方向の長さ
-        * @param XDirection X方向指定(+方向:1,-方向:-1,中心から-+の方向:0)
-        * @param YDirection Y方向指定(+方向:1,-方向:-1,中心から-+の方向:0)
-        * @return Object
-        */
-       public static Object  lineXY(World par1World,int X,int Y,int Z,int Block,int meta,int XLength,int YLength,int XDirection,int YDirection)
-       {
-               Object DataBox=null;
-               DataBox = lineX(par1World,X,Y,Z,Block,meta,XLength,XDirection);
-               DataBox = lineY(par1World,X,Y,Z,Block,YLength,meta,YDirection);
-               return DataBox;
-       }
-
-       /**
-        * XZ方向に線状にBlockを配置します。
-        * Directionが0の場合、特殊な計算式で
-        * +,-方向:loop-1の長さになります。
-        * @param par1World
-        * @param X 基準X座標
-        * @param Y 基準Y座標
-        * @param Z 基準Z座標
-        * @param Block 配置するBlock
-        * @param meta 配置するMetadata
-        * @param XLength X方向の長さ
-        * @param ZLength Y方向の長さ
-        * @param XDirection X方向指定(+方向:1,-方向:-1,中心から-+の方向:0)
-        * @param ZDirection Z方向指定(+方向:1,-方向:-1,中心から-+の方向:0)
-        * @return Object
-        */
-       public static Object  lineXZ(World par1World,int X,int Y,int Z,int Block,int meta,int XLength,int ZLength,int XDirection,int ZDirection)
-       {
-               Object DataBox=null;
-               DataBox = lineX(par1World,X,Y,Z,Block,meta,XLength,XDirection);
-               DataBox = lineZ(par1World,X,Y,Z,Block,meta,ZLength,ZDirection);
-               return DataBox;
-       }
-
-       /**
-        * YZ方向に線状にBlockを配置します。
-        * Directionが0の場合、特殊な計算式で
-        * +,-方向:loop-1の長さになります。
-        * @param par1World
-        * @param X 基準X座標
-        * @param Y 基準Y座標
-        * @param Z 基準Z座標
-        * @param Block 配置するBlock
-        * @param meta 配置するMetadata
-        * @param YLength X方向の長さ
-        * @param ZLength Y方向の長さ
-        * @param YDirection Y方向指定(+方向:1,-方向:-1,中心から-+の方向:0)
-        * @param ZDirection Z方向指定(+方向:1,-方向:-1,中心から-+の方向:0)
-        * @return Object
-        */
-       public static Object  lineYZ(World par1World,int X,int Y,int Z,int Block,int meta,int YLength,int ZLength,int YDirection,int ZDirection)
-       {
-               Object DataBox=null;
-               DataBox = lineY(par1World,X,Y,Z,Block,meta,YLength,YDirection);
-               DataBox = lineZ(par1World,X,Y,Z,Block,meta,ZLength,ZDirection);
-               return DataBox;
-       }
-
-       /**
-        * XYZ方向に線状にBlockを配置します。
-        * Directionが0の場合、特殊な計算式で
-        * +,-方向:loop-1の長さになります。
-        * @param par1World
-        * @param X 基準X座標
-        * @param Y 基準Y座標
-        * @param Z 基準Z座標
-        * @param Block 配置するBlock
-        * @param meta 配置するMetadata
-        * @param XLength X方向の長さ
-        * @param YLength Y方向の長さ
-        * @param ZLength Z方向の長さ
-        * @param XDirection X方向指定(+方向:1,-方向:-1,中心から-+の方向:0)
-        * @param YDirection Y方向指定(+方向:1,-方向:-1,中心から-+の方向:0)
-        * @param ZDirection Z方向指定(+方向:1,-方向:-1,中心から-+の方向:0)
-        * @return Object
-        */
-       public static Object  lineXYZ(World par1World,int X,int Y,int Z,int Block,int meta,int XLength,int YLength,int ZLength,int XDirection,int YDirection,int ZDirection)
-       {
-               Object DataBox=null;
-               DataBox = lineX(par1World,X,Y,Z,Block,meta,XLength,XDirection);
-               DataBox = lineY(par1World,X,Y,Z,Block,meta,YLength,YDirection);
-               DataBox = lineZ(par1World,X,Y,Z,Block,meta,ZLength,ZDirection);
-               return DataBox;
-       }
-
-       /**
-        * X方向の壁を作成します。
-        * Directionは1で固定です。
-        * @param par1World
-        * @param X 基準X座標
-        * @param Y 基準Y座標
-        * @param Z 基準Z座標
-        * @param Block 配置するBlock
-        * @param meta 配置するMetadata
-        * @param Length 幅
-        * @param height 高さ
-        * @return Object
-        */
-       public static Object wallX(World par1World,int X,int Y,int Z,int Block,int meta,int Length,int height)
-       {
-               Object DataBox = null;
-               for(int loop = 0;loop < Length;loop++){
-                       lineY(par1World, X - (Length/2) + loop, Y, Z, Block,meta, height, 1);
-               }
-               return DataBox;
-       }
-
-       /**
-        * Z方向の壁を作成します。
-        * Directionは1で固定です。
-        * @param par1World
-        * @param X 基準X座標
-        * @param Y 基準Y座標
-        * @param Z 基準Z座標
-        * @param Block 配置するBlock
-        * @param meta 配置するMetadata
-        * @param Length 幅
-        * @param height 高さ
-        * @return Object
-        */
-       public static Object wallZ(World par1World,int X,int Y,int Z,int Block,int meta,int Length,int height)
-       {
-               Object DataBox = null;
-               for(int loop = 0;loop < Length;loop++){
-                       lineY(par1World, X, Y, Z - (Length/2) + loop, Block,meta, height, 1);
-               }
-               return DataBox;
-       }
-
-       /**
-        * 辺だけの四角を作成します。
-        * @param par1World
-        * @param X 基準X座標
-        * @param Y 基準Y座標
-        * @param Z 基準Z座標
-        * @param Block 配置するBlock
-        * @param meta 配置するMetadata
-        * @param LengthX X方向の長さ
-        * @param LengthZ  Z方向の長さ
-        * @return Object
-        */
-       public static Object spuareFrame(World par1World,int X,int Y,int Z,int Block,int meta,int LengthX,int LengthZ)
-       {
-               Object DataBox = null;
-               DataBox = lineX(par1World, X, Y, Z + (LengthZ/2), Block,meta, LengthX/2+1, 0);
-               DataBox = lineX(par1World, X, Y, Z - (LengthZ/2), Block,meta, LengthX/2+1, 0);
-               DataBox = lineZ(par1World, X + (LengthX/2), Y, Z, Block,meta, LengthZ/2+1, 0);
-               DataBox = lineZ(par1World, X - (LengthX/2), Y, Z, Block,meta, LengthZ/2+1, 0);
-               return DataBox;
-       }
-
-       /**
-        * 辺だけの箱を作成します。
-        * @param par1World
-        * @param X 基準X座標
-        * @param Y 基準Y座標
-        * @param Z 基準Z座標
-        * @param Block 配置するBlock
-        * @param meta 配置するMetadata
-        * @param LengthX X方向の長さ
-        * @param LengthZ  Z方向の長さ
-        * @param height 高さ
-        * @return Object
-        */
-       public static Object boxFrame(World par1World,int X,int Y,int Z,int Block,int meta,int LengthX,int LengthZ,int height)
-       {
-               Object DataBox=null;
-               DataBox = lineX(par1World, X, Y, Z + (LengthZ/2), Block,meta, LengthX/2, 0);
-               DataBox = lineX(par1World, X, Y, Z - (LengthZ/2), Block,meta, LengthX/2, 0);
-               DataBox = lineX(par1World, X, Y + height-1, Z + (LengthZ/2), Block,meta, LengthX/2, 0);
-               DataBox = lineX(par1World, X, Y + height-1, Z - (LengthZ/2), Block,meta, LengthX/2, 0);
-
-               DataBox = lineY(par1World,X +(LengthX/2),Y,Z +(LengthZ/2),Block,meta,height,1);
-               DataBox = lineY(par1World,X -(LengthX/2),Y,Z +(LengthZ/2),Block,meta,height,1);
-               DataBox = lineY(par1World,X +(LengthX/2),Y,Z - (LengthZ/2),Block,meta,height,1);
-               DataBox = lineY(par1World,X -(LengthX/2),Y,Z - (LengthZ/2),Block,meta,height,1);
-
-               DataBox = lineZ(par1World, X + (LengthX/2), Y, Z, Block,meta, LengthZ/2, 0);
-               DataBox = lineZ(par1World, X - (LengthX/2), Y, Z, Block,meta, LengthZ/2, 0);
-               DataBox = lineZ(par1World, X + (LengthX/2), Y + height-1, Z, Block,meta, LengthZ/2, 0);
-               DataBox = lineZ(par1World, X - (LengthX/2), Y + height-1, Z, Block,meta, LengthZ/2, 0);
-               return DataBox;
-       }
-
-       /**
-        * 四角を作成します。
-        * @param par1World
-        * @param X 基準X座標
-        * @param Y 基準Y座標
-        * @param Z 基準Z座標
-        * @param Block 配置するBlock
-        * @param meta 配置するMetadata
-        * @param LengthX X方向の長さ
-        * @param LengthZ  Z方向の長さ
-        * @return Object
-        */
-       public static Object square(World par1World,int X,int Y,int Z,int Block,int meta,int LengthX,int LengthZ)
-       {
-               Object DataBox = null;
-               int loop1 = 0;
-               for(loop1=0; loop1 < LengthZ; loop1++){
-                       DataBox = lineX(par1World,X - (LengthX/2),Y,Z - (LengthZ/2) + loop1,Block,meta,LengthX,1);
-               }
-               return DataBox;
-       }
-
-       /**
-        * 箱を生成します。
-        * @param par1World
-        * @param X 基準X座標
-        * @param Y 基準Y座標
-        * @param Z 基準Z座標
-        * @param Block 配置するBlock
-        * @param meta 配置するMetadata
-        * @param LengthX X方向の長さ
-        * @param LengthZ  Z方向の長さ
-        * @param height 高さ
-        * @return Object
-        */
-       public static Object box(World par1World,int X,int Y,int Z,int Block,int meta,int LengthX,int LengthZ,int height)
-       {
-               Object DataBox = null;
-               DataBox = square(par1World, X, Y, Z, Block, meta,LengthX,LengthZ);
-               DataBox = square(par1World,X,Y+height,Z,Block,meta,LengthX,LengthZ);
-               DataBox = wallX(par1World,X,Y,Z-(LengthZ/2),Block,meta,LengthX,height);
-               DataBox = wallZ(par1World,X-(LengthX/2),Y,Z,Block,meta,LengthZ,height);
-               DataBox = wallX(par1World,X,Y,Z+(LengthZ/2),Block,meta,LengthX,height);
-               DataBox = wallZ(par1World,X+(LengthX/2),Y,Z,Block,meta,LengthZ,height);
-               return DataBox;
-       }
-
-       /**
-        * Blockで埋め尽くされた箱を生成します。
-        * @param par1World
-        * @param X 基準X座標
-        * @param Y 基準Y座標
-        * @param Z 基準Z座標
-        * @param Block 配置するBlock
-        * @param meta 配置するMetadata
-        * @param LengthX X方向の長さ
-        * @param LengthZ  Z方向の長さ
-        * @param height 高さ
-        * @return Object
-        */
-       public static Object fillBox(World par1World , int X,int Y,int Z,int Block,int meta,int LengthX,int LengthZ,int height)
-       {
-               Object DataBox = null;
-               DataBox = square(par1World, X, Y, Z, Block,meta, LengthX,LengthZ);
-               DataBox = square(par1World,X,Y+height,Z,Block,meta,LengthX,LengthZ);
-               DataBox = wallX(par1World,X,Y,Z-(LengthZ/2),Block,meta,LengthX,height);
-               DataBox = wallZ(par1World,X-(LengthX/2),Y,Z,Block,meta,LengthZ,height);
-               DataBox = wallX(par1World,X,Y,Z+(LengthZ/2),Block,meta,LengthX,height);
-               DataBox = wallZ(par1World,X+(LengthX/2),Y,Z,Block,meta,LengthZ,height);
-
-               for(int i = 0; i < LengthX - 1; i++)
-               {
-                       DataBox = wallZ(par1World,X + 1 - LengthX / 2 + i, Y , Z , Block ,meta,LengthZ, height);
-               }
-
-               return DataBox;
-       }
-
-       /**
-        * 座標ごとにデータを指定して配置します。
-        * 配列になっているので、順番に指定してください。
-        * @param par1World
-        * @param X 基準X座標
-        * @param Y 基準Y座標
-        * @param Z 基準Z座標
-        * @param Block 配置するBlock
-        * @param meta 配置するMetadata
-        * @param XPosition 配置する相対X座標
-        * @param YPosition 配置する相対Y座標
-        * @param ZPosition 配置する相対Z座標
-        * @param Option
-        * @return Object
-        */
-       public static Object fineSetBlock(World par1World,int X,int Y,int Z,int[] Block,int[] meta,int[] XPosition,int[] YPosition,int[] ZPosition,Object[] Option){
-               Object DataBox = null;
-               for(int i=0;i<Block.length;i++){
-                       DataBox = par1World.setBlockAndMetadata(X+XPosition[i], Y+YPosition[i], Z+ZPosition[i], Block[i],meta[i]);
-               }
-
-               if(Option!=null){
-                       for(int j=0;j<Option.length;j++){
-                               DataBox = Option[j];
-                       }
-               }
-               return DataBox;
-       }
-
-       /**
-        * X方向に台形を作成します。
-        * 必ずbottom/(upper*3)*(height/upper)かupper/(bottom*3)*(height/buttom)が整数になるようにしてください。
-        * @param par1World
-        * @param X 基準X座標
-        * @param Y 基準Y座標
-        * @param Z 基準Z座標
-        * @param Block 配置するBlock
-        * @param meta 配置するMetadata
-        * @param upperSide 上辺の長さ
-        * @param bottomSide 下辺の長さ
-        * @param height 高さ
-        * @return Object
-        */
-       public static Object trapezoidX(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){
-               Object dataBox = null;
-               int Rate=0;
-               int Math=0;
-               int XRate=0;
-               int YRate = 0;
-               for(int i=0;i<height;i++){
-                       YRate++;
-                       Math++;
-                       XRate++;
-                       if(upperSide < bottomSide){
-                               if(Math == bottomSide/(upperSide*3)*(height/upperSide)){
-                                       Rate++;
-                                       Math=0;
-                               }
-                       }
-
-                       if(bottomSide < upperSide){
-                               if(Math == upperSide/(bottomSide*3)*(height/bottomSide)){
-                                       Rate--;
-                                       Math=0;
-                               }
-                       }
-
-                       dataBox=lineZ(par1World, X+XRate-1, Y+YRate, Z, Block, meta, upperSide+Rate, 0);
-               }
-               return dataBox;
-       }
-
-       /**
-        * Y方向のXラインに台形を作成します。
-        * 必ずbottom/(upper*3)*(height/upper)かupper/(bottom*3)*(height/buttom)が整数になるようにしてください。
-        * @param par1World
-        * @param X 基準X座標
-        * @param Y 基準Y座標
-        * @param Z 基準Z座標
-        * @param Block 配置するBlock
-        * @param meta 配置するMetadata
-        * @param upperSide 上辺の長さ
-        * @param bottomSide 下辺の長さ
-        * @param height 高さ
-        * @return Object
-        */
-       public static Object trapezoidY_X(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){
-               Object dataBox = null;
-               int Rate=0;
-               int Math=0;
-               int YRate = 0;
-               for(int i=0;i<height;i++){
-                       YRate++;
-                       Math++;
-                       if(upperSide < bottomSide){
-                               if(Math == bottomSide/(upperSide*3)*(height/upperSide)){
-                                       Rate++;
-                                       Math=0;
-                               }
-                       }
-
-                       if(bottomSide < upperSide){
-                               if(Math == upperSide/(bottomSide*3)*(height/bottomSide)){
-                                       Rate--;
-                                       Math=0;
-                               }
-                       }
-
-                       dataBox=lineZ(par1World, X, Y+YRate, Z, Block, meta, upperSide+Rate, 0);
-               }
-               return dataBox;
-       }
-
-       /**
-        * Y方向のZラインに台形を作成します。
-        * 必ずbottom/(upper*3)*(height/upper)かupper/(bottom*3)*(height/buttom)が整数になるようにしてください。
-        * @param par1World
-        * @param X 基準X座標
-        * @param Y 基準Y座標
-        * @param Z 基準Z座標
-        * @param Block 配置するBlock
-        * @param meta 配置するMetadata
-        * @param upperSide 上辺の長さ
-        * @param bottomSide 下辺の長さ
-        * @param height 高さ
-        * @return Object
-        */
-       public static Object trapezoidY_Z(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){
-               Object dataBox = null;
-               int Rate=0;
-               int Math=0;
-               int YRate = 0;
-               for(int i=0;i<height;i++){
-                       YRate++;
-                       Math++;
-                       if(upperSide < bottomSide){
-                               if(Math == bottomSide/(upperSide*3)*(height/upperSide)){
-                                       Rate++;
-                                       Math=0;
-                               }
-                       }
-
-                       if(bottomSide < upperSide){
-                               if(Math == upperSide/(bottomSide*3)*(height/bottomSide)){
-                                       Rate--;
-                                       Math=0;
-                               }
-                       }
-
-                       dataBox=lineX(par1World, X, Y+YRate, Z, Block, meta, upperSide+Rate, 0);
-               }
-               return dataBox;
-       }
-
-       /**
-        * Z方向に台形を作成します。
-        * 必ずbottom/(upper*3)*(height/upper)かupper/(bottom*3)*(height/buttom)が整数になるようにしてください。
-        * @param par1World
-        * @param X 基準X座標
-        * @param Y 基準Y座標
-        * @param Z 基準Z座標
-        * @param Block 配置するBlock
-        * @param meta 配置するMetadata
-        * @param upperSide 上辺の長さ
-        * @param bottomSide 下辺の長さ
-        * @param height 高さ
-        * @return Object
-        */
-       public static Object TrapezoidZ(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){
-               Object dataBox = null;
-               int Rate=0;
-               int Math=0;
-               int ZRate=0;
-               for(int i=0;i<height;i++){
-                       Math++;
-                       ZRate++;
-                       if(upperSide < bottomSide){
-                               if(Math == bottomSide/(upperSide*3)*(height/upperSide)){
-                                       Rate++;
-                                       Math=0;
-                               }
-                       }
-
-                       if(bottomSide < upperSide){
-                               if(Math == upperSide/(bottomSide*3)*(height/bottomSide)){
-                                       Rate--;
-                                       Math=0;
-                               }
-                       }
-
-                       dataBox=lineX(par1World, X, Y, Z+ZRate, Block, meta, upperSide+Rate, 0);
-               }
-               return dataBox;
-       }
-
-}
\ No newline at end of file
diff --git a/src/chemicraft/entity/EntityAtomsGrenade.java b/src/chemicraft/entity/EntityAtomsGrenade.java
deleted file mode 100644 (file)
index deb72b1..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-package chemicraft.entity;
-
-import java.util.Iterator;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.projectile.EntityThrowable;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.world.World;
-
-public class EntityAtomsGrenade extends EntityThrowable
-{
-
-       private float explodeSize;
-       private boolean isExplode;
-       private boolean onFire;
-       private boolean isNuke;
-
-       public EntityAtomsGrenade(World par1World, EntityLiving par2EntityLiving, boolean par3, boolean par4, boolean par5) {
-               super(par1World, par2EntityLiving);
-               this.isExplode = par3;
-               this.onFire = par4;
-               this.isNuke = par5;
-       }
-
-       @Override
-       public void onUpdate(){
-               super.onUpdate();
-       }
-
-       @SuppressWarnings("unchecked")
-       @Override
-       protected void onImpact(MovingObjectPosition par1MovingObjectPosition)
-       {
-
-               if(isExplode){
-                       this.explodeSize = 3.0F;
-               }
-
-               if(isNuke){
-                       this.explodeSize = 20.0F;
-               }
-
-               if (par1MovingObjectPosition.entityHit != null) {
-                       par1MovingObjectPosition.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.func_85052_h()), 2);
-                       par1MovingObjectPosition.entityHit.setFire(5);
-               }
-
-               if (!this.worldObj.isRemote && !isNuke) {
-                       this.worldObj.createExplosion((Entity)null, this.posX, this.posY, this.posZ, explodeSize, onFire);
-                       this.isDead = true;
-               }else if(!this.worldObj.isRemote && isNuke){
-                       this.worldObj.createExplosion((Entity)null, this.posX, this.posY, this.posZ, explodeSize, onFire);
-                       Iterator<EntityLiving> itr = this.worldObj.getEntitiesWithinAABB(EntityLiving.class, this.boundingBox.expand(30, 30, 30)).iterator();
-                       while(itr.hasNext()){
-                               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);
-                               int distance = (int)Math.sqrt( Math.pow(dx, 2) + Math.pow(dy, 2) + Math.pow(dz, 2) );
-                               if(30 - distance >= 0){
-                                       entity.addPotionEffect(new PotionEffect(2, (60 + (30 - distance)) * 20, (30 - distance) / 5));
-                                       entity.addPotionEffect(new PotionEffect(4, (60 + (30 - distance)) * 20, (30 - distance) / 5));
-                                       entity.addPotionEffect(new PotionEffect(18, (60 + (30 - distance)) * 20, (30 - distance) / 5));
-                                       entity.addPotionEffect(new PotionEffect(19, (60 + (30 - distance)) * 20, (30 - distance) / 5));
-                               }
-                       }
-                       this.isDead = true;
-               }
-
-       }
-
-}
diff --git a/src/chemicraft/gui/GuiChemicalCombinationTable.java b/src/chemicraft/gui/GuiChemicalCombinationTable.java
deleted file mode 100644 (file)
index 7daf181..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-package chemicraft.gui;
-
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiTextField;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.entity.player.EntityPlayer;
-import chemicraft.ChemiCraft;
-import chemicraft.container.ContainerChemicalCombinationTable;
-import chemicraft.tileentity.TileEntityChemicalCombinationTable;
-import cpw.mods.fml.common.network.PacketDispatcher;
-
-public class GuiChemicalCombinationTable extends GuiContainer {
-
-       private GuiTextField atomList;
-
-       private TileEntityChemicalCombinationTable tileentity;
-
-       public GuiChemicalCombinationTable(EntityPlayer par1EntityPlayer, TileEntityChemicalCombinationTable par2) {
-               super(new ContainerChemicalCombinationTable(par1EntityPlayer, par2));
-               this.tileentity = par2;
-               this.ySize = 204;
-       }
-
-       @Override
-       public void initGui(){
-               super.initGui();
-               this.atomList = new GuiTextField(this.fontRenderer, 9, 103, 160, 15);
-               this.atomList.setFocused(false);
-               this.atomList.setMaxStringLength(25);
-               this.controlList.add(new GuiButton(0, this.guiLeft + 172 - 41, this.guiTop + 80 - 21, 40, 20, "Add"));
-               this.controlList.add(new GuiButton(1, this.guiLeft + 172 - 41, this.guiTop + 80, 40, 20, "Eject"));
-       }
-
-       @Override
-       protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) {
-               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.guiChemicalCombinationTexture));
-               this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
-       }
-
-       @Override
-       protected void actionPerformed(GuiButton par1GuiButton) {
-               if(par1GuiButton.id == 0){
-                       this.tileentity.field_00001();
-                       PacketDispatcher.sendPacketToServer(this.tileentity.getDescriptionPacket());
-               }else if(par1GuiButton.id == 1){
-                       this.tileentity.field_00002();
-                       PacketDispatcher.sendPacketToServer(this.tileentity.getDescriptionPacket());
-               }
-               return;
-       }
-
-       @Override
-       protected void drawGuiContainerForegroundLayer(int par1, int par2) {
-               this.atomList.setText(this.tileentity.getAtoms());
-               this.atomList.drawTextBox();
-       }
-
-}
diff --git a/src/chemicraft/gui/GuiChemicalCraftingTable.java b/src/chemicraft/gui/GuiChemicalCraftingTable.java
deleted file mode 100644 (file)
index a25ad96..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-package chemicraft.gui;
-
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.entity.player.EntityPlayer;
-import chemicraft.ChemiCraft;
-import chemicraft.container.ContainerChemicalCraftingTable;
-import chemicraft.tileentity.TileEntityChemicalCraftingTable;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class GuiChemicalCraftingTable extends GuiContainer {
-
-       public GuiChemicalCraftingTable(EntityPlayer par1EntityPlayer, TileEntityChemicalCraftingTable par2){
-               super(new ContainerChemicalCraftingTable(par1EntityPlayer, par2));
-       }
-
-
-
-       @Override
-       protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3){
-               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.guiChemicalCraftingTexture));
-               this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
-       }
-
-}
diff --git a/src/chemicraft/gui/GuiDecompositionTable.java b/src/chemicraft/gui/GuiDecompositionTable.java
deleted file mode 100644 (file)
index b22ae2b..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-package chemicraft.gui;
-
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.entity.player.EntityPlayer;
-import chemicraft.ChemiCraft;
-import chemicraft.container.ContainerDecompositionTable;
-import chemicraft.tileentity.TileEntityDecompositionTable;
-
-public class GuiDecompositionTable extends GuiContainer{
-
-<<<<<<< HEAD:common/chemicraft/gui/GuiPyrolysisTable.java
-       private TileEntityPyrolysisTable tileentity;
-
-       public GuiPyrolysisTable(EntityPlayer par1EntityPlayer, TileEntityPyrolysisTable par2) {
-               super(new ContainerPyrolysisTable(par1EntityPlayer, par2));
-               this.tileentity = par2;
-               this.ySize = 204;
-=======
-       public GuiDecompositionTable(EntityPlayer par1EntityPlayer, TileEntityDecompositionTable par2) {
-               super(new ContainerDecompositionTable(par1EntityPlayer, par2));
->>>>>>> cbf016a981df6758b057ca883a1527676a1a9ec3:src/chemicraft/gui/GuiDecompositionTable.java
-       }
-
-       @Override
-       protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) {
-               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 drawGuiContainerForegroundLayer(int par1, int par2) {
-               this.fontRenderer.drawString(String.valueOf("Temp:" + (int)this.tileentity.getHeat()), 110, 100, 0x000000);
-       }
-
-}
diff --git a/src/chemicraft/gui/GuiElectrolysisTable.java b/src/chemicraft/gui/GuiElectrolysisTable.java
deleted file mode 100644 (file)
index a18faaf..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-package chemicraft.gui;
-
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.entity.player.EntityPlayer;
-import chemicraft.ChemiCraft;
-import chemicraft.container.ContainerElectrolysisTable;
-import chemicraft.tileentity.TileEntityElectrolysisTable;
-
-public class GuiElectrolysisTable extends GuiContainer
-{
-
-       public GuiElectrolysisTable(EntityPlayer par1EntityPlayer, TileEntityElectrolysisTable par2) {
-               super(new ContainerElectrolysisTable(par1EntityPlayer, par2));
-               this.ySize = 204;
-       }
-
-       @Override
-       protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3)
-       {
-               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.guiElectrolysisTableTexture));
-               this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
-       }
-
-}
diff --git a/src/chemicraft/gui/GuiToolAndWeaponCraftingTable.java b/src/chemicraft/gui/GuiToolAndWeaponCraftingTable.java
deleted file mode 100644 (file)
index d3e9288..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-package chemicraft.gui;
-
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.entity.player.EntityPlayer;
-import chemicraft.ChemiCraft;
-import chemicraft.container.ContainerToolAndWeaponCraftingTable;
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
-
-public class GuiToolAndWeaponCraftingTable extends GuiContainer {
-
-       public GuiToolAndWeaponCraftingTable(EntityPlayer par1EntityPlayer, TileEntityToolAndWeaponCraftingTable par2) {
-               super(new ContainerToolAndWeaponCraftingTable(par1EntityPlayer, par2));
-       }
-
-       @Override
-       protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) {
-               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/src/chemicraft/inventory/InventoryChemicalCombinationTableMaterial.java b/src/chemicraft/inventory/InventoryChemicalCombinationTableMaterial.java
deleted file mode 100644 (file)
index 42f2f05..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryChemicalCombinationTableMaterial implements IInventory {
-
-       private ItemStack[] inventory = new ItemStack[16];
-       private Container eventHandler;
-
-       public void setEventHandler(Container par1){
-               this.eventHandler = par1;
-       }
-
-       @Override
-       public int getSizeInventory() {
-               return this.inventory.length;
-       }
-
-       @Override
-       public ItemStack getStackInSlot(int var1) {
-               return this.inventory[var1];
-       }
-
-       @Override
-       public ItemStack decrStackSize(int var1, int var2) {
-               if (this.inventory[var1] != null)
-               {
-                       ItemStack var3;
-
-                       if (this.inventory[var1].stackSize <= var2)
-                       {
-                               var3 = this.inventory[var1];
-                               this.inventory[var1] = null;
-                               this.onInventoryChanged();
-                               return var3;
-                       }
-                       else
-                       {
-                               var3 = this.inventory[var1].splitStack(var2);
-
-                               if (this.inventory[var1].stackSize == 0)
-                               {
-                                       this.inventory[var1] = null;
-                               }
-
-                               this.onInventoryChanged();
-                               return var3;
-                       }
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public ItemStack getStackInSlotOnClosing(int var1) {
-               if (this.inventory[var1] != null)
-               {
-                       ItemStack var2 = this.inventory[var1];
-                       this.inventory[var1] = null;
-                       return var2;
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public void setInventorySlotContents(int var1, ItemStack var2) {
-               this.inventory[var1] = var2;
-
-               if (var2 != null && var2.stackSize > this.getInventoryStackLimit())
-               {
-                       var2.stackSize = this.getInventoryStackLimit();
-               }
-
-               this.onInventoryChanged();
-       }
-
-       @Override
-       public String getInvName() {
-               return "ChemicalCombinationTableMaterial";
-       }
-
-       @Override
-       public int getInventoryStackLimit() {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged() {
-               if(this.eventHandler != null) this.eventHandler.onCraftMatrixChanged(this);
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1) {
-               return true;
-       }
-
-       @Override
-       public void openChest() {
-       }
-
-       @Override
-       public void closeChest() {
-       }
-
-}
diff --git a/src/chemicraft/inventory/InventoryChemicalCombinationTableResult.java b/src/chemicraft/inventory/InventoryChemicalCombinationTableResult.java
deleted file mode 100644 (file)
index a6edc74..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryChemicalCombinationTableResult implements IInventory {
-
-       private ItemStack[] inventory = new ItemStack[15];
-       private Container eventHandler;
-
-       public void setEventHandler(Container par1){
-               this.eventHandler = par1;
-       }
-
-       @Override
-       public int getSizeInventory() {
-               return this.inventory.length;
-       }
-
-       @Override
-       public ItemStack getStackInSlot(int var1) {
-               return this.inventory[var1];
-       }
-
-       @Override
-       public ItemStack decrStackSize(int var1, int var2) {
-               if (this.inventory[var1] != null)
-               {
-                       ItemStack var3;
-
-                       if (this.inventory[var1].stackSize <= var2)
-                       {
-                               var3 = this.inventory[var1];
-                               this.inventory[var1] = null;
-                               this.onInventoryChanged();
-                               return var3;
-                       }
-                       else
-                       {
-                               var3 = this.inventory[var1].splitStack(var2);
-
-                               if (this.inventory[var1].stackSize == 0)
-                               {
-                                       this.inventory[var1] = null;
-                               }
-
-                               this.onInventoryChanged();
-                               return var3;
-                       }
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public ItemStack getStackInSlotOnClosing(int var1) {
-               if (this.inventory[var1] != null)
-               {
-                       ItemStack var2 = this.inventory[var1];
-                       this.inventory[var1] = null;
-                       return var2;
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public void setInventorySlotContents(int var1, ItemStack var2) {
-               this.inventory[var1] = var2;
-
-               if (var2 != null && var2.stackSize > this.getInventoryStackLimit())
-               {
-                       var2.stackSize = this.getInventoryStackLimit();
-               }
-
-               this.onInventoryChanged();
-       }
-
-       @Override
-       public String getInvName() {
-               return "ChemicalCombinationTableResult";
-       }
-
-       @Override
-       public int getInventoryStackLimit() {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged() {
-               if(this.eventHandler != null) this.eventHandler.onCraftMatrixChanged(this);
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1) {
-               return true;
-       }
-
-       @Override
-       public void openChest() {
-       }
-
-       @Override
-       public void closeChest() {
-       }
-
-
-}
diff --git a/src/chemicraft/inventory/InventoryChemicalCraftingMaterial.java b/src/chemicraft/inventory/InventoryChemicalCraftingMaterial.java
deleted file mode 100644 (file)
index 6bd7c4b..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryChemicalCraftingMaterial implements IInventory {
-
-       private ItemStack[] inventory = new ItemStack[9];
-
-       private Container eventHandelr;
-
-       public void setEventHandler(Container par1Container){
-               this.eventHandelr = par1Container;
-       }
-
-       @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 "ChemicalCraftingInventory";
-       }
-
-       @Override
-       public int getInventoryStackLimit() {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged() {
-               this.eventHandelr.onCraftMatrixChanged(this);
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1) {
-               return true;
-       }
-
-       @Override
-       public void openChest() {
-
-       }
-
-       @Override
-       public void closeChest() {
-
-       }
-
-}
diff --git a/src/chemicraft/inventory/InventoryChemicalCraftingNBT.java b/src/chemicraft/inventory/InventoryChemicalCraftingNBT.java
deleted file mode 100644 (file)
index f57eb68..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryChemicalCraftingNBT implements IInventory {
-
-       private ItemStack[] inventory = new ItemStack[3];
-
-       private Container eventHandelr;
-
-       public void setEventHandler(Container par1Container){
-               this.eventHandelr = par1Container;
-       }
-
-       @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 "ChemicalCraftingInventory";
-       }
-
-       @Override
-       public int getInventoryStackLimit() {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged() {
-               this.eventHandelr.onCraftMatrixChanged(this);
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1) {
-               return true;
-       }
-
-       @Override
-       public void openChest() {
-
-       }
-
-       @Override
-       public void closeChest() {
-
-       }
-
-}
diff --git a/src/chemicraft/inventory/InventoryChemicalCraftingResult.java b/src/chemicraft/inventory/InventoryChemicalCraftingResult.java
deleted file mode 100644 (file)
index 1c6aa6e..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryChemicalCraftingResult implements IInventory {
-
-       private ItemStack[] inventory = new ItemStack[1];
-
-       private Container eventHandelr;
-
-       public void setEventHandler(Container par1Container){
-               this.eventHandelr = par1Container;
-       }
-
-       @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 "ChemicalCraftingInventory";
-       }
-
-       @Override
-       public int getInventoryStackLimit() {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged() {
-               this.eventHandelr.onCraftMatrixChanged(this);
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1) {
-               return true;
-       }
-
-       @Override
-       public void openChest() {
-
-       }
-
-       @Override
-       public void closeChest() {
-
-       }
-
-
-}
diff --git a/src/chemicraft/inventory/InventoryDecompositionTableMaterial.java b/src/chemicraft/inventory/InventoryDecompositionTableMaterial.java
deleted file mode 100644 (file)
index 8803c14..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryDecompositionTableMaterial implements IInventory {
-
-       private ItemStack[] inventory = new ItemStack[1];
-       private Container eventHandler;
-
-       public void setEventHandler(Container par1){
-               this.eventHandler = par1;
-       }
-
-       @Override
-       public int getSizeInventory() {
-               return this.inventory.length;
-       }
-
-       @Override
-       public ItemStack getStackInSlot(int var1) {
-               return this.inventory[var1];
-       }
-
-       @Override
-       public ItemStack decrStackSize(int var1, int var2) {
-               if (this.inventory[var1] != null)
-               {
-                       ItemStack var3;
-
-                       if (this.inventory[var1].stackSize <= var2)
-                       {
-                               var3 = this.inventory[var1];
-                               this.inventory[var1] = null;
-                               this.onInventoryChanged();
-                               return var3;
-                       }
-                       else
-                       {
-                               var3 = this.inventory[var1].splitStack(var2);
-
-                               if (this.inventory[var1].stackSize == 0)
-                               {
-                                       this.inventory[var1] = null;
-                               }
-
-                               this.onInventoryChanged();
-                               return var3;
-                       }
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public ItemStack getStackInSlotOnClosing(int var1) {
-               if (this.inventory[var1] != null)
-               {
-                       ItemStack var2 = this.inventory[var1];
-                       this.inventory[var1] = null;
-                       return var2;
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public void setInventorySlotContents(int var1, ItemStack var2) {
-               this.inventory[var1] = var2;
-
-               if (var2 != null && var2.stackSize > this.getInventoryStackLimit())
-               {
-                       var2.stackSize = this.getInventoryStackLimit();
-               }
-
-               this.onInventoryChanged();
-       }
-
-       @Override
-       public String getInvName() {
-               return "DecompositionTableMaterial";
-       }
-
-       @Override
-       public int getInventoryStackLimit() {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged() {
-               if(this.eventHandler != null) this.eventHandler.onCraftMatrixChanged(this);
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1) {
-               return true;
-       }
-
-       @Override
-       public void openChest() {
-       }
-
-       @Override
-       public void closeChest() {
-       }
-
-}
diff --git a/src/chemicraft/inventory/InventoryDecompositionTableResult.java b/src/chemicraft/inventory/InventoryDecompositionTableResult.java
deleted file mode 100644 (file)
index 05bd099..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryDecompositionTableResult implements IInventory {
-
-       private ItemStack[] inventory = new ItemStack[16];
-       private Container eventHandler;
-
-       public void setEventHandler(Container par1){
-               this.eventHandler = par1;
-       }
-
-       @Override
-       public int getSizeInventory() {
-               return this.inventory.length;
-       }
-
-       @Override
-       public ItemStack getStackInSlot(int var1) {
-               return this.inventory[var1];
-       }
-
-       @Override
-       public ItemStack decrStackSize(int var1, int var2) {
-               if (this.inventory[var1] != null)
-               {
-                       ItemStack var3;
-
-                       if (this.inventory[var1].stackSize <= var2)
-                       {
-                               var3 = this.inventory[var1];
-                               this.inventory[var1] = null;
-                               this.onInventoryChanged();
-                               return var3;
-                       }
-                       else
-                       {
-                               var3 = this.inventory[var1].splitStack(var2);
-
-                               if (this.inventory[var1].stackSize == 0)
-                               {
-                                       this.inventory[var1] = null;
-                               }
-
-                               this.onInventoryChanged();
-                               return var3;
-                       }
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public ItemStack getStackInSlotOnClosing(int var1) {
-               if (this.inventory[var1] != null)
-               {
-                       ItemStack var2 = this.inventory[var1];
-                       this.inventory[var1] = null;
-                       return var2;
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public void setInventorySlotContents(int var1, ItemStack var2) {
-               this.inventory[var1] = var2;
-
-               if (var2 != null && var2.stackSize > this.getInventoryStackLimit())
-               {
-                       var2.stackSize = this.getInventoryStackLimit();
-               }
-
-               this.onInventoryChanged();
-       }
-
-       @Override
-       public String getInvName() {
-               return "DecompositionTableResult";
-       }
-
-       @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/src/chemicraft/inventory/InventoryElectrolysisFuel.java b/src/chemicraft/inventory/InventoryElectrolysisFuel.java
deleted file mode 100644 (file)
index a811979..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryElectrolysisFuel implements IInventory
-{
-
-       private ItemStack[] inventory = new ItemStack[1];
-
-       private Container eventHandelr;
-
-       public void setEventHandler(Container par1Container)
-       {
-               this.eventHandelr = par1Container;
-       }
-
-       @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 "ChemicalCraftingInventory";
-       }
-
-       @Override
-       public int getInventoryStackLimit()
-       {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged()
-       {
-               this.eventHandelr.onCraftMatrixChanged(this);
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1)
-       {
-               return true;
-       }
-
-       @Override
-       public void openChest()
-       {
-
-       }
-
-       @Override
-       public void closeChest()
-       {
-
-       }
-
-}
diff --git a/src/chemicraft/inventory/InventoryElectrolysisMaterial.java b/src/chemicraft/inventory/InventoryElectrolysisMaterial.java
deleted file mode 100644 (file)
index d004d5c..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryElectrolysisMaterial implements IInventory
-{
-
-       private ItemStack[] inventory = new ItemStack[1];
-
-       private Container eventHandelr;
-
-       public void setEventHandler(Container par1Container)
-       {
-               this.eventHandelr = par1Container;
-       }
-
-       @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 "ChemicalCraftingInventory";
-       }
-
-       @Override
-       public int getInventoryStackLimit()
-       {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged()
-       {
-               this.eventHandelr.onCraftMatrixChanged(this);
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1)
-       {
-               return true;
-       }
-
-       @Override
-       public void openChest()
-       {
-
-       }
-
-       @Override
-       public void closeChest()
-       {
-
-       }
-
-}
diff --git a/src/chemicraft/inventory/InventoryElectrolysisResult.java b/src/chemicraft/inventory/InventoryElectrolysisResult.java
deleted file mode 100644 (file)
index 2acf3a2..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryElectrolysisResult implements IInventory
-{
-
-       private ItemStack[] inventory = new ItemStack[16];
-
-       private Container eventHandelr;
-
-       public void setEventHandler(Container par1Container)
-       {
-               this.eventHandelr = par1Container;
-       }
-
-       @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 "ChemicalCraftingInventory";
-       }
-
-       @Override
-       public int getInventoryStackLimit()
-       {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged()
-       {
-               this.eventHandelr.onCraftMatrixChanged(this);
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1)
-       {
-               return true;
-       }
-
-       @Override
-       public void openChest()
-       {
-
-       }
-
-       @Override
-       public void closeChest()
-       {
-
-       }
-
-}
diff --git a/src/chemicraft/inventory/InventoryToolAndWeaponCraftingTableMaterial.java b/src/chemicraft/inventory/InventoryToolAndWeaponCraftingTableMaterial.java
deleted file mode 100644 (file)
index aad5063..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryToolAndWeaponCraftingTableMaterial implements IInventory {
-
-       private ItemStack[] inventory = new ItemStack[16];
-       private Container eventHandler;
-
-       public void setEventHandler(Container par1){
-               this.eventHandler = par1;
-       }
-
-       @Override
-       public int getSizeInventory() {
-               return this.inventory.length;
-       }
-
-       @Override
-       public ItemStack getStackInSlot(int var1) {
-               return this.inventory[var1];
-       }
-
-       @Override
-       public ItemStack decrStackSize(int var1, int var2) {
-               if (this.inventory[var1] != null)
-               {
-                       ItemStack var3;
-
-                       if (this.inventory[var1].stackSize <= var2)
-                       {
-                               var3 = this.inventory[var1];
-                               this.inventory[var1] = null;
-                               this.onInventoryChanged();
-                               return var3;
-                       }
-                       else
-                       {
-                               var3 = this.inventory[var1].splitStack(var2);
-
-                               if (this.inventory[var1].stackSize == 0)
-                               {
-                                       this.inventory[var1] = null;
-                               }
-
-                               this.onInventoryChanged();
-