From 3fa0017e90e510ab49b58dde9a62c57f78fcfd24 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sun, 21 Dec 2014 02:44:58 +0000 Subject: [PATCH] Added getSubTileAsFloatingFlowerStack() to the internal method handler. --- .../vazkii/botania/api/internal/DummyMethodHandler.java | 5 +++++ .../botania/api/internal/IInternalMethodHandler.java | 2 ++ src/main/java/vazkii/botania/api/package-info.java | 2 +- .../common/core/handler/InternalMethodHandler.java | 8 +++++++- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index 9a4b2eb28..bc13b32eb 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -112,6 +112,11 @@ public class DummyMethodHandler implements IInternalMethodHandler { public ItemStack getSubTileAsStack(String subTile) { return new ItemStack(Blocks.stone, 0, 0); } + + @Override + public ItemStack getSubTileAsFloatingFlowerStack(String subTile) { + return getSubTileAsStack(subTile); + } @Override public IIcon getSubTileIconForName(String name) { diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index d54dd4d5d..f724fcaaf 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -73,6 +73,8 @@ public interface IInternalMethodHandler { public IManaNetwork getManaNetworkInstance(); public ItemStack getSubTileAsStack(String subTile); + + public ItemStack getSubTileAsFloatingFlowerStack(String subTile); public IIcon getSubTileIconForName(String name); diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index 0e1e90659..128b2cab7 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 = "26", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "27", 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 42f7f7af5..12d060671 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -13,7 +13,6 @@ package vazkii.botania.common.core.handler; import java.util.List; -import cpw.mods.fml.common.Optional; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -40,6 +39,7 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.block.BlockSpecialFlower; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lexicon.page.PageBrew; import vazkii.botania.common.lexicon.page.PageCraftingRecipe; @@ -52,6 +52,7 @@ import vazkii.botania.common.lexicon.page.PageRuneRecipe; import vazkii.botania.common.lexicon.page.PageText; import baubles.common.lib.PlayerHandler; import buildcraft.api.transport.IPipeTile; +import cpw.mods.fml.common.Optional; public class InternalMethodHandler extends DummyMethodHandler { @@ -143,6 +144,11 @@ public class InternalMethodHandler extends DummyMethodHandler { public ItemStack getSubTileAsStack(String subTile) { return ItemBlockSpecialFlower.ofType(subTile); } + + @Override + public ItemStack getSubTileAsFloatingFlowerStack(String subTile) { + return ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), subTile); + } @Override public IManaNetwork getManaNetworkInstance() {