From c9bd15a20d51aff7c4de0aa8ec31c8c8b4fbba82 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 2 Nov 2014 14:58:57 -0800 Subject: [PATCH] Close #84. Fix #302. Fix #309. Update BuildCraft API to 6.1.x --- build.gradle | 2 +- .../apiculture/gadgets/TileAlveary.java | 20 +++--- .../apiculture/gadgets/TileApiary.java | 18 +++-- .../apiculture/trigger/TriggerNoFrames.java | 12 ++-- .../forestry/core/gadgets/TileForestry.java | 4 +- .../forestry/core/gadgets/TileMachine.java | 33 +++------ .../core/triggers/ForestryTrigger.java | 24 +++---- .../java/forestry/core/triggers/Trigger.java | 49 +++++++------- .../core/triggers/TriggerHasWork.java | 12 ++-- .../core/triggers/TriggerLowFuel.java | 12 ++-- .../core/triggers/TriggerLowGermlings.java | 13 ++-- .../core/triggers/TriggerLowResource.java | 12 ++-- .../core/triggers/TriggerLowSoil.java | 12 ++-- .../core/triggers/TriggerMissingDrone.java | 12 ++-- .../core/triggers/TriggerMissingQueen.java | 12 ++-- .../forestry/energy/gadgets/EngineCopper.java | 32 ++++----- .../factory/gadgets/MachineBottler.java | 53 +++++++-------- .../factory/gadgets/MachineCarpenter.java | 6 +- .../factory/gadgets/MachineCentrifuge.java | 6 +- .../factory/gadgets/MachineFermenter.java | 47 ++++++------- .../factory/gadgets/MachineMoistener.java | 45 ++++++------- .../factory/gadgets/MachineRaintank.java | 45 ++++++------- .../factory/gadgets/MachineSqueezer.java | 67 +++++++++---------- .../factory/gadgets/MachineStill.java | 47 ++++++------- .../forestry/farming/gadgets/TileHatch.java | 27 ++++---- .../triggers/TriggerLowFertilizer.java | 14 ++-- .../farming/triggers/TriggerLowLiquid.java | 14 ++-- .../farming/triggers/TriggerLowSoil.java | 30 ++++++--- .../forestry/mail/gadgets/MachineMailbox.java | 46 ++++++------- .../forestry/mail/gadgets/MachineTrader.java | 30 ++++----- .../forestry/mail/triggers/TriggerBuffer.java | 13 ++-- .../mail/triggers/TriggerHasMail.java | 13 ++-- .../mail/triggers/TriggerLowInput.java | 12 ++-- .../mail/triggers/TriggerLowPaper.java | 12 ++-- .../mail/triggers/TriggerLowStamps.java | 12 ++-- .../forestry/plugins/PluginBuildCraft.java | 55 +++++++-------- 36 files changed, 395 insertions(+), 478 deletions(-) diff --git a/build.gradle b/build.gradle index b600301cd..d3f530733 100755 --- a/build.gradle +++ b/build.gradle @@ -76,7 +76,7 @@ configurations { dependencies { compile 'net.industrial-craft:industrialcraft-2:2.2.575-experimental:api' - apis 'com.mod-buildcraft:buildcraft:6.0.18:dev' + apis 'com.mod-buildcraft:buildcraft:6.1.5:dev' } processResources { diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlveary.java b/src/main/java/forestry/apiculture/gadgets/TileAlveary.java index 744762ddb..4a860584c 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlveary.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlveary.java @@ -10,15 +10,7 @@ ******************************************************************************/ package forestry.apiculture.gadgets; -import java.util.LinkedList; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; - -import buildcraft.api.gates.ITrigger; - +import buildcraft.api.statements.ITriggerExternal; import forestry.api.apiculture.IAlvearyComponent; import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; @@ -32,6 +24,12 @@ import forestry.core.proxy.Proxies; import forestry.core.triggers.ForestryTrigger; import forestry.core.utils.TileInventoryAdapter; import forestry.core.utils.Utils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; + +import java.util.LinkedList; public abstract class TileAlveary extends TileForestry implements IAlvearyComponent { @@ -249,8 +247,8 @@ public abstract class TileAlveary extends TileForestry implements IAlvearyCompon // / ITRIGGERPROVIDER @Override - public LinkedList getCustomTriggers() { - LinkedList res = new LinkedList(); + public LinkedList getCustomTriggers() { + LinkedList res = new LinkedList(); res.add(ForestryTrigger.missingQueen); res.add(ForestryTrigger.missingDrone); return res; diff --git a/src/main/java/forestry/apiculture/gadgets/TileApiary.java b/src/main/java/forestry/apiculture/gadgets/TileApiary.java index ca2d2f098..ced69cb45 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileApiary.java +++ b/src/main/java/forestry/apiculture/gadgets/TileApiary.java @@ -10,14 +10,7 @@ ******************************************************************************/ package forestry.apiculture.gadgets; -import java.util.LinkedList; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; - -import buildcraft.api.gates.ITrigger; - +import buildcraft.api.statements.ITriggerExternal; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IHiveFrame; import forestry.api.core.ForestryAPI; @@ -25,6 +18,11 @@ import forestry.core.gadgets.TileBase; import forestry.core.network.GuiId; import forestry.core.triggers.ForestryTrigger; import forestry.plugins.PluginApiculture; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; + +import java.util.LinkedList; public class TileApiary extends TileBeehouse implements ISidedInventory { @@ -345,8 +343,8 @@ public class TileApiary extends TileBeehouse implements ISidedInventory { /* ITRIGGERPROVIDER */ @Override - public LinkedList getCustomTriggers() { - LinkedList res = new LinkedList(); + public LinkedList getCustomTriggers() { + LinkedList res = new LinkedList(); res.add(ForestryTrigger.missingQueen); res.add(ForestryTrigger.missingDrone); res.add(PluginApiculture.triggerNoFrames); diff --git a/src/main/java/forestry/apiculture/trigger/TriggerNoFrames.java b/src/main/java/forestry/apiculture/trigger/TriggerNoFrames.java index 663cc4285..e939a55f9 100755 --- a/src/main/java/forestry/apiculture/trigger/TriggerNoFrames.java +++ b/src/main/java/forestry/apiculture/trigger/TriggerNoFrames.java @@ -10,14 +10,12 @@ ******************************************************************************/ package forestry.apiculture.trigger; -import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.gates.ITriggerParameter; - +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; import forestry.apiculture.gadgets.TileApiary; import forestry.core.triggers.Trigger; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; public class TriggerNoFrames extends Trigger { @@ -29,7 +27,7 @@ public class TriggerNoFrames extends Trigger { * Return true if the tile given in parameter activates the trigger, given the parameters. */ @Override - public boolean isTriggerActive(ForgeDirection direction, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof TileApiary)) return false; diff --git a/src/main/java/forestry/core/gadgets/TileForestry.java b/src/main/java/forestry/core/gadgets/TileForestry.java index df6522140..f551888de 100755 --- a/src/main/java/forestry/core/gadgets/TileForestry.java +++ b/src/main/java/forestry/core/gadgets/TileForestry.java @@ -24,7 +24,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.gates.ITrigger; +import buildcraft.api.statements.ITriggerExternal; import com.mojang.authlib.GameProfile; import forestry.core.EnumErrorCode; @@ -147,7 +147,7 @@ public abstract class TileForestry extends TileEntity implements INetworkedEntit fromPacketPayload(packet.payload); } - public LinkedList getCustomTriggers() { + public LinkedList getCustomTriggers() { return null; } diff --git a/src/main/java/forestry/core/gadgets/TileMachine.java b/src/main/java/forestry/core/gadgets/TileMachine.java index f20b60935..17f25de92 100755 --- a/src/main/java/forestry/core/gadgets/TileMachine.java +++ b/src/main/java/forestry/core/gadgets/TileMachine.java @@ -10,20 +10,6 @@ ******************************************************************************/ package forestry.core.gadgets; -import java.util.HashMap; -import java.util.LinkedList; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; - -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.gates.ITrigger; - import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.ISpecialInventory; @@ -37,11 +23,19 @@ import forestry.core.utils.EnumAccess; import forestry.core.utils.EnumTankLevel; import forestry.core.utils.Utils; import forestry.plugins.PluginApiculture; -import forestry.plugins.PluginCore; import forestry.plugins.PluginEnergy; import forestry.plugins.PluginFactory; -import forestry.plugins.PluginMail; import forestry.plugins.PluginIC2; +import forestry.plugins.PluginMail; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.util.ForgeDirection; + +import java.util.HashMap; public abstract class TileMachine extends TileForestry implements ISpecialInventory, IClimatised, IHintSource { @@ -379,11 +373,4 @@ public abstract class TileMachine extends TileForestry implements ISpecialInvent // NEIGHBOUR CHANGE public void onNeighborBlockChange() { } - - // ITRIGGERPROVIDER - @Override - public LinkedList getCustomTriggers() { - return null; - } - } diff --git a/src/main/java/forestry/core/triggers/ForestryTrigger.java b/src/main/java/forestry/core/triggers/ForestryTrigger.java index 9a19b020f..d0a9ceff3 100755 --- a/src/main/java/forestry/core/triggers/ForestryTrigger.java +++ b/src/main/java/forestry/core/triggers/ForestryTrigger.java @@ -10,7 +10,7 @@ ******************************************************************************/ package forestry.core.triggers; -import buildcraft.api.gates.ActionManager; +import buildcraft.api.statements.StatementManager; public class ForestryTrigger { @@ -27,20 +27,20 @@ public class ForestryTrigger { public static Trigger hasWork; public static void initialize() { - ActionManager.registerTrigger(lowFuel25 = new TriggerLowFuel("lowFuel.25", 0.25f)); - ActionManager.registerTrigger(lowFuel10 = new TriggerLowFuel("lowFuel.10", 0.1f)); - ActionManager.registerTrigger(lowResource25 = new TriggerLowResource("lowResources.25", 0.25f)); - ActionManager.registerTrigger(lowResource10 = new TriggerLowResource("lowResources.10", 0.1f)); + StatementManager.registerStatement(lowFuel25 = new TriggerLowFuel("lowFuel.25", 0.25f)); + StatementManager.registerStatement(lowFuel10 = new TriggerLowFuel("lowFuel.10", 0.1f)); + StatementManager.registerStatement(lowResource25 = new TriggerLowResource("lowResources.25", 0.25f)); + StatementManager.registerStatement(lowResource10 = new TriggerLowResource("lowResources.10", 0.1f)); - ActionManager.registerTrigger(lowSoil25 = new TriggerLowSoil("lowSoil.25", 0.25f)); - ActionManager.registerTrigger(lowSoil10 = new TriggerLowSoil("lowSoil.10", 0.1f)); - ActionManager.registerTrigger(lowGermlings25 = new TriggerLowGermlings("lowGermlings.25", 0.25f)); - ActionManager.registerTrigger(lowGermlings10 = new TriggerLowGermlings("lowGermlings.10", 0.1f)); + StatementManager.registerStatement(lowSoil25 = new TriggerLowSoil("lowSoil.25", 0.25f)); + StatementManager.registerStatement(lowSoil10 = new TriggerLowSoil("lowSoil.10", 0.1f)); + StatementManager.registerStatement(lowGermlings25 = new TriggerLowGermlings("lowGermlings.25", 0.25f)); + StatementManager.registerStatement(lowGermlings10 = new TriggerLowGermlings("lowGermlings.10", 0.1f)); - ActionManager.registerTrigger(missingQueen = new TriggerMissingQueen()); - ActionManager.registerTrigger(missingDrone = new TriggerMissingDrone()); + StatementManager.registerStatement(missingQueen = new TriggerMissingQueen()); + StatementManager.registerStatement(missingDrone = new TriggerMissingDrone()); - ActionManager.registerTrigger(hasWork = new TriggerHasWork()); + StatementManager.registerStatement(hasWork = new TriggerHasWork()); } } diff --git a/src/main/java/forestry/core/triggers/Trigger.java b/src/main/java/forestry/core/triggers/Trigger.java index 3e04f7cd1..aba1c683d 100755 --- a/src/main/java/forestry/core/triggers/Trigger.java +++ b/src/main/java/forestry/core/triggers/Trigger.java @@ -10,21 +10,18 @@ ******************************************************************************/ package forestry.core.triggers; +import buildcraft.api.statements.IStatement; +import buildcraft.api.statements.IStatementParameter; +import buildcraft.api.statements.ITriggerExternal; +import buildcraft.api.statements.StatementManager; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.core.render.TextureManager; +import forestry.core.utils.StringUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -import buildcraft.api.gates.ITrigger; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import buildcraft.api.gates.ActionManager; -import buildcraft.api.gates.ITileTrigger; -import buildcraft.api.gates.ITriggerParameter; - -import forestry.core.render.TextureManager; -import forestry.core.utils.StringUtil; - -public abstract class Trigger implements ITileTrigger { +public abstract class Trigger implements ITriggerExternal { private final String uid; private final String unlocalized; @@ -34,9 +31,9 @@ public abstract class Trigger implements ITileTrigger { } public Trigger(String uid, String localization) { - this.uid = "forestry." + uid; + this.uid = "forestry:" + uid; unlocalized = "trigger." + localization; - ActionManager.registerTrigger(this); + StatementManager.registerStatement(this); } @Override @@ -50,20 +47,20 @@ public abstract class Trigger implements ITileTrigger { } @Override - public boolean hasParameter() { - return false; - } - - @Override - public boolean requiresParameter() { - return false; - } - - @Override - public ITriggerParameter createParameter() { + public IStatementParameter createParameter(int index) { return null; } + @Override + public int maxParameters() { + return 0; + } + + @Override + public int minParameters() { + return 0; + } + @SideOnly(Side.CLIENT) private IIcon icon; @@ -80,7 +77,7 @@ public abstract class Trigger implements ITileTrigger { } @Override - public ITrigger rotateLeft() { + public IStatement rotateLeft() { return this; } } diff --git a/src/main/java/forestry/core/triggers/TriggerHasWork.java b/src/main/java/forestry/core/triggers/TriggerHasWork.java index 9b7c83743..c3cf8503e 100755 --- a/src/main/java/forestry/core/triggers/TriggerHasWork.java +++ b/src/main/java/forestry/core/triggers/TriggerHasWork.java @@ -10,13 +10,11 @@ ******************************************************************************/ package forestry.core.triggers; -import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.gates.ITriggerParameter; - +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; import forestry.core.gadgets.TilePowered; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; public class TriggerHasWork extends Trigger { @@ -29,7 +27,7 @@ public class TriggerHasWork extends Trigger { * the parameters. */ @Override - public boolean isTriggerActive(ForgeDirection direction, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof TilePowered)) return false; diff --git a/src/main/java/forestry/core/triggers/TriggerLowFuel.java b/src/main/java/forestry/core/triggers/TriggerLowFuel.java index a979436d7..64bdaf496 100755 --- a/src/main/java/forestry/core/triggers/TriggerLowFuel.java +++ b/src/main/java/forestry/core/triggers/TriggerLowFuel.java @@ -10,14 +10,12 @@ ******************************************************************************/ package forestry.core.triggers; -import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.gates.ITriggerParameter; - +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; import forestry.core.gadgets.Engine; import forestry.core.gadgets.TilePowered; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; public class TriggerLowFuel extends Trigger { @@ -37,7 +35,7 @@ public class TriggerLowFuel extends Trigger { * Return true if the tile given in parameter activates the trigger, given the parameters. */ @Override - public boolean isTriggerActive(ForgeDirection direction, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { if (tile instanceof TilePowered) return !((TilePowered) tile).hasFuelMin(threshold); diff --git a/src/main/java/forestry/core/triggers/TriggerLowGermlings.java b/src/main/java/forestry/core/triggers/TriggerLowGermlings.java index c6cb24f9c..73cfd1690 100755 --- a/src/main/java/forestry/core/triggers/TriggerLowGermlings.java +++ b/src/main/java/forestry/core/triggers/TriggerLowGermlings.java @@ -10,13 +10,11 @@ ******************************************************************************/ package forestry.core.triggers; -import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.gates.ITriggerParameter; - +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; import forestry.core.gadgets.TilePowered; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; public class TriggerLowGermlings extends Trigger { @@ -36,11 +34,10 @@ public class TriggerLowGermlings extends Trigger { * Return true if the tile given in parameter activates the trigger, given the parameters. */ @Override - public boolean isTriggerActive(ForgeDirection direction, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof TilePowered)) return false; return !((TilePowered) tile).hasResourcesMin(threshold); } - } diff --git a/src/main/java/forestry/core/triggers/TriggerLowResource.java b/src/main/java/forestry/core/triggers/TriggerLowResource.java index 9fca50a8c..5e172ad33 100755 --- a/src/main/java/forestry/core/triggers/TriggerLowResource.java +++ b/src/main/java/forestry/core/triggers/TriggerLowResource.java @@ -10,13 +10,11 @@ ******************************************************************************/ package forestry.core.triggers; -import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.gates.ITriggerParameter; - +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; import forestry.core.gadgets.TilePowered; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; public class TriggerLowResource extends Trigger { @@ -36,7 +34,7 @@ public class TriggerLowResource extends Trigger { * Return true if the tile given in parameter activates the trigger, given the parameters. */ @Override - public boolean isTriggerActive(ForgeDirection direction, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof TilePowered)) return false; diff --git a/src/main/java/forestry/core/triggers/TriggerLowSoil.java b/src/main/java/forestry/core/triggers/TriggerLowSoil.java index 723928348..076339e53 100755 --- a/src/main/java/forestry/core/triggers/TriggerLowSoil.java +++ b/src/main/java/forestry/core/triggers/TriggerLowSoil.java @@ -10,13 +10,11 @@ ******************************************************************************/ package forestry.core.triggers; -import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.gates.ITriggerParameter; - +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; import forestry.core.gadgets.TilePowered; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; public class TriggerLowSoil extends Trigger { @@ -36,7 +34,7 @@ public class TriggerLowSoil extends Trigger { * Return true if the tile given in parameter activates the trigger, given the parameters. */ @Override - public boolean isTriggerActive(ForgeDirection direction, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof TilePowered)) return false; diff --git a/src/main/java/forestry/core/triggers/TriggerMissingDrone.java b/src/main/java/forestry/core/triggers/TriggerMissingDrone.java index dad50a377..b190af196 100755 --- a/src/main/java/forestry/core/triggers/TriggerMissingDrone.java +++ b/src/main/java/forestry/core/triggers/TriggerMissingDrone.java @@ -10,14 +10,12 @@ ******************************************************************************/ package forestry.core.triggers; -import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.gates.ITriggerParameter; - +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; import forestry.core.EnumErrorCode; import forestry.core.interfaces.IErrorSource; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; public class TriggerMissingDrone extends Trigger { @@ -29,7 +27,7 @@ public class TriggerMissingDrone extends Trigger { * Return true if the tile given in parameter activates the trigger, given the parameters. */ @Override - public boolean isTriggerActive(ForgeDirection direction, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof IErrorSource)) return false; diff --git a/src/main/java/forestry/core/triggers/TriggerMissingQueen.java b/src/main/java/forestry/core/triggers/TriggerMissingQueen.java index 1277e0656..d76c2ef9f 100755 --- a/src/main/java/forestry/core/triggers/TriggerMissingQueen.java +++ b/src/main/java/forestry/core/triggers/TriggerMissingQueen.java @@ -10,14 +10,12 @@ ******************************************************************************/ package forestry.core.triggers; -import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.gates.ITriggerParameter; - +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; import forestry.core.EnumErrorCode; import forestry.core.interfaces.IErrorSource; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; public class TriggerMissingQueen extends Trigger { @@ -29,7 +27,7 @@ public class TriggerMissingQueen extends Trigger { * Return true if the tile given in parameter activates the trigger, given the parameters. */ @Override - public boolean isTriggerActive(ForgeDirection direction, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof IErrorSource)) return false; diff --git a/src/main/java/forestry/energy/gadgets/EngineCopper.java b/src/main/java/forestry/energy/gadgets/EngineCopper.java index 27388234f..54d2d4ce5 100755 --- a/src/main/java/forestry/energy/gadgets/EngineCopper.java +++ b/src/main/java/forestry/energy/gadgets/EngineCopper.java @@ -10,23 +10,8 @@ ******************************************************************************/ package forestry.energy.gadgets; -import java.util.ArrayList; -import java.util.LinkedList; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - +import buildcraft.api.statements.ITriggerExternal; import cpw.mods.fml.common.registry.GameData; - -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.gates.ITrigger; - import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.fuels.FuelManager; @@ -42,6 +27,17 @@ import forestry.core.triggers.ForestryTrigger; import forestry.core.utils.BlockUtil; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.TileInventoryAdapter; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; + +import java.util.ArrayList; +import java.util.LinkedList; public class EngineCopper extends Engine implements ISpecialInventory, ISidedInventory { @@ -502,8 +498,8 @@ public class EngineCopper extends Engine implements ISpecialInventory, ISidedInv /* ITRIGGERPROVIDER */ @Override - public LinkedList getCustomTriggers() { - LinkedList res = new LinkedList(); + public LinkedList getCustomTriggers() { + LinkedList res = new LinkedList(); res.add(ForestryTrigger.lowFuel25); return res; } diff --git a/src/main/java/forestry/factory/gadgets/MachineBottler.java b/src/main/java/forestry/factory/gadgets/MachineBottler.java index 0d6a85695..627aee714 100755 --- a/src/main/java/forestry/factory/gadgets/MachineBottler.java +++ b/src/main/java/forestry/factory/gadgets/MachineBottler.java @@ -10,37 +10,14 @@ ******************************************************************************/ package forestry.factory.gadgets; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.Map; -import java.util.Stack; - -import forestry.api.recipes.ICraftingProvider; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; - -import buildcraft.api.gates.ITrigger; - +import buildcraft.api.statements.ITriggerExternal; import forestry.api.core.ForestryAPI; +import forestry.api.recipes.ICraftingProvider; import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; -import forestry.core.fluids.tanks.StandardTank; import forestry.core.fluids.TankManager; +import forestry.core.fluids.tanks.StandardTank; import forestry.core.gadgets.TileBase; import forestry.core.gadgets.TilePowered; import forestry.core.interfaces.ILiquidTankContainer; @@ -52,6 +29,26 @@ import forestry.core.utils.InventoryAdapter; import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.Map; +import java.util.Stack; public class MachineBottler extends TilePowered implements ISidedInventory, ILiquidTankContainer { @@ -501,8 +498,8 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq // ITRIGGERPROVIDER @Override - public LinkedList getCustomTriggers() { - LinkedList res = new LinkedList(); + public LinkedList getCustomTriggers() { + LinkedList res = new LinkedList(); res.add(ForestryTrigger.lowResource25); res.add(ForestryTrigger.lowResource10); res.add(ForestryTrigger.hasWork); diff --git a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java index 222d19b13..83c5b9264 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java @@ -34,7 +34,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; -import buildcraft.api.gates.ITrigger; +import buildcraft.api.statements.ITriggerExternal; import forestry.api.core.ForestryAPI; import forestry.api.recipes.ICarpenterManager; @@ -708,8 +708,8 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL // ITRIGGERPROVIDER @Override - public LinkedList getCustomTriggers() { - LinkedList res = new LinkedList(); + public LinkedList getCustomTriggers() { + LinkedList res = new LinkedList(); res.add(ForestryTrigger.hasWork); return res; } diff --git a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java index 7c5a20fe3..9aa6ddf64 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java +++ b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java @@ -26,7 +26,7 @@ import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.gates.ITrigger; +import buildcraft.api.statements.ITriggerExternal; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; @@ -468,8 +468,8 @@ public class MachineCentrifuge extends TilePowered implements ISidedInventory, I /* ITRIGGERPROVIDER */ @Override - public LinkedList getCustomTriggers() { - LinkedList res = new LinkedList(); + public LinkedList getCustomTriggers() { + LinkedList res = new LinkedList(); res.add(ForestryTrigger.lowResource25); res.add(ForestryTrigger.lowResource10); res.add(ForestryTrigger.hasWork); diff --git a/src/main/java/forestry/factory/gadgets/MachineFermenter.java b/src/main/java/forestry/factory/gadgets/MachineFermenter.java index c3b862ce0..440fe6a74 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFermenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineFermenter.java @@ -10,27 +10,7 @@ ******************************************************************************/ package forestry.factory.gadgets; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.Map; - -import forestry.core.fluids.tanks.FilteredTank; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; -import net.minecraftforge.fluids.FluidStack; - -import buildcraft.api.gates.ITrigger; - +import buildcraft.api.statements.ITriggerExternal; import forestry.api.core.ForestryAPI; import forestry.api.fuels.FuelManager; import forestry.api.recipes.IFermenterManager; @@ -38,6 +18,9 @@ import forestry.api.recipes.IVariableFermentable; import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; +import forestry.core.fluids.TankManager; +import forestry.core.fluids.tanks.FilteredTank; +import forestry.core.fluids.tanks.StandardTank; import forestry.core.gadgets.TileBase; import forestry.core.gadgets.TilePowered; import forestry.core.interfaces.ILiquidTankContainer; @@ -45,14 +28,28 @@ import forestry.core.network.EntityNetData; import forestry.core.network.GuiId; import forestry.core.triggers.ForestryTrigger; import forestry.core.utils.EnumTankLevel; -import forestry.core.fluids.tanks.StandardTank; -import forestry.core.fluids.TankManager; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; +import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.Map; + public class MachineFermenter extends TilePowered implements ISidedInventory, ILiquidTankContainer { // / CONSTANTS @@ -687,8 +684,8 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL // ITRIGGERPROVIDER @Override - public LinkedList getCustomTriggers() { - LinkedList res = new LinkedList(); + public LinkedList getCustomTriggers() { + LinkedList res = new LinkedList(); res.add(ForestryTrigger.lowFuel25); res.add(ForestryTrigger.lowFuel10); res.add(ForestryTrigger.lowResource25); diff --git a/src/main/java/forestry/factory/gadgets/MachineMoistener.java b/src/main/java/forestry/factory/gadgets/MachineMoistener.java index 665235bfb..59c3c953d 100755 --- a/src/main/java/forestry/factory/gadgets/MachineMoistener.java +++ b/src/main/java/forestry/factory/gadgets/MachineMoistener.java @@ -10,26 +10,7 @@ ******************************************************************************/ package forestry.factory.gadgets; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.Map; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -import buildcraft.api.gates.ITrigger; - +import buildcraft.api.statements.ITriggerExternal; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.fuels.FuelManager; @@ -38,6 +19,8 @@ import forestry.api.recipes.IMoistenerManager; import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; +import forestry.core.fluids.TankManager; +import forestry.core.fluids.tanks.FilteredTank; import forestry.core.gadgets.TileBase; import forestry.core.gadgets.TilePowered; import forestry.core.interfaces.ILiquidTankContainer; @@ -45,14 +28,28 @@ import forestry.core.network.EntityNetData; import forestry.core.network.GuiId; import forestry.core.triggers.ForestryTrigger; import forestry.core.utils.EnumTankLevel; -import forestry.core.fluids.tanks.FilteredTank; -import forestry.core.fluids.TankManager; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.Map; + public class MachineMoistener extends TilePowered implements ISpecialInventory, ISidedInventory, ILiquidTankContainer { /* CONSTANTS */ @@ -741,8 +738,8 @@ public class MachineMoistener extends TilePowered implements ISpecialInventory, // ITRIGGERPROVIDER @Override - public LinkedList getCustomTriggers() { - LinkedList res = new LinkedList(); + public LinkedList getCustomTriggers() { + LinkedList res = new LinkedList(); res.add(ForestryTrigger.lowFuel25); res.add(ForestryTrigger.lowFuel10); res.add(ForestryTrigger.lowResource25); diff --git a/src/main/java/forestry/factory/gadgets/MachineRaintank.java b/src/main/java/forestry/factory/gadgets/MachineRaintank.java index a2c0c367a..bea2076b5 100755 --- a/src/main/java/forestry/factory/gadgets/MachineRaintank.java +++ b/src/main/java/forestry/factory/gadgets/MachineRaintank.java @@ -10,8 +10,23 @@ ******************************************************************************/ package forestry.factory.gadgets; -import java.util.LinkedList; - +import buildcraft.api.statements.ITriggerExternal; +import forestry.api.core.EnumHumidity; +import forestry.api.core.ForestryAPI; +import forestry.core.EnumErrorCode; +import forestry.core.config.Config; +import forestry.core.config.Defaults; +import forestry.core.fluids.TankManager; +import forestry.core.fluids.tanks.FilteredTank; +import forestry.core.gadgets.TileBase; +import forestry.core.interfaces.ILiquidTankContainer; +import forestry.core.network.GuiId; +import forestry.core.triggers.ForestryTrigger; +import forestry.core.utils.Fluids; +import forestry.core.utils.InventoryAdapter; +import forestry.core.utils.LiquidHelper; +import forestry.core.utils.StackUtils; +import forestry.core.utils.Utils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; @@ -19,32 +34,14 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.biome.BiomeGenBase; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; - -import buildcraft.api.gates.ITrigger; - -import forestry.api.core.EnumHumidity; -import forestry.api.core.ForestryAPI; -import forestry.core.EnumErrorCode; -import forestry.core.config.Config; -import forestry.core.config.Defaults; -import forestry.core.gadgets.TileBase; -import forestry.core.interfaces.ILiquidTankContainer; -import forestry.core.network.GuiId; -import forestry.core.triggers.ForestryTrigger; -import forestry.core.utils.Fluids; -import forestry.core.fluids.TankManager; -import forestry.core.fluids.tanks.FilteredTank; -import forestry.core.utils.InventoryAdapter; -import forestry.core.utils.LiquidHelper; -import forestry.core.utils.StackUtils; -import forestry.core.utils.Utils; import net.minecraftforge.fluids.FluidTankInfo; +import java.util.LinkedList; + public class MachineRaintank extends TileBase implements ISidedInventory, ILiquidTankContainer { /* CONSTANTS */ @@ -324,8 +321,8 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui /* ITRIGGERPROVIDER */ @Override - public LinkedList getCustomTriggers() { - LinkedList res = new LinkedList(); + public LinkedList getCustomTriggers() { + LinkedList res = new LinkedList(); res.add(ForestryTrigger.lowResource25); res.add(ForestryTrigger.lowResource10); res.add(ForestryTrigger.hasWork); diff --git a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java index 866668c03..872d88e49 100755 --- a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java +++ b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java @@ -10,14 +10,28 @@ ******************************************************************************/ package forestry.factory.gadgets; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.Map; -import java.util.Stack; - +import buildcraft.api.statements.ITriggerExternal; +import forestry.api.core.ForestryAPI; +import forestry.api.core.ISpecialInventory; +import forestry.api.recipes.ISqueezerManager; +import forestry.core.EnumErrorCode; +import forestry.core.config.Config; +import forestry.core.config.Defaults; +import forestry.core.fluids.TankManager; +import forestry.core.fluids.tanks.FilteredTank; +import forestry.core.fluids.tanks.StandardTank; +import forestry.core.gadgets.TileBase; +import forestry.core.gadgets.TilePowered; +import forestry.core.interfaces.ILiquidTankContainer; +import forestry.core.network.EntityNetData; +import forestry.core.network.GuiId; +import forestry.core.proxy.Proxies; +import forestry.core.triggers.ForestryTrigger; +import forestry.core.utils.EnumTankLevel; +import forestry.core.utils.InventoryAdapter; +import forestry.core.utils.LiquidHelper; +import forestry.core.utils.StackUtils; +import forestry.core.utils.Utils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; @@ -25,37 +39,20 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; - -import buildcraft.api.gates.ITrigger; - -import forestry.api.core.ForestryAPI; -import forestry.api.core.ISpecialInventory; -import forestry.api.recipes.ISqueezerManager; -import forestry.core.EnumErrorCode; -import forestry.core.config.Config; -import forestry.core.config.Defaults; -import forestry.core.gadgets.TileBase; -import forestry.core.gadgets.TilePowered; -import forestry.core.interfaces.ILiquidTankContainer; -import forestry.core.network.EntityNetData; -import forestry.core.network.GuiId; -import forestry.core.triggers.ForestryTrigger; -import forestry.core.utils.EnumTankLevel; -import forestry.core.fluids.tanks.StandardTank; -import forestry.core.fluids.tanks.FilteredTank; -import forestry.core.fluids.TankManager; -import forestry.core.proxy.Proxies; -import forestry.core.utils.InventoryAdapter; -import forestry.core.utils.LiquidHelper; -import forestry.core.utils.StackUtils; -import forestry.core.utils.Utils; import net.minecraftforge.fluids.FluidTankInfo; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.Map; +import java.util.Stack; + public class MachineSqueezer extends TilePowered implements ISpecialInventory, ISidedInventory, ILiquidTankContainer { /* CONSTANTS */ @@ -576,8 +573,8 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I /* ITRIGGERPROVIDER */ @Override - public LinkedList getCustomTriggers() { - LinkedList res = new LinkedList(); + public LinkedList getCustomTriggers() { + LinkedList res = new LinkedList(); res.add(ForestryTrigger.hasWork); return res; } diff --git a/src/main/java/forestry/factory/gadgets/MachineStill.java b/src/main/java/forestry/factory/gadgets/MachineStill.java index b22143963..049c2880f 100755 --- a/src/main/java/forestry/factory/gadgets/MachineStill.java +++ b/src/main/java/forestry/factory/gadgets/MachineStill.java @@ -10,32 +10,16 @@ ******************************************************************************/ package forestry.factory.gadgets; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.Map; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; -import net.minecraftforge.fluids.FluidStack; - -import buildcraft.api.gates.ITrigger; - +import buildcraft.api.statements.ITriggerExternal; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.recipes.IStillManager; import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; +import forestry.core.fluids.TankManager; +import forestry.core.fluids.tanks.FilteredTank; +import forestry.core.fluids.tanks.StandardTank; import forestry.core.gadgets.TileBase; import forestry.core.gadgets.TilePowered; import forestry.core.interfaces.ILiquidTankContainer; @@ -43,15 +27,28 @@ import forestry.core.network.EntityNetData; import forestry.core.network.GuiId; import forestry.core.triggers.ForestryTrigger; import forestry.core.utils.EnumTankLevel; -import forestry.core.fluids.tanks.StandardTank; -import forestry.core.fluids.tanks.FilteredTank; -import forestry.core.fluids.TankManager; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; +import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.Map; + public class MachineStill extends TilePowered implements ISpecialInventory, ISidedInventory, ILiquidTankContainer { /* CONSTANTS */ @@ -498,8 +495,8 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid /* ITRIGGERPROVIDER */ @Override - public LinkedList getCustomTriggers() { - LinkedList res = new LinkedList(); + public LinkedList getCustomTriggers() { + LinkedList res = new LinkedList(); res.add(ForestryTrigger.hasWork); return res; } diff --git a/src/main/java/forestry/farming/gadgets/TileHatch.java b/src/main/java/forestry/farming/gadgets/TileHatch.java index d8ba476f7..2ed3bc6b5 100755 --- a/src/main/java/forestry/farming/gadgets/TileHatch.java +++ b/src/main/java/forestry/farming/gadgets/TileHatch.java @@ -10,25 +10,22 @@ ******************************************************************************/ package forestry.farming.gadgets; -import java.util.ArrayList; -import java.util.LinkedList; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidContainerRegistry; - -import buildcraft.api.gates.ITrigger; - +import buildcraft.api.statements.ITriggerExternal; import forestry.api.core.ITileStructure; import forestry.core.utils.BlockUtil; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; import forestry.plugins.PluginFarming; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidContainerRegistry; + +import java.util.ArrayList; +import java.util.LinkedList; public class TileHatch extends TileFarm implements ISidedInventory { @@ -329,11 +326,11 @@ public class TileHatch extends TileFarm implements ISidedInventory { /* ITRIGGERPROVIDER */ @Override - public LinkedList getCustomTriggers() { + public LinkedList getCustomTriggers() { if (!hasMaster()) return null; - LinkedList list = new LinkedList(); + LinkedList list = new LinkedList(); list.add(PluginFarming.lowResourceLiquid50); list.add(PluginFarming.lowResourceLiquid25); list.add(PluginFarming.lowSoil128); diff --git a/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java b/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java index 892147ce9..85dac0ebe 100755 --- a/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java +++ b/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java @@ -10,17 +10,15 @@ ******************************************************************************/ package forestry.farming.triggers; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.gates.ITriggerParameter; - +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; import forestry.api.core.ITileStructure; import forestry.core.triggers.Trigger; import forestry.farming.gadgets.TileFarmPlain; import forestry.farming.gadgets.TileHatch; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; public class TriggerLowFertilizer extends Trigger { @@ -37,7 +35,7 @@ public class TriggerLowFertilizer extends Trigger { } @Override - public boolean isTriggerActive(ForgeDirection direction, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof TileHatch)) return false; diff --git a/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java b/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java index a68f933ab..1b6641784 100755 --- a/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java +++ b/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java @@ -10,17 +10,15 @@ ******************************************************************************/ package forestry.farming.triggers; -import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.gates.ITriggerParameter; - +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; import forestry.api.core.ITileStructure; -import forestry.core.triggers.Trigger; import forestry.core.fluids.TankManager; +import forestry.core.triggers.Trigger; import forestry.farming.gadgets.TileFarmPlain; import forestry.farming.gadgets.TileHatch; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidTankInfo; public class TriggerLowLiquid extends Trigger { @@ -42,7 +40,7 @@ public class TriggerLowLiquid extends Trigger { * the parameters. */ @Override - public boolean isTriggerActive(ForgeDirection direction, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof TileHatch)) return false; diff --git a/src/main/java/forestry/farming/triggers/TriggerLowSoil.java b/src/main/java/forestry/farming/triggers/TriggerLowSoil.java index 80b2a91f6..fd4dbeb4c 100755 --- a/src/main/java/forestry/farming/triggers/TriggerLowSoil.java +++ b/src/main/java/forestry/farming/triggers/TriggerLowSoil.java @@ -10,18 +10,16 @@ ******************************************************************************/ package forestry.farming.triggers; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.gates.ITriggerParameter; - +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; import forestry.api.core.ITileStructure; import forestry.core.triggers.Trigger; import forestry.farming.gadgets.TileFarmPlain; import forestry.farming.gadgets.TileHatch; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; public class TriggerLowSoil extends Trigger { @@ -38,8 +36,13 @@ public class TriggerLowSoil extends Trigger { } @Override - public boolean hasParameter() { - return true; + public int maxParameters() { + return 1; + } + + @Override + public int minParameters() { + return 0; } /** @@ -47,7 +50,12 @@ public class TriggerLowSoil extends Trigger { * the parameters. */ @Override - public boolean isTriggerActive(ForgeDirection direction, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { + IStatementParameter parameter = null; + if (parameters.length > 0) { + parameter = parameters[0]; + } + if (!(tile instanceof TileHatch)) return false; diff --git a/src/main/java/forestry/mail/gadgets/MachineMailbox.java b/src/main/java/forestry/mail/gadgets/MachineMailbox.java index f26e1dfea..6d46a1b7a 100755 --- a/src/main/java/forestry/mail/gadgets/MachineMailbox.java +++ b/src/main/java/forestry/mail/gadgets/MachineMailbox.java @@ -10,39 +10,33 @@ ******************************************************************************/ package forestry.mail.gadgets; -import java.util.LinkedList; - +import buildcraft.api.statements.ITriggerExternal; import com.mojang.authlib.GameProfile; +import forestry.api.core.ForestryAPI; +import forestry.api.core.ISpecialInventory; +import forestry.api.mail.ILetter; +import forestry.api.mail.IMailAddress; +import forestry.api.mail.IPostalState; +import forestry.api.mail.PostManager; +import forestry.core.config.Config; +import forestry.core.gadgets.TileBase; +import forestry.core.network.GuiId; +import forestry.core.proxy.Proxies; +import forestry.core.utils.InventoryAdapter; +import forestry.mail.EnumDeliveryState; +import forestry.mail.IMailContainer; +import forestry.mail.POBox; +import forestry.mail.PostRegistry; +import forestry.plugins.PluginMail; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.gates.ITrigger; - -import forestry.api.core.ForestryAPI; -import forestry.api.core.ISpecialInventory; -import forestry.api.mail.ILetter; -import forestry.api.mail.IPostalState; -import forestry.api.mail.PostManager; -import forestry.api.mail.IMailAddress; - -import forestry.core.config.Config; -import forestry.core.gadgets.TileBase; -import forestry.core.network.GuiId; -import forestry.core.proxy.Proxies; -import forestry.core.utils.InventoryAdapter; - -import forestry.mail.EnumDeliveryState; -import forestry.mail.IMailContainer; -import forestry.mail.POBox; -import forestry.mail.PostRegistry; - -import forestry.plugins.PluginMail; +import java.util.LinkedList; public class MachineMailbox extends TileBase implements IMailContainer, ISpecialInventory, ISidedInventory { @@ -122,8 +116,8 @@ public class MachineMailbox extends TileBase implements IMailContainer, ISpecial /* ITRIGGERPROVIDER */ @Override - public LinkedList getCustomTriggers() { - LinkedList res = new LinkedList(); + public LinkedList getCustomTriggers() { + LinkedList res = new LinkedList(); res.add(PluginMail.triggerHasMail); return res; } diff --git a/src/main/java/forestry/mail/gadgets/MachineTrader.java b/src/main/java/forestry/mail/gadgets/MachineTrader.java index a7cba1ac3..6dc03f595 100755 --- a/src/main/java/forestry/mail/gadgets/MachineTrader.java +++ b/src/main/java/forestry/mail/gadgets/MachineTrader.java @@ -10,24 +10,11 @@ ******************************************************************************/ package forestry.mail.gadgets; -import java.util.LinkedList; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.gates.ITrigger; - +import buildcraft.api.statements.ITriggerExternal; import forestry.api.core.ForestryAPI; +import forestry.api.mail.IMailAddress; import forestry.api.mail.IStamps; import forestry.api.mail.PostManager; -import forestry.api.mail.IMailAddress; -import forestry.mail.MailAddress; import forestry.core.EnumErrorCode; import forestry.core.gadgets.TileBase; import forestry.core.network.EntityNetData; @@ -36,8 +23,17 @@ import forestry.core.proxy.Proxies; import forestry.core.utils.EnumAccess; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.StackUtils; +import forestry.mail.MailAddress; import forestry.mail.TradeStation; import forestry.plugins.PluginMail; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import java.util.LinkedList; public class MachineTrader extends TileBase implements ISidedInventory { @@ -379,8 +375,8 @@ public class MachineTrader extends TileBase implements ISidedInventory { /* ITRIGGERPROVIDER */ @Override - public LinkedList getCustomTriggers() { - LinkedList res = new LinkedList(); + public LinkedList getCustomTriggers() { + LinkedList res = new LinkedList(); res.add(PluginMail.lowPaper64); res.add(PluginMail.lowPaper32); res.add(PluginMail.lowInput25); diff --git a/src/main/java/forestry/mail/triggers/TriggerBuffer.java b/src/main/java/forestry/mail/triggers/TriggerBuffer.java index bff411e0c..ddbb52103 100755 --- a/src/main/java/forestry/mail/triggers/TriggerBuffer.java +++ b/src/main/java/forestry/mail/triggers/TriggerBuffer.java @@ -10,14 +10,12 @@ ******************************************************************************/ package forestry.mail.triggers; -import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.gates.ITriggerParameter; - +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; import forestry.core.triggers.Trigger; import forestry.mail.gadgets.MachineTrader; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; public class TriggerBuffer extends Trigger { @@ -34,12 +32,11 @@ public class TriggerBuffer extends Trigger { } @Override - public boolean isTriggerActive(ForgeDirection direction, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof MachineTrader)) return false; return ((MachineTrader) tile).hasOutputBufMin(threshold); } - } diff --git a/src/main/java/forestry/mail/triggers/TriggerHasMail.java b/src/main/java/forestry/mail/triggers/TriggerHasMail.java index 62efc4d5c..e437dd803 100755 --- a/src/main/java/forestry/mail/triggers/TriggerHasMail.java +++ b/src/main/java/forestry/mail/triggers/TriggerHasMail.java @@ -10,14 +10,12 @@ ******************************************************************************/ package forestry.mail.triggers; -import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.gates.ITriggerParameter; - +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; import forestry.core.triggers.Trigger; import forestry.mail.IMailContainer; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; public class TriggerHasMail extends Trigger { @@ -26,11 +24,12 @@ public class TriggerHasMail extends Trigger { } @Override - public boolean isTriggerActive(ForgeDirection direction, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof IMailContainer)) return false; return ((IMailContainer) tile).hasMail(); } + } diff --git a/src/main/java/forestry/mail/triggers/TriggerLowInput.java b/src/main/java/forestry/mail/triggers/TriggerLowInput.java index 001f1aa19..f509bb5c9 100755 --- a/src/main/java/forestry/mail/triggers/TriggerLowInput.java +++ b/src/main/java/forestry/mail/triggers/TriggerLowInput.java @@ -10,14 +10,12 @@ ******************************************************************************/ package forestry.mail.triggers; -import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.gates.ITriggerParameter; - +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; import forestry.core.triggers.Trigger; import forestry.mail.gadgets.MachineTrader; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; public class TriggerLowInput extends Trigger { @@ -34,7 +32,7 @@ public class TriggerLowInput extends Trigger { } @Override - public boolean isTriggerActive(ForgeDirection direction, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof MachineTrader)) return false; diff --git a/src/main/java/forestry/mail/triggers/TriggerLowPaper.java b/src/main/java/forestry/mail/triggers/TriggerLowPaper.java index 553e76c48..a9abd2f88 100755 --- a/src/main/java/forestry/mail/triggers/TriggerLowPaper.java +++ b/src/main/java/forestry/mail/triggers/TriggerLowPaper.java @@ -10,14 +10,12 @@ ******************************************************************************/ package forestry.mail.triggers; -import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.gates.ITriggerParameter; - +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; import forestry.core.triggers.Trigger; import forestry.mail.gadgets.MachineTrader; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; public class TriggerLowPaper extends Trigger { @@ -34,7 +32,7 @@ public class TriggerLowPaper extends Trigger { } @Override - public boolean isTriggerActive(ForgeDirection direction, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof MachineTrader)) return false; diff --git a/src/main/java/forestry/mail/triggers/TriggerLowStamps.java b/src/main/java/forestry/mail/triggers/TriggerLowStamps.java index 6652a93f6..a7536223e 100755 --- a/src/main/java/forestry/mail/triggers/TriggerLowStamps.java +++ b/src/main/java/forestry/mail/triggers/TriggerLowStamps.java @@ -10,14 +10,12 @@ ******************************************************************************/ package forestry.mail.triggers; -import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.gates.ITriggerParameter; - +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; import forestry.core.triggers.Trigger; import forestry.mail.gadgets.MachineTrader; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; public class TriggerLowStamps extends Trigger { @@ -34,7 +32,7 @@ public class TriggerLowStamps extends Trigger { } @Override - public boolean isTriggerActive(ForgeDirection direction, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof MachineTrader)) return false; diff --git a/src/main/java/forestry/plugins/PluginBuildCraft.java b/src/main/java/forestry/plugins/PluginBuildCraft.java index 4e977d068..01d89f942 100755 --- a/src/main/java/forestry/plugins/PluginBuildCraft.java +++ b/src/main/java/forestry/plugins/PluginBuildCraft.java @@ -10,24 +10,13 @@ ******************************************************************************/ package forestry.plugins; -import java.util.LinkedList; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; - -import buildcraft.api.fuels.IronEngineCoolant; -import buildcraft.api.fuels.IronEngineFuel; -import buildcraft.api.gates.ActionManager; -import buildcraft.api.gates.ITrigger; -import buildcraft.api.gates.ITriggerProvider; -import buildcraft.api.recipes.BuildcraftRecipes; -import buildcraft.api.transport.IPipeTile; - +import buildcraft.api.fuels.BuildcraftFuelRegistry; +import buildcraft.api.recipes.BuildcraftRecipeRegistry; +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.ITriggerExternal; +import buildcraft.api.statements.ITriggerInternal; +import buildcraft.api.statements.ITriggerProvider; +import buildcraft.api.statements.StatementManager; import forestry.core.GameMode; import forestry.core.config.Config; import forestry.core.config.Configuration; @@ -37,8 +26,16 @@ import forestry.core.config.Property; import forestry.core.gadgets.TileForestry; import forestry.core.proxy.Proxies; import forestry.core.utils.LiquidHelper; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; -@Plugin(pluginID = "BC6", name = "BuildCraft 6", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.buildcraft6.description") +import java.util.Collection; + +@Plugin(pluginID = "BC6.1", name = "BuildCraft 6.1", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.buildcraft6.description") public class PluginBuildCraft extends ForestryPlugin implements ITriggerProvider { public static PluginBuildCraft instance; @@ -48,7 +45,7 @@ public class PluginBuildCraft extends ForestryPlugin implements ITriggerProvider public static Item wrench; public static Item stoneGear; public static Item pipeWaterproof; - public static final String validVersionRange = "[6.0.0,6.1.0)"; + public static final String validVersionRange = "[6.1.0,6.2.0)"; public PluginBuildCraft() { if (PluginBuildCraft.instance == null) @@ -75,17 +72,16 @@ public class PluginBuildCraft extends ForestryPlugin implements ITriggerProvider Property buildcraftignore = config.get("buildcraft.ignore", Config.CATEGORY_COMMON, false); buildcraftignore.Comment = "set to true to ignore buildcraft"; PluginBuildCraft.ignore = Boolean.parseBoolean(buildcraftignore.Value); - - IronEngineCoolant.addCoolant(LiquidHelper.getLiquid(Defaults.LIQUID_ICE, 1).getFluid(), 10.0f); + BuildcraftFuelRegistry.coolant.addCoolant(LiquidHelper.getFluid(Defaults.LIQUID_ICE), 10.0f); addIronEngineFuel(LiquidHelper.getLiquid(Defaults.LIQUID_ETHANOL, 1).getFluid(), 4, Defaults.ENGINE_CYCLE_DURATION_ETHANOL * GameMode.getGameMode().getFloatSetting("fuel.ethanol.combustion")); // Add recipe for ethanol - addRefineryRecipe(LiquidHelper.getLiquid(Defaults.LIQUID_BIOMASS, 4), null, LiquidHelper.getLiquid(Defaults.LIQUID_ETHANOL, 1), 10, 1); + addRefineryRecipe("forestry:BiomassToEthanol", LiquidHelper.getLiquid(Defaults.LIQUID_BIOMASS, 4), LiquidHelper.getLiquid(Defaults.LIQUID_ETHANOL, 1), 10, 1); // Add custom trigger handler - ActionManager.registerTriggerProvider(this); + StatementManager.registerTriggerProvider(this); initStoneGear(); initWaterproof(); @@ -103,12 +99,11 @@ public class PluginBuildCraft extends ForestryPlugin implements ITriggerProvider } private void addIronEngineFuel(Fluid fuel, float powerPerCycle, float totalBurningTime) { - IronEngineFuel.addFuel(fuel, (int) powerPerCycle, (int) totalBurningTime); + BuildcraftFuelRegistry.fuel.addFuel(fuel, (int) powerPerCycle, (int) totalBurningTime); } - private void addRefineryRecipe(FluidStack ingredient1, FluidStack ingredient2, FluidStack result, int energy, int delay) { - BuildcraftRecipes.refinery.addRecipe(ingredient1, ingredient2, result, energy, delay); - + private void addRefineryRecipe(String id, FluidStack ingredient1, FluidStack result, int energy, int delay) { + BuildcraftRecipeRegistry.refinery.addRecipe(id, ingredient1, result, energy, delay); } private void initStoneGear() { @@ -133,12 +128,12 @@ public class PluginBuildCraft extends ForestryPlugin implements ITriggerProvider // / ITRIGGERPROVIDER @Override - public LinkedList getPipeTriggers(IPipeTile pipe) { + public Collection getInternalTriggers(IStatementContainer container) { return null; } @Override - public LinkedList getNeighborTriggers(Block block, TileEntity tile) { + public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { if (tile instanceof TileForestry) return ((TileForestry) tile).getCustomTriggers();