Close #84. Fix #302. Fix #309. Update BuildCraft API to 6.1.x

This commit is contained in:
mezz committed 2014-11-02 15:00:28 -08:00
1 parent 486b7a8f80
commit c9bd15a20d
36 files changed
+395 -478

No files matched your search

@@ -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<ITrigger> getCustomTriggers() {
LinkedList<ITrigger> res = new LinkedList<ITrigger>();
public LinkedList<ITriggerExternal> getCustomTriggers() {
LinkedList<ITriggerExternal> res = new LinkedList<ITriggerExternal>();
res.add(ForestryTrigger.missingQueen);
res.add(ForestryTrigger.missingDrone);
return res;
@@ -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<ITrigger> getCustomTriggers() {
LinkedList<ITrigger> res = new LinkedList<ITrigger>();
public LinkedList<ITriggerExternal> getCustomTriggers() {
LinkedList<ITriggerExternal> res = new LinkedList<ITriggerExternal>();
res.add(ForestryTrigger.missingQueen);
res.add(ForestryTrigger.missingDrone);
res.add(PluginApiculture.triggerNoFrames);
@@ -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;
@@ -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<ITrigger> getCustomTriggers() {
public LinkedList<ITriggerExternal> getCustomTriggers() {
return null;
}
@@ -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<ITrigger> getCustomTriggers() {
return null;
}
}
@@ -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());
}
}
@@ -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;
}
}
@@ -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;
@@ -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);
@@ -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);
}
}
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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<ITrigger> getCustomTriggers() {
LinkedList<ITrigger> res = new LinkedList<ITrigger>();
public LinkedList<ITriggerExternal> getCustomTriggers() {
LinkedList<ITriggerExternal> res = new LinkedList<ITriggerExternal>();
res.add(ForestryTrigger.lowFuel25);
return res;
}
@@ -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<ITrigger> getCustomTriggers() {
LinkedList<ITrigger> res = new LinkedList<ITrigger>();
public LinkedList<ITriggerExternal> getCustomTriggers() {
LinkedList<ITriggerExternal> res = new LinkedList<ITriggerExternal>();
res.add(ForestryTrigger.lowResource25);
res.add(ForestryTrigger.lowResource10);
res.add(ForestryTrigger.hasWork);
@@ -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<ITrigger> getCustomTriggers() {
LinkedList<ITrigger> res = new LinkedList<ITrigger>();
public LinkedList<ITriggerExternal> getCustomTriggers() {
LinkedList<ITriggerExternal> res = new LinkedList<ITriggerExternal>();
res.add(ForestryTrigger.hasWork);
return res;
}
@@ -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<ITrigger> getCustomTriggers() {
LinkedList<ITrigger> res = new LinkedList<ITrigger>();
public LinkedList<ITriggerExternal> getCustomTriggers() {
LinkedList<ITriggerExternal> res = new LinkedList<ITriggerExternal>();
res.add(ForestryTrigger.lowResource25);
res.add(ForestryTrigger.lowResource10);
res.add(ForestryTrigger.hasWork);
@@ -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<ITrigger> getCustomTriggers() {
LinkedList<ITrigger> res = new LinkedList<ITrigger>();
public LinkedList<ITriggerExternal> getCustomTriggers() {
LinkedList<ITriggerExternal> res = new LinkedList<ITriggerExternal>();
res.add(ForestryTrigger.lowFuel25);
res.add(ForestryTrigger.lowFuel10);
res.add(ForestryTrigger.lowResource25);
@@ -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<ITrigger> getCustomTriggers() {
LinkedList<ITrigger> res = new LinkedList<ITrigger>();
public LinkedList<ITriggerExternal> getCustomTriggers() {
LinkedList<ITriggerExternal> res = new LinkedList<ITriggerExternal>();
res.add(ForestryTrigger.lowFuel25);
res.add(ForestryTrigger.lowFuel10);
res.add(ForestryTrigger.lowResource25);
@@ -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<ITrigger> getCustomTriggers() {
LinkedList<ITrigger> res = new LinkedList<ITrigger>();
public LinkedList<ITriggerExternal> getCustomTriggers() {
LinkedList<ITriggerExternal> res = new LinkedList<ITriggerExternal>();
res.add(ForestryTrigger.lowResource25);
res.add(ForestryTrigger.lowResource10);
res.add(ForestryTrigger.hasWork);
@@ -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<ITrigger> getCustomTriggers() {
LinkedList<ITrigger> res = new LinkedList<ITrigger>();
public LinkedList<ITriggerExternal> getCustomTriggers() {
LinkedList<ITriggerExternal> res = new LinkedList<ITriggerExternal>();
res.add(ForestryTrigger.hasWork);
return res;
}
@@ -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<ITrigger> getCustomTriggers() {
LinkedList<ITrigger> res = new LinkedList<ITrigger>();
public LinkedList<ITriggerExternal> getCustomTriggers() {
LinkedList<ITriggerExternal> res = new LinkedList<ITriggerExternal>();
res.add(ForestryTrigger.hasWork);
return res;
}
@@ -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<ITrigger> getCustomTriggers() {
public LinkedList<ITriggerExternal> getCustomTriggers() {
if (!hasMaster())
return null;
LinkedList<ITrigger> list = new LinkedList<ITrigger>();
LinkedList<ITriggerExternal> list = new LinkedList<ITriggerExternal>();
list.add(PluginFarming.lowResourceLiquid50);
list.add(PluginFarming.lowResourceLiquid25);
list.add(PluginFarming.lowSoil128);
@@ -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;
@@ -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;
@@ -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;
@@ -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<ITrigger> getCustomTriggers() {
LinkedList<ITrigger> res = new LinkedList<ITrigger>();
public LinkedList<ITriggerExternal> getCustomTriggers() {
LinkedList<ITriggerExternal> res = new LinkedList<ITriggerExternal>();
res.add(PluginMail.triggerHasMail);
return res;
}
@@ -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<ITrigger> getCustomTriggers() {
LinkedList<ITrigger> res = new LinkedList<ITrigger>();
public LinkedList<ITriggerExternal> getCustomTriggers() {
LinkedList<ITriggerExternal> res = new LinkedList<ITriggerExternal>();
res.add(PluginMail.lowPaper64);
res.add(PluginMail.lowPaper32);
res.add(PluginMail.lowInput25);
@@ -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);
}
}
@@ -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();
}
}
@@ -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;
@@ -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;
@@ -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;
@@ -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<ITrigger> getPipeTriggers(IPipeTile pipe) {
public Collection<ITriggerInternal> getInternalTriggers(IStatementContainer container) {
return null;
}
@Override
public LinkedList<ITrigger> getNeighborTriggers(Block block, TileEntity tile) {
public Collection<ITriggerExternal> getExternalTriggers(ForgeDirection side, TileEntity tile) {
if (tile instanceof TileForestry)
return ((TileForestry) tile).getCustomTriggers();