From 669e37fc0b0db196a6ffc2704fac2339fd3c84c6 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 12 Apr 2014 18:48:12 +0100 Subject: [PATCH] Unified recipe field names. --- .../common/crafting/ModCrafingRecipes.java | 52 +++++++++---------- .../botania/common/lexicon/LexiconData.java | 10 ++-- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index ee0c550a1..65452f480 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -59,15 +59,15 @@ public final class ModCrafingRecipes { public static List recipesUnstableBlocks; public static IRecipe recipePylon; public static IRecipe recipeDistributor; - public static IRecipe livingrockDecorRecipe1; - public static IRecipe livingrockDecorRecipe2; - public static IRecipe livingrockDecorRecipe3; - public static IRecipe livingrockDecorRecipe4; - public static IRecipe livingwoodDecorRecipe1; - public static IRecipe livingwoodDecorRecipe2; - public static IRecipe livingwoodDecorRecipe3; - public static IRecipe livingwoodDecorRecipe4; - public static IRecipe livingwoodDecorRecipe5; + public static IRecipe recipeLivingrockDecor1; + public static IRecipe recipeLivingrockDecor2; + public static IRecipe recipeLivingrockDecor3; + public static IRecipe recipeLivingrockDecor4; + public static IRecipe recipeLivingwoodDecor1; + public static IRecipe recipeLivingwoodDecor2; + public static IRecipe recipeLivingwoodDecor3; + public static IRecipe recipeLivingwoodDecor4; + public static IRecipe recipeLivingwoodDecor5; public static List recipesManaBeacons; public static List recipesSignalFlares; public static IRecipe recipeManaVoid; @@ -77,10 +77,10 @@ public final class ModCrafingRecipes { public static IRecipe recipeTurntable; public static IRecipe recipeFertilizerPowder; public static IRecipe recipeFerilizerDye; - public static IRecipe livingwoodTwigRecipe; - public static IRecipe dirtRodRecipe; - public static IRecipe terraformRodRecipe; - public static IRecipe redstoneSpreaderRecipe; + public static IRecipe recipeLivingwoodTwig; + public static IRecipe recipeDirtRod; + public static IRecipe recipeTerraformRod; + public static IRecipe recipeRedstoneSpreader; public static void init() { // Lexicon Recipe @@ -234,32 +234,32 @@ public final class ModCrafingRecipes { addOreDictRecipe(new ItemStack(ModBlocks.livingrock, 4, 1), "RR", "RR", 'R', LibOreDict.LIVING_ROCK); - livingrockDecorRecipe1 = BotaniaAPI.getLatestAddedRecipe(); + recipeLivingrockDecor1 = BotaniaAPI.getLatestAddedRecipe(); addShapelessOreDictRecipe(new ItemStack(ModBlocks.livingrock, 1, 2), new ItemStack(ModBlocks.livingrock, 1, 1), new ItemStack(Items.wheat_seeds)); - livingrockDecorRecipe2 = BotaniaAPI.getLatestAddedRecipe(); + recipeLivingrockDecor2 = BotaniaAPI.getLatestAddedRecipe(); addShapelessOreDictRecipe(new ItemStack(ModBlocks.livingrock, 2, 3), new ItemStack(ModBlocks.livingrock, 1, 1), "cobblestone"); - livingrockDecorRecipe3 = BotaniaAPI.getLatestAddedRecipe(); + recipeLivingrockDecor3 = BotaniaAPI.getLatestAddedRecipe(); addOreDictRecipe(new ItemStack(ModBlocks.livingrock, 4, 4), "RR", "RR", 'R', new ItemStack(ModBlocks.livingrock, 1, 1)); - livingrockDecorRecipe4 = BotaniaAPI.getLatestAddedRecipe(); + recipeLivingrockDecor4 = BotaniaAPI.getLatestAddedRecipe(); // Livingwood Decorative Blocks addShapelessOreDictRecipe(new ItemStack(ModBlocks.livingwood, 4, 1), LibOreDict.LIVING_WOOD); - livingwoodDecorRecipe1 = BotaniaAPI.getLatestAddedRecipe(); + recipeLivingwoodDecor1 = BotaniaAPI.getLatestAddedRecipe(); addShapelessOreDictRecipe(new ItemStack(ModBlocks.livingwood, 1, 2), new ItemStack(ModBlocks.livingwood, 1, 1), new ItemStack(Items.wheat_seeds)); - livingwoodDecorRecipe2 = BotaniaAPI.getLatestAddedRecipe(); + recipeLivingwoodDecor2 = BotaniaAPI.getLatestAddedRecipe(); addOreDictRecipe(new ItemStack(ModBlocks.livingwood, 4, 3), "WW", "WW", 'W', new ItemStack(ModBlocks.livingwood, 1, 1)); - livingwoodDecorRecipe3 = BotaniaAPI.getLatestAddedRecipe(); + recipeLivingwoodDecor3 = BotaniaAPI.getLatestAddedRecipe(); addOreDictRecipe(new ItemStack(ModBlocks.livingwood, 4, 4), " W ", "W W", " W ", 'W', new ItemStack(ModBlocks.livingwood, 1, 1)); - livingwoodDecorRecipe4 = BotaniaAPI.getLatestAddedRecipe(); + recipeLivingwoodDecor4 = BotaniaAPI.getLatestAddedRecipe(); addShapelessOreDictRecipe(new ItemStack(ModBlocks.livingwood, 1, 5), LibOreDict.LIVING_WOOD, new ItemStack(Items.glowstone_dust)); - livingwoodDecorRecipe5 = BotaniaAPI.getLatestAddedRecipe(); + recipeLivingwoodDecor5 = BotaniaAPI.getLatestAddedRecipe(); // Mana Beacon Recipe for(int i = 0; i < 16; i++) @@ -331,7 +331,7 @@ public final class ModCrafingRecipes { addOreDictRecipe(new ItemStack(ModItems.manaResource, 1, 3), "W", "W", 'W', LibOreDict.LIVING_WOOD); - livingwoodTwigRecipe = BotaniaAPI.getLatestAddedRecipe(); + recipeLivingwoodTwig = BotaniaAPI.getLatestAddedRecipe(); // Rod of the Lands Recipe addOreDictRecipe(new ItemStack(ModItems.dirtRod), @@ -339,7 +339,7 @@ public final class ModCrafingRecipes { 'D', new ItemStack(Blocks.dirt), 'T', LibOreDict.LIVINGWOOD_TWIG, 'E', LibOreDict.RUNE[2]); - dirtRodRecipe = BotaniaAPI.getLatestAddedRecipe(); + recipeDirtRod = BotaniaAPI.getLatestAddedRecipe(); // Terra Firma Rod Recipe addOreDictRecipe(new ItemStack(ModItems.terraformRod), @@ -351,12 +351,12 @@ public final class ModCrafingRecipes { 'S', LibOreDict.RUNE[4], 'M', LibOreDict.RUNE[5], 'A', LibOreDict.RUNE[6]); - terraformRodRecipe = BotaniaAPI.getLatestAddedRecipe(); + recipeTerraformRod = BotaniaAPI.getLatestAddedRecipe(); // Redstone Mana Spreader Recipe GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.spreader, 1, 1), new ItemStack(ModBlocks.spreader), new ItemStack(Items.redstone)); - redstoneSpreaderRecipe = BotaniaAPI.getLatestAddedRecipe(); + recipeRedstoneSpreader = BotaniaAPI.getLatestAddedRecipe(); } private static void addOreDictRecipe(ItemStack output, Object... recipe) { diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 087926ad8..3c05a7d0f 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -192,7 +192,7 @@ public final class LexiconData { compositeLens.setLexiconPages(new PageText("0")); redstoneSpreader = new BLexiconEntry(LibLexicon.MANA_REDSTONE_SPREADER, categoryMana); - redstoneSpreader.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.redstoneSpreaderRecipe)); + redstoneSpreader.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeRedstoneSpreader)); // FUNCTIONAL FLOWERS ENTRIES functionalIntro = new BLexiconEntry(LibLexicon.FFLOWER_INTRO, categoryFunctionalFlowers); @@ -270,17 +270,17 @@ public final class LexiconData { grassSeeds.setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", ModManaInfusionRecipes.grassSeedsRecipe), new PageManaInfusionRecipe("2", ModManaInfusionRecipes.podzolSeedsRecipe), new PageManaInfusionRecipe("3", ModManaInfusionRecipes.mycelSeedsRecipes)); dirtRod = new BLexiconEntry(LibLexicon.TOOL_DIRT_ROD, categoryTools); - dirtRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.dirtRodRecipe)); + dirtRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeDirtRod)); terraformRod = new BLexiconEntry(LibLexicon.TOOL_TERRAFORM_ROD, categoryTools); - terraformRod.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCrafingRecipes.terraformRodRecipe)); + terraformRod.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCrafingRecipes.recipeTerraformRod)); // MISCLENAEOUS ENTRIES unstableBlocks = new BLexiconEntry(LibLexicon.MISC_UNSTABLE_BLOCKS, categoryMisc); unstableBlocks.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_UNSTABLE_BLOCK), new PageCraftingRecipe("2", ModCrafingRecipes.recipesUnstableBlocks), new PageText("3"), new PageImage("4", LibResources.ENTRY_UNSTABLE_BEACON), new PageCraftingRecipe("5", ModCrafingRecipes.recipesManaBeacons), new PageText("6"), new PageCraftingRecipe("7", ModCrafingRecipes.recipesSignalFlares)); decorativeBlocks = new BLexiconEntry(LibLexicon.MISC_DECORATIVE_BLOCKS, categoryMisc); - decorativeBlocks.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.livingrockDecorRecipe1), new PageCraftingRecipe("2", ModCrafingRecipes.livingrockDecorRecipe2), new PageCraftingRecipe("3", ModCrafingRecipes.livingrockDecorRecipe3), new PageCraftingRecipe("4", ModCrafingRecipes.livingrockDecorRecipe4), - new PageCraftingRecipe("5", ModCrafingRecipes.livingwoodDecorRecipe1), new PageCraftingRecipe("6", ModCrafingRecipes.livingwoodDecorRecipe2), new PageCraftingRecipe("7", ModCrafingRecipes.livingwoodDecorRecipe3), new PageCraftingRecipe("8", ModCrafingRecipes.livingwoodDecorRecipe4), new PageCraftingRecipe("9", ModCrafingRecipes.livingwoodDecorRecipe5)); + decorativeBlocks.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeLivingrockDecor1), new PageCraftingRecipe("2", ModCrafingRecipes.recipeLivingrockDecor2), new PageCraftingRecipe("3", ModCrafingRecipes.recipeLivingrockDecor3), new PageCraftingRecipe("4", ModCrafingRecipes.recipeLivingrockDecor4), + new PageCraftingRecipe("5", ModCrafingRecipes.recipeLivingwoodDecor1), new PageCraftingRecipe("6", ModCrafingRecipes.recipeLivingwoodDecor2), new PageCraftingRecipe("7", ModCrafingRecipes.recipeLivingwoodDecor3), new PageCraftingRecipe("8", ModCrafingRecipes.recipeLivingwoodDecor4), new PageCraftingRecipe("9", ModCrafingRecipes.recipeLivingwoodDecor5)); } }