OSDN Git Service

ChemiCraft.java修正
[chemicraft/chemicraft.git] / common / chemicraft / ChemiCraft.java
index 093c26c..7f8829a 100644 (file)
@@ -1,28 +1,33 @@
 package chemicraft;\r
 \r
-import net.minecraft.src.Block;\r
-import net.minecraft.src.CreativeTabs;\r
-import net.minecraft.src.Item;\r
-import net.minecraft.src.ItemStack;\r
-import net.minecraft.src.Material;\r
+import net.minecraft.block.Block;\r
+import net.minecraft.block.material.Material;\r
+import net.minecraft.client.audio.SoundManager;\r
+import net.minecraft.creativetab.CreativeTabs;\r
+import net.minecraft.item.Item;\r
+import net.minecraft.item.ItemStack;\r
 import net.minecraftforge.common.Configuration;\r
 import net.minecraftforge.common.Property;\r
 import chemicraft.block.BlockChemicalCombinationTable;\r
 import chemicraft.block.BlockChemicalCraftingTable;\r
-import chemicraft.block.BlockDecompositionTable;\r
+import chemicraft.block.BlockElectrolysisTable;\r
+import chemicraft.block.BlockPyrolysisTable;\r
 import chemicraft.block.BlockToolAndWeaponCraftingTable;\r
+import chemicraft.compounds.CompoundDebug;\r
+import chemicraft.compounds.CompoundWater;\r
 import chemicraft.debug.CommandDeleteItem;\r
 import chemicraft.debug.CommandGenDebugRoom;\r
 import chemicraft.debug.CommandSetTile;\r
-import chemicraft.item.ItemAtomGrenade;\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.TileEntityDecompositionTable;\r
+import chemicraft.tileentity.TileEntityElectrolysisTable;\r
+import chemicraft.tileentity.TileEntityPyrolysisTable;\r
 import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;\r
 import chemicraft.util.Auxiliary;\r
 import chemicraft.util.Auxiliary.ArrayAuxiliary;\r
@@ -40,31 +45,30 @@ import cpw.mods.fml.common.registry.GameRegistry;
 \r
 /**\r
  * ChemiCraft本体\r
- *\r
  * @author P.C.C.\r
  *\r
  */\r
 @Mod(modid = "chemiCraft", name = "ChemiCraft", version = "beta")\r
-// ID,名前,バージョン\r
-@NetworkMod(clientSideRequired = true, serverSideRequired = false, versionBounds = "1.3.2", channels = "chemicraft", packetHandler = PacketHandler.class)\r
-// クライアント、サーバー共に必要 1.3.2用\r
+@NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.4.6", channels = "chemicraft", packetHandler = PacketHandler.class)\r
 public class ChemiCraft {\r
 \r
-       public final String[] atomsName = { "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 final String[] atomsNameJP = { "水素", "ヘリウム", "リチウム", "ベリウム", "ホウ素", "炭素", "窒素", "酸素", "フッ素", "ネオン", "ナトリウム", "マグネシウム", "アルミニウム", "ケイ素", "リン", "硫黄", "塩素", "アルゴン", "カリウム", "カルシウム", "スカンジウム",\r
-                       "チタン", "バナジウム", "クロム", "マンガン", "鉄", "コバルト", "ニッケル", "銅", "亜鉛", "ガリウム", "ゲルマニウム", "ヒ素", "セレン", "臭素", "クリプトン", "ルビジウム", "ストロンチウム", "イットリウム", "ジルコニウム", "ニオブ", "モリブデン", "テクネチウム", "ルテニウム",\r
-                       "ロジウム", "パラジウム", "銀", "カドミウム", "インジウム", "スズ", "アンチモン", "テルル", "ヨウ素", "キセノン", "セシウム", "バリウム", "ランタン", "セリウム", "プラセオジム", "ネオジム", "プロメチウム", "サマリウム", "ユウロビウム", "ガドリニウム", "テルビウム", "ジスプロニウム",\r
-                       "ホルミウム", "エルビウム", "ツリウム", "イッテルビウム", "ルテチウム", "ハフニウム", "タンタル", "タングステン", "レニウム", "オスミウム", "イリジウム", "白金", "金", "水銀", "タリウム", "鉛", "ビスマス", "ポロニウム", "アスタチン", "ラドン", "フランシウム", "ラジウム",\r
-                       "アクチニウム", "トリウム", "プロトアクチウム", "ウラン", "ネプツニウム", "プルトニウム", "アメリシウム", "キュリウム", "バークリウム", "カルホルニウム", "アインスタイニウム", "フェルミウム", "メンデレビウム", "ノーベリウム", "ローレンシウム", "ラサホージウム", "ドブニウム", "シーボーギウム",\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
@@ -73,18 +77,18 @@ public class ChemiCraft {
        public static ChemiCraft instance;\r
 \r
        /**\r
-        * ChemiCraftのProxy\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
+        * ChemiCraftのCreativeTab.\r
         */\r
        public static final CreativeTabs creativeTab = new CreativeTabAtoms("ChemiCraft");\r
 \r
        /**\r
-        * ItemID\r
+        * ItemID.\r
         */\r
        public int atomsID;\r
        public int compoundsID;\r
@@ -92,31 +96,34 @@ public class ChemiCraft {
        public int atomGrenadeID;\r
 \r
        /**\r
-        * BlockID\r
+        * BlockID.\r
         */\r
-       public int decompositionTableID;\r
+       public int pyrolysisTableID;\r
        public int chemicalConbinationTableID;\r
        public int toolAndWeaponCraftingTableID;\r
        public int chemicalCraftingTableID;\r
+       public int electrolysisTableID;\r
 \r
        /**\r
-        * GUIID\r
+        * GUIID.\r
         */\r
-       public int guiDecompositionTableID;\r
+       public int guiPyrolysisTableID;\r
        public int guiChemicalCombinationTableID;\r
        public int guiToolAndWeaponCraftingTableID;\r
        public int guiChemicalCraftingTableID;\r
+       public int guiElectrolysisTableID;\r
 \r
        /**\r
-        * Block型変数\r
+        * Block型変数.\r
         */\r
-       public Block blockDecompositionTable;\r
+       public Block blockPyrolysisTable;\r
        public Block blockChemicalCombinationTable;\r
        public Block blockToolAndWeaponCraftingTable;\r
        public Block blockChemicalCraftingTable;\r
+       public Block blockElectrolysisTable;\r
 \r
        /**\r
-        * Item型変数\r
+        * Item型変数.\r
         */\r
        public Item itemAtoms;\r
        public Item itemCompounds;\r
@@ -124,139 +131,166 @@ public class ChemiCraft {
        public Item itemAtomGrenade;\r
 \r
        /**\r
-        * このmodで使用するTextureのパス\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 guiDecompositionTexture = "/chemicraft/guis/Decomposition.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
+       public final String ITEM_ATOMS_TEXTURE = "/chemicraft/items/Atoms.png";\r
+       public final String ITEM_COMPOUNDS_TEXTURE = "/chemicraft/items/Compounds.png";\r
+       public final String ITEM_TEXTURE = "/chemicraft/items/items.png";\r
+       public final String BLOCK_CHEMICALCRAFTING_TABLE_TEXTURE = "/chemicraft/blocks/cctable.png";\r
+       public final String GUI_PYROLYSIS_TEXTURE = "/chemicraft/guis/Pyrolysis.png";\r
+       public final String GUI_ELECTROLYSIS_TEXTURE = "/chemicraft/guis/Electrolysis.png";\r
+       public final String GUI_CHEMICALCOMBINATION_TEXTURE = "/chemicraft/guis/ChemicalCombination.png";\r
+       public final String GUI_TOOLANDWEAPONCRAFTING_TEXTURE = "/chemicraft/guis/ToolAndWeaponCrafting.png";\r
+       public final String GUI_CHEMICALCRAFTING_TEXTURE = "/chemicraft/guis/MaterialCrafting.png";\r
 \r
        /**\r
-        * このmodに必要な補助クラスのインスタンス\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.instance;\r
+       private ChemiCraftAPI api = ChemiCraftAPI.getInstance();\r
+       private ChemiCraftData chemicalData = new ChemiCraftData();\r
 \r
        @Mod.PreInit\r
-       public void chemiPreLoadMethod(FMLPreInitializationEvent event) {\r
+       public void chemiPreLoadMethod(final FMLPreInitializationEvent event) {\r
                Configuration cfg = new Configuration(event.getSuggestedConfigurationFile());\r
                cfg.load();\r
 \r
-               Property decompositionTableIDProp = cfg.getBlock("DecompositionTable", 2400);\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
+               Property chemicalCraftingTableIDProp = cfg.getBlock("ChemicalCraftingTableID", 2403);\r
+               Property electrolysisTableIDProp = cfg.getBlock("ElectrolysisTableID", 2404);\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 guiDecompositionTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 1000);\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
+               Property guiElectrolysisTableIDProp = cfg.get("GUI", "GUIElectrolysisTableID", 1004);\r
 \r
 \r
-               this.decompositionTableID = decompositionTableIDProp.getInt();\r
+               this.pyrolysisTableID = pyrolysisTableIDProp.getInt();\r
                this.chemicalConbinationTableID = chemicalCombinationTableIDProp.getInt();\r
                this.toolAndWeaponCraftingTableID = toolAndWeaponCraftingTableIDProp.getInt();\r
-               this.chemicalCraftingTableID = ChemicalCraftingTableIDProp.getInt();\r
+               this.chemicalCraftingTableID = chemicalCraftingTableIDProp.getInt();\r
+               this.electrolysisTableID = electrolysisTableIDProp.getInt();\r
                this.atomsID = atomsIDProp.getInt();\r
                this.compoundsID = compoundsIDProp.getInt();\r
                this.gasCollectingBottleID = gasCollectingBottleIDProp.getInt();\r
                this.atomGrenadeID = atomGrenadeIDProp.getInt();\r
-               this.guiDecompositionTableID = guiDecompositionTableIDProp.getInt();\r
+               this.guiPyrolysisTableID = guiPyrolysisTableIDProp.getInt();\r
                this.guiChemicalCombinationTableID = guiChemicalCombinationTableIDProp.getInt();\r
                this.guiToolAndWeaponCraftingTableID = guiToolAndWeaponCraftingTableIDProp.getInt();\r
                this.guiChemicalCraftingTableID = guiChemicalCraftingTableIDProp.getInt();\r
+               this.guiElectrolysisTableID = guiElectrolysisTableIDProp.getInt();\r
 \r
                cfg.save();\r
-\r
-               // 描画関係の読み込み\r
-               proxy.registerRenderInformation();\r
        }\r
 \r
        @Mod.ServerStarting\r
-       public void serverStarting(FMLServerStartingEvent event){\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(FMLPostInitializationEvent event) {\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(FMLPostInitializationEvent event){\r
+       private void settingProcessing(final FMLPostInitializationEvent event) {\r
 \r
                // Blockを追加します\r
-               this.blockDecompositionTable = new BlockDecompositionTable(this.decompositionTableID, 0, Material.ground).setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("DecompositionTable");\r
-               this.blockChemicalCombinationTable = new BlockChemicalCombinationTable(this.chemicalConbinationTableID, 0, Material.ground).setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("ChemicalCombinationTable");\r
-               this.blockToolAndWeaponCraftingTable = new BlockToolAndWeaponCraftingTable(this.toolAndWeaponCraftingTableID, 0, Material.ground).setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("ToolAndWeaponCraftingTable");\r
-               this.blockChemicalCraftingTable = new BlockChemicalCraftingTable(chemicalCraftingTableID, 0, Material.ground).setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("ChemicalCraftingTable");\r
-\r
+               this.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(this.chemicalCraftingTableID, 0, Material.ground).\r
+                               setHardness(2.0F).\r
+                               setResistance(0.0F).\r
+                               setStepSound(Block.soundStoneFootstep).\r
+                               setBlockName("ChemicalCraftingTable");\r
+               this.blockElectrolysisTable = new BlockElectrolysisTable(this.electrolysisTableID, 0, Material.ground).\r
+                               setHardness(2.0F).\r
+                               setResistance(0.0F).\r
+                               setStepSound(Block.soundStoneFootstep).\r
+                               setBlockName("ElectrolysisTable");\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 ItemAtomGrenade(this.atomGrenadeID).setItemName("grenade").setIconIndex(1);\r
+               this.itemAtomGrenade = new ItemAtomsGrenade(this.atomGrenadeID).setItemName("grenade").setIconIndex(1);\r
 \r
                // BlockをMinecraftに登録します\r
-               GameRegistry.registerBlock(this.blockDecompositionTable);\r
-               GameRegistry.registerBlock(this.blockChemicalCombinationTable);\r
-               GameRegistry.registerBlock(this.blockToolAndWeaponCraftingTable);\r
-               GameRegistry.registerBlock(this.blockChemicalCraftingTable);\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
+               GameRegistry.registerBlock(this.blockElectrolysisTable, "BlockElectrolysisTable");\r
 \r
                // Blockの名前を設定します\r
-               this.nameAuxiliary.addName(this.blockDecompositionTable, "DecompositionTable");\r
-               this.nameAuxiliary.addName(this.blockDecompositionTable, "ja_JP", "分解台");\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
+               this.nameAuxiliary.addName(this.blockToolAndWeaponCraftingTable, "ToolAndWeaponCraftingTable");\r
+               this.nameAuxiliary.addName(this.blockToolAndWeaponCraftingTable, "ja_JP", "ツール&武器製作台");\r
+               this.nameAuxiliary.addName(this.blockChemicalCraftingTable, "ChemicalCraftingTable");\r
+               this.nameAuxiliary.addName(this.blockChemicalCraftingTable, "ja_JP", "素材製作台");\r
+               this.nameAuxiliary.addName(this.blockElectrolysisTable, "ElectrolysisTable");\r
+               this.nameAuxiliary.addName(this.blockElectrolysisTable, "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.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(TileEntityDecompositionTable.class, "DecompositionTable");\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
+               GameRegistry.registerTileEntity(TileEntityElectrolysisTable.class, "TileEntityElectrolysisTable");\r
 \r
                // GUIを追加します\r
                NetworkRegistry.instance().registerGuiHandler(instance, proxy);\r
 \r
-               //Textureをpreloadします\r
-               proxy.registerTextures();\r
+               // 描画関係の読み込み\r
+               proxy.registerRenderInformation();\r
 \r
                //化学作業台類のレシピを追加します\r
-               GameRegistry.addRecipe(new ItemStack(this.blockDecompositionTable),\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(Block.tnt),\r
+                       Character.valueOf('A'), new ItemStack(Item.bucketLava),\r
                });\r
                GameRegistry.addRecipe(new ItemStack(this.blockChemicalCombinationTable),\r
                                new Object[]{\r
@@ -283,84 +317,58 @@ public class ChemiCraft {
                        Character.valueOf('A'), new ItemStack(this.itemAtoms, 1, 0),\r
                });\r
 \r
-               //\r
-               ChemiCraftAPI.instance.addDecompositionRecipe(new ItemStack(Block.dirt), new ItemStack[]{new ItemStack(Block.stone)});\r
-\r
                // 化合物を追加します\r
-               ChemiCraftAPI.instance.addLangCompound("ja_JP", "CarbonDioxide", "二酸化炭素");\r
+               api.addLangCompound("ja_JP", "CarbonMonoxide", "一酸化炭素");\r
+               api.addLangCompound("ja_JP", "CarbonDioxide", "二酸化炭素");\r
+               api.addLangCompound("ja_JP", "Water", "水");\r
+
 \r
-               // 化合物のレシピを追加します\r
-               ChemiCraftAPI.instance.addChemicalCombinationRecipe(new ItemStack[]{new ItemStack(this.itemAtoms, 1, CARBON), new ItemStack(this.itemAtoms, 1, OXYGEN) }, new ItemStack(this.itemCompounds, 1, api.getDamageByName("CarbonDioxide")));\r
+               //化合物のHandlerを設定します\r
+               api.settingCompoundHandler("Water", new CompoundWater());\r
 \r
-               //手榴弾の追加\r
-               ChemiCraftAPI.instance.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());\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(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
+\r
+               api.addDecompositionRecipe(new ItemStack(Item.potion, 1, 0),\r
+                               new int[] {ChemiCraftData.HYDROGEN, ChemiCraftData.OXYGEN},\r
+                               new int[] {2, 1});\r
+\r
+               api.addDecompositionRecipe(new ItemStack(this.itemCompounds, 1, api.getCompound("Water")),\r
+                               new int[] {ChemiCraftData.HYDROGEN, ChemiCraftData.OXYGEN},\r
+                               new int[] {2, 1});\r
+\r
+               api.addDecompositionFuel(new ItemStack(Item.coal), 2000*8);\r
        }\r
 \r
-       private void apiProcessing(FMLPostInitializationEvent event){\r
+       private void apiProcessing(final FMLPostInitializationEvent event) {\r
                // API用の処理\r
-               this.nameAuxiliary.addName(itemCompounds, ChemiCraftAPI.instance.getCompoundsName().toArray());\r
-               this.nameAuxiliary.addName(itemCompounds, "ja_JP", ChemiCraftAPI.instance.getCompoundsLangName().toArray());\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
+               //DebugTickingの追加\r
+               this.proxy.registerTickHandler();\r
+               api.addCompound("Debug");\r
+               this.api.settingCompoundHandler("Debug", new CompoundDebug());\r
        }\r
 \r
-       public final static int HYDROGEN = 0;\r
-       public final static int HELIUM = 1;\r
-       public final static int LITHIUM = 2;\r
-       public final static int BERYLLIUM = 3;\r
-       public final static int BORON = 4;\r
-       public final static int CARBON = 5;\r
-       public final static int NITROGEN = 6;\r
-       public final static int OXYGEN = 7;\r
-       public final static int FLUORINE = 8;\r
-       public final static int NEON = 9;\r
-       public final static int SODIUM = 10;\r
-       public final static int MAGNESIUM = 11;\r
-       public final static int ALMINIUM = 12;\r
-       public final static int SILICON = 13;\r
-       public final static int PHOSPHORUS = 14;\r
-       public final static int SULFUR = 15;\r
-       public final static int CHLORINE = 16;\r
-       public final static int ARGON = 17;\r
-       public final static int POTASSIUM = 18;\r
-       public final static int CALCIUM = 19;\r
-       public final static int SCANDIUM = 20;\r
-       public final static int TITANIUM = 21;\r
-       public final static int VANADIUM = 22;\r
-       public final static int CHROMIUM = 23;\r
-       public final static int MANGANESE = 24;\r
-       public final static int IRON = 25;\r
-       public final static int COBALT = 26;\r
-       public final static int NICKEL = 27;\r
-       public final static int COPPER = 28;\r
-       public final static int ZINC = 29;\r
-       public final static int GALLIUM = 30;\r
-       public final static int GERMANIUM = 31;\r
-       public final static int ARSENIC = 32;\r
-       public final static int SELENIUM = 33;\r
-       public final static int BROMINE = 34;\r
-       public final static int KRYPTON = 35;\r
-       public final static int RUBIDIUM = 36;\r
-       public final static int STRONTIUM = 37;\r
-       public final static int YTTORIUM = 38;\r
-       public final static int ZIRCONIUM = 39;\r
-       public final static int NIOBIUM = 40;\r
-       public final static int MOLYBDENUM = 41;\r
-       public final static int TECHNETIUM = 42;\r
-       public final static int RUTHENIUM = 43;\r
-       public final static int RHODIUM = 44;\r
-       public final static int PALLADIUM = 45;\r
-       public final static int SILVER = 46;\r
-       public final static int CADMIUM = 47;\r
-       public final static int URANIUM = 91;\r
-\r
-       public final static String HYDROGEN_ = "H";\r
-       public final static String HELIUM_ = "He";\r
-       public final static String LITHIUM_ = "Li";\r
-       public final static String BERYLLIUM_ = "Be";\r
-       public final static String BORON_ = "B";\r
-       public final static String CARBON_ = "C";\r
-       public final static String NITOROGEN_ = "N";\r
-       public final static String OXYGEN_ = "O";\r
-\r
-\r
-}
\ No newline at end of file
+}\r