From f3ef4fb726e9edd63e147d131d354ab4ca4dae0e Mon Sep 17 00:00:00 2001 From: Alexander Hess Date: Sun, 31 Aug 2014 17:59:00 +0100 Subject: [PATCH] Register ingot storage blocks to Ore Dictionary This will allow EnderIO alloys to be used in Big Reactors as turbine coil materials as well as reactor interior materials --- .../java/crazypants/enderio/material/Alloy.java | 6 ++++-- .../enderio/material/MaterialRecipes.java | 13 +++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/crazypants/enderio/material/Alloy.java b/src/main/java/crazypants/enderio/material/Alloy.java index f1a073ac..e17d2f21 100644 --- a/src/main/java/crazypants/enderio/material/Alloy.java +++ b/src/main/java/crazypants/enderio/material/Alloy.java @@ -15,13 +15,15 @@ public enum Alloy { public final String unlocalisedName; public final String iconKey; - public final String oredictName; + public final String oredictIngotName; + public final String oredictBlockName; private final float hardness; private Alloy(String baseName, float hardness) { this.unlocalisedName = "enderio." + baseName; this.iconKey = "enderio:" + baseName; - this.oredictName = "ingot" + StringUtils.capitalize(baseName); + this.oredictIngotName = "ingot" + StringUtils.capitalize(baseName); + this.oredictBlockName = "block" + StringUtils.capitalize(baseName); this.hardness = hardness; } diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index 8d94cc8f..575b700a 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -31,9 +31,10 @@ public class MaterialRecipes { OreDictionary.registerOre("itemSilicon", new ItemStack(EnderIO.itemMaterial, 1, Material.SILICON.ordinal())); for (Alloy alloy : Alloy.values()) { - OreDictionary.registerOre(alloy.oredictName, new ItemStack(EnderIO.itemAlloy, 1, alloy.ordinal())); + OreDictionary.registerOre(alloy.oredictIngotName, new ItemStack(EnderIO.itemAlloy, 1, alloy.ordinal())); + OreDictionary.registerOre(alloy.oredictBlockName, new ItemStack(EnderIO.blockIngotStorage, 1, alloy.ordinal())); } - + OreDictionary.registerOre("nuggetPulsatingIron", new ItemStack(EnderIO.itemMaterial, 1, Material.PHASED_IRON_NUGGET.ordinal())); OreDictionary.registerOre("nuggetVibrantAlloy", new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_NUGGET.ordinal())); @@ -148,15 +149,15 @@ public class MaterialRecipes { } else { GameRegistry.addShapedRecipe(enderCapacitor, " e ", "cgc", " e ", 'e', phasedGold, 'c', activatedCapacitor, 'g', Blocks.glowstone); } - + if(Config.reinforcedObsidianEnabled) { ItemStack reinfObs = new ItemStack(EnderIO.blockReinforcedObsidian); GameRegistry.addShapedRecipe(reinfObs , "dbd", "bob", "dbd", 'd', darkSteel, 'b', EnderIO.blockDarkIronBars, 'o', Blocks.obsidian); } - + for (Alloy alloy : Alloy.values()) { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(EnderIO.blockIngotStorage, 1, alloy.ordinal()), "iii", "iii", "iii", 'i', alloy.oredictName)); - GameRegistry.addShapelessRecipe(new ItemStack(EnderIO.itemAlloy, 9, alloy.ordinal()), new ItemStack(EnderIO.blockIngotStorage, 1, alloy.ordinal())); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(EnderIO.blockIngotStorage, 1, alloy.ordinal()), "iii", "iii", "iii", 'i', alloy.oredictIngotName)); + GameRegistry.addShapelessRecipe(new ItemStack(EnderIO.itemAlloy, 9, alloy.ordinal()), new ItemStack(EnderIO.blockIngotStorage, 1, alloy.ordinal())); } }