diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index 96e4d537..92d30829 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -648,12 +648,13 @@ public class TContent implements IFuelHandler 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 index 17618d71..416a9cb4 100644 --- a/src/main/java/tconstruct/items/ArmorPattern.java +++ b/src/main/java/tconstruct/items/ArmorPattern.java @@ -3,7 +3,6 @@ package tconstruct.items; 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 index b54c0f8c..4d1589aa 100644 --- a/src/main/java/tconstruct/items/Bowstring.java +++ b/src/main/java/tconstruct/items/Bowstring.java @@ -3,7 +3,6 @@ package tconstruct.items; 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 index 3f73cfe6..3866ff96 100644 --- a/src/main/java/tconstruct/items/GoldenHead.java +++ b/src/main/java/tconstruct/items/GoldenHead.java @@ -2,7 +2,6 @@ package tconstruct.items; 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 index 47f6c3e7..faef2c37 100644 --- a/src/main/java/tconstruct/items/Pattern.java +++ b/src/main/java/tconstruct/items/Pattern.java @@ -3,7 +3,6 @@ package tconstruct.items; 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 index 663852fc..75ca6da4 100644 --- a/src/main/java/tconstruct/items/SpecialFood.java +++ b/src/main/java/tconstruct/items/SpecialFood.java @@ -2,7 +2,6 @@ package tconstruct.items; 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 index 72639d64..ffd673d1 100644 --- a/src/main/java/tconstruct/items/ToolPart.java +++ b/src/main/java/tconstruct/items/ToolPart.java @@ -3,7 +3,6 @@ package tconstruct.items; 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 index 960503c5..68d4f785 100644 --- a/src/main/java/tconstruct/items/ToolPartHidden.java +++ b/src/main/java/tconstruct/items/ToolPartHidden.java @@ -3,6 +3,7 @@ package tconstruct.items; import java.util.List; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; public class ToolPartHidden extends ToolPart { @@ -12,7 +13,7 @@ public class ToolPartHidden extends ToolPart 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 index 1788f36b..bdd29b2e 100644 --- a/src/main/java/tconstruct/items/ToolShard.java +++ b/src/main/java/tconstruct/items/ToolShard.java @@ -2,7 +2,6 @@ package tconstruct.items; 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 index a734a14c..0cc18dda 100644 --- a/src/main/java/tconstruct/items/armor/ExoArmor.java +++ b/src/main/java/tconstruct/items/armor/ExoArmor.java @@ -2,7 +2,6 @@ package tconstruct.items.armor; 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 index 593b0d0b..a6a6b033 100644 --- a/src/main/java/tconstruct/items/tools/Arrow.java +++ b/src/main/java/tconstruct/items/tools/Arrow.java @@ -94,7 +94,7 @@ public class Arrow extends ToolCore } @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 index b7d3970b..b4c20aa6 100644 --- a/src/main/java/tconstruct/items/tools/FryingPan.java +++ b/src/main/java/tconstruct/items/tools/FryingPan.java @@ -55,7 +55,7 @@ public class FryingPan extends Weapon 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 index 02564637..ee73256c 100644 --- a/src/main/java/tconstruct/items/tools/Hammer.java +++ b/src/main/java/tconstruct/items/tools/Hammer.java @@ -206,7 +206,7 @@ public class Hammer extends HarvestTool } @Override - public void getSubItems (int id, CreativeTabs tab, List list) + public void getSubItems (Item id, CreativeTabs tab, List list) { super.getSubItems(id, tab, list);