OSDN Git Service

誰かEntityAtomGrenadeを登録してくれ...
[chemicraft/chemicraft.git] / common / chemicraft / ChemiCraft.java
index 72b39b2..fa5465e 100644 (file)
@@ -8,12 +8,13 @@ import net.minecraft.src.Material;
 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.BlockMaterialCraftingTable;\r
-import chemicraft.block.BlockToolAndMaterialCraftingTable;\r
+import chemicraft.block.BlockToolAndWeaponCraftingTable;\r
 import chemicraft.debug.CommandDeleteItem;\r
+import chemicraft.debug.CommandGenDebugRoom;\r
 import chemicraft.debug.CommandSetTile;\r
-import chemicraft.debug.CompoundHandlerTest;\r
+import chemicraft.entity.EntityAtomGrenade;\r
 import chemicraft.item.ItemAtomGrenade;\r
 import chemicraft.item.ItemAtoms;\r
 import chemicraft.item.ItemCompounds;\r
@@ -21,10 +22,11 @@ import chemicraft.item.ItemGasCollectingBottle;
 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.TileEntityMaterialCraftingTable;\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
@@ -35,11 +37,11 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 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.EntityRegistry;\r
 import cpw.mods.fml.common.registry.GameRegistry;\r
 \r
 /**\r
  * ChemiCraft本体\r
- *\r
  * @author P.C.C.\r
  *\r
  */\r
@@ -49,21 +51,23 @@ import cpw.mods.fml.common.registry.GameRegistry;
 // クライアント、サーバー共に必要 1.3.2用\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
@@ -72,18 +76,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.CommonProxy")\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 CreativeTabs creativeTab = new CreativeTabAtoms("ChemiCraft");\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
@@ -91,39 +95,39 @@ public class ChemiCraft {
        public int atomGrenadeID;\r
 \r
        /**\r
-        * BlockID\r
+        * BlockID.\r
         */\r
        public int decompositionTableID;\r
        public int chemicalConbinationTableID;\r
        public int toolAndWeaponCraftingTableID;\r
-       public int materialCraftingTableID;\r
+       public int chemicalCraftingTableID;\r
 \r
        /**\r
-        * GUIID\r
+        * GUIID.\r
         */\r
        public int guiDecompositionTableID;\r
        public int guiChemicalCombinationTableID;\r
        public int guiToolAndWeaponCraftingTableID;\r
-       public int guiMaterialCraftingTableID;\r
+       public int guiChemicalCraftingTableID;\r
 \r
        /**\r
-        * Block型変数\r
+        * Block型変数.\r
         */\r
-       public static Block blockDecompositionTable;\r
-       public static Block blockChemicalCombinationTable;\r
-       public static Block blockToolAndWeaponCraftingTable;\r
-       public static Block blockMaterialCraftingTable;\r
+       public Block blockDecompositionTable;\r
+       public Block blockChemicalCombinationTable;\r
+       public Block blockToolAndWeaponCraftingTable;\r
+       public Block blockChemicalCraftingTable;\r
 \r
        /**\r
-        * Item型変数\r
+        * Item型変数.\r
         */\r
-       public static Item itemAtoms;\r
-       public static Item itemCompounds;\r
-       public static Item itemGasCollectingBottle;\r
-       public static Item itemAtomGrenade;\r
+       public Item itemAtoms;\r
+       public Item itemCompounds;\r
+       public Item itemGasCollectingBottle;\r
+       public Item itemAtomGrenade;\r
 \r
        /**\r
-        * このmodで使用するTextureのパス\r
+        * このmodで使用するTextureのパス.\r
         */\r
        public String itemAtomsTexture = "/chemicraft/items/Atoms.png";\r
        public String itemCompoundsTexture = "/chemicraft/items/Compounds.png";\r
@@ -132,23 +136,26 @@ public class ChemiCraft {
        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 guiMaterialCraftingTexture = "/chemicraft/guis/MaterialCrafting.png";\r
+       public String guiChemicalCraftingTexture = "/chemicraft/guis/MaterialCrafting.png";\r
 \r
        /**\r
-        * このmodに必要な補助クラスのインスタンス\r
+        * このmodに必要な補助クラスのインスタンス.\r
         */\r
-       private Auxiliary Auxiliary = new Auxiliary();\r
-       private NameAuxiliary NameAuxiliary = Auxiliary.new NameAuxiliary();\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
 \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 chemicalCombinationTableIDProp = cfg.getBlock("ChemicalCombinationID", 2401);\r
                Property toolAndWeaponCraftingTableIDProp = cfg.getBlock("ToolAndWeaponCraftingTableID", 2402);\r
-               Property materialCraftingTableIDProp = cfg.getBlock("MaterialCraftingTableID", 2403);\r
+               Property chemicalCraftingTableIDProp = cfg.getBlock("ChemicalCraftingTableID", 2403);\r
 \r
                Property atomsIDProp = cfg.getItem("AtomsID", 25000);\r
                Property compoundsIDProp = cfg.getItem("CompoundsID", 25001);\r
@@ -158,13 +165,13 @@ public class ChemiCraft {
                Property guiDecompositionTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 1000);\r
                Property guiChemicalCombinationTableIDProp = cfg.get("GUI", "GUIChemicalCombinationTableID", 1001);\r
                Property guiToolAndWeaponCraftingTableIDProp = cfg.get("GUI", "GUIToolAndWeaponCraftingTableID", 1002);\r
-               Property guiMaterialCraftingTableIDProp = cfg.get("GUI", "GUIMaterialCraftingTableID", 1003);\r
+               Property guiChemicalCraftingTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 1003);\r
 \r
 \r
                this.decompositionTableID = decompositionTableIDProp.getInt();\r
                this.chemicalConbinationTableID = chemicalCombinationTableIDProp.getInt();\r
                this.toolAndWeaponCraftingTableID = toolAndWeaponCraftingTableIDProp.getInt();\r
-               this.materialCraftingTableID = materialCraftingTableIDProp.getInt();\r
+               this.chemicalCraftingTableID = chemicalCraftingTableIDProp.getInt();\r
                this.atomsID = atomsIDProp.getInt();\r
                this.compoundsID = compoundsIDProp.getInt();\r
                this.gasCollectingBottleID = gasCollectingBottleIDProp.getInt();\r
@@ -172,7 +179,7 @@ public class ChemiCraft {
                this.guiDecompositionTableID = guiDecompositionTableIDProp.getInt();\r
                this.guiChemicalCombinationTableID = guiChemicalCombinationTableIDProp.getInt();\r
                this.guiToolAndWeaponCraftingTableID = guiToolAndWeaponCraftingTableIDProp.getInt();\r
-               this.guiMaterialCraftingTableID = guiMaterialCraftingTableIDProp.getInt();\r
+               this.guiChemicalCraftingTableID = guiChemicalCraftingTableIDProp.getInt();\r
 \r
                cfg.save();\r
 \r
@@ -181,28 +188,42 @@ public class ChemiCraft {
        }\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
-\r
-               ChemiCraftAPI.instance.addCompound("Test");\r
-               ChemiCraftAPI.instance.addCompound("Test2");\r
-               ChemiCraftAPI.instance.settingCompoundHandler("Test", new CompoundHandlerTest());\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 BlockToolAndMaterialCraftingTable(this.toolAndWeaponCraftingTableID, 0, Material.ground).setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("ToolAndWeaponCraftingTable");\r
-               this.blockMaterialCraftingTable = new BlockMaterialCraftingTable(materialCraftingTableID, 0, Material.ground).setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("MaterialCraftingTable");\r
+               this.blockDecompositionTable = new BlockDecompositionTable(this.decompositionTableID, 0, Material.ground).\r
+                               setHardness(2.0F).\r
+                               setResistance(0.0F).\r
+                               setStepSound(Block.soundStoneFootstep).\r
+                               setBlockName("DecompositionTable");\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
 \r
                // Itemを追加します\r
@@ -215,32 +236,32 @@ public class ChemiCraft {
                GameRegistry.registerBlock(this.blockDecompositionTable);\r
                GameRegistry.registerBlock(this.blockChemicalCombinationTable);\r
                GameRegistry.registerBlock(this.blockToolAndWeaponCraftingTable);\r
-               GameRegistry.registerBlock(this.blockMaterialCraftingTable);\r
+               GameRegistry.registerBlock(this.blockChemicalCraftingTable);\r
 \r
                // Blockの名前を設定します\r
-               this.NameAuxiliary.addName(this.blockDecompositionTable, "DecompositionTable");\r
-               this.NameAuxiliary.addName(this.blockDecompositionTable, "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(blockMaterialCraftingTable, "MaterialCraftingTable");\r
-               this.NameAuxiliary.addName(blockMaterialCraftingTable, "ja_JP", "素材製作台");\r
+               this.nameAuxiliary.addName(this.blockDecompositionTable, "DecompositionTable");\r
+               this.nameAuxiliary.addName(this.blockDecompositionTable, "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
 \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
+               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(TileEntityChemicalCombinationTable.class, "TileEntityChemicalCombinationTable");\r
                GameRegistry.registerTileEntity(TileEntityToolAndWeaponCraftingTable.class, "TileEntityToolAndWeaponCraftingTable");\r
-               GameRegistry.registerTileEntity(TileEntityMaterialCraftingTable.class, "TileEntityMaterialCraftingTable");\r
+               GameRegistry.registerTileEntity(TileEntityChemicalCraftingTable.class, "TileEntityChemicalCraftingTable");\r
 \r
                // GUIを追加します\r
                NetworkRegistry.instance().registerGuiHandler(instance, proxy);\r
@@ -248,59 +269,335 @@ public class ChemiCraft {
                //Textureをpreloadします\r
                proxy.registerTextures();\r
 \r
+               //Entityを追加します\r
+               EntityRegistry.registerModEntity(EntityAtomGrenade.class, "EntityAtomGrenade", 1, this, 250, 5, false);\r
+               EntityRegistry.registerGlobalEntityID(EntityAtomGrenade.class, "EntityAtomGrenade", 220);\r
+\r
                //化学作業台類のレシピを追加します\r
                GameRegistry.addRecipe(new ItemStack(this.blockDecompositionTable),\r
                                new Object[]{\r
                        "XYX", "ZAZ", "ZZZ",\r
-                       new Character('X'), new ItemStack(Item.ingotIron),\r
-                       new Character('Y'), new ItemStack(Block.workbench),\r
-                       new Character('Z'), new ItemStack(Block.stone),\r
-                       new Character('A'), new ItemStack(Block.tnt),\r
+                       Character.valueOf('X'), new ItemStack(Item.ingotIron),\r
+                       Character.valueOf('Y'), new ItemStack(Block.workbench),\r
+                       Character.valueOf('Z'), new ItemStack(Block.stone),\r
+                       Character.valueOf('A'), new ItemStack(Block.tnt),\r
                });\r
                GameRegistry.addRecipe(new ItemStack(this.blockChemicalCombinationTable),\r
                                new Object[]{\r
                        "XYX", "ZAZ", "ZZZ",\r
-                       new Character('X'), new ItemStack(Item.ingotIron),\r
-                       new Character('Y'), new ItemStack(Block.workbench),\r
-                       new Character('Z'), new ItemStack(Block.stone),\r
-                       new Character('A'), new ItemStack(Block.obsidian),\r
+                       Character.valueOf('X'), new ItemStack(Item.ingotIron),\r
+                       Character.valueOf('Y'), new ItemStack(Block.workbench),\r
+                       Character.valueOf('Z'), new ItemStack(Block.stone),\r
+                       Character.valueOf('A'), new ItemStack(Block.obsidian),\r
                });\r
                GameRegistry.addRecipe(new ItemStack(this.blockToolAndWeaponCraftingTable),\r
                                new Object[]{\r
                        "XYX", "ZAZ", "ZZZ",\r
-                       new Character('X'), new ItemStack(Item.ingotIron),\r
-                       new Character('Y'), new ItemStack(Block.workbench),\r
-                       new Character('Z'), new ItemStack(Block.stone),\r
-                       new Character('A'), new ItemStack(Item.pickaxeSteel),\r
+                       Character.valueOf('X'), new ItemStack(Item.ingotIron),\r
+                       Character.valueOf('Y'), new ItemStack(Block.workbench),\r
+                       Character.valueOf('Z'), new ItemStack(Block.stone),\r
+                       Character.valueOf('A'), new ItemStack(Item.pickaxeSteel),\r
                });\r
-               GameRegistry.addRecipe(new ItemStack(this.blockMaterialCraftingTable),\r
+               GameRegistry.addRecipe(new ItemStack(this.blockChemicalCraftingTable),\r
                                new Object[]{\r
                        "XYX", "ZAZ", "ZZZ",\r
-                       new Character('X'), new ItemStack(Item.ingotIron),\r
-                       new Character('Y'), new ItemStack(Block.workbench),\r
-                       new Character('Z'), new ItemStack(Block.stone),\r
-                       new Character('A'), new ItemStack(this.itemAtoms, 1, 0),\r
+                       Character.valueOf('X'), new ItemStack(Item.ingotIron),\r
+                       Character.valueOf('Y'), new ItemStack(Block.workbench),\r
+                       Character.valueOf('Z'), new ItemStack(Block.stone),\r
+                       Character.valueOf('A'), new ItemStack(this.itemAtoms, 1, 0),\r
                });\r
 \r
+               //\r
+               ChemiCraftAPI.getInstance().addDecompositionRecipe(new ItemStack(Block.dirt), new ItemStack[]{new ItemStack(Block.stone)});\r
+\r
+               // 化合物を追加します\r
+               ChemiCraftAPI.getInstance().addLangCompound("ja_JP", "CarbonDioxide", "二酸化炭素");\r
+\r
                //手榴弾の追加\r
-               ChemiCraftAPI.instance.addMaterialRecipe(new ItemStack[]{new ItemStack(Item.gunpowder)}, new ItemStack(this.itemAtomGrenade, 16, 0), new NBTRecipeGrenade());\r
+               ChemiCraftAPI.getInstance().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
 \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, ChemiCraftAPI.getInstance().getCompoundsName().toArray());\r
+               this.nameAuxiliary.addName(itemCompounds, "ja_JP", ChemiCraftAPI.getInstance().getCompoundsLangName().toArray());\r
+       }\r
+\r
+       private void debug(final FMLPostInitializationEvent event) {\r
+               //デバッグ処理\r
+               api.addChemicalCombinationRecipe(\r
+                               new String[]{HYDROGEN_SIGN, OXYGEN_SIGN},\r
+                               new Integer[]{2, 1},\r
+                               new ItemStack(Block.dirt)\r
+                               );\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 URANIUM = 91;\r
+       public static final int HYDROGEN = 0;\r
+       public static final int HELIUM = 1;\r
+       public static final int LITHIUM = 2;\r
+       public static final int BERYLLIUM = 3;\r
+       public static final int BORON = 4;\r
+       public static final int CARBON = 5;\r
+       public static final int NITROGEN = 6;\r
+       public static final int OXYGEN = 7;\r
+       public static final int FLUORINE = 8;\r
+       public static final int NEON = 9;\r
+       public static final int SODIUM = 10;\r
+       public static final int MAGNESIUM = 11;\r
+       public static final int ALMINIUM = 12;\r
+       public static final int SILICON = 13;\r
+       public static final int PHOSPHORUS = 14;\r
+       public static final int SULFUR = 15;\r
+       public static final int CHLORINE = 16;\r
+       public static final int ARGON = 17;\r
+       public static final int POTASSIUM = 18;\r
+       public static final int CALCIUM = 19;\r
+       public static final int SCANDIUM = 20;\r
+       public static final int TITANIUM = 21;\r
+       public static final int VANADIUM = 22;\r
+       public static final int CHROMIUM = 23;\r
+       public static final int MANGANESE = 24;\r
+       public static final int IRON = 25;\r
+       public static final int COBALT = 26;\r
+       public static final int NICKEL = 27;\r
+       public static final int COPPER = 28;\r
+       public static final int ZINC = 29;\r
+       public static final int GALLIUM = 30;\r
+       public static final int GERMANIUM = 31;\r
+       public static final int ARSENIC = 32;\r
+       public static final int SELENIUM = 33;\r
+       public static final int BROMINE = 34;\r
+       public static final int KRYPTON = 35;\r
+       public static final int RUBIDIUM = 36;\r
+       public static final int STRONTIUM = 37;\r
+       public static final int YTTORIUM = 38;\r
+       public static final int ZIRCONIUM = 39;\r
+       public static final int NIOBIUM = 40;\r
+       public static final int MOLYBDENUM = 41;\r
+       public static final int TECHNETIUM = 42;\r
+       public static final int RUTHENIUM = 43;\r
+       public static final int RHODIUM = 44;\r
+       public static final int PALLADIUM = 45;\r
+       public static final int SILVER = 46;\r
+       public static final int CADMIUM = 47;\r
+       public static final int INDIUM = 48;\r
+       public static final int TIN = 49;\r
+       public static final int ANTIMONY = 50;\r
+       public static final int TELLURIUM = 51;\r
+       public static final int IODINE = 52;\r
+       public static final int XENON = 53;\r
+       public static final int CAESIUM = 54;\r
+       public static final int BARIUM = 55;\r
+       public static final int LANTHANUM = 56;\r
+       public static final int CERIUM = 57;\r
+       public static final int PRASEODYMIUM = 58;\r
+       public static final int NEODYMIUM = 59;\r
+       public static final int PROMETHIUM = 60;\r
+       public static final int SAMARIUM = 61;\r
+       public static final int EUROPIUM = 62;\r
+       public static final int GADOLINIUM = 63;\r
+       public static final int TERBIUM = 64;\r
+       public static final int DYSPROSIUM = 65;\r
+       public static final int HOLMIUM = 66;\r
+       public static final int ERBIUM = 67;\r
+       public static final int THULIUM = 68;\r
+       public static final int YTTERBIUM = 69;\r
+       public static final int LUTETIUM = 70;\r
+       public static final int HAFNIUM = 71;\r
+       public static final int TANTALUM = 72;\r
+       public static final int TUNGSTEN = 73;\r
+       public static final int RHENIUM = 74;\r
+       public static final int OSMIUM = 75;\r
+       public static final int IRIDIUM = 76;\r
+       public static final int PLATINUM = 77;\r
+       public static final int GOLD = 78;\r
+       public static final int MERCURY = 79;\r
+       public static final int THALLIUM = 80;\r
+       public static final int LEAD = 81;\r
+       public static final int BISMUTH = 82;\r
+       public static final int POLONIUM = 83;\r
+       public static final int ASTATINE = 84;\r
+       public static final int RADON = 85;\r
+       public static final int FRANCIUM = 86;\r
+       public static final int RADIUM = 87;\r
+       public static final int ACTINIUM = 88;\r
+       public static final int THORIUM = 89;\r
+       public static final int PROTACTINIUM = 90;\r
+       public static final int URANIUM = 91;\r
+       public static final int NEPTUNIUM = 92;\r
+       public static final int PLUTONIUM = 93;\r
+       public static final int AMERICIUM = 94;\r
+       public static final int CURIUM = 95;\r
+       public static final int BERKELIUM = 96;\r
+       public static final int CALIforNIUM = 97;\r
+       public static final int EINSTEINIUM = 98;\r
+       public static final int FERMIUM = 99;\r
+       public static final int MENDILEVIUM = 100;\r
+       public static final int NOBELIUM = 101;\r
+       public static final int LAWRENCIUM = 102;\r
+       public static final int RUTHERforDIUM = 103;\r
+       public static final int DUBNIUM = 104;\r
+       public static final int SEABORGIUM = 105;\r
+       public static final int BOHRIUM = 106;\r
+       public static final int HASSIUM = 107;\r
+       public static final int MEITNERIUM = 108;\r
+       public static final int DARMSTADTIUM = 109;\r
+       public static final int ROENTGENIUM = 110;\r
+       public static final int COPERNICIUM = 111;\r
+       public static final int UNUNTRIUM = 112;\r
+       public static final int UNUNQUADIUM = 113;\r
+       public static final int UNUNPENTIUM = 114;\r
+       public static final int UNUNHEXIUM = 115;\r
+       public static final int UNUNSEPTIUM = 116;\r
+       public static final int UNUNOCTIUM = 117;\r
+\r
+       public static final String HYDROGEN_SIGN = "H";\r
+       public static final String HELIUM_SIGN = "He";\r
+       public static final String LITHIUM_SIGN = "Li";\r
+       public static final String BERYLLIUM_SIGN = "Be";\r
+       public static final String BORON_SIGN = "B";\r
+       public static final String CARBON_SIGN = "C";\r
+       public static final String NITROGEN_SIGN = "N";\r
+       public static final String OXYGEN_SIGN = "O";\r
+       public static final String FLUORINE_SIGN = "F";\r
+       public static final String NEON_SIGN = "Ne";\r
+       public static final String SODIUM_SIGN = "Na";\r
+       public static final String MAGNESIUM_SIGN = "Mg";\r
+       public static final String ALMINIUM_SIGN = "Al";\r
+       public static final String SILICON_SIGN = "Si";\r
+       public static final String PHOSPHORUS_SIGN = "P";\r
+       public static final String SULFUR_SIGN = "S";\r
+       public static final String CHLORINE_SIGN = "Cl";\r
+       public static final String ARGON_SIGN = "Ar";\r
+       public static final String POTASSIUM_SIGN = "K";\r
+       public static final String CALCIUM_SIGN = "Ca";\r
+       public static final String SCANDIUM_SIGN = "Sc";\r
+       public static final String TITANIUM_SIGN = "Ti";\r
+       public static final String VANADIUM_SIGN = "V";\r
+       public static final String CHROMIUM_SIGN = "Cr";\r
+       public static final String MANGANESE_SIGN = "Mn";\r
+       public static final String IRON_SIGN = "Fe";\r
+       public static final String COBALT_SIGN = "Co";\r
+       public static final String NICKEL_SIGN = "Ni";\r
+       public static final String COPPER_SIGN = "Cu";\r
+       public static final String ZINC_SIGN = "Zn";\r
+       public static final String GALLIUM_SIGN = "Ga";\r
+       public static final String GERMANIUM_SIGN = "Ge";\r
+       public static final String ARSENIC_SIGN = "As";\r
+       public static final String SELENIUM_SIGN = "Se";\r
+       public static final String BROMINE_SIGN = "Br";\r
+       public static final String KRYPTON_SIGN = "Kr";\r
+       public static final String RUBIDIUM_SIGN = "Rb";\r
+       public static final String STRONTIUM_SIGN = "Sr";\r
+       public static final String YTTORIUM_SIGN = "Y";\r
+       public static final String ZIRCONIUM_SIGN = "Zr";\r
+       public static final String NIOBIUM_SIGN = "Nb";\r
+       public static final String MOLYBDENUM_SIGN = "Mo";\r
+       public static final String TECHNETIUM_SIGN = "Tc";\r
+       public static final String RUTHENIUM_SIGN = "Ru";\r
+       public static final String RHODIUM_SIGN = "Rh";\r
+       public static final String PALLADIUM_SIGN = "Pd";\r
+       public static final String SILVER_SIGN = "Ag";\r
+       public static final String CADMIUM_SIGN = "Cd";\r
+       public static final String INDIUM_SIGN = "In";\r
+       public static final String TIN_SIGN = "Sn";\r
+       public static final String ANTIMONY_SIGN = "Sb";\r
+       public static final String TELLURIUM_SIGN = "Te";\r
+       public static final String IODINE_SIGN = "I";\r
+       public static final String XENON_SIGN = "Xe";\r
+       public static final String CAESIUM_SIGN = "Cs";\r
+       public static final String BARIUM_SIGN = "Ba";\r
+       public static final String LANTHANUM_SIGN = "La";\r
+       public static final String CERIUM_SIGN = "Ce";\r
+       public static final String PRASEODYMIUM_SIGN = "Pr";\r
+       public static final String NEODYMIUM_SIGN = "Nd";\r
+       public static final String PROMETHIUM_SIGN = "Pm";\r
+       public static final String SAMARIUM_SIGN = "Sm";\r
+       public static final String EUROPIUM_SIGN = "Eu";\r
+       public static final String GADOLINIUM_SIGN = "Gd";\r
+       public static final String TERBIUM_SIGN = "Tb";\r
+       public static final String DYSPROSIUM_SIGN = "Dy";\r
+       public static final String HOLMIUM_SIGN = "Ho";\r
+       public static final String ERBIUM_SIGN = "Er";\r
+       public static final String THULIUM_SIGN = "Tm";\r
+       public static final String YTTERBIUM_SIGN = "Yb";\r
+       public static final String LUTETIUM_SIGN = "Lu";\r
+       public static final String HAFNIUM_SIGN = "Hf";\r
+       public static final String TANTALUM_SIGN = "Ta";\r
+       public static final String TUNGSTEN_SIGN = "W";\r
+       public static final String RHENIUM_SIGN = "Re";\r
+       public static final String OSMIUM_SIGN = "Os";\r
+       public static final String IRIDIUM_SIGN = "Ir";\r
+       public static final String PLATINUM_SIGN = "Pt";\r
+       public static final String GOLD_SIGN = "Au";\r
+       public static final String MERCURY_SIGN = "Hg";\r
+       public static final String THALLIUM_SIGN = "Tl";\r
+       public static final String LEAD_SIGN = "Pb";\r
+       public static final String BISMUTH_SIGN = "Bi";\r
+       public static final String POLONIUM_SIGN = "Po";\r
+       public static final String ASTATINE_SIGN = "At";\r
+       public static final String RADON_SIGN = "Rn";\r
+       public static final String FRANCIUM_SIGN = "Fr";\r
+       public static final String RADIUM_SIGN = "Ra";\r
+       public static final String ACTINIUM_SIGN = "Ac";\r
+       public static final String THORIUM_SIGN = "Th";\r
+       public static final String PROTACTINIUM_SIGN = "Pa";\r
+       public static final String URANIUM_SIGN = "U";\r
+       public static final String NEPTUNIUM_SIGN = "Np";\r
+       public static final String PLUTONIUM_SIGN = "Pu";\r
+       public static final String AMERICIUM_SIGN = "Am";\r
+       public static final String CURIUM_SIGN = "Cm";\r
+       public static final String BERKELIUM_SIGN = "Bk";\r
+       public static final String CALIforNIUM_SIGN = "Cf";\r
+       public static final String EINSTEINIUM_SIGN = "Es";\r
+       public static final String FERMIUM_SIGN = "Fm";\r
+       public static final String MENDILEVIUM_SIGN = "Md";\r
+       public static final String NOBELIUM_SIGN = "No";\r
+       public static final String LAWRENCIUM_SIGN = "Lr";\r
+       public static final String RUTHERforDIUM_SIGN = "Rf";\r
+       public static final String DUBNIUM_SIGN = "Db";\r
+       public static final String SEABORGIUM_SIGN = "Sg";\r
+       public static final String BOHRIUM_SIGN = "Bh";\r
+       public static final String HASSIUM_SIGN = "Hs";\r
+       public static final String MEITNERIUM_SIGN = "Mt";\r
+       public static final String DARMSTADTIUM_SIGN = "Ds";\r
+       public static final String ROENTGENIUM_SIGN = "Rg";\r
+       public static final String COPERNICIUM_SIGN = "Cn";\r
+       public static final String UNUNTRIUM_SIGN = "Uut";\r
+       public static final String UNUNQUADIUM_SIGN = "Uuq";\r
+       public static final String UNUNPENTIUM_SIGN = "Uup";\r
+       public static final String UNUNHEXIUM_SIGN = "Uuh";\r
+       public static final String UNUNSEPTIUM_SIGN = "Uus";\r
+       public static final String UNUNOCTIUM_SIGN = "Uuo";\r
+\r
+       public static final String[] ATOMSLIST = {\r
+               "H",  "He",  "Li",  "Be",  "B",  "C",  "N",  "O",  "F",  "Ne",\r
+               "Na",  "Mg",  "Al",  "Si",  "P",  "S",  "Cl",  "Ar",  "K",  "Ca",\r
+               "Sc",  "Ti",  "V",  "Cr",  "Mn",  "Fe",  "Co",  "Ni",  "Cu",  "Zn",\r
+               "Ga",  "Ge", "As", "Se", "Br", "Kr", "Rb", "Sr", "Y", "Zr",\r
+               "Nb", "Mo", "Tc", "Ru", "Rh", "Pd", "Ag", "Cd", "In", "Sn",\r
+               "Sb", "Te", "I", "Xe", "Cs", "Ba", "La", "Ce", "Pr", "Pm",\r
+               "Sm", "Eu", "Gd", "Tb", "Dy", "Ho", "Er", "Tm", "Yb", "Lu",\r
+               "Hf", "Ta", "W", "Re", "Os", "Ir", "Pt", "Au", "Hg", "Tl",\r
+               "Pb", "Bi", "Po", "At", "Rn", "Fr", "Ra", "Ac", "Th", "Pa",\r
+               "U", "Np", "Pu", "Am", "Cm", "Bk", "Cf", "Es", "Fm", "Md",\r
+               "No", "Lr", "Rf", "Db", "Sg", "Bh", "Hs", "Mt", "Ds", "Rg",\r
+               "Cn", "Uut", "Uuq", "Uup", "Uuh", "Uus", "Uuo"\r
+       };\r
 \r
 }
\ No newline at end of file