diff --git a/api/buildcraft/api/statements/StatementParameterItemStack.java b/api/buildcraft/api/statements/StatementParameterItemStack.java index 181f599d..8efc6ffa 100755 --- a/api/buildcraft/api/statements/StatementParameterItemStack.java +++ b/api/buildcraft/api/statements/StatementParameterItemStack.java @@ -15,6 +15,7 @@ import net.minecraft.util.IIcon; import buildcraft.api.core.NetworkData; public class StatementParameterItemStack implements IStatementParameter { + @NetworkData protected ItemStack stack; diff --git a/common/buildcraft/core/statements/TriggerFluidContainer.java b/common/buildcraft/core/statements/TriggerFluidContainer.java index 6f96242a..385f0451 100644 --- a/common/buildcraft/core/statements/TriggerFluidContainer.java +++ b/common/buildcraft/core/statements/TriggerFluidContainer.java @@ -19,6 +19,7 @@ import net.minecraftforge.fluids.IFluidHandler; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; +import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.utils.StringUtils; public class TriggerFluidContainer extends BCStatement implements ITriggerExternal { @@ -118,4 +119,9 @@ public class TriggerFluidContainer extends BCStatement implements ITriggerExtern return StatementIconProvider.Trigger_FluidContainer_Full; } } + + @Override + public IStatementParameter createParameter(int index) { + return new StatementParameterItemStack(); + } } diff --git a/common/buildcraft/core/statements/TriggerFluidContainerLevel.java b/common/buildcraft/core/statements/TriggerFluidContainerLevel.java index c49224df..4a63011f 100644 --- a/common/buildcraft/core/statements/TriggerFluidContainerLevel.java +++ b/common/buildcraft/core/statements/TriggerFluidContainerLevel.java @@ -19,6 +19,7 @@ import net.minecraftforge.fluids.IFluidHandler; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; +import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.utils.StringUtils; public class TriggerFluidContainerLevel extends BCStatement implements ITriggerExternal { @@ -101,4 +102,9 @@ public class TriggerFluidContainerLevel extends BCStatement implements ITriggerE return StatementIconProvider.Trigger_FluidContainer_Below75; } } + + @Override + public IStatementParameter createParameter(int index) { + return new StatementParameterItemStack(); + } } diff --git a/common/buildcraft/core/statements/TriggerInventory.java b/common/buildcraft/core/statements/TriggerInventory.java index f909e9b6..cc8b7920 100644 --- a/common/buildcraft/core/statements/TriggerInventory.java +++ b/common/buildcraft/core/statements/TriggerInventory.java @@ -18,6 +18,7 @@ import buildcraft.api.core.IInvSlot; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; +import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.ItemList; import buildcraft.core.inventory.InventoryIterator; import buildcraft.core.inventory.StackHelper; @@ -110,4 +111,9 @@ public class TriggerInventory extends BCStatement implements ITriggerExternal { return StatementIconProvider.Trigger_Inventory_Full; } } + + @Override + public IStatementParameter createParameter(int index) { + return new StatementParameterItemStack(); + } } diff --git a/common/buildcraft/core/statements/TriggerInventoryLevel.java b/common/buildcraft/core/statements/TriggerInventoryLevel.java index d33a98e7..ca276a14 100644 --- a/common/buildcraft/core/statements/TriggerInventoryLevel.java +++ b/common/buildcraft/core/statements/TriggerInventoryLevel.java @@ -18,6 +18,7 @@ import buildcraft.api.core.IInvSlot; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; +import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.inventory.InventoryIterator; import buildcraft.core.inventory.StackHelper; import buildcraft.core.utils.StringUtils; @@ -104,4 +105,9 @@ public class TriggerInventoryLevel extends BCStatement implements ITriggerExtern return StatementIconProvider.Trigger_Inventory_Below75; } } + + @Override + public IStatementParameter createParameter(int index) { + return new StatementParameterItemStack(); + } } diff --git a/common/buildcraft/transport/Gate.java b/common/buildcraft/transport/Gate.java index ba7a72a2..4776123a 100644 --- a/common/buildcraft/transport/Gate.java +++ b/common/buildcraft/transport/Gate.java @@ -350,11 +350,6 @@ public final class Gate implements IGate, IStatementContainer { int oldRedstoneOutputSide = redstoneOutputSide; redstoneOutputSide = 0; - - /* for (ForgeDirection ioSide : ForgeDirection.VALID_DIRECTIONS) { - pipe.transport.allowInput(ioSide, true); - pipe.transport.allowOutput(ioSide, true); - } */ boolean wasActive = activeActions.size() > 0; diff --git a/common/buildcraft/transport/statements/TriggerPipeContents.java b/common/buildcraft/transport/statements/TriggerPipeContents.java index 5ad7a110..79420703 100644 --- a/common/buildcraft/transport/statements/TriggerPipeContents.java +++ b/common/buildcraft/transport/statements/TriggerPipeContents.java @@ -21,6 +21,7 @@ import buildcraft.api.gates.IGate; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; +import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.inventory.StackHelper; import buildcraft.core.statements.BCStatement; import buildcraft.core.utils.StringUtils; @@ -147,6 +148,11 @@ public class TriggerPipeContents extends BCStatement implements ITriggerInternal return false; } + + @Override + public IStatementParameter createParameter(int index) { + return new StatementParameterItemStack(); + } @Override @SideOnly(Side.CLIENT)