競合修正

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

diff --git a/common/chemicraft/item/ItemAtoms.java b/common/chemicraft/item/ItemAtoms.java
index 06eaec9..ad1b147 100644 (file)
--- a/common/chemicraft/item/ItemAtoms.java
+++ b/common/chemicraft/item/ItemAtoms.java
@@ -2,18 +2,18 @@ package chemicraft.item;
 
 import java.util.List;
 
-import net.minecraft.src.CreativeTabs;
-import net.minecraft.src.Item;
-import net.minecraft.src.ItemStack;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import chemicraft.ChemiCraft;
-import cpw.mods.fml.common.Side;
-import cpw.mods.fml.common.asm.SideOnly;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemAtoms extends Item {
 
        public ItemAtoms(int par1){
                super(par1);
-               this.maxStackSize = 1;
+               this.maxStackSize = 64;
                this.setHasSubtypes(true);
                this.setMaxDamage(0);
                this.setCreativeTab(ChemiCraft.instance.creativeTab);
@@ -21,10 +21,11 @@ public class ItemAtoms extends Item {
 
 
 
+       @SuppressWarnings({ "unchecked", "rawtypes" })
        @SideOnly(Side.CLIENT)
        @Override
        public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List){
-               for(int type = 0; type < ChemiCraft.instance.atomsName.length; type++)
+               for(int type = 0; type < ChemiCraft.instance.ATOMSNAME.length; type++)
                {
                        par3List.add(new ItemStack(par1, 1, type));
                        this.setIconIndex(type);
@@ -35,14 +36,14 @@ public class ItemAtoms extends Item {
 
        @Override
        public String getItemNameIS(ItemStack par1ItemStack){
-               return super.getItemName() + "." + ChemiCraft.instance.atomsName[par1ItemStack.getItemDamage()];
+               return super.getItemName() + "." + ChemiCraft.instance.ATOMSNAME[par1ItemStack.getItemDamage()];
        }
 
 
 
        @Override
        public String getTextureFile(){
-               return ChemiCraft.instance.itemAtomsTexture;
+               return ChemiCraft.instance.ITEM_ATOMS_TEXTURE;
        }