Fix Some More Format.

SlimeKnights · Feb 7, 2014 · 380e105 · 380e105
1 parent 0d2a868
commit 380e105
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 16 deletions.
diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java
@@ -648,12 +648,13 @@ void registerItems ()
         GameRegistry.registerItem(TRepo.diamondApple, "diamondApple");
         GameRegistry.registerItem(TRepo.strangeFood, "strangeFood");
         GameRegistry.registerItem(TRepo.oreBerries, "oreBerries");
-        
+
         boolean foodOverhaul = false;
-        if (Loader.isModLoaded("HungerOverhaul") || Loader.isModLoaded("fc_food")) {
-        	foodOverhaul = true;
+        if (Loader.isModLoaded("HungerOverhaul") || Loader.isModLoaded("fc_food"))
+        {
+            foodOverhaul = true;
         }
-        
+
         TRepo.jerky = new Jerky(foodOverhaul).setUnlocalizedName("tconstruct.jerky");
         GameRegistry.registerItem(TRepo.jerky, "jerky");
 

diff --git a/src/main/java/tconstruct/items/ArmorPattern.java b/src/main/java/tconstruct/items/ArmorPattern.java
@@ -3,7 +3,6 @@
 import java.util.List;
 
 import mantle.items.abstracts.CraftingItem;
-import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;

diff --git a/src/main/java/tconstruct/items/Bowstring.java b/src/main/java/tconstruct/items/Bowstring.java
@@ -3,7 +3,6 @@
 import java.util.List;
 
 import mantle.items.abstracts.CraftingItem;
-import net.minecraft.block.Block;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

diff --git a/src/main/java/tconstruct/items/GoldenHead.java b/src/main/java/tconstruct/items/GoldenHead.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;

diff --git a/src/main/java/tconstruct/items/Pattern.java b/src/main/java/tconstruct/items/Pattern.java
@@ -3,7 +3,6 @@
 import java.util.List;
 
 import mantle.items.abstracts.CraftingItem;
-import net.minecraft.block.Block;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;

diff --git a/src/main/java/tconstruct/items/SpecialFood.java b/src/main/java/tconstruct/items/SpecialFood.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;

diff --git a/src/main/java/tconstruct/items/ToolPart.java b/src/main/java/tconstruct/items/ToolPart.java
@@ -3,7 +3,6 @@
 import java.util.List;
 
 import mantle.items.abstracts.CraftingItem;
-import net.minecraft.block.Block;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

diff --git a/src/main/java/tconstruct/items/ToolPartHidden.java b/src/main/java/tconstruct/items/ToolPartHidden.java
@@ -3,6 +3,7 @@
 import java.util.List;
 
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
 
 public class ToolPartHidden extends ToolPart
 {
@@ -12,7 +13,7 @@ public ToolPartHidden(String textureType, String name)
         super(textureType, name);
     }
 
-    public void getSubItems (int id, CreativeTabs tab, List list)
+    public void getSubItems (Item id, CreativeTabs tab, List list)
     {
 
     }

diff --git a/src/main/java/tconstruct/items/ToolShard.java b/src/main/java/tconstruct/items/ToolShard.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;

diff --git a/src/main/java/tconstruct/items/armor/ExoArmor.java b/src/main/java/tconstruct/items/armor/ExoArmor.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;

diff --git a/src/main/java/tconstruct/items/tools/Arrow.java b/src/main/java/tconstruct/items/tools/Arrow.java
@@ -94,7 +94,7 @@ public float getDamageModifier ()
     }
 
     @Override
-    public void getSubItems (int id, CreativeTabs tab, List list)
+    public void getSubItems (Item id, CreativeTabs tab, List list)
     {
         //Vanilla style arrow
         Item accessory = getAccessoryItem();

diff --git a/src/main/java/tconstruct/items/tools/FryingPan.java b/src/main/java/tconstruct/items/tools/FryingPan.java
@@ -55,7 +55,7 @@ public String getToolName ()
         return "Frying Pan";
     }
 
-    public void getSubItems (int id, CreativeTabs tab, List list)
+    public void getSubItems (Item id, CreativeTabs tab, List list)
     {
         super.getSubItems(id, tab, list);
 

diff --git a/src/main/java/tconstruct/items/tools/Hammer.java b/src/main/java/tconstruct/items/tools/Hammer.java
@@ -206,7 +206,7 @@ else if (renderPass == getPartAmount() + 5)
     }
 
     @Override
-    public void getSubItems (int id, CreativeTabs tab, List list)
+    public void getSubItems (Item id, CreativeTabs tab, List list)
     {
         super.getSubItems(id, tab, list);