(・∀・)

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

diff --git a/common/pcc/chemicraft/base/item/ItemAtomsGrenade.java b/common/pcc/chemicraft/base/item/ItemAtomsGrenade.java
index 6a72e32..ada8ec0 100644 (file)
--- a/common/pcc/chemicraft/base/item/ItemAtomsGrenade.java
+++ b/common/pcc/chemicraft/base/item/ItemAtomsGrenade.java
@@ -2,6 +2,7 @@ package pcc.chemicraft.base.item;
 
 import java.util.List;
 
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -11,6 +12,10 @@ import net.minecraft.world.World;
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.base.entity.EntityAtomsGrenade;
 
+/**
+ * 手榴弾のアイテムです。
+ * @author mozipi
+ */
 public class ItemAtomsGrenade extends Item {
 
        public ItemAtomsGrenade(int par1) {
@@ -18,8 +23,8 @@ public class ItemAtomsGrenade extends Item {
        }
 
        @Override
-       public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer){
-               if(par1ItemStack.stackSize <= 0){
+       public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
+               if (par1ItemStack.stackSize <= 0) {
                        return null;
                }
 
@@ -27,25 +32,27 @@ public class ItemAtomsGrenade extends Item {
                boolean var2 = false;
                boolean var3 = false;
 
-               if(par1ItemStack.stackTagCompound != null){
+               if (par1ItemStack.stackTagCompound != null) {
                        NBTTagList var4 = par1ItemStack.getTagCompound().getTagList("Effect");
 
-                       for(int i = 0;i < 3;i++){
-                               if(!((NBTTagCompound)var4.tagAt(0)).getString("GrenadeEffect" + i).equals("")){
-                                       if(((NBTTagCompound)var4.tagAt(0)).getString("GrenadeEffect" + i).equals("Hydrogen")){
+                       for (int i = 0;i < 3;i++) {
+                               if (!((NBTTagCompound)var4.tagAt(0)).getString("GrenadeEffect" + i).equals("")) {
+                                       if (((NBTTagCompound)var4.tagAt(0)).getString("GrenadeEffect" + i).equals("Hydrogen")) {
                                                var1 = true;
                                        }
-                                       if(((NBTTagCompound)var4.tagAt(0)).getString("GrenadeEffect" + i).equals("Carbon")){
+                                       if (((NBTTagCompound)var4.tagAt(0)).getString("GrenadeEffect" + i).equals("Carbon")) {
                                                var2 = true;
                                        }
-                                       if(((NBTTagCompound)var4.tagAt(0)).getString("GrenadeEffect" + i).equals("Uranium")){
+                                       if (((NBTTagCompound)var4.tagAt(0)).getString("GrenadeEffect" + i).equals("Uranium")) {
                                                var3 = true;
                                        }
                                }
                        }
                }
-               EntityAtomsGrenade entity = new EntityAtomsGrenade(par2World, par3EntityPlayer, var1, var2, var3);
-               par2World.spawnEntityInWorld(entity);
+               if (!par2World.isRemote) {
+                       EntityAtomsGrenade entity = new EntityAtomsGrenade(par2World, par3EntityPlayer, var1, var2, var3);
+                       par2World.spawnEntityInWorld(entity);
+               }
                par1ItemStack.stackSize--;
                return par1ItemStack;
        }
@@ -53,11 +60,11 @@ public class ItemAtomsGrenade extends Item {
        @Override
        public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
                ItemStack var2 = new ItemStack(this);
-               if(par1ItemStack.hasTagCompound()){
+               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("")){
+                       for (int i = 0;i < 3;i++) {
+                               if (!((NBTTagCompound)var1.tagAt(0)).getString("GrenadeEffect" + i).equals("")) {
                                        par3List.add(
                                                        ((NBTTagCompound)var1.tagAt(0)).getString("GrenadeEffect" + i)
                                                        );
@@ -73,8 +80,8 @@ public class ItemAtomsGrenade extends Item {
        }
 
        @Override
-       public String getTextureFile(){
-               return ChemiCraft.ITEM_TEXTURE;
+       public void updateIcons(IconRegister par1IconRegister){
+               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "ItemAtomsGrenade");
        }
 
 }