Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft

[chemicraft/chemicraft.git] / common / pcc / chemicraft / base / item / ItemOreSerarcher.java

diff --git a/common/pcc/chemicraft/base/item/ItemOreSerarcher.java b/common/pcc/chemicraft/base/item/ItemOreSerarcher.java
index c418de8..f0a928d 100644 (file)
--- a/common/pcc/chemicraft/base/item/ItemOreSerarcher.java
+++ b/common/pcc/chemicraft/base/item/ItemOreSerarcher.java
@@ -1,5 +1,6 @@
 package pcc.chemicraft.base.item;
 
+import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -30,10 +31,10 @@ public class ItemOreSerarcher extends Item {
                                if (par3World.isRemote) {
                                        this.changeItem(par2EntityPlayer);
                                }
-                               String blockName = ChemiCraftBase.instance.apiBase.getAtomOresAtomName().get(
-                                               (Math.abs(ChemiCraftBase.instance.atomOresID[ChemiCraftBase.instance.atomOresID.length-1] -
-                                                               (par3World.getBlockId(par4, par5, par6) + 3))) * 16 +
-                                                               par3World.getBlockMetadata(par4, par5, par6));
+                               String blockName = new ItemStack(
+                                               Block.blocksList[par3World.getBlockId(par4, par5, par6)],
+                                               1,
+                                               par3World.getBlockMetadata(par4, par5, par6)).getDisplayName();
                                par1ItemStack.getTagCompound().setString("OreName", blockName);
                        }
                }
@@ -50,11 +51,12 @@ public class ItemOreSerarcher extends Item {
                return par1ItemStack;
        }
 
+       @Override
        public String getItemDisplayName(ItemStack par1ItemStack) {
                if (par1ItemStack.getTagCompound() != null) {
-                       return "OreSearcher:" + par1ItemStack.getTagCompound().getString("OreName");
+                       return super.getItemDisplayName(par1ItemStack) + ":" + par1ItemStack.getTagCompound().getString("OreName");
                }
-               return "OreSearcher";
+               return super.getItemDisplayName(par1ItemStack);
        }
 
        @Override
@@ -64,7 +66,7 @@ public class ItemOreSerarcher extends Item {
 
        @Override
        public void updateIcons(IconRegister par1IconRegister){
-               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "ItemOreSearcher");
+               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "ore_searcher");
        }
 
 }