From 9e37f37c5347cd7963e4d54be0a229cb0ed9041f Mon Sep 17 00:00:00 2001 From: nekosune Date: Tue, 2 Feb 2016 21:40:38 +0000 Subject: [PATCH] Added quartz variants to Ore Dictionary --- .../vazkii/botania/common/crafting/ModCraftingRecipes.java | 6 +++--- src/main/java/vazkii/botania/common/item/ModItems.java | 3 +++ src/main/java/vazkii/botania/common/lib/LibOreDict.java | 4 ++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index bfe2040d2..3a9a13b49 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -1407,7 +1407,7 @@ public final class ModCraftingRecipes { // Wing Recipes GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.flightTiara, 1, 1), new ItemStack(ModItems.flightTiara, 1, Short.MAX_VALUE), "gemQuartz")); for(int i = 0; i < 7; i++) - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.flightTiara, 1, 2 + i), new ItemStack(ModItems.flightTiara, 1, Short.MAX_VALUE), new ItemStack(ModItems.quartz, 1, i)); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.flightTiara, 1, 2 + i), new ItemStack(ModItems.flightTiara, 1, Short.MAX_VALUE), LibOreDict.QUARTZ[i])); recipesWings = BotaniaAPI.getLatestAddedRecipes(8); // Mana Fluxfield Recipe @@ -2318,9 +2318,9 @@ public final class ModCraftingRecipes { } private static IRecipe addQuartzRecipes(int meta, Item req, Block block, Block stairs, Block slab) { - GameRegistry.addRecipe(new ItemStack(block), + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(block), "QQ", "QQ", - 'Q', new ItemStack(ModItems.quartz, 1, meta)); + 'Q', LibOreDict.QUARTZ[meta])); GameRegistry.addRecipe(new ItemStack(block, 2, 2), "Q", "Q", 'Q', block); diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 5b8c67e09..f49907061 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -423,6 +423,9 @@ public final class ModItems { OreDictionary.registerOre(LibOreDict.DYE[i], new ItemStack(dye, 1, i)); OreDictionary.registerOre(LibOreDict.RUNE[i], new ItemStack(rune, 1, i)); } + for(int i = 0; i < 7; i++) + OreDictionary.registerOre(LibOreDict.QUARTZ[i],new ItemStack(quartz,1,i)); + OreDictionary.registerOre(LibOreDict.PESTLE_AND_MORTAR, pestleAndMortar); OreDictionary.registerOre(LibOreDict.MANA_STEEL, new ItemStack(manaResource, 1, 0)); OreDictionary.registerOre(LibOreDict.MANA_PEARL, new ItemStack(manaResource, 1, 1)); diff --git a/src/main/java/vazkii/botania/common/lib/LibOreDict.java b/src/main/java/vazkii/botania/common/lib/LibOreDict.java index e020f041d..7f756b1a7 100644 --- a/src/main/java/vazkii/botania/common/lib/LibOreDict.java +++ b/src/main/java/vazkii/botania/common/lib/LibOreDict.java @@ -90,4 +90,8 @@ public final class LibOreDict { "stoneAndesiteBricks", "stoneBasaltBricks", "stoneDioriteBricks", "stoneGraniteBricks", "stoneAndesiteChiseled", "stoneBasaltChiseled", "stoneDioriteChiseled", "stoneGraniteChiseled" }; + + public static final String[] QUARTZ = new String[] { + "quartzDark","quartzMana","quartzBlaze","quartzLavender","quartzRed","quartzElven","quartzSunny" + }; }