From f14d5a41866536aa3ffde9b3776c1e6369afca89 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 8 Feb 2014 13:17:05 +0000 Subject: [PATCH] Preparation for the new lexicon page types. --- .../api/internal/DummyMethodHandler.java | 38 ++++++++++++++++- .../api/internal/IInternalMethodHandler.java | 19 ++++++++- .../core/handler/InternalMethodHandler.java | 42 ++++++++++++++++--- .../botania/common/lexicon/LexiconData.java | 10 ++--- ...ngRecipes.java => PageCraftingRecipe.java} | 6 +-- .../lexicon/page/PageManaInfusionRecipe.java | 16 +++++++ .../common/lexicon/page/PagePetalRecipe.java | 16 +++++++ .../common/lexicon/page/PageRuneRecipe.java | 16 +++++++ 8 files changed, 146 insertions(+), 17 deletions(-) rename MODSRC/vazkii/botania/common/lexicon/page/{PageCraftingRecipes.java => PageCraftingRecipe.java} (97%) create mode 100644 MODSRC/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java create mode 100644 MODSRC/vazkii/botania/common/lexicon/page/PagePetalRecipe.java create mode 100644 MODSRC/vazkii/botania/common/lexicon/page/PageRuneRecipe.java diff --git a/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java b/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java index 8b4bdcd05..6d75ddb0f 100644 --- a/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java @@ -17,6 +17,9 @@ import net.minecraft.block.Block; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.Icon; import vazkii.botania.api.lexicon.LexiconPage; +import vazkii.botania.api.recipe.RecipeManaInfusion; +import vazkii.botania.api.recipe.RecipePetals; +import vazkii.botania.api.recipe.RecipeRuneAltar; public class DummyMethodHandler implements IInternalMethodHandler { @@ -31,15 +34,46 @@ public class DummyMethodHandler implements IInternalMethodHandler { } @Override - public LexiconPage recipesPage(String key, List recipes) { + public LexiconPage craftingRecipesPage(String key, List recipes) { return dummyPage(key); } @Override - public LexiconPage recipePage(String key, IRecipe recipe) { + public LexiconPage craftingRecipePage(String key, IRecipe recipe) { return dummyPage(key); } + @Override + public LexiconPage petalRecipesPage(String key, List recipes) { + return dummyPage(key); + } + + @Override + public LexiconPage petalRecipePage(String key, RecipePetals recipe) { + return dummyPage(key); + } + + @Override + public LexiconPage runeRecipesPage(String key, List recipes) { + return dummyPage(key); + } + + @Override + public LexiconPage runeRecipePage(String key, RecipeRuneAltar recipe) { + return dummyPage(key); + } + + @Override + public LexiconPage manaInfusionRecipesPage(String key, List recipes) { + return dummyPage(key); + } + + @Override + public LexiconPage manaInfusionRecipePage(String key, RecipeManaInfusion recipe) { + return dummyPage(key); + } + + private LexiconPage dummyPage(String key) { return new DummyPage(key); } diff --git a/MODSRC/vazkii/botania/api/internal/IInternalMethodHandler.java b/MODSRC/vazkii/botania/api/internal/IInternalMethodHandler.java index 747cd426f..04ec78578 100644 --- a/MODSRC/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/MODSRC/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -16,6 +16,9 @@ import java.util.List; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.Icon; import vazkii.botania.api.lexicon.LexiconPage; +import vazkii.botania.api.recipe.RecipeManaInfusion; +import vazkii.botania.api.recipe.RecipePetals; +import vazkii.botania.api.recipe.RecipeRuneAltar; /** * Any methods that refer to internal methods in Botania are here. @@ -30,10 +33,22 @@ public interface IInternalMethodHandler { public LexiconPage imagePage(String key, String resource); - public LexiconPage recipesPage(String key, List recipes); + public LexiconPage craftingRecipesPage(String key, List recipes); - public LexiconPage recipePage(String key, IRecipe recipe); + public LexiconPage craftingRecipePage(String key, IRecipe recipe); + public LexiconPage petalRecipesPage(String key, List recipes); + + public LexiconPage petalRecipePage(String key, RecipePetals recipe); + + public LexiconPage runeRecipesPage(String key, List recipes); + + public LexiconPage runeRecipePage(String key, RecipeRuneAltar recipe); + + public LexiconPage manaInfusionRecipesPage(String key, List recipes); + + public LexiconPage manaInfusionRecipePage(String key, RecipeManaInfusion recipe); + public Icon getSubTileIconForName(String name); } diff --git a/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java b/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java index 294aa3723..e58c920e1 100644 --- a/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -18,8 +18,11 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.Icon; import vazkii.botania.api.internal.IInternalMethodHandler; import vazkii.botania.api.lexicon.LexiconPage; +import vazkii.botania.api.recipe.RecipeManaInfusion; +import vazkii.botania.api.recipe.RecipePetals; +import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.common.block.BlockSpecialFlower; -import vazkii.botania.common.lexicon.page.PageCraftingRecipes; +import vazkii.botania.common.lexicon.page.PageCraftingRecipe; import vazkii.botania.common.lexicon.page.PageImage; import vazkii.botania.common.lexicon.page.PageText; @@ -36,13 +39,13 @@ public class InternalMethodHandler implements IInternalMethodHandler { } @Override - public LexiconPage recipesPage(String key, List recipes) { - return new PageCraftingRecipes(key, recipes); + public LexiconPage craftingRecipesPage(String key, List recipes) { + return new PageCraftingRecipe(key, recipes); } @Override - public LexiconPage recipePage(String key, IRecipe recipe) { - return new PageCraftingRecipes(key, recipe); + public LexiconPage craftingRecipePage(String key, IRecipe recipe) { + return new PageCraftingRecipe(key, recipe); } @Override @@ -51,4 +54,33 @@ public class InternalMethodHandler implements IInternalMethodHandler { return icon == null ? Block.plantRed.getIcon(0, 0) : icon; } + @Override + public LexiconPage petalRecipesPage(String key, List recipes) { + return null; + } + + @Override + public LexiconPage petalRecipePage(String key, RecipePetals recipe) { + return null; + } + + @Override + public LexiconPage runeRecipesPage(String key, List recipes) { + return null; + } + + @Override + public LexiconPage runeRecipePage(String key, RecipeRuneAltar recipe) { + return null; + } + + @Override + public LexiconPage manaInfusionRecipesPage(String key, List recipes) { + return null; + } + + @Override + public LexiconPage manaInfusionRecipePage(String key, RecipeManaInfusion recipe) { + return null; + } } diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 64af8110d..c44a90218 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -16,7 +16,7 @@ import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.crafting.ModCrafingRecipes; -import vazkii.botania.common.lexicon.page.PageCraftingRecipes; +import vazkii.botania.common.lexicon.page.PageCraftingRecipe; import vazkii.botania.common.lexicon.page.PageImage; import vazkii.botania.common.lexicon.page.PageText; import vazkii.botania.common.lib.LibLexicon; @@ -47,16 +47,16 @@ public final class LexiconData { // BASICS ENTRIES flowers = new BLexiconEntry(LibLexicon.BASICS_FLOWERS, categoryBasics); - flowers.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_FLOWERS), new PageText("2"), new PageCraftingRecipes("3", ModCrafingRecipes.recipesPetals), new PageCraftingRecipes("4", ModCrafingRecipes.recipePestleAndMortar), new PageCraftingRecipes("5", ModCrafingRecipes.recipesDyes)); + flowers.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_FLOWERS), new PageText("2"), new PageCraftingRecipe("3", ModCrafingRecipes.recipesPetals), new PageCraftingRecipe("4", ModCrafingRecipes.recipePestleAndMortar), new PageCraftingRecipe("5", ModCrafingRecipes.recipesDyes)); apothecary = new BLexiconEntry(LibLexicon.BASICS_APOTHECARY, categoryBasics); - apothecary.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_APOTHECARY), new PageText("2"), new PageText("3"), new PageCraftingRecipes("4", ModCrafingRecipes.recipesApothecary)); + apothecary.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_APOTHECARY), new PageText("2"), new PageText("3"), new PageCraftingRecipe("4", ModCrafingRecipes.recipesApothecary)); lexicon = new BLexiconEntry(LibLexicon.BASICS_LEXICON, categoryBasics); - lexicon.setPriority().setLexiconPages(new PageText("0"), new PageCraftingRecipes("1", ModCrafingRecipes.recipeLexicon)); + lexicon.setPriority().setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeLexicon)); wand = new BLexiconEntry(LibLexicon.BASICS_WAND, categoryBasics); - wand.setPriority().setLexiconPages(new PageText("0"), new PageCraftingRecipes("1", ModCrafingRecipes.recipesTwigWand)); + wand.setPriority().setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipesTwigWand)); } } diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageCraftingRecipes.java b/MODSRC/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java similarity index 97% rename from MODSRC/vazkii/botania/common/lexicon/page/PageCraftingRecipes.java rename to MODSRC/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index c74c85c7e..c1d2384aa 100644 --- a/MODSRC/vazkii/botania/common/lexicon/page/PageCraftingRecipes.java +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -40,7 +40,7 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; import cpw.mods.fml.relauncher.ReflectionHelper; -public class PageCraftingRecipes extends LexiconPage { +public class PageCraftingRecipe extends LexiconPage { private static final ResourceLocation craftingOverlay = new ResourceLocation(LibResources.GUI_CRAFTING_OVERLAY); @@ -54,12 +54,12 @@ public class PageCraftingRecipes extends LexiconPage { ItemStack tooltipStack, tooltipContainerStack; - public PageCraftingRecipes(String unlocalizedName, List recipes) { + public PageCraftingRecipe(String unlocalizedName, List recipes) { super(unlocalizedName); this.recipes = recipes; } - public PageCraftingRecipes(String unlocalizedName, IRecipe recipe) { + public PageCraftingRecipe(String unlocalizedName, IRecipe recipe) { this(unlocalizedName, Arrays.asList(recipe)); } diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/MODSRC/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java new file mode 100644 index 000000000..8250b626c --- /dev/null +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -0,0 +1,16 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Feb 8, 2014, 1:11:42 PM (GMT)] + */ +package vazkii.botania.common.lexicon.page; + +public class PageManaInfusionRecipe { + +} diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/MODSRC/vazkii/botania/common/lexicon/page/PagePetalRecipe.java new file mode 100644 index 000000000..68f13295a --- /dev/null +++ b/MODSRC/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -0,0 +1,16 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Feb 8, 2014, 1:11:35 PM (GMT)] + */ +package vazkii.botania.common.lexicon.page; + +public class PagePetalRecipe { + +} diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageRuneRecipe.java b/MODSRC/vazkii/botania/common/lexicon/page/PageRuneRecipe.java new file mode 100644 index 000000000..be68ab907 --- /dev/null +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageRuneRecipe.java @@ -0,0 +1,16 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Feb 8, 2014, 1:11:48 PM (GMT)] + */ +package vazkii.botania.common.lexicon.page; + +public class PageRuneRecipe { + +}