From 49c812d2b44054cbdf851b4df21053a69360307e Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sun, 10 Aug 2014 15:27:00 +0100 Subject: [PATCH] Glimmering Flowers, Floating Flowers and Mana Pylons now lessen Thaumcraft Infusion instability. --- .../common/block/decor/BlockMiniIsland.java | 8 +++++++- .../common/block/decor/BlockShinyFlower.java | 10 +++++++++- .../api/crafting/IInfusionStabiliser.java | 19 +++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 apis/thaumcraft/api/crafting/IInfusionStabiliser.java diff --git a/MODSRC/vazkii/botania/common/block/decor/BlockMiniIsland.java b/MODSRC/vazkii/botania/common/block/decor/BlockMiniIsland.java index 849bbc5fe..5ec883ca3 100644 --- a/MODSRC/vazkii/botania/common/block/decor/BlockMiniIsland.java +++ b/MODSRC/vazkii/botania/common/block/decor/BlockMiniIsland.java @@ -26,6 +26,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.lib.LibRenderIDs; @@ -38,7 +39,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.registry.GameRegistry; -public class BlockMiniIsland extends BlockModContainer implements ILexiconable { +public class BlockMiniIsland extends BlockModContainer implements ILexiconable, IInfusionStabiliser { public BlockMiniIsland() { super(Material.ground); @@ -117,4 +118,9 @@ public class BlockMiniIsland extends BlockModContainer implements ILexiconable { public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { return LexiconData.shinyFlowers; } + + @Override + public boolean canStabaliseInfusion(World world, int x, int y, int z) { + return false; + } } diff --git a/MODSRC/vazkii/botania/common/block/decor/BlockShinyFlower.java b/MODSRC/vazkii/botania/common/block/decor/BlockShinyFlower.java index e5f932e99..f6595e248 100644 --- a/MODSRC/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/MODSRC/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -16,13 +16,16 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import cpw.mods.fml.common.Optional; -public class BlockShinyFlower extends BlockModFlower { +@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) +public class BlockShinyFlower extends BlockModFlower implements IInfusionStabiliser { public BlockShinyFlower() { super(LibBlockNames.SHINY_FLOWER); @@ -44,4 +47,9 @@ public class BlockShinyFlower extends BlockModFlower { return LexiconData.shinyFlowers; } + @Override + public boolean canStabaliseInfusion(World world, int x, int y, int z) { + return true; + } + } diff --git a/apis/thaumcraft/api/crafting/IInfusionStabiliser.java b/apis/thaumcraft/api/crafting/IInfusionStabiliser.java new file mode 100644 index 000000000..768b25ffc --- /dev/null +++ b/apis/thaumcraft/api/crafting/IInfusionStabiliser.java @@ -0,0 +1,19 @@ +package thaumcraft.api.crafting; + +import net.minecraft.world.World; + +/** + * + * @author Azanor + * + * Blocks that implement this interface act as infusion crafting stabilisers like candles and skulls + * + */ +public interface IInfusionStabiliser { + + /** + * returns true if the block can stabilise things + */ + public boolean canStabaliseInfusion(World world, int x, int y, int z); + +} \ No newline at end of file