修正・変更

[chemicraft/chemicraft.git] / common / pcc / chemicraft / core / item / ItemAtoms.java

diff --git a/common/pcc/chemicraft/core/item/ItemAtoms.java b/common/pcc/chemicraft/core/item/ItemAtoms.java
index 9962ffc..d6838f1 100644 (file)
--- a/common/pcc/chemicraft/core/item/ItemAtoms.java
+++ b/common/pcc/chemicraft/core/item/ItemAtoms.java
@@ -3,13 +3,16 @@ package pcc.chemicraft.core.item;
 import java.util.List;
 import java.util.Random;
 
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.Icon;
 import net.minecraft.world.World;
+import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.core.ChemiCraftCore;
 import pcc.chemicraft.util.AtomInfo;
 import cpw.mods.fml.relauncher.Side;
@@ -17,6 +20,8 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemAtoms extends Item {
 
+       private Icon[] icons;
+
        public ItemAtoms(int par1){
                super(par1);
                this.maxStackSize = 64;
@@ -65,16 +70,29 @@ public class ItemAtoms extends Item {
 
 
 
-       public int getMetadata(int par1)
-       {
-               return par1;
+       @Override
+       @SideOnly(Side.CLIENT)
+       public Icon getIconFromDamage(int par1) {
+               return this.icons[par1];
        }
 
 
 
        @Override
        public String getUnlocalizedName(ItemStack par1ItemStack){
-               return super.getUnlocalizedName() + ChemiCraftCore.instance.ATOMSNAME[par1ItemStack.getItemDamage()];
+               return super.getUnlocalizedName() + "." + ChemiCraftCore.instance.ATOMSNAME[par1ItemStack.getItemDamage()];
+       }
+
+
+
+       @Override
+       @SideOnly(Side.CLIENT)
+       public void updateIcons(IconRegister par1IconRegister) {
+               this.icons = new Icon[ChemiCraftCore.instance.ATOMSNAME.length];
+
+               for (int i = 0; i < ChemiCraftCore.instance.ATOMSNAME.length; i++) {
+                       this.icons[i] = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "atoms_" + ChemiCraftCore.instance.ATOMSNAME[i]);
+               }
        }
 
 }
\ No newline at end of file