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

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

diff --git a/common/chemicraft/item/ItemAtomsGrenade.java b/common/chemicraft/item/ItemAtomsGrenade.java
index 1dcfda9..8d33bec 100644 (file)
--- a/common/chemicraft/item/ItemAtomsGrenade.java
+++ b/common/chemicraft/item/ItemAtomsGrenade.java
@@ -2,16 +2,12 @@ package chemicraft.item;
 
 import java.util.List;
 
-import chemicraft.entity.EntityAtomsGrenade;
-
-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 net.minecraft.src.WorldClient;
-import net.minecraft.src.WorldServer;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.world.World;
 import chemicraft.entity.EntityAtomsGrenade;
 
 public class ItemAtomsGrenade extends Item {
@@ -54,14 +50,14 @@ public class ItemAtomsGrenade extends Item {
        }
 
        @Override
-       public void addInformation(ItemStack par1ItemStack, List par2List) {
+       public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
                ItemStack var2 = new ItemStack(this);
                if(par1ItemStack.hasTagCompound()){
                        NBTTagList var1 = par1ItemStack.getTagCompound().getTagList("Effect");
 
                        for(int i = 0;i < 3;i++){
                                if(!((NBTTagCompound)var1.tagAt(0)).getString("GrenadeEffect" + i).equals("")){
-                                       par2List.add(
+                                       par3List.add(
                                                        ((NBTTagCompound)var1.tagAt(0)).getString("GrenadeEffect" + i)
                                                        );
                                }