diff --git a/api/buildcraft/api/gates/GateExpansionController.java b/api/buildcraft/api/gates/GateExpansionController.java index 67b847f3..dcf65bbb 100644 --- a/api/buildcraft/api/gates/GateExpansionController.java +++ b/api/buildcraft/api/gates/GateExpansionController.java @@ -41,7 +41,7 @@ public abstract class GateExpansionController { return false; } - public boolean isTriggerActive(ITrigger trigger, ITriggerParameter parameter) { + public boolean isTriggerActive(ITrigger trigger, IStatementParameter[] parameters) { return false; } diff --git a/api/buildcraft/api/gates/IAction.java b/api/buildcraft/api/gates/IAction.java index c2fae11d..a56ca07f 100755 --- a/api/buildcraft/api/gates/IAction.java +++ b/api/buildcraft/api/gates/IAction.java @@ -11,6 +11,6 @@ package buildcraft.api.gates; public interface IAction extends IStatement { - void actionActivate(IGate gate, IActionParameter[] parameters); + void actionActivate(IGate gate, IStatementParameter[] parameters); } diff --git a/api/buildcraft/api/gates/IActionParameter.java b/api/buildcraft/api/gates/IActionParameter.java deleted file mode 100755 index da49412e..00000000 --- a/api/buildcraft/api/gates/IActionParameter.java +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt - */ -package buildcraft.api.gates; - -public interface IActionParameter extends IStatementParameter { - -} diff --git a/api/buildcraft/api/gates/IActionProvider.java b/api/buildcraft/api/gates/IActionProvider.java index c1c2d717..15356534 100644 --- a/api/buildcraft/api/gates/IActionProvider.java +++ b/api/buildcraft/api/gates/IActionProvider.java @@ -18,13 +18,13 @@ import buildcraft.api.transport.IPipeTile; public interface IActionProvider { /** - * Returns the list of actions that are available from the pipe holding the + * Returns the list of actions that are available from the tile holding the * gate. */ - Collection getPipeActions(IPipeTile pipe); + Collection getInternalActions(TileEntity tile); /** * Returns the list of actions available to a gate next to the given block. */ - Collection getNeighborActions(ForgeDirection side, Block block, TileEntity tile); + Collection getExternalActions(ForgeDirection side, TileEntity tile); } diff --git a/api/buildcraft/api/gates/IActionReceptor.java b/api/buildcraft/api/gates/IActionReceptor.java index 70254822..89ace346 100644 --- a/api/buildcraft/api/gates/IActionReceptor.java +++ b/api/buildcraft/api/gates/IActionReceptor.java @@ -9,5 +9,5 @@ package buildcraft.api.gates; public interface IActionReceptor { - void actionActivated(IAction action, IActionParameter[] parameters); + void actionActivated(IAction action, IStatementParameter[] parameters); } diff --git a/api/buildcraft/api/gates/ITrigger.java b/api/buildcraft/api/gates/ITrigger.java index e4fc5923..3807fb08 100755 --- a/api/buildcraft/api/gates/ITrigger.java +++ b/api/buildcraft/api/gates/ITrigger.java @@ -11,6 +11,6 @@ package buildcraft.api.gates; public interface ITrigger extends IStatement { - boolean isTriggerActive(IGate gate, ITriggerParameter[] parameters); + boolean isTriggerActive(IGate gate, IStatementParameter[] parameters); } diff --git a/api/buildcraft/api/gates/ITriggerParameter.java b/api/buildcraft/api/gates/ITriggerParameter.java deleted file mode 100644 index 68c7d6af..00000000 --- a/api/buildcraft/api/gates/ITriggerParameter.java +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt - */ -package buildcraft.api.gates; - -public interface ITriggerParameter extends IStatementParameter { - -} diff --git a/api/buildcraft/api/gates/ITriggerProvider.java b/api/buildcraft/api/gates/ITriggerProvider.java index 4e30d1a0..80d27e54 100644 --- a/api/buildcraft/api/gates/ITriggerProvider.java +++ b/api/buildcraft/api/gates/ITriggerProvider.java @@ -18,13 +18,13 @@ import buildcraft.api.transport.IPipeTile; public interface ITriggerProvider { /** - * Returns the list of triggers that are available from the pipe holding the gate. + * Returns the list of triggers that are available from the object holding the gate. */ - Collection getPipeTriggers(IPipeTile pipe); + Collection getInternalTriggers(TileEntity tile); /** * Returns the list of triggers available to a gate next to the given block. */ - Collection getNeighborTriggers(ForgeDirection side, Block block, TileEntity tile); + Collection getExternalTriggers(ForgeDirection side, TileEntity tile); } diff --git a/api/buildcraft/api/gates/StatementManager.java b/api/buildcraft/api/gates/StatementManager.java index c29bbfa2..42554319 100644 --- a/api/buildcraft/api/gates/StatementManager.java +++ b/api/buildcraft/api/gates/StatementManager.java @@ -52,11 +52,11 @@ public final class StatementManager { parameters.put(createParameter(param).getUniqueTag(), param); } - public static List getNeighborTriggers(ForgeDirection side, Block block, TileEntity entity) { + public static List getExternalTriggers(ForgeDirection side, TileEntity entity) { List result = new LinkedList(); for (ITriggerProvider provider : triggerProviders) { - Collection toAdd = provider.getNeighborTriggers(side, block, entity); + Collection toAdd = provider.getExternalTriggers(side, entity); if (toAdd != null) { for (ITrigger t : toAdd) { @@ -70,11 +70,11 @@ public final class StatementManager { return result; } - public static List getNeighborActions(ForgeDirection side, Block block, TileEntity entity) { + public static List getExternalActions(ForgeDirection side, TileEntity entity) { List result = new LinkedList(); for (IActionProvider provider : actionProviders) { - Collection toAdd = provider.getNeighborActions(side, block, entity); + Collection toAdd = provider.getExternalActions(side, entity); if (toAdd != null) { for (IAction t : toAdd) { @@ -88,11 +88,11 @@ public final class StatementManager { return result; } - public static List getPipeTriggers(IPipeTile pipe) { + public static List getInternalTriggers(TileEntity tile) { List result = new LinkedList(); for (ITriggerProvider provider : triggerProviders) { - Collection toAdd = provider.getPipeTriggers(pipe); + Collection toAdd = provider.getInternalTriggers(tile); if (toAdd != null) { for (ITrigger t : toAdd) { @@ -106,11 +106,11 @@ public final class StatementManager { return result; } - public static List getPipeActions(IPipeTile pipe) { + public static List getInternalActions(TileEntity tile) { List result = new LinkedList(); for (IActionProvider provider : actionProviders) { - Collection toAdd = provider.getPipeActions(pipe); + Collection toAdd = provider.getInternalActions(tile); if (toAdd != null) { for (IAction t : toAdd) { diff --git a/api/buildcraft/api/gates/ActionParameterItemStack.java b/api/buildcraft/api/gates/StatementParameterItemStack.java similarity index 90% rename from api/buildcraft/api/gates/ActionParameterItemStack.java rename to api/buildcraft/api/gates/StatementParameterItemStack.java index ea5611bf..7339fa3f 100755 --- a/api/buildcraft/api/gates/ActionParameterItemStack.java +++ b/api/buildcraft/api/gates/StatementParameterItemStack.java @@ -15,7 +15,7 @@ import net.minecraft.util.IIcon; import buildcraft.api.core.NetworkData; import buildcraft.api.transport.IPipeTile; -public class ActionParameterItemStack implements IActionParameter { +public class StatementParameterItemStack implements IStatementParameter { @NetworkData protected ItemStack stack; @@ -53,8 +53,8 @@ public class ActionParameterItemStack implements IActionParameter { @Override public boolean equals(Object object) { - if (object instanceof ActionParameterItemStack) { - ActionParameterItemStack param = (ActionParameterItemStack) object; + if (object instanceof StatementParameterItemStack) { + StatementParameterItemStack param = (StatementParameterItemStack) object; return ItemStack.areItemStacksEqual(stack, param.stack) && ItemStack.areItemStackTagsEqual(stack, param.stack); diff --git a/api/buildcraft/api/gates/TriggerParameterItemStack.java b/api/buildcraft/api/gates/TriggerParameterItemStack.java deleted file mode 100644 index 7df18e1c..00000000 --- a/api/buildcraft/api/gates/TriggerParameterItemStack.java +++ /dev/null @@ -1,98 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt - */ -package buildcraft.api.gates; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IIcon; -import buildcraft.api.core.NetworkData; -import buildcraft.api.transport.IPipeTile; - -public class TriggerParameterItemStack implements ITriggerParameter { - - @NetworkData - protected ItemStack stack; - - @Override - public IIcon getIcon() { - return null; - } - - @Override - public ItemStack getItemStack() { - return stack; - } - - @Override - public void onClick(Object source, IStatement stmt, ItemStack stack, int mouseButton) { - if (stack != null) { - this.stack = stack.copy(); - this.stack.stackSize = 1; - } - } - - @Override - public void writeToNBT(NBTTagCompound compound) { - if (stack != null) { - NBTTagCompound tagCompound = new NBTTagCompound(); - stack.writeToNBT(tagCompound); - compound.setTag("stack", tagCompound); - } - } - - @Override - public void readFromNBT(NBTTagCompound compound) { - // Legacy code to prevent existing gates from losing their contents - int itemID = compound.getInteger("itemID"); - if (itemID != 0) { - stack = new ItemStack((Item) Item.itemRegistry.getObject(itemID), 1, compound.getInteger("itemDMG")); - return; - } - - stack = ItemStack.loadItemStackFromNBT(compound.getCompoundTag("stack")); - } - - @Override - public boolean equals(Object object) { - if (object instanceof TriggerParameterItemStack) { - TriggerParameterItemStack param = (TriggerParameterItemStack) object; - - return ItemStack.areItemStacksEqual(stack, param.stack) - && ItemStack.areItemStackTagsEqual(stack, param.stack); - } else { - return false; - } - } - - @Override - public String getDescription() { - if (stack != null) { - return stack.getDisplayName(); - } else { - return ""; - } - } - - @Override - public String getUniqueTag() { - return "buildcraft:stackTrigger"; - } - - @Override - public void registerIcons(IIconRegister iconRegister) { - - } - - @Override - public IStatementParameter rotateLeft() { - return this; - } -} diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index 52e37c68..c647928a 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -63,11 +63,11 @@ import buildcraft.api.core.IIconProvider; import buildcraft.api.core.IWorldProperty; import buildcraft.api.core.JavaTools; import buildcraft.api.fuels.BuildcraftFuelRegistry; -import buildcraft.api.gates.ActionParameterItemStack; +import buildcraft.api.gates.StatementParameterItemStack; import buildcraft.api.gates.IAction; import buildcraft.api.gates.ITrigger; import buildcraft.api.gates.StatementManager; -import buildcraft.api.gates.TriggerParameterItemStack; +import buildcraft.api.gates.StatementParameterItemStack; import buildcraft.api.recipes.BuildcraftRecipeRegistry; import buildcraft.core.BlockSpring; import buildcraft.core.BuildCraftConfiguration; @@ -344,8 +344,8 @@ public class BuildCraftCore extends BuildCraftMod { NetworkIdRegistry.instance = new NetworkIdRegistry(); - StatementManager.registerParameterClass(TriggerParameterItemStack.class); - StatementManager.registerParameterClass(ActionParameterItemStack.class); + StatementManager.registerParameterClass(StatementParameterItemStack.class); + StatementManager.registerParameterClass(StatementParameterItemStack.class); StatementManager.registerParameterClass(StatementParameterDirection.class); StatementManager.registerParameterClass(StatementParameterRedstoneGateSideOnly.class); StatementManager.registerTriggerProvider(new DefaultTriggerProvider()); diff --git a/common/buildcraft/builders/TileFiller.java b/common/buildcraft/builders/TileFiller.java index 57cafb12..b5db3209 100644 --- a/common/buildcraft/builders/TileFiller.java +++ b/common/buildcraft/builders/TileFiller.java @@ -19,7 +19,7 @@ import buildcraft.BuildCraftCore; import buildcraft.api.core.IAreaProvider; import buildcraft.api.filler.FillerManager; import buildcraft.api.gates.IAction; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.api.gates.IActionReceptor; import buildcraft.builders.statements.ActionFiller; import buildcraft.core.Box; @@ -314,7 +314,7 @@ public class TileFiller extends TileAbstractBuilder implements IMachine, IAction } @Override - public void actionActivated(IAction action, IActionParameter[] parameters) { + public void actionActivated(IAction action, IStatementParameter[] parameters) { if (action == BuildCraftCore.actionOn) { lastMode = ActionMachineControl.Mode.On; } else if (action == BuildCraftCore.actionOff) { diff --git a/common/buildcraft/builders/statements/BuildersActionProvider.java b/common/buildcraft/builders/statements/BuildersActionProvider.java index ba817d44..f37916cc 100644 --- a/common/buildcraft/builders/statements/BuildersActionProvider.java +++ b/common/buildcraft/builders/statements/BuildersActionProvider.java @@ -27,12 +27,12 @@ public class BuildersActionProvider implements IActionProvider { private final HashMap actionMap = new HashMap(); @Override - public Collection getPipeActions(IPipeTile pipe) { + public Collection getInternalActions(TileEntity tile) { return null; } @Override - public Collection getNeighborActions(ForgeDirection side, Block block, TileEntity tile) { + public Collection getExternalActions(ForgeDirection side, TileEntity tile) { LinkedList actions = new LinkedList(); if (tile instanceof TileFiller) { for (IFillerPattern p : FillerManager.registry.getPatterns()) { diff --git a/common/buildcraft/core/inventory/filters/StatementParameterStackFilter.java b/common/buildcraft/core/inventory/filters/StatementParameterStackFilter.java index 44c0527d..25a8b7ff 100755 --- a/common/buildcraft/core/inventory/filters/StatementParameterStackFilter.java +++ b/common/buildcraft/core/inventory/filters/StatementParameterStackFilter.java @@ -12,9 +12,9 @@ import java.util.ArrayList; import net.minecraft.item.ItemStack; -import buildcraft.api.gates.ActionParameterItemStack; +import buildcraft.api.gates.StatementParameterItemStack; import buildcraft.api.gates.IStatementParameter; -import buildcraft.api.gates.TriggerParameterItemStack; +import buildcraft.api.gates.StatementParameterItemStack; /** * Returns true if the stack matches any one one of the filter stacks. @@ -26,7 +26,7 @@ public class StatementParameterStackFilter extends ArrayStackOrListFilter { for (IStatementParameter s : parameters) { if (s != null) { - if (s instanceof ActionParameterItemStack || s instanceof TriggerParameterItemStack) { + if (s instanceof StatementParameterItemStack || s instanceof StatementParameterItemStack) { tmp.add(s.getItemStack()); } } diff --git a/common/buildcraft/core/robots/AIRobotSearchStackRequest.java b/common/buildcraft/core/robots/AIRobotSearchStackRequest.java index 827a8b22..98af130c 100755 --- a/common/buildcraft/core/robots/AIRobotSearchStackRequest.java +++ b/common/buildcraft/core/robots/AIRobotSearchStackRequest.java @@ -15,7 +15,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.gates.ActionParameterItemStack; +import buildcraft.api.gates.StatementParameterItemStack; import buildcraft.api.gates.IStatementParameter; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; @@ -130,7 +130,7 @@ public class AIRobotSearchStackRequest extends AIRobot { for (ActionSlot s : new ActionIterator(pipe)) { if (s.action instanceof ActionStationRequestItems) { for (IStatementParameter p : s.parameters) { - ActionParameterItemStack param = (ActionParameterItemStack) p; + StatementParameterItemStack param = (StatementParameterItemStack) p; if (param != null && !isBlacklisted(param.getItemStack())) { StackRequest req = new StackRequest(); diff --git a/common/buildcraft/core/robots/boards/BoardRobotGenericBreakBlock.java b/common/buildcraft/core/robots/boards/BoardRobotGenericBreakBlock.java index d149aa87..90296902 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotGenericBreakBlock.java +++ b/common/buildcraft/core/robots/boards/BoardRobotGenericBreakBlock.java @@ -18,8 +18,8 @@ import net.minecraft.world.World; import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.core.BlockIndex; -import buildcraft.api.gates.ActionParameterItemStack; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.StatementParameterItemStack; +import buildcraft.api.gates.IStatementParameter; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.TickHandlerCore; @@ -129,9 +129,9 @@ public abstract class BoardRobotGenericBreakBlock extends RedstoneBoardRobot { for (ActionSlot slot : new ActionIterator(station.getPipe().pipe)) { if (slot.action instanceof ActionRobotFilter) { - for (IActionParameter p : slot.parameters) { - if (p != null && p instanceof ActionParameterItemStack) { - ActionParameterItemStack param = (ActionParameterItemStack) p; + for (IStatementParameter p : slot.parameters) { + if (p != null && p instanceof StatementParameterItemStack) { + StatementParameterItemStack param = (StatementParameterItemStack) p; ItemStack stack = param.getItemStack(); if (stack != null && stack.getItem() instanceof ItemBlock) { diff --git a/common/buildcraft/core/robots/boards/BoardRobotPump.java b/common/buildcraft/core/robots/boards/BoardRobotPump.java index 042ec668..42c3770d 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotPump.java +++ b/common/buildcraft/core/robots/boards/BoardRobotPump.java @@ -24,8 +24,8 @@ import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.core.BlockIndex; import buildcraft.api.core.BuildCraftAPI; -import buildcraft.api.gates.ActionParameterItemStack; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.StatementParameterItemStack; +import buildcraft.api.gates.IStatementParameter; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.TickHandlerCore; @@ -116,9 +116,9 @@ public class BoardRobotPump extends RedstoneBoardRobot { for (ActionSlot slot : new ActionIterator(station.getPipe().pipe)) { if (slot.action instanceof ActionRobotFilter) { - for (IActionParameter p : slot.parameters) { - if (p != null && p instanceof ActionParameterItemStack) { - ActionParameterItemStack param = (ActionParameterItemStack) p; + for (IStatementParameter p : slot.parameters) { + if (p != null && p instanceof StatementParameterItemStack) { + StatementParameterItemStack param = (StatementParameterItemStack) p; ItemStack stack = param.getItemStack(); if (stack != null) { diff --git a/common/buildcraft/core/statements/ActionRedstoneOutput.java b/common/buildcraft/core/statements/ActionRedstoneOutput.java index 76c22b0f..4a7fbe93 100644 --- a/common/buildcraft/core/statements/ActionRedstoneOutput.java +++ b/common/buildcraft/core/statements/ActionRedstoneOutput.java @@ -8,7 +8,7 @@ */ package buildcraft.core.statements; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.core.utils.StringUtils; public class ActionRedstoneOutput extends BCActionPassive { @@ -28,8 +28,8 @@ public class ActionRedstoneOutput extends BCActionPassive { } @Override - public IActionParameter createParameter(int index) { - IActionParameter param = null; + public IStatementParameter createParameter(int index) { + IStatementParameter param = null; if (index == 0) { param = new StatementParameterRedstoneGateSideOnly(); diff --git a/common/buildcraft/core/statements/BCActionActive.java b/common/buildcraft/core/statements/BCActionActive.java index e79bd8da..f6b1111c 100644 --- a/common/buildcraft/core/statements/BCActionActive.java +++ b/common/buildcraft/core/statements/BCActionActive.java @@ -9,7 +9,7 @@ package buildcraft.core.statements; import buildcraft.api.gates.IAction; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.IStatementParameter; public abstract class BCActionActive extends BCStatement implements IAction { @@ -18,7 +18,7 @@ public abstract class BCActionActive extends BCStatement implements IAction { } @Override - public IActionParameter createParameter(int index) { + public IStatementParameter createParameter(int index) { return null; } } diff --git a/common/buildcraft/core/statements/BCActionPassive.java b/common/buildcraft/core/statements/BCActionPassive.java index 550a6263..7e8175e9 100755 --- a/common/buildcraft/core/statements/BCActionPassive.java +++ b/common/buildcraft/core/statements/BCActionPassive.java @@ -9,8 +9,8 @@ package buildcraft.core.statements; import buildcraft.api.gates.IAction; -import buildcraft.api.gates.IActionParameter; import buildcraft.api.gates.IGate; +import buildcraft.api.gates.IStatementParameter; public abstract class BCActionPassive extends BCStatement implements IAction { @@ -19,11 +19,11 @@ public abstract class BCActionPassive extends BCStatement implements IAction { } @Override - public IActionParameter createParameter(int index) { + public IStatementParameter createParameter(int index) { return null; } @Override - public final void actionActivate(IGate gate, IActionParameter[] parameters) { + public final void actionActivate(IGate gate, IStatementParameter[] parameters) { } } diff --git a/common/buildcraft/core/statements/BCTrigger.java b/common/buildcraft/core/statements/BCTrigger.java index 646bf39f..95af3d62 100644 --- a/common/buildcraft/core/statements/BCTrigger.java +++ b/common/buildcraft/core/statements/BCTrigger.java @@ -14,8 +14,8 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.gates.IGate; import buildcraft.api.gates.ITrigger; -import buildcraft.api.gates.ITriggerParameter; -import buildcraft.api.gates.TriggerParameterItemStack; +import buildcraft.api.gates.IStatementParameter; +import buildcraft.api.gates.StatementParameterItemStack; import buildcraft.transport.Pipe; /** @@ -30,8 +30,8 @@ public abstract class BCTrigger extends BCStatement implements ITrigger { } @Override - public boolean isTriggerActive(IGate gate, ITriggerParameter[] parameters) { - ITriggerParameter p = parameters[0]; + public boolean isTriggerActive(IGate gate, IStatementParameter[] parameters) { + IStatementParameter p = parameters[0]; Pipe pipe = (Pipe) gate.getPipe(); for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { @@ -43,12 +43,12 @@ public abstract class BCTrigger extends BCStatement implements ITrigger { return false; } - public boolean isTriggerActive(ForgeDirection side, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(ForgeDirection side, TileEntity tile, IStatementParameter parameter) { return false; } @Override - public ITriggerParameter createParameter(int index) { - return new TriggerParameterItemStack(); + public IStatementParameter createParameter(int index) { + return new StatementParameterItemStack(); } } diff --git a/common/buildcraft/core/statements/DefaultActionProvider.java b/common/buildcraft/core/statements/DefaultActionProvider.java index f6526df1..5a4073df 100644 --- a/common/buildcraft/core/statements/DefaultActionProvider.java +++ b/common/buildcraft/core/statements/DefaultActionProvider.java @@ -26,12 +26,12 @@ import buildcraft.core.IMachine; public class DefaultActionProvider implements IActionProvider { @Override - public Collection getPipeActions(IPipeTile pipe) { + public Collection getInternalActions(TileEntity tile) { return null; } @Override - public Collection getNeighborActions(ForgeDirection side, Block block, TileEntity tile) { + public Collection getExternalActions(ForgeDirection side, TileEntity tile) { LinkedList res = new LinkedList(); res.add(BuildCraftCore.actionRedstone); diff --git a/common/buildcraft/core/statements/DefaultTriggerProvider.java b/common/buildcraft/core/statements/DefaultTriggerProvider.java index e3354c64..f9690cc3 100644 --- a/common/buildcraft/core/statements/DefaultTriggerProvider.java +++ b/common/buildcraft/core/statements/DefaultTriggerProvider.java @@ -29,7 +29,7 @@ import buildcraft.core.IMachine; public class DefaultTriggerProvider implements ITriggerProvider { @Override - public LinkedList getNeighborTriggers(ForgeDirection side, Block block, TileEntity tile) { + public LinkedList getExternalTriggers(ForgeDirection side, TileEntity tile) { LinkedList res = new LinkedList(); if (tile instanceof IInventory && ((IInventory) tile).getSizeInventory() > 0) { @@ -65,16 +65,11 @@ public class DefaultTriggerProvider implements ITriggerProvider { res.add(BuildCraftCore.triggerEnergyLow); } - if (block != null && block.canProvidePower()) { - // res.add(BuildCraftCore.triggerRedstoneActive); - // res.add(BuildCraftCore.triggerRedstoneInactive); - } - return res; } @Override - public LinkedList getPipeTriggers(IPipeTile pipe) { + public LinkedList getInternalTriggers(TileEntity pipe) { return null; } } diff --git a/common/buildcraft/core/statements/StatementParameterDirection.java b/common/buildcraft/core/statements/StatementParameterDirection.java index 9243a69c..ce32454a 100644 --- a/common/buildcraft/core/statements/StatementParameterDirection.java +++ b/common/buildcraft/core/statements/StatementParameterDirection.java @@ -14,15 +14,15 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.NetworkData; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.api.gates.IStatement; import buildcraft.api.gates.IStatementParameter; -import buildcraft.api.gates.ITriggerParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipeTile; import buildcraft.core.utils.StringUtils; -public class StatementParameterDirection implements IActionParameter, ITriggerParameter { +public class StatementParameterDirection implements IStatementParameter { @NetworkData public ForgeDirection direction = ForgeDirection.UNKNOWN; diff --git a/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java b/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java index ddb5895b..d5d84e42 100644 --- a/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java +++ b/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java @@ -5,15 +5,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import buildcraft.api.core.NetworkData; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.api.gates.IStatement; import buildcraft.api.gates.IStatementParameter; -import buildcraft.api.gates.ITriggerParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.api.transport.IPipeTile; import buildcraft.core.utils.StringUtils; public class StatementParameterRedstoneGateSideOnly implements - IActionParameter, ITriggerParameter { + IStatementParameter { @NetworkData public boolean isOn = false; diff --git a/common/buildcraft/core/statements/TriggerEnergy.java b/common/buildcraft/core/statements/TriggerEnergy.java index c50239e3..0540bca7 100755 --- a/common/buildcraft/core/statements/TriggerEnergy.java +++ b/common/buildcraft/core/statements/TriggerEnergy.java @@ -20,7 +20,7 @@ import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyHandler; import buildcraft.api.gates.IGate; -import buildcraft.api.gates.ITriggerParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.core.utils.StringUtils; public class TriggerEnergy extends BCTrigger { @@ -58,7 +58,7 @@ public class TriggerEnergy extends BCTrigger { return false; } @Override - public boolean isTriggerActive(IGate gate, ITriggerParameter[] parameters) { + public boolean isTriggerActive(IGate gate, IStatementParameter[] parameters) { if (gate.getPipe() instanceof IEnergyHandler) { if (isValidEnergyHandler((IEnergyHandler) gate.getPipe())) { return isTriggeredEnergyHandler((IEnergyHandler) gate.getPipe()); @@ -72,7 +72,7 @@ public class TriggerEnergy extends BCTrigger { @Override - public boolean isTriggerActive(ForgeDirection side, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(ForgeDirection side, TileEntity tile, IStatementParameter parameter) { if (tile instanceof IEnergyHandler) { // Since we return false upon the trigger being invalid anyway, // we can skip the isValidEnergyHandler(...) check. diff --git a/common/buildcraft/core/statements/TriggerFluidContainer.java b/common/buildcraft/core/statements/TriggerFluidContainer.java index 26091bf8..ba34a2f9 100644 --- a/common/buildcraft/core/statements/TriggerFluidContainer.java +++ b/common/buildcraft/core/statements/TriggerFluidContainer.java @@ -18,7 +18,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import buildcraft.api.gates.ITriggerParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.core.utils.StringUtils; public class TriggerFluidContainer extends BCTrigger { @@ -45,7 +45,7 @@ public class TriggerFluidContainer extends BCTrigger { } @Override - public boolean isTriggerActive(ForgeDirection side, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(ForgeDirection side, TileEntity tile, IStatementParameter parameter) { if (tile instanceof IFluidHandler) { IFluidHandler container = (IFluidHandler) tile; diff --git a/common/buildcraft/core/statements/TriggerFluidContainerLevel.java b/common/buildcraft/core/statements/TriggerFluidContainerLevel.java index d3e62fdb..1c068c8e 100644 --- a/common/buildcraft/core/statements/TriggerFluidContainerLevel.java +++ b/common/buildcraft/core/statements/TriggerFluidContainerLevel.java @@ -18,7 +18,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import buildcraft.api.gates.ITriggerParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.core.utils.StringUtils; public class TriggerFluidContainerLevel extends BCTrigger { @@ -52,7 +52,7 @@ public class TriggerFluidContainerLevel extends BCTrigger { } @Override - public boolean isTriggerActive(ForgeDirection side, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(ForgeDirection side, TileEntity tile, IStatementParameter parameter) { if (tile instanceof IFluidHandler) { IFluidHandler container = (IFluidHandler) tile; diff --git a/common/buildcraft/core/statements/TriggerInventory.java b/common/buildcraft/core/statements/TriggerInventory.java index 52d47d12..aebbfe9a 100644 --- a/common/buildcraft/core/statements/TriggerInventory.java +++ b/common/buildcraft/core/statements/TriggerInventory.java @@ -17,7 +17,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.IInvSlot; -import buildcraft.api.gates.ITriggerParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.core.ItemList; import buildcraft.core.inventory.InventoryIterator; import buildcraft.core.inventory.StackHelper; @@ -48,7 +48,7 @@ public class TriggerInventory extends BCTrigger { } @Override - public boolean isTriggerActive(ForgeDirection side, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(ForgeDirection side, TileEntity tile, IStatementParameter parameter) { ItemStack searchedStack = null; if (parameter != null) { diff --git a/common/buildcraft/core/statements/TriggerInventoryLevel.java b/common/buildcraft/core/statements/TriggerInventoryLevel.java index 3977d6bb..3b6620bc 100644 --- a/common/buildcraft/core/statements/TriggerInventoryLevel.java +++ b/common/buildcraft/core/statements/TriggerInventoryLevel.java @@ -17,7 +17,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.IInvSlot; -import buildcraft.api.gates.ITriggerParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.core.inventory.InventoryIterator; import buildcraft.core.inventory.StackHelper; import buildcraft.core.utils.StringUtils; @@ -58,7 +58,7 @@ public class TriggerInventoryLevel extends BCTrigger { } @Override - public boolean isTriggerActive(ForgeDirection side, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(ForgeDirection side, TileEntity tile, IStatementParameter parameter) { // A parameter is required if (parameter == null) { return false; diff --git a/common/buildcraft/core/statements/TriggerMachine.java b/common/buildcraft/core/statements/TriggerMachine.java index bf0cd4bb..53d308c1 100644 --- a/common/buildcraft/core/statements/TriggerMachine.java +++ b/common/buildcraft/core/statements/TriggerMachine.java @@ -12,7 +12,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.gates.ITriggerParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.core.IMachine; import buildcraft.core.utils.StringUtils; @@ -32,7 +32,7 @@ public class TriggerMachine extends BCTrigger { } @Override - public boolean isTriggerActive(ForgeDirection side, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(ForgeDirection side, TileEntity tile, IStatementParameter parameter) { if (tile instanceof IMachine) { IMachine machine = (IMachine) tile; diff --git a/common/buildcraft/core/statements/TriggerRedstoneInput.java b/common/buildcraft/core/statements/TriggerRedstoneInput.java index 679dc592..0509d2fd 100644 --- a/common/buildcraft/core/statements/TriggerRedstoneInput.java +++ b/common/buildcraft/core/statements/TriggerRedstoneInput.java @@ -9,7 +9,7 @@ package buildcraft.core.statements; import buildcraft.api.gates.IGate; -import buildcraft.api.gates.ITriggerParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.core.utils.StringUtils; import buildcraft.transport.TileGenericPipe; @@ -28,8 +28,8 @@ public class TriggerRedstoneInput extends BCTrigger { } @Override - public ITriggerParameter createParameter(int index) { - ITriggerParameter param = null; + public IStatementParameter createParameter(int index) { + IStatementParameter param = null; if (index == 0) { param = new StatementParameterRedstoneGateSideOnly(); @@ -44,7 +44,7 @@ public class TriggerRedstoneInput extends BCTrigger { } @Override - public boolean isTriggerActive(IGate gate, ITriggerParameter[] parameters) { + public boolean isTriggerActive(IGate gate, IStatementParameter[] parameters) { TileGenericPipe tile = (TileGenericPipe) gate.getPipe().getTile(); int level = tile.redstoneInput; if (parameters.length > 0 && parameters[0] instanceof StatementParameterRedstoneGateSideOnly && diff --git a/common/buildcraft/energy/statements/EnergyStatementProvider.java b/common/buildcraft/energy/statements/EnergyStatementProvider.java index db36c704..88513dcb 100644 --- a/common/buildcraft/energy/statements/EnergyStatementProvider.java +++ b/common/buildcraft/energy/statements/EnergyStatementProvider.java @@ -17,12 +17,12 @@ import buildcraft.energy.TileEngine; public class EnergyStatementProvider implements ITriggerProvider { @Override - public Collection getPipeTriggers(IPipeTile pipe) { + public Collection getInternalTriggers(TileEntity pipe) { return null; } @Override - public Collection getNeighborTriggers(ForgeDirection side, Block block, TileEntity tile) { + public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { LinkedList triggers = new LinkedList(); if (tile instanceof TileEngine) { diff --git a/common/buildcraft/energy/statements/TriggerEngineHeat.java b/common/buildcraft/energy/statements/TriggerEngineHeat.java index 583bcbe8..c652baa8 100644 --- a/common/buildcraft/energy/statements/TriggerEngineHeat.java +++ b/common/buildcraft/energy/statements/TriggerEngineHeat.java @@ -15,7 +15,7 @@ import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.gates.ITriggerParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.core.statements.BCTrigger; import buildcraft.core.utils.StringUtils; import buildcraft.energy.TileEngine; @@ -37,7 +37,7 @@ public class TriggerEngineHeat extends BCTrigger { } @Override - public boolean isTriggerActive(ForgeDirection side, TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(ForgeDirection side, TileEntity tile, IStatementParameter parameter) { if (tile instanceof TileEngine) { TileEngine engine = (TileEngine) tile; diff --git a/common/buildcraft/silicon/TileLaser.java b/common/buildcraft/silicon/TileLaser.java index ad1854e2..df6b39a2 100644 --- a/common/buildcraft/silicon/TileLaser.java +++ b/common/buildcraft/silicon/TileLaser.java @@ -21,7 +21,7 @@ import buildcraft.api.core.NetworkData; import buildcraft.api.core.Position; import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.gates.IAction; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.api.gates.IActionReceptor; import buildcraft.api.power.ILaserTarget; import buildcraft.api.power.ILaserTargetBlock; @@ -299,7 +299,7 @@ public class TileLaser extends TileBuildCraft implements IActionReceptor, IMachi } @Override - public void actionActivated(IAction action, IActionParameter[] parameters) { + public void actionActivated(IAction action, IStatementParameter[] parameters) { if (action == BuildCraftCore.actionOn) { lastMode = ActionMachineControl.Mode.On; } else if (action == BuildCraftCore.actionOff) { diff --git a/common/buildcraft/silicon/TileLaserTableBase.java b/common/buildcraft/silicon/TileLaserTableBase.java index 434ec207..27bbfaab 100644 --- a/common/buildcraft/silicon/TileLaserTableBase.java +++ b/common/buildcraft/silicon/TileLaserTableBase.java @@ -16,7 +16,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import buildcraft.BuildCraftCore; import buildcraft.api.gates.IAction; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.api.gates.IActionReceptor; import buildcraft.api.power.ILaserTarget; import buildcraft.core.IMachine; @@ -220,7 +220,7 @@ public abstract class TileLaserTableBase extends TileBuildCraft implements ILase } @Override - public void actionActivated(IAction action, IActionParameter[] parameters) { + public void actionActivated(IAction action, IStatementParameter[] parameters) { if (action == BuildCraftCore.actionOn) { lastMode = ActionMachineControl.Mode.On; } else if (action == BuildCraftCore.actionOff) { diff --git a/common/buildcraft/silicon/statements/ActionRobotFilter.java b/common/buildcraft/silicon/statements/ActionRobotFilter.java index 9d94a38d..023b2644 100755 --- a/common/buildcraft/silicon/statements/ActionRobotFilter.java +++ b/common/buildcraft/silicon/statements/ActionRobotFilter.java @@ -15,8 +15,8 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; -import buildcraft.api.gates.ActionParameterItemStack; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.StatementParameterItemStack; +import buildcraft.api.gates.IStatementParameter; import buildcraft.api.robots.IDockingStation; import buildcraft.core.inventory.filters.ArrayFluidFilter; import buildcraft.core.inventory.filters.ArrayStackOrListFilter; @@ -59,8 +59,8 @@ public class ActionRobotFilter extends BCActionPassive { } @Override - public IActionParameter createParameter(int index) { - return new ActionParameterItemStack(); + public IStatementParameter createParameter(int index) { + return new StatementParameterItemStack(); } public static Collection getGateFilterStacks(IDockingStation station) { @@ -68,9 +68,9 @@ public class ActionRobotFilter extends BCActionPassive { for (ActionSlot slot : new ActionIterator(((DockingStation) station).getPipe().pipe)) { if (slot.action instanceof ActionRobotFilter) { - for (IActionParameter p : slot.parameters) { - if (p != null && p instanceof ActionParameterItemStack) { - ActionParameterItemStack param = (ActionParameterItemStack) p; + for (IStatementParameter p : slot.parameters) { + if (p != null && p instanceof StatementParameterItemStack) { + StatementParameterItemStack param = (StatementParameterItemStack) p; ItemStack stack = param.getItemStack(); if (stack != null) { diff --git a/common/buildcraft/silicon/statements/ActionRobotGotoStation.java b/common/buildcraft/silicon/statements/ActionRobotGotoStation.java index 1caed689..fbd68a0b 100755 --- a/common/buildcraft/silicon/statements/ActionRobotGotoStation.java +++ b/common/buildcraft/silicon/statements/ActionRobotGotoStation.java @@ -12,8 +12,8 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.BlockIndex; -import buildcraft.api.gates.ActionParameterItemStack; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.StatementParameterItemStack; +import buildcraft.api.gates.IStatementParameter; import buildcraft.api.gates.IGate; import buildcraft.api.robots.AIRobot; import buildcraft.core.ItemMapLocation; @@ -43,7 +43,7 @@ public class ActionRobotGotoStation extends BCActionActive { } @Override - public void actionActivate(IGate gate, IActionParameter[] parameters) { + public void actionActivate(IGate gate, IStatementParameter[] parameters) { Pipe pipe = (Pipe) gate.getPipe(); TileGenericPipe tile = pipe.container; RobotRegistry registry = RobotRegistry.getRegistry(pipe.getWorld()); @@ -62,7 +62,7 @@ public class ActionRobotGotoStation extends BCActionActive { DockingStation newStation = station; if (parameters[0] != null) { - ActionParameterItemStack stackParam = (ActionParameterItemStack) parameters[0]; + StatementParameterItemStack stackParam = (StatementParameterItemStack) parameters[0]; ItemStack item = stackParam.getItemStack(); if (item.getItem() instanceof ItemMapLocation) { @@ -92,8 +92,8 @@ public class ActionRobotGotoStation extends BCActionActive { } @Override - public IActionParameter createParameter(int index) { - return new ActionParameterItemStack(); + public IStatementParameter createParameter(int index) { + return new StatementParameterItemStack(); } } diff --git a/common/buildcraft/silicon/statements/ActionRobotWorkInArea.java b/common/buildcraft/silicon/statements/ActionRobotWorkInArea.java index fead4320..a67ee310 100755 --- a/common/buildcraft/silicon/statements/ActionRobotWorkInArea.java +++ b/common/buildcraft/silicon/statements/ActionRobotWorkInArea.java @@ -11,8 +11,8 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import buildcraft.api.core.IZone; -import buildcraft.api.gates.ActionParameterItemStack; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.StatementParameterItemStack; +import buildcraft.api.gates.IStatementParameter; import buildcraft.core.ItemMapLocation; import buildcraft.core.statements.BCActionPassive; import buildcraft.core.utils.StringUtils; @@ -39,7 +39,7 @@ public class ActionRobotWorkInArea extends BCActionPassive { return null; } - ItemStack stack = ((ActionParameterItemStack) slot.parameters[0]).getItemStack(); + ItemStack stack = ((StatementParameterItemStack) slot.parameters[0]).getItemStack(); if (!(stack.getItem() instanceof ItemMapLocation)) { return null; @@ -59,7 +59,7 @@ public class ActionRobotWorkInArea extends BCActionPassive { } @Override - public IActionParameter createParameter(int index) { - return new ActionParameterItemStack(); + public IStatementParameter createParameter(int index) { + return new StatementParameterItemStack(); } } diff --git a/common/buildcraft/silicon/statements/ActionStationAcceptFluids.java b/common/buildcraft/silicon/statements/ActionStationAcceptFluids.java index 44068409..4a52b9be 100755 --- a/common/buildcraft/silicon/statements/ActionStationAcceptFluids.java +++ b/common/buildcraft/silicon/statements/ActionStationAcceptFluids.java @@ -9,8 +9,8 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; -import buildcraft.api.gates.ActionParameterItemStack; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.StatementParameterItemStack; +import buildcraft.api.gates.IStatementParameter; import buildcraft.core.statements.BCActionPassive; import buildcraft.core.utils.StringUtils; @@ -36,7 +36,7 @@ public class ActionStationAcceptFluids extends BCActionPassive { } @Override - public IActionParameter createParameter(int index) { - return new ActionParameterItemStack(); + public IStatementParameter createParameter(int index) { + return new StatementParameterItemStack(); } } diff --git a/common/buildcraft/silicon/statements/ActionStationAcceptItemsInv.java b/common/buildcraft/silicon/statements/ActionStationAcceptItemsInv.java index 52b1eb12..d817a4bb 100755 --- a/common/buildcraft/silicon/statements/ActionStationAcceptItemsInv.java +++ b/common/buildcraft/silicon/statements/ActionStationAcceptItemsInv.java @@ -16,8 +16,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.IInvSlot; -import buildcraft.api.gates.ActionParameterItemStack; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.StatementParameterItemStack; +import buildcraft.api.gates.IStatementParameter; import buildcraft.core.inventory.ITransactor; import buildcraft.core.inventory.Transactor; import buildcraft.core.robots.DockingStation; @@ -47,8 +47,8 @@ public class ActionStationAcceptItemsInv extends ActionStationInputItems { } @Override - public IActionParameter createParameter(int index) { - return new ActionParameterItemStack(); + public IStatementParameter createParameter(int index) { + return new StatementParameterItemStack(); } @Override diff --git a/common/buildcraft/silicon/statements/ActionStationAcceptItemsPipe.java b/common/buildcraft/silicon/statements/ActionStationAcceptItemsPipe.java index 64cdc5ca..b63bf1b3 100755 --- a/common/buildcraft/silicon/statements/ActionStationAcceptItemsPipe.java +++ b/common/buildcraft/silicon/statements/ActionStationAcceptItemsPipe.java @@ -11,8 +11,8 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; import buildcraft.api.core.IInvSlot; -import buildcraft.api.gates.ActionParameterItemStack; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.StatementParameterItemStack; +import buildcraft.api.gates.IStatementParameter; import buildcraft.core.robots.DockingStation; import buildcraft.core.robots.EntityRobot; import buildcraft.core.utils.StringUtils; @@ -42,8 +42,8 @@ public class ActionStationAcceptItemsPipe extends ActionStationInputItems { } @Override - public IActionParameter createParameter(int index) { - return new ActionParameterItemStack(); + public IStatementParameter createParameter(int index) { + return new StatementParameterItemStack(); } @Override diff --git a/common/buildcraft/silicon/statements/ActionStationAllowCraft.java b/common/buildcraft/silicon/statements/ActionStationAllowCraft.java index 5dd8ee88..d1fca77e 100755 --- a/common/buildcraft/silicon/statements/ActionStationAllowCraft.java +++ b/common/buildcraft/silicon/statements/ActionStationAllowCraft.java @@ -9,8 +9,8 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; -import buildcraft.api.gates.ActionParameterItemStack; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.StatementParameterItemStack; +import buildcraft.api.gates.IStatementParameter; import buildcraft.core.statements.BCActionPassive; import buildcraft.core.utils.StringUtils; @@ -36,7 +36,7 @@ public class ActionStationAllowCraft extends BCActionPassive { } @Override - public IActionParameter createParameter(int index) { - return new ActionParameterItemStack(); + public IStatementParameter createParameter(int index) { + return new StatementParameterItemStack(); } } diff --git a/common/buildcraft/silicon/statements/ActionStationForbidRobot.java b/common/buildcraft/silicon/statements/ActionStationForbidRobot.java index 024b32f6..a002b4b7 100755 --- a/common/buildcraft/silicon/statements/ActionStationForbidRobot.java +++ b/common/buildcraft/silicon/statements/ActionStationForbidRobot.java @@ -10,8 +10,8 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; -import buildcraft.api.gates.ActionParameterItemStack; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.StatementParameterItemStack; +import buildcraft.api.gates.IStatementParameter; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.ItemRobot; import buildcraft.core.robots.DockingStation; @@ -47,8 +47,8 @@ public class ActionStationForbidRobot extends BCActionPassive { } @Override - public IActionParameter createParameter(int index) { - return new ActionParameterItemStack(); + public IStatementParameter createParameter(int index) { + return new StatementParameterItemStack(); } public static boolean isForbidden(DockingStation station, EntityRobotBase robot) { @@ -64,9 +64,9 @@ public class ActionStationForbidRobot extends BCActionPassive { } public static boolean isForbidden(ActionSlot slot, EntityRobotBase robot) { - for (IActionParameter p : slot.parameters) { + for (IStatementParameter p : slot.parameters) { if (p != null) { - ActionParameterItemStack actionStack = (ActionParameterItemStack) p; + StatementParameterItemStack actionStack = (StatementParameterItemStack) p; ItemStack stack = p.getItemStack(); if (stack != null && stack.getItem() instanceof ItemRobot) { diff --git a/common/buildcraft/silicon/statements/ActionStationProvideFluids.java b/common/buildcraft/silicon/statements/ActionStationProvideFluids.java index 918b3a14..d8a50762 100755 --- a/common/buildcraft/silicon/statements/ActionStationProvideFluids.java +++ b/common/buildcraft/silicon/statements/ActionStationProvideFluids.java @@ -9,8 +9,8 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; -import buildcraft.api.gates.ActionParameterItemStack; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.StatementParameterItemStack; +import buildcraft.api.gates.IStatementParameter; import buildcraft.core.statements.BCActionPassive; import buildcraft.core.utils.StringUtils; @@ -36,7 +36,7 @@ public class ActionStationProvideFluids extends BCActionPassive { } @Override - public IActionParameter createParameter(int index) { - return new ActionParameterItemStack(); + public IStatementParameter createParameter(int index) { + return new StatementParameterItemStack(); } } diff --git a/common/buildcraft/silicon/statements/ActionStationProvideItems.java b/common/buildcraft/silicon/statements/ActionStationProvideItems.java index f6b84ee5..3c622beb 100755 --- a/common/buildcraft/silicon/statements/ActionStationProvideItems.java +++ b/common/buildcraft/silicon/statements/ActionStationProvideItems.java @@ -9,8 +9,8 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; -import buildcraft.api.gates.ActionParameterItemStack; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.StatementParameterItemStack; +import buildcraft.api.gates.IStatementParameter; import buildcraft.core.statements.BCActionPassive; import buildcraft.core.utils.StringUtils; @@ -36,7 +36,7 @@ public class ActionStationProvideItems extends BCActionPassive { } @Override - public IActionParameter createParameter(int index) { - return new ActionParameterItemStack(); + public IStatementParameter createParameter(int index) { + return new StatementParameterItemStack(); } } diff --git a/common/buildcraft/silicon/statements/ActionStationRequestItems.java b/common/buildcraft/silicon/statements/ActionStationRequestItems.java index 156c7e12..cbf2b4cd 100755 --- a/common/buildcraft/silicon/statements/ActionStationRequestItems.java +++ b/common/buildcraft/silicon/statements/ActionStationRequestItems.java @@ -16,8 +16,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.IInvSlot; -import buildcraft.api.gates.ActionParameterItemStack; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.StatementParameterItemStack; +import buildcraft.api.gates.IStatementParameter; import buildcraft.core.inventory.ITransactor; import buildcraft.core.inventory.Transactor; import buildcraft.core.robots.DockingStation; @@ -52,8 +52,8 @@ public class ActionStationRequestItems extends ActionStationInputItems { } @Override - public IActionParameter createParameter(int index) { - return new ActionParameterItemStack(); + public IStatementParameter createParameter(int index) { + return new StatementParameterItemStack(); } @Override diff --git a/common/buildcraft/silicon/statements/RobotsActionProvider.java b/common/buildcraft/silicon/statements/RobotsActionProvider.java index a45a2b74..22819cb4 100755 --- a/common/buildcraft/silicon/statements/RobotsActionProvider.java +++ b/common/buildcraft/silicon/statements/RobotsActionProvider.java @@ -34,14 +34,18 @@ import buildcraft.transport.TileGenericPipe; public class RobotsActionProvider implements IActionProvider { @Override - public Collection getPipeActions(IPipeTile pipe) { + public Collection getInternalActions(TileEntity tile) { + if (!(tile instanceof TileGenericPipe)) { + return null; + } + LinkedList result = new LinkedList(); ArrayList stations = new ArrayList(); for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if (((TileGenericPipe) pipe).getStation(dir) != null) { - stations.add(((TileGenericPipe) pipe).getStation(dir)); + if (((TileGenericPipe) tile).getStation(dir) != null) { + stations.add(((TileGenericPipe) tile).getStation(dir)); } } @@ -55,32 +59,32 @@ public class RobotsActionProvider implements IActionProvider { result.add(BuildCraftSilicon.actionRobotFilter); result.add(BuildCraftSilicon.actionStationForbidRobot); - if (((TileGenericPipe) pipe).pipe.transport instanceof PipeTransportItems) { + if (((TileGenericPipe) tile).pipe.transport instanceof PipeTransportItems) { result.add(BuildCraftSilicon.actionStationDropInPipe); } for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - TileEntity tile = ((TileGenericPipe) pipe).getTile(dir); - Block block = ((TileGenericPipe) pipe).getBlock(dir); - - if (tile instanceof IInventory) { + TileEntity sideTile = ((TileGenericPipe) tile).getTile(dir); + Block sideBlock = ((TileGenericPipe) tile).getBlock(dir); + + if (sideTile instanceof IInventory) { result.add(BuildCraftSilicon.actionStationProvideItems); result.add(BuildCraftSilicon.actionStationRequestItems); result.add(BuildCraftSilicon.actionStationAcceptItems); } - if (tile instanceof IFluidHandler) { + if (sideTile instanceof IFluidHandler) { result.add(BuildCraftSilicon.actionStationAcceptFluids); result.add(BuildCraftSilicon.actionStationProvideFluids); } - if (tile instanceof IRequestProvider) { + if (sideTile instanceof IRequestProvider) { result.add(BuildCraftSilicon.actionStationMachineRequestItems); } - if (tile instanceof TileEntityFurnace - || tile instanceof TileAssemblyTable - || block instanceof BlockWorkbench) { + if (sideTile instanceof TileEntityFurnace + || sideTile instanceof TileAssemblyTable + || sideBlock instanceof BlockWorkbench) { result.add(BuildCraftSilicon.actionRobotAllowCraft); } } @@ -89,7 +93,7 @@ public class RobotsActionProvider implements IActionProvider { } @Override - public Collection getNeighborActions(ForgeDirection side, Block block, TileEntity tile) { + public Collection getExternalActions(ForgeDirection side, TileEntity tile) { return null; } diff --git a/common/buildcraft/silicon/statements/RobotsTriggerProvider.java b/common/buildcraft/silicon/statements/RobotsTriggerProvider.java index 0bd3bfd2..358a35a1 100755 --- a/common/buildcraft/silicon/statements/RobotsTriggerProvider.java +++ b/common/buildcraft/silicon/statements/RobotsTriggerProvider.java @@ -25,13 +25,17 @@ import buildcraft.transport.TileGenericPipe; public class RobotsTriggerProvider implements ITriggerProvider { @Override - public Collection getPipeTriggers(IPipeTile pipe) { + public Collection getInternalTriggers(TileEntity tile) { LinkedList result = new LinkedList(); + + if (!(tile instanceof TileGenericPipe)) { + return result; + } boolean stationFound = false; for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if (((TileGenericPipe) pipe).getStation(dir) != null) { + if (((TileGenericPipe) tile).getStation(dir) != null) { stationFound = true; break; } @@ -47,7 +51,7 @@ public class RobotsTriggerProvider implements ITriggerProvider { } @Override - public Collection getNeighborTriggers(ForgeDirection side, Block block, TileEntity tile) { + public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { return null; } diff --git a/common/buildcraft/silicon/statements/TriggerRobotSleep.java b/common/buildcraft/silicon/statements/TriggerRobotSleep.java index a89b0cae..eb9f0a6d 100755 --- a/common/buildcraft/silicon/statements/TriggerRobotSleep.java +++ b/common/buildcraft/silicon/statements/TriggerRobotSleep.java @@ -11,7 +11,7 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.gates.IGate; -import buildcraft.api.gates.ITriggerParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.core.robots.AIRobotSleep; import buildcraft.core.robots.DockingStation; import buildcraft.core.robots.EntityRobot; @@ -37,7 +37,7 @@ public class TriggerRobotSleep extends BCTrigger { } @Override - public boolean isTriggerActive(IGate gate, ITriggerParameter[] parameters) { + public boolean isTriggerActive(IGate gate, IStatementParameter[] parameters) { Pipe pipe = (Pipe) gate.getPipe(); TileGenericPipe tile = pipe.container; diff --git a/common/buildcraft/transport/Gate.java b/common/buildcraft/transport/Gate.java index 7a18c08d..afd319ef 100644 --- a/common/buildcraft/transport/Gate.java +++ b/common/buildcraft/transport/Gate.java @@ -25,14 +25,13 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.gates.GateExpansionController; import buildcraft.api.gates.IAction; -import buildcraft.api.gates.IActionParameter; import buildcraft.api.gates.IActionReceptor; import buildcraft.api.gates.IGate; import buildcraft.api.gates.IGateExpansion; +import buildcraft.api.gates.IStatementParameter; import buildcraft.api.gates.ITrigger; -import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.StatementManager; -import buildcraft.api.gates.TriggerParameterItemStack; +import buildcraft.api.gates.StatementParameterItemStack; import buildcraft.api.transport.IPipe; import buildcraft.api.transport.PipeWire; import buildcraft.core.GuiIds; @@ -56,10 +55,10 @@ public final class Gate implements IGate { public final BiMap expansions = HashBiMap.create(); public ITrigger[] triggers = new ITrigger[MAX_STATEMENTS]; - public ITriggerParameter[][] triggerParameters = new ITriggerParameter[8][MAX_PARAMETERS]; + public IStatementParameter[][] triggerParameters = new IStatementParameter[MAX_STATEMENTS][MAX_PARAMETERS]; public IAction[] actions = new IAction[MAX_STATEMENTS]; - public IActionParameter[][] actionParameters = new IActionParameter[8][MAX_PARAMETERS]; + public IStatementParameter[][] actionParameters = new IStatementParameter[MAX_STATEMENTS][MAX_PARAMETERS]; public ActionActiveState[] actionsState = new ActionActiveState[MAX_STATEMENTS]; public ArrayList activeActions = new ArrayList(); @@ -106,19 +105,19 @@ public final class Gate implements IGate { return actions[position]; } - public void setTriggerParameter(int trigger, int param, ITriggerParameter p) { + public void setTriggerParameter(int trigger, int param, IStatementParameter p) { triggerParameters[trigger][param] = p; } - public void setActionParameter(int action, int param, IActionParameter p) { + public void setActionParameter(int action, int param, IStatementParameter p) { actionParameters[action][param] = p; } - public ITriggerParameter getTriggerParameter(int trigger, int param) { + public IStatementParameter getTriggerParameter(int trigger, int param) { return triggerParameters[trigger][param]; } - public IActionParameter getActionParameter(int action, int param) { + public IStatementParameter getActionParameter(int action, int param) { return actionParameters[action][param]; } @@ -203,14 +202,14 @@ public final class Gate implements IGate { // This is for legacy trigger loading if (data.hasKey("triggerParameters[" + i + "]")) { - triggerParameters[i][0] = new TriggerParameterItemStack(); + triggerParameters[i][0] = new StatementParameterItemStack(); triggerParameters[i][0].readFromNBT(data.getCompoundTag("triggerParameters[" + i + "]")); } for (int j = 0; j < material.numTriggerParameters; ++j) { if (data.hasKey("triggerParameters[" + i + "][" + j + "]")) { NBTTagCompound cpt = data.getCompoundTag("triggerParameters[" + i + "][" + j + "]"); - triggerParameters[i][j] = (ITriggerParameter) StatementManager.createParameter(cpt.getString("kind")); + triggerParameters[i][j] = StatementManager.createParameter(cpt.getString("kind")); triggerParameters[i][j].readFromNBT(cpt); } } @@ -218,7 +217,7 @@ public final class Gate implements IGate { for (int j = 0; j < material.numActionParameters; ++j) { if (data.hasKey("actionParameters[" + i + "][" + j + "]")) { NBTTagCompound cpt = data.getCompoundTag("actionParameters[" + i + "][" + j + "]"); - actionParameters[i][j] = (IActionParameter) StatementManager.createParameter(cpt.getString("kind")); + actionParameters[i][j] = StatementManager.createParameter(cpt.getString("kind")); actionParameters[i][j].readFromNBT(cpt); } } @@ -394,7 +393,7 @@ public final class Gate implements IGate { actionsState[it] = ActionActiveState.Deactivated; ITrigger trigger = triggers[it]; - ITriggerParameter[] parameter = triggerParameters[it]; + IStatementParameter[] parameter = triggerParameters[it]; if (trigger != null) { if (isTriggerActive(trigger, parameter)) { @@ -504,7 +503,7 @@ public final class Gate implements IGate { return false; } - public boolean isTriggerActive(ITrigger trigger, ITriggerParameter[] parameters) { + public boolean isTriggerActive(ITrigger trigger, IStatementParameter[] parameters) { if (trigger == null) { return false; } @@ -516,7 +515,7 @@ public final class Gate implements IGate { // TODO: This can probably be refactored with regular triggers instead // of yet another system. for (GateExpansionController expansion : expansions.values()) { - if (expansion.isTriggerActive(trigger, parameters[0])) { + if (expansion.isTriggerActive(trigger, parameters)) { return true; } } @@ -540,12 +539,12 @@ public final class Gate implements IGate { public List getAllValidTriggers() { ArrayList allTriggers = new ArrayList(64); - allTriggers.addAll(StatementManager.getPipeTriggers(pipe.container)); + allTriggers.addAll(StatementManager.getInternalTriggers(pipe.container)); for (ForgeDirection o : ForgeDirection.VALID_DIRECTIONS) { TileEntity tile = pipe.container.getTile(o); Block block = pipe.container.getBlock(o); - allTriggers.addAll(StatementManager.getNeighborTriggers(o, block, tile)); + allTriggers.addAll(StatementManager.getExternalTriggers(o, tile)); } return allTriggers; @@ -566,12 +565,12 @@ public final class Gate implements IGate { public List getAllValidActions() { ArrayList allActions = new ArrayList(64); - allActions.addAll(StatementManager.getPipeActions(pipe.container)); + allActions.addAll(StatementManager.getInternalActions(pipe.container)); for (ForgeDirection o : ForgeDirection.VALID_DIRECTIONS) { TileEntity tile = pipe.container.getTile(o); Block block = pipe.container.getBlock(o); - allActions.addAll(StatementManager.getNeighborActions(o, block, tile)); + allActions.addAll(StatementManager.getExternalActions(o, tile)); } return allActions; diff --git a/common/buildcraft/transport/PipeActionProvider.java b/common/buildcraft/transport/PipeActionProvider.java index 4668ed32..f3a5dd33 100644 --- a/common/buildcraft/transport/PipeActionProvider.java +++ b/common/buildcraft/transport/PipeActionProvider.java @@ -13,7 +13,7 @@ import buildcraft.api.transport.IPipeTile; public class PipeActionProvider implements IActionProvider { @Override - public Collection getPipeActions(IPipeTile tile) { + public Collection getInternalActions(TileEntity tile) { LinkedList result = new LinkedList(); Pipe pipe = null; if (tile instanceof TileGenericPipe) { @@ -36,7 +36,7 @@ public class PipeActionProvider implements IActionProvider { } @Override - public Collection getNeighborActions(ForgeDirection side, Block block, TileEntity tile) { + public Collection getExternalActions(ForgeDirection side, TileEntity tile) { return null; } diff --git a/common/buildcraft/transport/PipeTriggerProvider.java b/common/buildcraft/transport/PipeTriggerProvider.java index 98ef95a8..81686527 100644 --- a/common/buildcraft/transport/PipeTriggerProvider.java +++ b/common/buildcraft/transport/PipeTriggerProvider.java @@ -23,7 +23,7 @@ import buildcraft.transport.statements.TriggerPipeContents; public class PipeTriggerProvider implements ITriggerProvider { @Override - public LinkedList getPipeTriggers(IPipeTile tile) { + public LinkedList getInternalTriggers(TileEntity tile) { LinkedList result = new LinkedList(); Pipe pipe = null; if (tile instanceof TileGenericPipe) { @@ -46,7 +46,7 @@ public class PipeTriggerProvider implements ITriggerProvider { result.add(BuildCraftCore.triggerRedstoneActive); result.add(BuildCraftCore.triggerRedstoneInactive); - switch (tile.getPipeType()) { + switch (((TileGenericPipe) tile).getPipeType()) { case ITEM: result.add(TriggerPipeContents.PipeContents.empty.trigger); result.add(TriggerPipeContents.PipeContents.containsItems.trigger); @@ -74,7 +74,7 @@ public class PipeTriggerProvider implements ITriggerProvider { } @Override - public LinkedList getNeighborTriggers(ForgeDirection side, Block block, TileEntity tile) { + public LinkedList getExternalTriggers(ForgeDirection side, TileEntity tile) { return null; } } diff --git a/common/buildcraft/transport/gates/ActionSlot.java b/common/buildcraft/transport/gates/ActionSlot.java index 7bf26d66..90c6a049 100755 --- a/common/buildcraft/transport/gates/ActionSlot.java +++ b/common/buildcraft/transport/gates/ActionSlot.java @@ -9,9 +9,9 @@ package buildcraft.transport.gates; import buildcraft.api.gates.IAction; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.IStatementParameter; public class ActionSlot { public IAction action; - public IActionParameter[] parameters; + public IStatementParameter[] parameters; } diff --git a/common/buildcraft/transport/gates/GateExpansionTimer.java b/common/buildcraft/transport/gates/GateExpansionTimer.java index f21168db..cd2d04fe 100644 --- a/common/buildcraft/transport/gates/GateExpansionTimer.java +++ b/common/buildcraft/transport/gates/GateExpansionTimer.java @@ -15,8 +15,8 @@ import buildcraft.BuildCraftTransport; import buildcraft.api.gates.GateExpansionController; import buildcraft.api.gates.IGate; import buildcraft.api.gates.IGateExpansion; +import buildcraft.api.gates.IStatementParameter; import buildcraft.api.gates.ITrigger; -import buildcraft.api.gates.ITriggerParameter; import buildcraft.transport.statements.TriggerClockTimer; import buildcraft.transport.statements.TriggerClockTimer.Time; @@ -67,12 +67,12 @@ public final class GateExpansionTimer extends GateExpansionBuildcraft implements } @Override - public boolean isTriggerActive(ITrigger trigger, ITriggerParameter parameter) { + public boolean isTriggerActive(ITrigger trigger, IStatementParameter[] parameters) { if (trigger instanceof TriggerClockTimer) { TriggerClockTimer timerTrigger = (TriggerClockTimer) trigger; return timers[timerTrigger.time.ordinal()].isActive(); } - return super.isTriggerActive(trigger, parameter); + return super.isTriggerActive(trigger, parameters); } @Override diff --git a/common/buildcraft/transport/gui/ContainerGateInterface.java b/common/buildcraft/transport/gui/ContainerGateInterface.java index baac2933..cc68e49e 100644 --- a/common/buildcraft/transport/gui/ContainerGateInterface.java +++ b/common/buildcraft/transport/gui/ContainerGateInterface.java @@ -21,10 +21,10 @@ import net.minecraft.inventory.Slot; import net.minecraft.util.ResourceLocation; import buildcraft.api.gates.IAction; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.api.gates.IStatement; import buildcraft.api.gates.ITrigger; -import buildcraft.api.gates.ITriggerParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.api.gates.StatementManager; import buildcraft.core.gui.BuildCraftContainer; import buildcraft.core.network.RPC; @@ -320,7 +320,7 @@ public class ContainerGateInterface extends BuildCraftContainer { } @RPC(RPCSide.BOTH) - public void setTriggerParameter(int trigger, int param, ITriggerParameter parameter, boolean notifyServer) { + public void setTriggerParameter(int trigger, int param, IStatementParameter parameter, boolean notifyServer) { if (gate == null) { return; } @@ -332,7 +332,7 @@ public class ContainerGateInterface extends BuildCraftContainer { } } - public ITriggerParameter getTriggerParameter(int trigger, int param) { + public IStatementParameter getTriggerParameter(int trigger, int param) { if (gate == null) { return null; } else { @@ -385,7 +385,7 @@ public class ContainerGateInterface extends BuildCraftContainer { } @RPC(RPCSide.BOTH) - public void setActionParameter(int action, int param, IActionParameter parameter, boolean notifyServer) { + public void setActionParameter(int action, int param, IStatementParameter parameter, boolean notifyServer) { if (gate == null) { return; } diff --git a/common/buildcraft/transport/gui/GuiGateInterface.java b/common/buildcraft/transport/gui/GuiGateInterface.java index 714b0cfe..defc2334 100644 --- a/common/buildcraft/transport/gui/GuiGateInterface.java +++ b/common/buildcraft/transport/gui/GuiGateInterface.java @@ -22,11 +22,11 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import buildcraft.api.gates.IAction; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.api.gates.IStatement; import buildcraft.api.gates.IStatementParameter; import buildcraft.api.gates.ITrigger; -import buildcraft.api.gates.ITriggerParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.core.gui.AdvancedSlot; import buildcraft.core.gui.GuiAdvancedInterface; import buildcraft.core.utils.StringUtils; @@ -183,7 +183,7 @@ public class GuiGateInterface extends GuiAdvancedInterface { @Override public void setParameter(IStatementParameter param, boolean notifyServer) { - container.setTriggerParameter(statementSlot.slot, slot, (ITriggerParameter) param, notifyServer); + container.setTriggerParameter(statementSlot.slot, slot, (IStatementParameter) param, notifyServer); } } @@ -199,7 +199,7 @@ public class GuiGateInterface extends GuiAdvancedInterface { @Override public void setParameter(IStatementParameter param, boolean notifyServer) { - container.setActionParameter(statementSlot.slot, slot, (IActionParameter) param, notifyServer); + container.setActionParameter(statementSlot.slot, slot, (IStatementParameter) param, notifyServer); } } diff --git a/common/buildcraft/transport/statements/ActionParameterSignal.java b/common/buildcraft/transport/statements/ActionParameterSignal.java index 813e91f4..198cb0d7 100644 --- a/common/buildcraft/transport/statements/ActionParameterSignal.java +++ b/common/buildcraft/transport/statements/ActionParameterSignal.java @@ -15,7 +15,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import buildcraft.api.core.NetworkData; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.api.gates.IStatement; import buildcraft.api.gates.IStatementParameter; import buildcraft.api.transport.IPipe; @@ -24,7 +24,7 @@ import buildcraft.api.transport.PipeWire; import buildcraft.core.statements.StatementIconProvider; import buildcraft.core.utils.StringUtils; -public class ActionParameterSignal implements IActionParameter { +public class ActionParameterSignal implements IStatementParameter { @NetworkData public PipeWire color = null; diff --git a/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java b/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java index 4dc871bc..83b8d44b 100644 --- a/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java +++ b/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java @@ -12,7 +12,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.core.statements.BCActionPassive; import buildcraft.core.statements.StatementParameterRedstoneGateSideOnly; import buildcraft.core.utils.StringUtils; @@ -45,8 +45,8 @@ public class ActionRedstoneFaderOutput extends BCActionPassive { } @Override - public IActionParameter createParameter(int index) { - IActionParameter param = null; + public IStatementParameter createParameter(int index) { + IStatementParameter param = null; if (index == 0) { param = new StatementParameterRedstoneGateSideOnly(); diff --git a/common/buildcraft/transport/statements/ActionSignalOutput.java b/common/buildcraft/transport/statements/ActionSignalOutput.java index 3c2af707..fea3f2c1 100644 --- a/common/buildcraft/transport/statements/ActionSignalOutput.java +++ b/common/buildcraft/transport/statements/ActionSignalOutput.java @@ -10,7 +10,7 @@ package buildcraft.transport.statements; import java.util.Locale; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.api.gates.IGate; import buildcraft.api.transport.PipeWire; import buildcraft.core.statements.BCActionActive; @@ -54,17 +54,17 @@ public class ActionSignalOutput extends BCActionActive { } @Override - public IActionParameter createParameter(int index) { + public IStatementParameter createParameter(int index) { return new ActionParameterSignal(); } @Override - public void actionActivate(IGate iGate, IActionParameter[] parameters) { + public void actionActivate(IGate iGate, IStatementParameter[] parameters) { Gate gate = (Gate) iGate; gate.broadcastSignal(color); - for (IActionParameter param : parameters) { + for (IStatementParameter param : parameters) { if (param != null) { ActionParameterSignal signal = (ActionParameterSignal) param; diff --git a/common/buildcraft/transport/statements/ActionValve.java b/common/buildcraft/transport/statements/ActionValve.java index c96f2c42..60675153 100644 --- a/common/buildcraft/transport/statements/ActionValve.java +++ b/common/buildcraft/transport/statements/ActionValve.java @@ -12,7 +12,7 @@ import java.util.Locale; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.gates.IActionParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.api.gates.IGate; import buildcraft.api.transport.IPipe; import buildcraft.core.statements.BCActionActive; @@ -68,8 +68,8 @@ public class ActionValve extends BCActionActive { } @Override - public IActionParameter createParameter(int index) { - IActionParameter param = null; + public IStatementParameter createParameter(int index) { + IStatementParameter param = null; if (index == 0) { param = new StatementParameterDirection(); @@ -79,7 +79,7 @@ public class ActionValve extends BCActionActive { } @Override - public void actionActivate(IGate gate, IActionParameter[] parameters) { + public void actionActivate(IGate gate, IStatementParameter[] parameters) { IPipe pipe = gate.getPipe(); if (pipe != null && pipe instanceof Pipe) { diff --git a/common/buildcraft/transport/statements/TriggerParameterSignal.java b/common/buildcraft/transport/statements/TriggerParameterSignal.java index 74d64849..aefb551b 100644 --- a/common/buildcraft/transport/statements/TriggerParameterSignal.java +++ b/common/buildcraft/transport/statements/TriggerParameterSignal.java @@ -17,13 +17,13 @@ import net.minecraft.util.IIcon; import buildcraft.api.core.NetworkData; import buildcraft.api.gates.IStatement; import buildcraft.api.gates.IStatementParameter; -import buildcraft.api.gates.ITriggerParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.PipeWire; import buildcraft.core.statements.StatementIconProvider; import buildcraft.core.utils.StringUtils; -public class TriggerParameterSignal implements ITriggerParameter { +public class TriggerParameterSignal implements IStatementParameter { @NetworkData public boolean active = false; diff --git a/common/buildcraft/transport/statements/TriggerPipeContents.java b/common/buildcraft/transport/statements/TriggerPipeContents.java index c41ab249..ac5fdfb4 100644 --- a/common/buildcraft/transport/statements/TriggerPipeContents.java +++ b/common/buildcraft/transport/statements/TriggerPipeContents.java @@ -18,7 +18,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import buildcraft.api.gates.IGate; -import buildcraft.api.gates.ITriggerParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.core.inventory.StackHelper; import buildcraft.core.statements.BCTrigger; import buildcraft.core.utils.StringUtils; @@ -64,9 +64,9 @@ public class TriggerPipeContents extends BCTrigger { } @Override - public boolean isTriggerActive(IGate gate, ITriggerParameter[] parameters) { + public boolean isTriggerActive(IGate gate, IStatementParameter[] parameters) { Pipe pipe = (Pipe) gate.getPipe(); - ITriggerParameter parameter = parameters[0]; + IStatementParameter parameter = parameters[0]; if (pipe.transport instanceof PipeTransportItems) { PipeTransportItems transportItems = (PipeTransportItems) pipe.transport; diff --git a/common/buildcraft/transport/statements/TriggerPipeSignal.java b/common/buildcraft/transport/statements/TriggerPipeSignal.java index b669bf53..63c7b21f 100644 --- a/common/buildcraft/transport/statements/TriggerPipeSignal.java +++ b/common/buildcraft/transport/statements/TriggerPipeSignal.java @@ -11,7 +11,7 @@ package buildcraft.transport.statements; import java.util.Locale; import buildcraft.api.gates.IGate; -import buildcraft.api.gates.ITriggerParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.api.transport.PipeWire; import buildcraft.core.statements.BCTrigger; import buildcraft.core.statements.StatementIconProvider; @@ -42,7 +42,7 @@ public class TriggerPipeSignal extends BCTrigger { } @Override - public boolean isTriggerActive(IGate gate, ITriggerParameter[] parameters) { + public boolean isTriggerActive(IGate gate, IStatementParameter[] parameters) { Pipe pipe = (Pipe) gate.getPipe(); if (active) { @@ -55,7 +55,7 @@ public class TriggerPipeSignal extends BCTrigger { } } - for (ITriggerParameter param : parameters) { + for (IStatementParameter param : parameters) { if (param != null) { TriggerParameterSignal signal = (TriggerParameterSignal) param; @@ -106,7 +106,7 @@ public class TriggerPipeSignal extends BCTrigger { } @Override - public ITriggerParameter createParameter(int index) { + public IStatementParameter createParameter(int index) { return new TriggerParameterSignal(); } } diff --git a/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java b/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java index f81e498b..d3245ea7 100644 --- a/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java +++ b/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java @@ -12,7 +12,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import buildcraft.api.gates.IGate; -import buildcraft.api.gates.ITriggerParameter; +import buildcraft.api.gates.IStatementParameter; import buildcraft.core.statements.BCTrigger; import buildcraft.core.statements.StatementParameterRedstoneGateSideOnly; import buildcraft.core.utils.StringUtils; @@ -34,7 +34,7 @@ public class TriggerRedstoneFaderInput extends BCTrigger { } @Override - public boolean isTriggerActive(IGate gate, ITriggerParameter[] parameters) { + public boolean isTriggerActive(IGate gate, IStatementParameter[] parameters) { TileGenericPipe tile = (TileGenericPipe) gate.getPipe().getTile(); int inputLevel = tile.redstoneInput; if (parameters.length > 0 && parameters[0] instanceof StatementParameterRedstoneGateSideOnly && @@ -52,8 +52,8 @@ public class TriggerRedstoneFaderInput extends BCTrigger { } @Override - public ITriggerParameter createParameter(int index) { - ITriggerParameter param = null; + public IStatementParameter createParameter(int index) { + IStatementParameter param = null; if (index == 0) { param = new StatementParameterRedstoneGateSideOnly();