diff --git a/lib_jars/[1.7.10]TerraFirmaCraft-deobf-0.79.13.jar b/lib_jars/[1.7.10]TerraFirmaCraft-deobf-0.79.15.jar similarity index 89% rename from lib_jars/[1.7.10]TerraFirmaCraft-deobf-0.79.13.jar rename to lib_jars/[1.7.10]TerraFirmaCraft-deobf-0.79.15.jar index 0105a38..dab0ed5 100644 Binary files a/lib_jars/[1.7.10]TerraFirmaCraft-deobf-0.79.13.jar and b/lib_jars/[1.7.10]TerraFirmaCraft-deobf-0.79.15.jar differ diff --git a/lib_jars/[1.7.10]TerraFirmaCraft-src-0.79.13.jar b/lib_jars/[1.7.10]TerraFirmaCraft-src-0.79.15.jar similarity index 92% rename from lib_jars/[1.7.10]TerraFirmaCraft-src-0.79.13.jar rename to lib_jars/[1.7.10]TerraFirmaCraft-src-0.79.15.jar index 81751e1..bc4434b 100644 Binary files a/lib_jars/[1.7.10]TerraFirmaCraft-src-0.79.13.jar and b/lib_jars/[1.7.10]TerraFirmaCraft-src-0.79.15.jar differ diff --git a/src/main/java/net/dries007/tfcnei/recipeHandlers/AlloyRecipeHandler.java b/src/main/java/net/dries007/tfcnei/recipeHandlers/AlloyRecipeHandler.java index c4dec4f..2280913 100644 --- a/src/main/java/net/dries007/tfcnei/recipeHandlers/AlloyRecipeHandler.java +++ b/src/main/java/net/dries007/tfcnei/recipeHandlers/AlloyRecipeHandler.java @@ -43,7 +43,7 @@ import com.bioxx.tfc.Core.Metal.AlloyMetal; import com.bioxx.tfc.Core.Metal.AlloyMetalCompare; import com.bioxx.tfc.Items.ItemOre; -import com.bioxx.tfc.TFCItems; +import com.bioxx.tfc.ItemSetup; import com.bioxx.tfc.api.Metal; import com.google.common.collect.HashMultimap; import net.dries007.tfcnei.util.Constants; @@ -91,8 +91,8 @@ public TemplateRecipeHandler newInstance() { alloyList = AlloyManager.instance.Alloys; Metal metal; - ItemStack itemStack = new ItemStack(TFCItems.OreChunk); - while ((metal = ((ItemOre) TFCItems.OreChunk).GetMetalType(itemStack)) != null) + ItemStack itemStack = new ItemStack(ItemSetup.OreChunk); + while ((metal = ((ItemOre) ItemSetup.OreChunk).GetMetalType(itemStack)) != null) { metalItemMap.put(metal, itemStack.copy()); itemStack.setItemDamage(itemStack.getItemDamage() + 1); diff --git a/src/main/java/net/dries007/tfcnei/recipeHandlers/AnvilRecipeHandler.java b/src/main/java/net/dries007/tfcnei/recipeHandlers/AnvilRecipeHandler.java index 5a5ea47..4dcd41a 100644 --- a/src/main/java/net/dries007/tfcnei/recipeHandlers/AnvilRecipeHandler.java +++ b/src/main/java/net/dries007/tfcnei/recipeHandlers/AnvilRecipeHandler.java @@ -41,7 +41,7 @@ import com.bioxx.tfc.Core.Recipes; import com.bioxx.tfc.GUI.GuiAnvil; import com.bioxx.tfc.Items.Tools.ItemHammer; -import com.bioxx.tfc.TFCItems; +import com.bioxx.tfc.ItemSetup; import com.bioxx.tfc.api.Crafting.AnvilManager; import com.bioxx.tfc.api.Crafting.AnvilRecipe; import com.bioxx.tfc.api.Crafting.AnvilReq; @@ -120,7 +120,7 @@ public void loadUsageRecipes(ItemStack ingredient) for (AnvilRecipe recipe : recipeList) arecipes.add(new CachedAnvilRecipe(HAMMER_NORMAL, recipe)); for (AnvilRecipe recipe : weldRecipeList) arecipes.add(new CachedAnvilRecipe(HAMMER_WELD, recipe)); } - else if (ingredient.getItem() == TFCItems.Powder && ingredient.getItemDamage() == 0) + else if (ingredient.getItem() == ItemSetup.Powder && ingredient.getItemDamage() == 0) { for (AnvilRecipe recipe : weldRecipeList) arecipes.add(new CachedAnvilRecipe(WELD, recipe)); } @@ -247,7 +247,7 @@ public List getOtherStacks() List stacks = new ArrayList<>(); stacks.add(new PositionedStack(hammers, -14, 100, false)); - if (type.isWeld()) stacks.add(new PositionedStack(new ItemStack(TFCItems.Powder), 164, 100)); + if (type.isWeld()) stacks.add(new PositionedStack(new ItemStack(ItemSetup.Powder), 164, 100)); return stacks; } } diff --git a/src/main/java/net/dries007/tfcnei/recipeHandlers/KnappingRecipeHandler.java b/src/main/java/net/dries007/tfcnei/recipeHandlers/KnappingRecipeHandler.java index 3ae1c60..9e6f829 100644 --- a/src/main/java/net/dries007/tfcnei/recipeHandlers/KnappingRecipeHandler.java +++ b/src/main/java/net/dries007/tfcnei/recipeHandlers/KnappingRecipeHandler.java @@ -41,7 +41,7 @@ import com.bioxx.tfc.Items.ItemFlatGeneric; import com.bioxx.tfc.Items.ItemLooseRock; import com.bioxx.tfc.Reference; -import com.bioxx.tfc.TFCItems; +import com.bioxx.tfc.ItemSetup; import com.bioxx.tfc.api.Crafting.CraftingManagerTFC; import com.bioxx.tfc.api.Crafting.ShapedRecipesTFC; import net.dries007.tfcnei.util.Helper; @@ -146,7 +146,7 @@ public void loadUsageRecipes(ItemStack ingredient) for (ItemStack inStack : recipe.getRecipeItems()) { if (inStack == null || flatType != inStack.getItem()) continue; - if (flatType == TFCItems.FlatClay) + if (flatType == ItemSetup.FlatClay) { if (ingredient.getItemDamage() == 0 && inStack.getItemDamage() == 1) // Compare to see if the ingredient is normal clay arecipes.add(new CachedKnappingRecipe(recipe)); @@ -175,23 +175,23 @@ public CachedKnappingRecipe(ShapedRecipesTFC recipe) for (ItemStack inStack : inputItems) { if (inStack == null) continue; - if (inStack.getItem() == TFCItems.FlatClay) // if its clay, we need some special code + if (inStack.getItem() == ItemSetup.FlatClay) // if its clay, we need some special code { if (inStack.getItemDamage() == 1) // Normal clay (damage value 1) { off = new ItemStack(inStack.getItem(), 1, 0); // Dark texture has data value 0 - setActualInput(new ItemStack(TFCItems.ClayBall, 5, 0)); + setActualInput(new ItemStack(ItemSetup.ClayBall, 5, 0)); } else if (inStack.getItemDamage() == 3) // Fire clay (damage value 3) { off = new ItemStack(inStack.getItem(), 1, 2); // Dark texture has data value 3 - setActualInput(new ItemStack(TFCItems.ClayBall, 5, 1)); + setActualInput(new ItemStack(ItemSetup.ClayBall, 5, 1)); } } else // If not clay (aka Leather or stone) add the recipe without a 'dark' texture in place. { - if (inStack.getItem() == TFCItems.FlatLeather) setActualInput(new ItemStack(TFCItems.Leather)); - else if (inStack.getItem() == TFCItems.FlatRock) setActualInput(new ItemStack(TFCItems.LooseRock, 1, inStack.getItemDamage())); + if (inStack.getItem() == ItemSetup.FlatLeather) setActualInput(new ItemStack(ItemSetup.Leather)); + else if (inStack.getItem() == ItemSetup.FlatRock) setActualInput(new ItemStack(ItemSetup.LooseRock, 1, inStack.getItemDamage())); } break; } diff --git a/src/main/java/net/dries007/tfcnei/recipeHandlers/QuernRecipeHandler.java b/src/main/java/net/dries007/tfcnei/recipeHandlers/QuernRecipeHandler.java index 3603ecb..18e7de0 100644 --- a/src/main/java/net/dries007/tfcnei/recipeHandlers/QuernRecipeHandler.java +++ b/src/main/java/net/dries007/tfcnei/recipeHandlers/QuernRecipeHandler.java @@ -39,7 +39,7 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; import com.bioxx.tfc.Reference; -import com.bioxx.tfc.TFCItems; +import com.bioxx.tfc.ItemSetup; import com.bioxx.tfc.api.Crafting.QuernManager; import com.bioxx.tfc.api.Crafting.QuernRecipe; import cpw.mods.fml.relauncher.ReflectionHelper; @@ -103,7 +103,7 @@ public void loadCraftingRecipes(ItemStack result) public void loadUsageRecipes(ItemStack ingredient) { for (QuernRecipe recipe : recipeList) - if (ingredient.getItem() == TFCItems.Quern || Helper.areItemStacksEqual(ingredient, recipe.getInItem())) + if (ingredient.getItem() == ItemSetup.Quern || Helper.areItemStacksEqual(ingredient, recipe.getInItem())) arecipes.add(new CachedQuernRecipe(recipe)); } @@ -146,7 +146,7 @@ public PositionedStack getIngredient() @Override public PositionedStack getOtherStack() { - return new PositionedStack(new ItemStack(TFCItems.Quern), 88, 9); + return new PositionedStack(new ItemStack(ItemSetup.Quern), 88, 9); } } }