From a27e1119e8d1c0851d11f06f752b0cf56a7c8fc6 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Mon, 29 Jun 2015 18:41:19 +0100 Subject: [PATCH] Added multiblockPage to the API internal method handler, because I forgot last time >_> --- .../vazkii/botania/api/internal/DummyMethodHandler.java | 6 ++++++ .../botania/api/internal/IInternalMethodHandler.java | 3 +++ src/main/java/vazkii/botania/api/package-info.java | 2 +- .../botania/common/core/handler/InternalMethodHandler.java | 7 +++++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index 8423779a2..5c50618a3 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/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.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.api.recipe.RecipeManaInfusion; @@ -103,6 +104,11 @@ public class DummyMethodHandler implements IInternalMethodHandler { public LexiconPage brewPage(String key, String bottomText, RecipeBrew recipe) { return dummyPage(key); } + + @Override + public LexiconPage multiblockPage(String key, MultiblockSet mb) { + return dummyPage(key); + } private LexiconPage dummyPage(String key) { return new DummyPage(key); diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index cbb51711b..98a201214 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/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.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.api.recipe.RecipeManaInfusion; @@ -70,6 +71,8 @@ public interface IInternalMethodHandler { public LexiconPage brewPage(String key, String bottomText, RecipeBrew recipe); + public LexiconPage multiblockPage(String key, MultiblockSet mb); + public IManaNetwork getManaNetworkInstance(); public ItemStack getSubTileAsStack(String subTile); diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index 58efeb60d..f1701e11b 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "54", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "55", provides = "BotaniaAPI") package vazkii.botania.api; import cpw.mods.fml.common.API; diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 85da0eec2..1e36d7ff7 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/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.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.api.recipe.RecipeManaInfusion; @@ -49,6 +50,7 @@ import vazkii.botania.common.lexicon.page.PageElvenRecipe; import vazkii.botania.common.lexicon.page.PageImage; import vazkii.botania.common.lexicon.page.PageLoreText; import vazkii.botania.common.lexicon.page.PageManaInfusionRecipe; +import vazkii.botania.common.lexicon.page.PageMultiblock; import vazkii.botania.common.lexicon.page.PagePetalRecipe; import vazkii.botania.common.lexicon.page.PageRuneRecipe; import vazkii.botania.common.lexicon.page.PageText; @@ -142,6 +144,11 @@ public class InternalMethodHandler extends DummyMethodHandler { return new PageBrew(recipe, key, bottomText); } + @Override + public LexiconPage multiblockPage(String key, MultiblockSet mb) { + return new PageMultiblock(key, mb); + } + @Override public ItemStack getSubTileAsStack(String subTile) { return ItemBlockSpecialFlower.ofType(subTile);