From 955683349dd05cdfdfa73837aa75c09ee1a48772 Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 5 Nov 2012 16:15:43 -0800 Subject: [PATCH] Ore Dictionary Improvements, replaces vanilla recipes with OreDict recipes for some vanilla items. Thanks Covert. --- common/forge_at.cfg | 6 + .../minecraftforge/oredict/OreDictionary.java | 155 +++++++++++++----- .../oredict/ShapedOreRecipe.java | 33 +++- .../oredict/ShapelessOreRecipe.java | 22 +++ 4 files changed, 177 insertions(+), 39 deletions(-) diff --git a/common/forge_at.cfg b/common/forge_at.cfg index fda689a764..e17967d486 100644 --- a/common/forge_at.cfg +++ b/common/forge_at.cfg @@ -94,3 +94,9 @@ public atw.a(Ljava/lang/String;ILyr;[Lace;)V #MD:GuiFlatPresets/func_82297_a public yr.*() #MD:BiomeGenBase/* #Everything protected->public # MapGenVillage public-f aev.e #FD:MapGenVillage/field_75055_e #villageSpawnBiomes +# ShapedRecipes +public+f wk.d #FD:ShapedRecipes/field_77574_d #recipeItems +public+f wk.b #FD:ShapedRecipes/field_77576_b #recipeWidth +public+f wk.c #FD:ShapedRecipes/field_77577_c #recipeHeight +# ShapelessRecipes +public wl.b #FD:ShapelessRecipes/field_77579_b #recipeItems \ No newline at end of file diff --git a/common/net/minecraftforge/oredict/OreDictionary.java b/common/net/minecraftforge/oredict/OreDictionary.java index 803ea32bb2..b04e17e5c0 100644 --- a/common/net/minecraftforge/oredict/OreDictionary.java +++ b/common/net/minecraftforge/oredict/OreDictionary.java @@ -7,9 +7,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import net.minecraft.src.Block; -import net.minecraft.src.Item; -import net.minecraft.src.ItemStack; +import net.minecraft.src.*; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.Event; @@ -23,43 +21,102 @@ public class OreDictionary initVanillaEntries(); } - public static void initVanillaEntries(){ - registerOre("woodLog", new ItemStack(Block.wood, 1, 0)); - registerOre("woodLog", new ItemStack(Block.wood, 1, 1)); - registerOre("woodLog", new ItemStack(Block.wood, 1, 2)); - registerOre("woodLog", new ItemStack(Block.wood, 1, 3)); + public static void initVanillaEntries() + { + registerOre("logWood", new ItemStack(Block.wood, 1, -1)); + registerOre("plankWood", new ItemStack(Block.planks, 1, -1)); + registerOre("slabWood", new ItemStack(Block.woodSingleSlab, 1, -1)); + registerOre("stairWood", Block.stairCompactPlanks); + registerOre("stairWood", Block.stairsWoodBirch); + registerOre("stairWood", Block.stairsWoodJungle); + registerOre("stairWood", Block.stairsWoodSpruce); + registerOre("stickWood", Item.stick); - registerOre("woodPlank", new ItemStack(Block.planks, 1, 0)); - registerOre("woodPlank", new ItemStack(Block.planks, 1, 1)); - registerOre("woodPlank", new ItemStack(Block.planks, 1, 2)); - registerOre("woodPlank", new ItemStack(Block.planks, 1, 3)); + // Build our list of items to replace with ore tags + Map replacements = new HashMap(); + replacements.put(new ItemStack(Block.planks, 1, -1), "plankWood"); + replacements.put(new ItemStack(Item.stick), "stickWood"); - registerOre("woodSlab", new ItemStack(Block.woodSingleSlab, 1, 0)); - registerOre("woodSlab", new ItemStack(Block.woodSingleSlab, 1, 1)); - registerOre("woodSlab", new ItemStack(Block.woodSingleSlab, 1, 2)); - registerOre("woodSlab", new ItemStack(Block.woodSingleSlab, 1, 3)); + // Register dyes + String[] dyes = + { + "dyeBlack", + "dyeRed", + "dyeGreen", + "dyeBrown", + "dyeBlue", + "dyePurple", + "dyeCyan", + "dyeLightGray", + "dyeGray", + "dyePink", + "dyeLime", + "dyeYellow", + "dyeLightBlue", + "dyeMagenta", + "dyeOrange", + "dyeWhite" + }; - registerOre("woodStair", Block.stairCompactPlanks); - registerOre("woodStair", Block.stairsWoodBirch); - registerOre("woodStair", Block.stairsWoodJungle); - registerOre("woodStair", Block.stairsWoodSpruce); + for(int i = 0; i < 16; i++) + { + ItemStack dye = new ItemStack(Item.dyePowder, 1, i); + registerOre(dyes[i], dye); + replacements.put(dye, dyes[i]); + } - registerOre("dyeBlack", new ItemStack(Item.dyePowder, 1, 0)); - registerOre("dyeRed", new ItemStack(Item.dyePowder, 1, 1)); - registerOre("dyeGreen", new ItemStack(Item.dyePowder, 1, 2)); - registerOre("dyeBrown", new ItemStack(Item.dyePowder, 1, 3)); - registerOre("dyeBlue", new ItemStack(Item.dyePowder, 1, 4)); - registerOre("dyePurple", new ItemStack(Item.dyePowder, 1, 5)); - registerOre("dyeCyan", new ItemStack(Item.dyePowder, 1, 6)); - registerOre("dyeLightGrey", new ItemStack(Item.dyePowder, 1, 7)); - registerOre("dyeGrey", new ItemStack(Item.dyePowder, 1, 8)); - registerOre("dyePink", new ItemStack(Item.dyePowder, 1, 9)); - registerOre("dyeLime", new ItemStack(Item.dyePowder, 1, 10)); - registerOre("dyeYellow", new ItemStack(Item.dyePowder, 1, 11)); - registerOre("dyeLightBlue", new ItemStack(Item.dyePowder, 1, 12)); - registerOre("dyeMagenta", new ItemStack(Item.dyePowder, 1, 13)); - registerOre("dyeOrange", new ItemStack(Item.dyePowder, 1, 14)); - registerOre("dyeWhite", new ItemStack(Item.dyePowder, 1, 15)); + ItemStack[] replaceStacks = replacements.keySet().toArray(new ItemStack[0]); + + // Ignore recipes for the following items + ItemStack[] exclusions = new ItemStack[] + { + new ItemStack(Block.blockLapis), + new ItemStack(Item.cookie), + }; + + List recipes = CraftingManager.getInstance().getRecipeList(); + List recipesToRemove = new ArrayList(); + List recipesToAdd = new ArrayList(); + + // Search vanilla recipes for recipes to replace + for(Object obj : recipes) + { + if(obj instanceof ShapedRecipes) + { + ShapedRecipes recipe = (ShapedRecipes)obj; + ItemStack output = recipe.getRecipeOutput(); + if (output != null && containsMatch(false, exclusions, output)) + { + continue; + } + + if(containsMatch(true, recipe.recipeItems, replaceStacks)) + { + recipesToRemove.add(recipe); + recipesToAdd.add(new ShapedOreRecipe(recipe, replacements)); + } + } + else if(obj instanceof ShapelessRecipes) + { + ShapelessRecipes recipe = (ShapelessRecipes)obj; + ItemStack output = recipe.getRecipeOutput(); + if (output != null && containsMatch(false, exclusions, output)) + { + continue; + } + + if(containsMatch(true, (ItemStack[])recipe.recipeItems.toArray(new ItemStack[0]), replaceStacks)) + { + recipesToRemove.add((IRecipe)obj); + IRecipe newRecipe = new ShapelessOreRecipe(recipe, replacements); + recipesToAdd.add(newRecipe); + } + } + } + + recipes.removeAll(recipesToRemove); + recipes.addAll(recipesToAdd); + System.out.println(recipesToRemove.size() + " " + recipesToAdd.size()); } /** @@ -138,7 +195,31 @@ public class OreDictionary } return val; } - + + private static boolean containsMatch(boolean strict, ItemStack[] inputs, ItemStack... targets) + { + for (ItemStack input : inputs) + { + for (ItemStack target : targets) + { + if (itemMatches(target, input, strict)) + { + return true; + } + } + } + return false; + } + + public static boolean itemMatches(ItemStack target, ItemStack input, boolean strict) + { + if (input == null && target != null || input != null && target == null) + { + return false; + } + return (target.itemID == input.itemID && ((target.getItemDamage() == -1 && !strict) || target.getItemDamage() == input.getItemDamage())); + } + //Convenience functions that make for cleaner code mod side. They all drill down to registerOre(String, int, ItemStack) public static void registerOre(String name, Item ore){ registerOre(name, new ItemStack(ore)); } public static void registerOre(String name, Block ore){ registerOre(name, new ItemStack(ore)); } diff --git a/common/net/minecraftforge/oredict/ShapedOreRecipe.java b/common/net/minecraftforge/oredict/ShapedOreRecipe.java index a89c95d6d2..3a85fcb182 100644 --- a/common/net/minecraftforge/oredict/ShapedOreRecipe.java +++ b/common/net/minecraftforge/oredict/ShapedOreRecipe.java @@ -2,6 +2,8 @@ package net.minecraftforge.oredict; import java.util.ArrayList; import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; import net.minecraft.src.Block; import net.minecraft.src.IRecipe; @@ -123,6 +125,33 @@ public class ShapedOreRecipe implements IRecipe } } + ShapedOreRecipe(ShapedRecipes recipe, Map replacements) + { + output = recipe.getRecipeOutput(); + width = recipe.recipeWidth; + height = recipe.recipeHeight; + + input = new Object[recipe.recipeItems.length]; + + for(int i = 0; i < input.length; i++) + { + ItemStack ingred = recipe.recipeItems[i]; + + if(ingred == null) continue; + + input[i] = recipe.recipeItems[i]; + + for(Entry replace : replacements.entrySet()) + { + if(OreDictionary.itemMatches(replace.getKey(), ingred, true)) + { + input[i] = OreDictionary.getOres(replace.getValue()); + break; + } + } + } + } + @Override public ItemStack getCraftingResult(InventoryCrafting var1){ return output.copy(); } @@ -208,7 +237,7 @@ public class ShapedOreRecipe implements IRecipe return true; } - + private boolean checkItemEquals(ItemStack target, ItemStack input) { if (input == null && target != null || input != null && target == null) @@ -217,7 +246,7 @@ public class ShapedOreRecipe implements IRecipe } return (target.itemID == input.itemID && (target.getItemDamage() == -1 || target.getItemDamage() == input.getItemDamage())); } - + public ShapedOreRecipe setMirrored(boolean mirror) { mirrored = mirror; diff --git a/common/net/minecraftforge/oredict/ShapelessOreRecipe.java b/common/net/minecraftforge/oredict/ShapelessOreRecipe.java index 626d01f322..e35e1729d3 100644 --- a/common/net/minecraftforge/oredict/ShapelessOreRecipe.java +++ b/common/net/minecraftforge/oredict/ShapelessOreRecipe.java @@ -2,6 +2,9 @@ package net.minecraftforge.oredict; import java.util.ArrayList; import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; +import java.util.List; import net.minecraft.src.Block; import net.minecraft.src.CraftingManager; @@ -54,6 +57,25 @@ public class ShapelessOreRecipe implements IRecipe } } + ShapelessOreRecipe(ShapelessRecipes recipe, Map replacements) + { + output = recipe.getRecipeOutput(); + + for(ItemStack ingred : ((List)recipe.recipeItems)) + { + Object finalObj = ingred; + for(Entry replace : replacements.entrySet()) + { + if(OreDictionary.itemMatches(replace.getKey(), ingred, false)) + { + finalObj = OreDictionary.getOres(replace.getValue()); + break; + } + } + input.add(finalObj); + } + } + @Override public int getRecipeSize(){ return input.size(); }