diff --git a/tconstruct/TConstruct.java b/tconstruct/TConstruct.java index ad0fd168..2e6abe59 100644 --- a/tconstruct/TConstruct.java +++ b/tconstruct/TConstruct.java @@ -125,6 +125,7 @@ public class TConstruct SpecialStackHandler.registerBuiltInStackHandlers(); content.modIntegration(); content.createEntities(); + content.modRecipes(); } public static LiquidCasting getTableCasting () diff --git a/tconstruct/common/TContent.java b/tconstruct/common/TContent.java index a1ffb556..38b6f0ea 100644 --- a/tconstruct/common/TContent.java +++ b/tconstruct/common/TContent.java @@ -1673,13 +1673,6 @@ public class TContent implements IFuelHandler //Armor GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(dryingRack, 1, 0), "bbb", 'b', "slabWood")); - //Remove vanilla recipes - if (!PHConstruct.vanillaMetalBlocks) - { - RecipeRemover.removeShapedRecipe(new ItemStack(Block.blockIron)); - RecipeRemover.removeShapedRecipe(new ItemStack(Block.blockGold)); - } - //Ultra hardcore recipes String[] surround = { "###", "#m#", "###" }; if (PHConstruct.goldAppleRecipe) @@ -1879,41 +1872,35 @@ public class TContent implements IFuelHandler initRecipes = true; if (PHConstruct.removeVanillaToolRecipes) { - RecipeRemover.removeShapedRecipe(new ItemStack(Item.pickaxeWood)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.axeWood)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.shovelWood)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.hoeWood)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.swordWood)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.pickaxeWood)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.axeWood)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.shovelWood)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.hoeWood)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.swordWood)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.pickaxeStone)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.axeStone)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.shovelStone)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.hoeStone)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.swordStone)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.pickaxeStone)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.axeStone)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.shovelStone)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.hoeStone)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.swordStone)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.pickaxeIron)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.axeIron)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.shovelIron)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.hoeIron)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.swordIron)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.pickaxeIron)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.axeIron)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.shovelIron)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.hoeIron)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.swordIron)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.pickaxeDiamond)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.axeDiamond)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.shovelDiamond)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.hoeDiamond)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.swordDiamond)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.pickaxeDiamond)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.axeDiamond)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.shovelDiamond)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.hoeDiamond)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.swordDiamond)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.pickaxeGold)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.axeGold)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.shovelGold)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.hoeGold)); - RecipeRemover.removeShapedRecipe(new ItemStack(Item.swordGold)); - } - else if (PHConstruct.deGreg) - { - CraftingManager cm = CraftingManager.getInstance(); - new RecipesTools().addRecipes(cm); - new RecipesWeapons().addRecipes(cm); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.pickaxeGold)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.axeGold)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.shovelGold)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.hoeGold)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.swordGold)); } if (!PHConstruct.vanillaMetalBlocks) @@ -1921,32 +1908,6 @@ public class TContent implements IFuelHandler RecipeRemover.removeShapedRecipe(new ItemStack(Block.blockIron)); RecipeRemover.removeShapedRecipe(new ItemStack(Block.blockGold)); } - else if (PHConstruct.deGreg) - { - String[] blockPattern = new String[] { "###", "###", "###" }; - GameRegistry.addRecipe(new ItemStack(Block.blockIron), blockPattern, '#', new ItemStack(Item.ingotIron)); - GameRegistry.addRecipe(new ItemStack(Block.blockGold), blockPattern, '#', new ItemStack(Item.ingotGold)); - GameRegistry.addRecipe(new ItemStack(Block.blockDiamond), blockPattern, '#', new ItemStack(Item.diamond)); - GameRegistry.addRecipe(new ItemStack(Block.blockLapis), blockPattern, '#', new ItemStack(Item.dyePowder, 1, 4)); - GameRegistry.addRecipe(new ItemStack(Block.blockEmerald), blockPattern, '#', new ItemStack(Item.emerald)); - GameRegistry.addRecipe(new ItemStack(Block.blockRedstone), blockPattern, '#', new ItemStack(Item.redstone)); - GameRegistry.addRecipe(new ItemStack(Block.blockNetherQuartz, 1), "##", "##", '#', Item.netherQuartz); - } - - if (PHConstruct.deGreg) - { - GameRegistry.addRecipe(new ItemStack(Item.flintAndSteel, 1), "A ", " B", 'A', Item.ingotIron, 'B', Item.flint); - List recipes = CraftingManager.getInstance().getRecipeList(); - addShapedRecipeFirst(recipes, new ItemStack(Block.planks, 4, 0), "#", '#', new ItemStack(Block.wood, 1, 0)); - addShapedRecipeFirst(recipes, new ItemStack(Block.planks, 4, 1), "#", '#', new ItemStack(Block.wood, 1, 1)); - addShapedRecipeFirst(recipes, new ItemStack(Block.planks, 4, 2), "#", '#', new ItemStack(Block.wood, 1, 2)); - addShapedRecipeFirst(recipes, new ItemStack(Block.planks, 4, 3), "#", '#', new ItemStack(Block.wood, 1, 3)); - addShapedRecipeFirst(recipes, new ItemStack(Item.stick, 4), "#", "#", '#', new ItemStack(Block.wood, 1, 0)); - addShapedRecipeFirst(recipes, new ItemStack(Item.stick, 4), "#", "#", '#', new ItemStack(Block.wood, 1, 1)); - addShapedRecipeFirst(recipes, new ItemStack(Item.stick, 4), "#", "#", '#', new ItemStack(Block.wood, 1, 2)); - addShapedRecipeFirst(recipes, new ItemStack(Item.stick, 4), "#", "#", '#', new ItemStack(Block.wood, 1, 3)); - addShapedRecipeFirst(recipes, new ItemStack(Item.bucketEmpty), "# #", " # ", '#', new ItemStack(Item.ingotIron)); - } } } diff --git a/tconstruct/util/RecipeRemover.java b/tconstruct/util/RecipeRemover.java index ab7771c6..32c95e35 100644 --- a/tconstruct/util/RecipeRemover.java +++ b/tconstruct/util/RecipeRemover.java @@ -2,6 +2,7 @@ package tconstruct.util; import java.util.List; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; @@ -16,6 +17,20 @@ public class RecipeRemover removeShapedRecipe(stack); } + public static void removeAnyRecipe (ItemStack resultItem) + { + List recipes = CraftingManager.getInstance().getRecipeList(); + for (int i = 0; i < recipes.size(); i++) + { + IRecipe tmpRecipe = recipes.get(i); + ItemStack recipeResult = tmpRecipe.getRecipeOutput(); + if (ItemStack.areItemStacksEqual(resultItem, recipeResult)) + { + recipes.remove(i--); + } + } + } + public static void removeShapedRecipe (ItemStack resultItem) { List recipes = CraftingManager.getInstance().getRecipeList();