OSDN Git Service

Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
[chemicraft/chemicraft.git] / common / pcc / chemicraft / base / ChemiCraftRegisterItem.java
index 2b71caa..d460d91 100644 (file)
@@ -9,8 +9,7 @@ import pcc.chemicraft.base.item.ItemDust;
 import pcc.chemicraft.base.item.ItemOreSerarcher;
 import pcc.chemicraft.base.item.ItemRadiationBullet;
 import pcc.chemicraft.base.item.ItemRadiationGun;
-import pcc.chemicraft.util.Auxiliary;
-import pcc.chemicraft.util.Auxiliary.NameAuxiliary;
+import pcc.chemicraft.base.ore.ItemAtomIngots;
 
 /**
  * アイテムを追加します
@@ -25,12 +24,13 @@ public class ChemiCraftRegisterItem extends ChemiCraftBaseRegister {
        @Override
        public void start() {
                //アイテムを変数に代入
+               this.mod.itemAtomIngots = new ItemAtomIngots(this.mod.atomIngotsID).setUnlocalizedName("atomIngots");
                this.mod.itemAtomGrenade = new ItemAtomsGrenade(this.mod.atomGrenadeID).setUnlocalizedName("AtomsGrenade");
+               this.mod.itemBlackSmoke = new ItemBlackSmoke(this.mod.blackSmokeID).setUnlocalizedName("BlackSmoke");
                this.mod.itemDust = new ItemDust(this.mod.dustID).setUnlocalizedName("dust");
+               this.mod.itemOreSearcher = new ItemOreSerarcher(this.mod.oreSerarcherID).setUnlocalizedName("oreSearcher");
                this.mod.itemRadiationGun = new ItemRadiationGun(this.mod.radiationGunID).setUnlocalizedName("RadiationGun");
                this.mod.itemRadiationBallet = new ItemRadiationBullet(this.mod.radiationBalletID).setUnlocalizedName("RadiationBullet");
-               this.mod.itemBlackSmoke = new ItemBlackSmoke(this.mod.blackSmokeID).setUnlocalizedName("BlackSmoke");
-               this.mod.itemOreSearcher = new ItemOreSerarcher(this.mod.oreSerarcherID).setUnlocalizedName("oreSearcher");
                this.mod.itemRaditionGunDataChip = new Item(this.mod.raditionGunDataChipID) {
                        @Override
                        public void updateIcons(IconRegister par1IconRegister) {
@@ -41,16 +41,16 @@ public class ChemiCraftRegisterItem extends ChemiCraftBaseRegister {
                //名前を登録&Minecraftに登録
                this.mod.nameAuxiliary.addName(this.mod.itemAtomGrenade, "AtomGrenade");
                this.mod.nameAuxiliary.addName(this.mod.itemAtomGrenade, "ja_JP", "元素手榴弾");
+               this.mod.nameAuxiliary.addName(this.mod.itemBlackSmoke, "BlackSmoke");
+               this.mod.nameAuxiliary.addName(this.mod.itemBlackSmoke, "ja_JP", "黒煙");
                this.mod.nameAuxiliary.addName(this.mod.itemDust, "dust");
                this.mod.nameAuxiliary.addName(this.mod.itemDust, "ja_JP", "粉塵");
+               this.mod.nameAuxiliary.addName(this.mod.itemOreSearcher, "OreSearcher");
+               this.mod.nameAuxiliary.addName(this.mod.itemOreSearcher, "ja_JP", "鉱石情報探知機");
                this.mod.nameAuxiliary.addName(this.mod.itemRadiationGun, "RadiationGun");
                this.mod.nameAuxiliary.addName(this.mod.itemRadiationGun, "ja_JP", "放射線銃");
                this.mod.nameAuxiliary.addName(this.mod.itemRadiationBallet, "RadiationBullet");
                this.mod.nameAuxiliary.addName(this.mod.itemRadiationGun, "ja_JP", "放射線弾");
-               this.mod.nameAuxiliary.addName(this.mod.itemBlackSmoke, "BlackSmoke");
-               this.mod.nameAuxiliary.addName(this.mod.itemBlackSmoke, "ja_JP", "黒煙");
-               this.mod.nameAuxiliary.addName(this.mod.itemOreSearcher, "OreSearcher");
-               this.mod.nameAuxiliary.addName(this.mod.itemOreSearcher, "ja_JP", "鉱石情報探知機");
                this.mod.nameAuxiliary.addName(this.mod.itemRaditionGunDataChip, "RaditionGunDataChip");
                this.mod.nameAuxiliary.addName(this.mod.itemRaditionGunDataChip, "ja_JP", "放射線銃データチップ");
        }