From c07884fb679f794da489088d0025cfac3fdb7c91 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Fri, 17 Oct 2014 16:55:05 +0100 Subject: [PATCH] API fixes. --- MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java | 5 +++++ .../vazkii/botania/api/internal/IInternalMethodHandler.java | 2 ++ MODSRC/vazkii/botania/api/package-info.java | 2 +- MODSRC/vazkii/botania/api/subtile/SubTileGenerating.java | 6 +++--- .../botania/common/core/handler/InternalMethodHandler.java | 5 +++++ 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java b/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java index 29675d6f0..549bd1972 100644 --- a/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java @@ -127,4 +127,9 @@ public class DummyMethodHandler implements IInternalMethodHandler { public boolean shouldForceCheck() { return true; } + + @Override + public int getPassiveFlowerDecay() { + return 0; + } } diff --git a/MODSRC/vazkii/botania/api/internal/IInternalMethodHandler.java b/MODSRC/vazkii/botania/api/internal/IInternalMethodHandler.java index fa1934a0e..00a16a296 100644 --- a/MODSRC/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/MODSRC/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -68,6 +68,8 @@ public interface IInternalMethodHandler { public IIcon getSubTileIconForName(String name); public boolean shouldForceCheck(); + + public int getPassiveFlowerDecay(); public IInventory getBaublesInventory(EntityPlayer player); diff --git a/MODSRC/vazkii/botania/api/package-info.java b/MODSRC/vazkii/botania/api/package-info.java index 94223801b..82da263c8 100644 --- a/MODSRC/vazkii/botania/api/package-info.java +++ b/MODSRC/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "17", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "18", provides = "BotaniaAPI") package vazkii.botania.api; import cpw.mods.fml.common.API; diff --git a/MODSRC/vazkii/botania/api/subtile/SubTileGenerating.java b/MODSRC/vazkii/botania/api/subtile/SubTileGenerating.java index 4137c777a..9c44868dd 100644 --- a/MODSRC/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/MODSRC/vazkii/botania/api/subtile/SubTileGenerating.java @@ -25,8 +25,6 @@ import net.minecraft.util.StatCollector; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaCollector; -import vazkii.botania.api.mana.IManaPool; -import vazkii.botania.common.core.handler.ConfigHandler; /** * The basic class for a Generating Flower. @@ -79,7 +77,9 @@ public class SubTileGenerating extends SubTileEntity { if(!supertile.getWorldObj().isRemote) { ++ticksExisted; - if(isPassiveFlower() && ConfigHandler.hardcorePassiveGeneration > 0 && ticksExisted > ConfigHandler.hardcorePassiveGeneration) { + int muhBalance = BotaniaAPI.internalHandler.getPassiveFlowerDecay(); + + if(isPassiveFlower() && muhBalance > 0 && ticksExisted > muhBalance) { supertile.getWorldObj().playAuxSFX(2001, supertile.xCoord, supertile.yCoord, supertile.zCoord, Block.getIdFromBlock(supertile.getBlockType())); supertile.getWorldObj().setBlockToAir(supertile.xCoord, supertile.yCoord, supertile.zCoord); } diff --git a/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java b/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java index 6d996d6f8..9ac8bc3c3 100644 --- a/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -138,5 +138,10 @@ public class InternalMethodHandler extends DummyMethodHandler { public boolean shouldForceCheck() { return ConfigHandler.flowerForceCheck; } + + @Override + public int getPassiveFlowerDecay() { + return ConfigHandler.hardcorePassiveGeneration; + } }