定数群を他クラスに移したのでpush%commit

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

diff --git a/common/chemicraft/item/ItemAtomGrenade.java b/common/chemicraft/item/ItemAtomGrenade.java
index 4ea937d..06d31c3 100644 (file)
--- a/common/chemicraft/item/ItemAtomGrenade.java
+++ b/common/chemicraft/item/ItemAtomGrenade.java
@@ -2,13 +2,16 @@ package chemicraft.item;
 
 import java.util.List;
 
+import net.minecraft.src.Entity;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.Item;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.NBTTagList;
 import net.minecraft.src.World;
-import chemicraft.entity.EntityAtomGrenade;
+import net.minecraft.src.WorldClient;
+import net.minecraft.src.WorldServer;
+import chemicraft.entity.EntityAtomsGrenade;
 
 public class ItemAtomGrenade extends Item {
 
@@ -16,6 +19,7 @@ public class ItemAtomGrenade extends Item {
                super(par1);
        }
 
+       @Override
        public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer){
                if(par1ItemStack.stackSize <= 0){
                        return null;
@@ -42,7 +46,7 @@ public class ItemAtomGrenade extends Item {
                                }
                        }
                }
-               EntityAtomGrenade entity = new EntityAtomGrenade(par2World, par3EntityPlayer, var1, var2, var3);
+               EntityAtomsGrenade entity = new EntityAtomsGrenade(par2World, par3EntityPlayer, var1, var2, var3);
                par2World.spawnEntityInWorld(entity);
                par1ItemStack.stackSize--;
                return par1ItemStack;
@@ -50,7 +54,8 @@ public class ItemAtomGrenade extends Item {
 
        @Override
        public void addInformation(ItemStack par1ItemStack, List par2List) {
-               if(par1ItemStack.getTagCompound() != null){
+               ItemStack var2 = new ItemStack(this);
+               if(par1ItemStack.hasTagCompound()){
                        NBTTagList var1 = par1ItemStack.getTagCompound().getTagList("Effect");
 
                        for(int i = 0;i < 3;i++){
@@ -64,6 +69,12 @@ public class ItemAtomGrenade extends Item {
        }
 
        @Override
+       public boolean getShareTag()
+       {
+               return true;
+       }
+
+       @Override
        public String getTextureFile(){
                return "/chemicraft/items/items.png";
        }