OSDN Git Service

Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft
[chemicraft/chemicraft.git] / common / chemicraft / ChemiCraft.java
index 357baa7..94ad8f5 100644 (file)
@@ -15,9 +15,8 @@ import chemicraft.compounds.CompoundWater;
 import chemicraft.debug.CommandDeleteItem;\r
 import chemicraft.debug.CommandGenDebugRoom;\r
 import chemicraft.debug.CommandSetTile;\r
-import chemicraft.entity.EntityAtomsGrenade;\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
@@ -38,7 +37,6 @@ 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
@@ -228,7 +226,7 @@ public class ChemiCraft {
                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
@@ -302,7 +300,11 @@ public class ChemiCraft {
 \r
                // 化合物を追加します\r
                api.addLangCompound("ja_JP", "CarbonDioxide", "二酸化炭素");\r
-               api.addLangCompound("ja_JP", "Water", "水");\r
+               api.addLangCompound("ja_JP", "Water", "水");
+               ChemiCraftAPI.getInstance().addLangCompound("ja_JP", "CarbonMonoxide", "一酸化炭素");\r
+               ChemiCraftAPI.getInstance().addLangCompound("ja_JP", "CarbonDioxide", "二酸化炭素");\r
+               ChemiCraftAPI.getInstance().addLangCompound("ja_JP", "Water", "水");\r
+
 \r
                //化合物のHandlerを設定します\r
                api.settingCompoundHandler("Water", new CompoundWater());\r
@@ -332,6 +334,7 @@ public class ChemiCraft {
                // API用の処理\r
                this.nameAuxiliary.addName(itemCompounds, ChemiCraftAPI.getInstance().getCompoundsName().toArray());\r
                this.nameAuxiliary.addName(itemCompounds, "ja_JP", ChemiCraftAPI.getInstance().getCompoundsLangName().toArray());\r
+               ChemiCraftAPI.getInstance().addCompoundHash(ChemiCraftAPI.getInstance().getCompoundsName().toArray());\r
        }\r
 \r
        private void debug(final FMLPostInitializationEvent event) {\r