From 58fde290f89cb5bcabbc392ff44140dd10dba7bd Mon Sep 17 00:00:00 2001 From: DemoXin Date: Thu, 27 Feb 2014 22:48:33 -0500 Subject: [PATCH 1/2] * Added Ore Dictionary entries and recipe replacements for Diamond, Emerald, Crops, Redstone, and Glowstone --- .../net/minecraftforge/oredict/OreDictionary.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/java/net/minecraftforge/oredict/OreDictionary.java b/src/main/java/net/minecraftforge/oredict/OreDictionary.java index 8a4507b330..071c734792 100644 --- a/src/main/java/net/minecraftforge/oredict/OreDictionary.java +++ b/src/main/java/net/minecraftforge/oredict/OreDictionary.java @@ -63,6 +63,14 @@ public class OreDictionary registerOre("oreEmerald", Blocks.emerald_ore); registerOre("oreQuartz", Blocks.quartz_ore); registerOre("oreCoal", Blocks.coal_ore); + registerOre("gemDiamond", Items.diamond); + registerOre("gemEmerald", Items.emerald); + registerOre("dustRedstone", Items.redstone); + registerOre("dustGlowstone", Items.glowstone_dust); + registerOre("glowstone", Blocks.glowstone); + registerOre("cropWheat", Items.wheat); + registerOre("cropPotato", Items.potato); + registerOre("cropCarrot", Items.carrot); registerOre("stone", Blocks.stone); registerOre("cobblestone", Blocks.cobblestone); registerOre("record", Items.record_13); @@ -88,6 +96,11 @@ public class OreDictionary replacements.put(new ItemStack(Blocks.stone, 1, WILDCARD_VALUE), "stone"); replacements.put(new ItemStack(Blocks.cobblestone), "cobblestone"); replacements.put(new ItemStack(Blocks.cobblestone, 1, WILDCARD_VALUE), "cobblestone"); + replacements.put(new ItemStack(Items.diamond), "gemDiamond"); + replacements.put(new ItemStack(Items.emerald), "gemEmerald"); + replacements.put(new ItemStack(Items.redstone), "dustRedstone"); + replacements.put(new ItemStack(Items.glowstone), "dustGlowstone"); + replacements.put(new ItemStack(Blocks.glowstone), "glowstone"); // Register dyes String[] dyes = From 488eb30272b88034c865d488fef6a2b83b76e13b Mon Sep 17 00:00:00 2001 From: DemoXin Date: Fri, 28 Feb 2014 02:54:50 -0500 Subject: [PATCH 2/2] * Fixed Items.glowstone to Items.glowstone_dust --- src/main/java/net/minecraftforge/oredict/OreDictionary.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/oredict/OreDictionary.java b/src/main/java/net/minecraftforge/oredict/OreDictionary.java index 071c734792..186690ae95 100644 --- a/src/main/java/net/minecraftforge/oredict/OreDictionary.java +++ b/src/main/java/net/minecraftforge/oredict/OreDictionary.java @@ -99,7 +99,7 @@ public class OreDictionary replacements.put(new ItemStack(Items.diamond), "gemDiamond"); replacements.put(new ItemStack(Items.emerald), "gemEmerald"); replacements.put(new ItemStack(Items.redstone), "dustRedstone"); - replacements.put(new ItemStack(Items.glowstone), "dustGlowstone"); + replacements.put(new ItemStack(Items.glowstone_dust), "dustGlowstone"); replacements.put(new ItemStack(Blocks.glowstone), "glowstone"); // Register dyes