修正・変更

[chemicraft/chemicraft.git] / common / pcc / chemicraft / base / ore / ItemAtomOres.java

diff --git a/common/pcc/chemicraft/base/ore/ItemAtomOres.java b/common/pcc/chemicraft/base/ore/ItemAtomOres.java
index 07330d8..2fd602d 100644 (file)
--- a/common/pcc/chemicraft/base/ore/ItemAtomOres.java
+++ b/common/pcc/chemicraft/base/ore/ItemAtomOres.java
@@ -1,11 +1,9 @@
 package pcc.chemicraft.base.ore;
 
 import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemDye;
 import net.minecraft.item.ItemStack;
 import pcc.chemicraft.base.ChemiCraftBase;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import pcc.chemicraft.base.ChemiCraftBaseAPI;
 
 /**
  * 鉱石のアイテム版です
@@ -19,11 +17,13 @@ public class ItemAtomOres extends ItemBlock {
                this.setHasSubtypes(true);
        }
 
+       /* 一時保留。詳しい仕様が決まらないと変更が難しいため。 --WIP--
        @Override
        @SideOnly(Side.CLIENT)
-       public int getIconFromDamage(int par1) {
+       public Icon getIconFromDamage(int par1) {
                return ChemiCraftBase.instance.blockAtomOres[0].getBlockTextureFromSideAndMetadata(2, BlockAtomOres.getBlockFromDye(par1));
        }
+       */
 
        @Override
        public int getMetadata(int par1) {
@@ -31,7 +31,9 @@ public class ItemAtomOres extends ItemBlock {
        }
 
        @Override
-       public String getItemNameIS(ItemStack par1ItemStack) {
-               return super.getItemName() + "." + ItemDye.dyeColorNames[BlockAtomOres.getBlockFromDye(par1ItemStack.getItemDamage())];
+       public String getUnlocalizedName(ItemStack par1ItemStack) {
+               int var2 = this.itemID - (ChemiCraftBase.instance.atomOresID[0]);
+               return super.getUnlocalizedName() + "." + ChemiCraftBaseAPI.instance().getAtomOresAtomName().get(par1ItemStack.getItemDamage() + var2 * 16);
        }
+
 }