修正・変更

[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 072fd8d..da85e5e 100644 (file)
--- a/common/pcc/chemicraft/core/item/ItemAtoms.java
+++ b/common/pcc/chemicraft/core/item/ItemAtoms.java
@@ -9,13 +9,7 @@ import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.EntityDamageSource;
 import net.minecraft.world.World;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;
-import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.core.ChemiCraftCore;
 import pcc.chemicraft.util.AtomInfo;
 import cpw.mods.fml.relauncher.Side;
@@ -59,7 +53,6 @@ public class ItemAtoms extends Item {
 
 
 
-       /* 一時保留。詳しいことが決まるまで変更が難しいため。 --WIP--
        @SuppressWarnings({ "unchecked", "rawtypes" })
        @SideOnly(Side.CLIENT)
        @Override
@@ -67,31 +60,30 @@ public class ItemAtoms extends Item {
                for(int type = 0; type < ChemiCraftCore.instance.ATOMSNAME.length; type++)
                {
                        par3List.add(new ItemStack(par1, 1, type));
-                       this.setIconIndex(type);
                }
        }
 
 
 
-       @Override
-       public String getItemNameIS(ItemStack par1ItemStack){
-               return super.getItemName() + "." + ChemiCraftCore.instance.ATOMSNAME[par1ItemStack.getItemDamage()];
+       public int getMetadata(int par1)
+       {
+               return par1;
        }
 
 
 
        @Override
-       public String getTextureFile(){
-               return ChemiCraft.ITEM_ATOMS_TEXTURE;
+       public String getUnlocalizedName(ItemStack par1ItemStack){
+               return super.getUnlocalizedName() + "." + ChemiCraftCore.instance.ATOMSNAME[par1ItemStack.getItemDamage()];
        }
 
 
 
-       @SideOnly(Side.CLIENT)
+       /* 一時保留。詳しいことが決まるまで変更が難しいため。 --WIP--
        @Override
-       public int getIconFromDamage(int par1){
-               return par1;
+       public String getTextureFile(){
+               return ChemiCraft.ITEM_ATOMS_TEXTURE;
        }
-       */
+        */
 
 }
\ No newline at end of file