X-Git-Url: http://git.sourceforge.jp/view?p=chemicraft%2Fchemicraft.git;a=blobdiff_plain;f=common%2Fchemicraft%2FChemiCraft.java;h=fe7ebf5fa17b16e5ed575944e6499183dfbfbde2;hp=2bd896cc50f2a329bce61587924d4e3e0c9951d7;hb=6abdf76bb420b766478ef8eb56b25801bd50b0e9;hpb=d719d8923bd1e1c22385eb3c147b4d274154b046;ds=sidebyside diff --git a/common/chemicraft/ChemiCraft.java b/common/chemicraft/ChemiCraft.java index 2bd896c..fe7ebf5 100644 --- a/common/chemicraft/ChemiCraft.java +++ b/common/chemicraft/ChemiCraft.java @@ -18,6 +18,7 @@ import chemicraft.debug.CommandSetTile; import chemicraft.entity.EntityAtomsGrenade; import chemicraft.item.ItemAtomGrenade; import chemicraft.item.ItemAtoms; +import chemicraft.item.ItemAtomsGrenade; import chemicraft.item.ItemCompounds; import chemicraft.item.ItemGasCollectingBottle; import chemicraft.system.CommonProxy; @@ -228,7 +229,7 @@ public class ChemiCraft { 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 ItemAtomGrenade(this.atomGrenadeID).setItemName("grenade").setIconIndex(1); + this.itemAtomGrenade = new ItemAtomsGrenade(this.atomGrenadeID).setItemName("grenade").setIconIndex(1); // BlockをMinecraftに登録します GameRegistry.registerBlock(this.blockDecompositionTable); @@ -301,6 +302,7 @@ public class ChemiCraft { }); // 化合物を追加します + ChemiCraftAPI.getInstance().addLangCompound("ja_JP", "CarbonMonoxide", "一酸化炭素"); ChemiCraftAPI.getInstance().addLangCompound("ja_JP", "CarbonDioxide", "二酸化炭素"); ChemiCraftAPI.getInstance().addLangCompound("ja_JP", "Water", "水"); @@ -329,6 +331,7 @@ public class ChemiCraft { // API用の処理 this.nameAuxiliary.addName(itemCompounds, ChemiCraftAPI.getInstance().getCompoundsName().toArray()); this.nameAuxiliary.addName(itemCompounds, "ja_JP", ChemiCraftAPI.getInstance().getCompoundsLangName().toArray()); + ChemiCraftAPI.getInstance().addCompoundHash(ChemiCraftAPI.getInstance().getCompoundsName().toArray()); } private void debug(final FMLPostInitializationEvent event) {