From 55c837a0534e9fce139b862e9a0ad7fdd0dbf34c Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sun, 2 Nov 2014 21:31:38 +0000 Subject: [PATCH] Added Brew pages to the internal method handler. --- MODSRC/vazkii/botania/api/brew/Brew.java | 7 ++++--- MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java | 6 ++++++ .../botania/api/internal/IInternalMethodHandler.java | 3 +++ .../botania/common/core/handler/InternalMethodHandler.java | 7 +++++++ 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/MODSRC/vazkii/botania/api/brew/Brew.java b/MODSRC/vazkii/botania/api/brew/Brew.java index 3ecf6b6e6..995cdd894 100644 --- a/MODSRC/vazkii/botania/api/brew/Brew.java +++ b/MODSRC/vazkii/botania/api/brew/Brew.java @@ -67,8 +67,9 @@ public class Brew { } /** - * Gets the display color for the ItemStack passed in. Note that for - * the lexicon, this passes in a botania Managlass Flask at all times. + * Gets the display color for the ItemStack passed in. Note that for + * the lexicon, this passes in a botania Managlass Vial or an + * Alfglass Flask at all times. */ public int getColor(ItemStack stack) { return color; @@ -91,7 +92,7 @@ public class Brew { /** * Gets the list of potion effects for the ItemStack passed in. * Note that for the lexicon, this passes in a botania Managlass - * Flask at all times. + * Vial or an Alfglass Flask at all times. */ public List getPotionEffects(ItemStack stack) { return effects; diff --git a/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java b/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java index aa731eac1..b994f3038 100644 --- a/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java @@ -26,6 +26,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.lexicon.LexiconPage; +import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; @@ -92,6 +93,11 @@ public class DummyMethodHandler implements IInternalMethodHandler { public LexiconPage elvenTradesPage(String key, RecipeElvenTrade recipe) { return dummyPage(key); } + + @Override + public LexiconPage brewPage(String key, String bottomText, RecipeBrew 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 60653ac09..9ad914ca2 100644 --- a/MODSRC/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/MODSRC/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -25,6 +25,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.lexicon.LexiconPage; +import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; @@ -64,6 +65,8 @@ public interface IInternalMethodHandler { public LexiconPage elvenTradePage(String key, List recipes); public LexiconPage elvenTradesPage(String key, RecipeElvenTrade recipe); + + public LexiconPage brewPage(String key, String bottomText, RecipeBrew recipe); public IManaNetwork getManaNetworkInstance(); diff --git a/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java b/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java index c4a381b6f..2799685b9 100644 --- a/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -29,6 +29,7 @@ import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.internal.DummyMethodHandler; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.lexicon.LexiconPage; +import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; @@ -40,6 +41,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.block.BlockSpecialFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import vazkii.botania.common.lexicon.page.PageBrew; import vazkii.botania.common.lexicon.page.PageCraftingRecipe; import vazkii.botania.common.lexicon.page.PageElvenRecipe; import vazkii.botania.common.lexicon.page.PageImage; @@ -125,6 +127,11 @@ public class InternalMethodHandler extends DummyMethodHandler { public LexiconPage elvenTradesPage(String key, RecipeElvenTrade recipe) { return new PageElvenRecipe(key, recipe); } + + @Override + public LexiconPage brewPage(String key, String bottomText, RecipeBrew recipe) { + return new PageBrew(recipe, key, bottomText); + } @Override public ItemStack getSubTileAsStack(String subTile) {