いろいろした

[chemicraft/chemicraft.git] / common / pcc / chemicraft / core / nbt / NBTRecipeGrenade.java

diff --git a/common/pcc/chemicraft/util/NBTRecipeGrenade.java b/common/pcc/chemicraft/core/nbt/NBTRecipeGrenade.java
similarity index 51%
rename from common/pcc/chemicraft/util/NBTRecipeGrenade.java
rename to common/pcc/chemicraft/core/nbt/NBTRecipeGrenade.java
index aa373ec..4d7b50e 100644 (file)
--- a/common/pcc/chemicraft/util/NBTRecipeGrenade.java
+++ b/common/pcc/chemicraft/core/nbt/NBTRecipeGrenade.java
@@ -1,4 +1,4 @@
-package pcc.chemicraft.util;
+package pcc.chemicraft.core.nbt;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -6,31 +6,30 @@ import net.minecraft.nbt.NBTTagList;
 import pcc.chemicraft.ChemiCraftData;
 import pcc.chemicraft.core.ChemiCraftCore;
 
-public class NBTRecipeGrenade extends ChemicalNBTRecipe {
+public class NBTRecipeGrenade implements ChemicalNBTRecipe {
 
        @Override
        public void setNBT(ItemStack[] materials, ItemStack result) {
-               if(result.stackTagCompound == null){
+               if (result.stackTagCompound == null) {
                        result.stackTagCompound = new NBTTagCompound();
                }
 
-               if (!result.stackTagCompound.hasKey("Effect"))
-               {
+               if (!result.stackTagCompound.hasKey("Effect")) {
                        result.stackTagCompound.setTag("Effect", new NBTTagList("Effect"));
                }
 
                NBTTagList tagList = (NBTTagList) result.getTagCompound().getTag("Effect");
                NBTTagCompound tag = new NBTTagCompound();
 
-               for(int i = 0;i < materials.length;i++){
-                       if(materials[i] != null){
-                               if(materials[i].itemID-256 == ChemiCraftCore.instance.atomsID && materials[i].getItemDamage() == ChemiCraftData.HYDROGEN){
+               for (int i = 0;i < materials.length;i++) {
+                       if (materials[i] != null) {
+                               if (materials[i].itemID-256 == ChemiCraftCore.instance.atomsID && materials[i].getItemDamage() == ChemiCraftData.HYDROGEN) {
                                        tag.setString("GrenadeEffect" + i, "Hydrogen");
                                }
-                               if(materials[i].itemID-256 == ChemiCraftCore.instance.atomsID && materials[i].getItemDamage() == ChemiCraftData.CARBON){
+                               if (materials[i].itemID-256 == ChemiCraftCore.instance.atomsID && materials[i].getItemDamage() == ChemiCraftData.CARBON) {
                                        tag.setString("GrenadeEffect" + i, "Carbon");
                                }
-                               if(materials[i].itemID-256 == ChemiCraftCore.instance.atomsID && materials[i].getItemDamage() == ChemiCraftData.URANIUM){
+                               if (materials[i].itemID-256 == ChemiCraftCore.instance.atomsID && materials[i].getItemDamage() == ChemiCraftData.URANIUM) {
                                        tag.setString("GrenadeEffect" + i, "Uranium");
                                }
                        }
@@ -42,18 +41,18 @@ public class NBTRecipeGrenade extends ChemicalNBTRecipe {
        @Override
        public ItemStack[] getMatchItems(ItemStack[] materials) {
                ItemStack[] var1 = new ItemStack[materials.length];
-               for(int i = 0;i < var1.length;i++){
-                       if(materials[i] != null){
-                               if(materials[i].getItemDamage() == ChemiCraftData.HYDROGEN){
+               for (int i = 0;i < var1.length;i++) {
+                       if (materials[i] != null) {
+                               if (materials[i].getItemDamage() == ChemiCraftData.HYDROGEN) {
                                        var1[i] = materials[i];
-                               }else if(materials[i].getItemDamage() == ChemiCraftData.CARBON){
+                               } else if (materials[i].getItemDamage() == ChemiCraftData.CARBON) {
                                        var1[i] = materials[i];
-                               }else if(materials[i].getItemDamage() == ChemiCraftData.URANIUM){
+                               } else if (materials[i].getItemDamage() == ChemiCraftData.URANIUM) {
                                        var1[i] = materials[i];
-                               }else{
+                               } else {
                                        var1[i] = null;
                                }
-                       }else{
+                       } else {
                                var1[i] = null;
                        }
                }