Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

triggers -> statements

Browse source
This commit is contained in:
asiekierka 2014-10-26 13:20:08 +01:00
parent 5fde18014b
commit 626709a806
71 changed files with 137 additions and 196 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/buildcraft/BuildCraftBuilders.java
View file

@ -109,8 +109,8 @@ import buildcraft.builders.schematics.SchematicStone;
import buildcraft.builders.schematics.SchematicTileCreative; import buildcraft.builders.schematics.SchematicTileCreative;
import buildcraft.builders.schematics.SchematicTripWireHook; import buildcraft.builders.schematics.SchematicTripWireHook;
import buildcraft.builders.schematics.SchematicWallSide; import buildcraft.builders.schematics.SchematicWallSide;
import buildcraft.builders.triggers.ActionFiller; import buildcraft.builders.statements.ActionFiller;
import buildcraft.builders.triggers.BuildersActionProvider; import buildcraft.builders.statements.BuildersActionProvider;
import buildcraft.builders.urbanism.BlockUrbanist; import buildcraft.builders.urbanism.BlockUrbanist;
import buildcraft.builders.urbanism.TileUrbanist; import buildcraft.builders.urbanism.TileUrbanist;
import buildcraft.builders.urbanism.UrbanistToolsIconProvider; import buildcraft.builders.urbanism.UrbanistToolsIconProvider;

28
common/buildcraft/BuildCraftCore.java
View file

@ -95,20 +95,20 @@ import buildcraft.core.recipes.IntegrationRecipeManager;
import buildcraft.core.recipes.RefineryRecipeManager; import buildcraft.core.recipes.RefineryRecipeManager;
import buildcraft.core.render.BlockHighlightHandler; import buildcraft.core.render.BlockHighlightHandler;
import buildcraft.core.robots.EntityRobot; import buildcraft.core.robots.EntityRobot;
import buildcraft.core.triggers.ActionMachineControl; import buildcraft.core.statements.ActionMachineControl;
import buildcraft.core.triggers.ActionMachineControl.Mode; import buildcraft.core.statements.ActionRedstoneOutput;
import buildcraft.core.triggers.ActionRedstoneOutput; import buildcraft.core.statements.DefaultActionProvider;
import buildcraft.core.triggers.DefaultActionProvider; import buildcraft.core.statements.DefaultTriggerProvider;
import buildcraft.core.triggers.DefaultTriggerProvider; import buildcraft.core.statements.StatementIconProvider;
import buildcraft.core.triggers.StatementIconProvider; import buildcraft.core.statements.StatementParameterDirection;
import buildcraft.core.triggers.StatementParameterDirection; import buildcraft.core.statements.TriggerEnergy;
import buildcraft.core.triggers.TriggerEnergy; import buildcraft.core.statements.TriggerFluidContainer;
import buildcraft.core.triggers.TriggerFluidContainer; import buildcraft.core.statements.TriggerFluidContainerLevel;
import buildcraft.core.triggers.TriggerFluidContainerLevel; import buildcraft.core.statements.TriggerInventory;
import buildcraft.core.triggers.TriggerInventory; import buildcraft.core.statements.TriggerInventoryLevel;
import buildcraft.core.triggers.TriggerInventoryLevel; import buildcraft.core.statements.TriggerMachine;
import buildcraft.core.triggers.TriggerMachine; import buildcraft.core.statements.TriggerRedstoneInput;
import buildcraft.core.triggers.TriggerRedstoneInput; import buildcraft.core.statements.ActionMachineControl.Mode;
import buildcraft.core.utils.CraftingHandler; import buildcraft.core.utils.CraftingHandler;
import buildcraft.core.utils.WorldPropertyIsDirt; import buildcraft.core.utils.WorldPropertyIsDirt;
import buildcraft.core.utils.WorldPropertyIsFarmland; import buildcraft.core.utils.WorldPropertyIsFarmland;

2
common/buildcraft/BuildCraftEnergy.java
View file

@ -68,7 +68,7 @@ import buildcraft.energy.TileEnergyEmitter;
import buildcraft.energy.TileEnergyReceiver; import buildcraft.energy.TileEnergyReceiver;
import buildcraft.energy.TileEngine; import buildcraft.energy.TileEngine;
import buildcraft.energy.TileEngine.EnergyStage; import buildcraft.energy.TileEngine.EnergyStage;
import buildcraft.energy.triggers.TriggerEngineHeat; import buildcraft.energy.statements.TriggerEngineHeat;
import buildcraft.energy.worldgen.BiomeGenOilDesert; import buildcraft.energy.worldgen.BiomeGenOilDesert;
import buildcraft.energy.worldgen.BiomeGenOilOcean; import buildcraft.energy.worldgen.BiomeGenOilOcean;
import buildcraft.energy.worldgen.BiomeInitializer; import buildcraft.energy.worldgen.BiomeInitializer;

36
common/buildcraft/BuildCraftTransport.java
View file

@ -118,28 +118,28 @@ import buildcraft.transport.schematics.BptItemPipeFilters;
import buildcraft.transport.schematics.BptPipeIron; import buildcraft.transport.schematics.BptPipeIron;
import buildcraft.transport.schematics.BptPipeWooden; import buildcraft.transport.schematics.BptPipeWooden;
import buildcraft.transport.schematics.SchematicPipe; import buildcraft.transport.schematics.SchematicPipe;
import buildcraft.transport.statements.ActionEnergyPulsar;
import buildcraft.transport.statements.ActionExtractionPreset;
import buildcraft.transport.statements.ActionParameterSignal;
import buildcraft.transport.statements.ActionPipeColor;
import buildcraft.transport.statements.ActionPipeDirection;
import buildcraft.transport.statements.ActionPowerLimiter;
import buildcraft.transport.statements.ActionRedstoneFaderOutput;
import buildcraft.transport.statements.ActionSignalOutput;
import buildcraft.transport.statements.ActionSingleEnergyPulse;
import buildcraft.transport.statements.ActionValve;
import buildcraft.transport.statements.TriggerClockTimer;
import buildcraft.transport.statements.TriggerParameterSignal;
import buildcraft.transport.statements.TriggerPipeContents;
import buildcraft.transport.statements.TriggerPipeSignal;
import buildcraft.transport.statements.TriggerRedstoneFaderInput;
import buildcraft.transport.statements.ActionValve.ValveState;
import buildcraft.transport.statements.TriggerClockTimer.Time;
import buildcraft.transport.statements.TriggerPipeContents.PipeContents;
import buildcraft.transport.stripes.StripesHandlerArrow; import buildcraft.transport.stripes.StripesHandlerArrow;
import buildcraft.transport.stripes.StripesHandlerBucket; import buildcraft.transport.stripes.StripesHandlerBucket;
import buildcraft.transport.stripes.StripesHandlerRightClick; import buildcraft.transport.stripes.StripesHandlerRightClick;
import buildcraft.transport.stripes.StripesHandlerShears; import buildcraft.transport.stripes.StripesHandlerShears;
import buildcraft.transport.triggers.ActionEnergyPulsar;
import buildcraft.transport.triggers.ActionExtractionPreset;
import buildcraft.transport.triggers.ActionParameterSignal;
import buildcraft.transport.triggers.ActionPipeColor;
import buildcraft.transport.triggers.ActionPipeDirection;
import buildcraft.transport.triggers.ActionPowerLimiter;
import buildcraft.transport.triggers.ActionRedstoneFaderOutput;
import buildcraft.transport.triggers.ActionSignalOutput;
import buildcraft.transport.triggers.ActionSingleEnergyPulse;
import buildcraft.transport.triggers.ActionValve;
import buildcraft.transport.triggers.ActionValve.ValveState;
import buildcraft.transport.triggers.TriggerClockTimer;
import buildcraft.transport.triggers.TriggerClockTimer.Time;
import buildcraft.transport.triggers.TriggerParameterSignal;
import buildcraft.transport.triggers.TriggerPipeContents;
import buildcraft.transport.triggers.TriggerPipeContents.PipeContents;
import buildcraft.transport.triggers.TriggerPipeSignal;
import buildcraft.transport.triggers.TriggerRedstoneFaderInput;
@Mod(version = Version.VERSION, modid = "BuildCraft|Transport", name = "Buildcraft Transport", dependencies = DefaultProps.DEPENDENCY_CORE) @Mod(version = Version.VERSION, modid = "BuildCraft|Transport", name = "Buildcraft Transport", dependencies = DefaultProps.DEPENDENCY_CORE)
public class BuildCraftTransport extends BuildCraftMod { public class BuildCraftTransport extends BuildCraftMod {

6
common/buildcraft/builders/TileFiller.java
View file

@ -20,7 +20,7 @@ import buildcraft.api.core.IAreaProvider;
import buildcraft.api.filler.FillerManager; import buildcraft.api.filler.FillerManager;
import buildcraft.api.gates.IAction; import buildcraft.api.gates.IAction;
import buildcraft.api.gates.IActionReceptor; import buildcraft.api.gates.IActionReceptor;
import buildcraft.builders.triggers.ActionFiller; import buildcraft.builders.statements.ActionFiller;
import buildcraft.core.Box; import buildcraft.core.Box;
import buildcraft.core.Box.Kind; import buildcraft.core.Box.Kind;
import buildcraft.core.IMachine; import buildcraft.core.IMachine;
@ -35,8 +35,8 @@ import buildcraft.core.network.PacketUpdate;
import buildcraft.core.network.RPC; import buildcraft.core.network.RPC;
import buildcraft.core.network.RPCHandler; import buildcraft.core.network.RPCHandler;
import buildcraft.core.network.RPCSide; import buildcraft.core.network.RPCSide;
import buildcraft.core.triggers.ActionMachineControl; import buildcraft.core.statements.ActionMachineControl;
import buildcraft.core.triggers.ActionMachineControl.Mode; import buildcraft.core.statements.ActionMachineControl.Mode;
import buildcraft.core.utils.Utils; import buildcraft.core.utils.Utils;
public class TileFiller extends TileAbstractBuilder implements IMachine, IActionReceptor { public class TileFiller extends TileAbstractBuilder implements IMachine, IActionReceptor {

4
common/buildcraft/builders/triggers/ActionFiller.java → common/buildcraft/builders/statements/ActionFiller.java
View file

@ -6,11 +6,11 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.builders.triggers; package buildcraft.builders.statements;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import buildcraft.core.builders.patterns.FillerPattern; import buildcraft.core.builders.patterns.FillerPattern;
import buildcraft.core.triggers.BCActionPassive; import buildcraft.core.statements.BCActionPassive;
public class ActionFiller extends BCActionPassive { public class ActionFiller extends BCActionPassive {

2
common/buildcraft/builders/triggers/BuildersActionProvider.java → common/buildcraft/builders/statements/BuildersActionProvider.java
View file

@ -6,7 +6,7 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.builders.triggers; package buildcraft.builders.statements;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;

10
common/buildcraft/core/blueprints/BlueprintBase.java
View file

@ -23,7 +23,7 @@ import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.api.blueprints.BuildingPermission; import buildcraft.api.blueprints.BuildingPermission;
import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.IBuilderContext;
import buildcraft.api.blueprints.MappingRegistry; import buildcraft.api.blueprints.MappingRegistry;
import buildcraft.api.blueprints.SchematicBlockBase; import buildcraft.api.blueprints.SchematicBlockShaped;
import buildcraft.api.blueprints.Translation; import buildcraft.api.blueprints.Translation;
import buildcraft.api.core.BCLog; import buildcraft.api.core.BCLog;
import buildcraft.api.core.Position; import buildcraft.api.core.Position;
@ -36,7 +36,7 @@ public abstract class BlueprintBase {
public ArrayList<NBTTagCompound> subBlueprintsNBT = new ArrayList<NBTTagCompound>(); public ArrayList<NBTTagCompound> subBlueprintsNBT = new ArrayList<NBTTagCompound>();
public SchematicBlockBase[][][] contents; public SchematicBlockShaped[][][] contents;
public int anchorX, anchorY, anchorZ; public int anchorX, anchorY, anchorZ;
public int sizeX, sizeY, sizeZ; public int sizeX, sizeY, sizeZ;
public BlueprintId id = new BlueprintId(); public BlueprintId id = new BlueprintId();
@ -56,7 +56,7 @@ public abstract class BlueprintBase {
} }
public BlueprintBase(int sizeX, int sizeY, int sizeZ) { public BlueprintBase(int sizeX, int sizeY, int sizeZ) {
contents = new SchematicBlockBase[sizeX][sizeY][sizeZ]; contents = new SchematicBlockShaped[sizeX][sizeY][sizeZ];
this.sizeX = sizeX; this.sizeX = sizeX;
this.sizeY = sizeY; this.sizeY = sizeY;
@ -92,7 +92,7 @@ public abstract class BlueprintBase {
} }
public void rotateLeft(BptContext context) { public void rotateLeft(BptContext context) {
SchematicBlockBase[][][] newContents = new SchematicBlockBase[sizeZ][sizeY][sizeX]; SchematicBlockShaped[][][] newContents = new SchematicBlockShaped[sizeZ][sizeY][sizeX];
for (int x = 0; x < sizeZ; ++x) { for (int x = 0; x < sizeZ; ++x) {
for (int y = 0; y < sizeY; ++y) { for (int y = 0; y < sizeY; ++y) {
@ -218,7 +218,7 @@ public abstract class BlueprintBase {
excavate = true; excavate = true;
} }
contents = new SchematicBlockBase[sizeX][sizeY][sizeZ]; contents = new SchematicBlockShaped[sizeX][sizeY][sizeZ];
try { try {
loadContents(nbt); loadContents(nbt);

6
common/buildcraft/core/blueprints/BptBuilderTemplate.java
View file

@ -14,7 +14,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.blueprints.BuilderAPI;
import buildcraft.api.blueprints.SchematicBlockBase; import buildcraft.api.blueprints.SchematicBlockShaped;
import buildcraft.api.core.BlockIndex; import buildcraft.api.core.BlockIndex;
import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.core.BuildCraftAPI;
import buildcraft.api.core.IInvSlot; import buildcraft.api.core.IInvSlot;
@ -49,7 +49,7 @@ public class BptBuilderTemplate extends BptBuilderBase {
continue; continue;
} }
SchematicBlockBase slot = blueprint.contents[i][j][k]; SchematicBlockShaped slot = blueprint.contents[i][j][k];
if (slot == null if (slot == null
&& !clearedLocations.contains(new BlockIndex( && !clearedLocations.contains(new BlockIndex(
@ -81,7 +81,7 @@ public class BptBuilderTemplate extends BptBuilderBase {
continue; continue;
} }
SchematicBlockBase slot = blueprint.contents[i][j][k]; SchematicBlockShaped slot = blueprint.contents[i][j][k];
if (slot != null && !builtLocations.contains(new BlockIndex(xCoord, yCoord, zCoord))) { if (slot != null && !builtLocations.contains(new BlockIndex(xCoord, yCoord, zCoord))) {
BuildingSlotBlock b = new BuildingSlotBlock(); BuildingSlotBlock b = new BuildingSlotBlock();

8
common/buildcraft/core/builders/BuildingSlotBlock.java
View file

@ -18,7 +18,7 @@ import net.minecraftforge.common.util.Constants;
import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.IBuilderContext;
import buildcraft.api.blueprints.MappingNotFoundException; import buildcraft.api.blueprints.MappingNotFoundException;
import buildcraft.api.blueprints.MappingRegistry; import buildcraft.api.blueprints.MappingRegistry;
import buildcraft.api.blueprints.SchematicBlockBase; import buildcraft.api.blueprints.SchematicBlockShaped;
import buildcraft.api.blueprints.SchematicFactory; import buildcraft.api.blueprints.SchematicFactory;
import buildcraft.api.blueprints.SchematicMask; import buildcraft.api.blueprints.SchematicMask;
import buildcraft.api.core.Position; import buildcraft.api.core.Position;
@ -26,7 +26,7 @@ import buildcraft.api.core.Position;
public class BuildingSlotBlock extends BuildingSlot { public class BuildingSlotBlock extends BuildingSlot {
public int x, y, z; public int x, y, z;
public SchematicBlockBase schematic; public SchematicBlockShaped schematic;
public enum Mode { public enum Mode {
ClearIfInvalid, Build ClearIfInvalid, Build
@ -37,7 +37,7 @@ public class BuildingSlotBlock extends BuildingSlot {
public int buildStage = 0; public int buildStage = 0;
@Override @Override
public SchematicBlockBase getSchematic () { public SchematicBlockShaped getSchematic () {
if (schematic == null) { if (schematic == null) {
return new SchematicMask(false); return new SchematicMask(false);
} else { } else {
@ -145,7 +145,7 @@ public class BuildingSlotBlock extends BuildingSlot {
z = nbt.getInteger("z"); z = nbt.getInteger("z");
if (nbt.hasKey("schematic")) { if (nbt.hasKey("schematic")) {
schematic = (SchematicBlockBase) SchematicFactory schematic = (SchematicBlockShaped) SchematicFactory
.createSchematicFromWorldNBT(nbt.getCompoundTag("schematic"), registry); .createSchematicFromWorldNBT(nbt.getCompoundTag("schematic"), registry);
} }

2
common/buildcraft/core/triggers/ActionMachineControl.java → common/buildcraft/core/statements/ActionMachineControl.java
View file

@ -6,7 +6,7 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.core.triggers; package buildcraft.core.statements;
import java.util.Locale; import java.util.Locale;

2
common/buildcraft/core/triggers/ActionRedstoneOutput.java → common/buildcraft/core/statements/ActionRedstoneOutput.java
View file

@ -6,7 +6,7 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.core.triggers; package buildcraft.core.statements;
public class ActionRedstoneOutput extends BCActionPassive { public class ActionRedstoneOutput extends BCActionPassive {

2
common/buildcraft/core/triggers/BCActionActive.java → common/buildcraft/core/statements/BCActionActive.java
View file

@ -6,7 +6,7 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.core.triggers; package buildcraft.core.statements;
import buildcraft.api.gates.IAction; import buildcraft.api.gates.IAction;
import buildcraft.api.gates.IActionParameter; import buildcraft.api.gates.IActionParameter;

2
common/buildcraft/core/triggers/BCActionPassive.java → common/buildcraft/core/statements/BCActionPassive.java
View file

@ -6,7 +6,7 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.core.triggers; package buildcraft.core.statements;
import buildcraft.api.gates.IAction; import buildcraft.api.gates.IAction;
import buildcraft.api.gates.IActionParameter; import buildcraft.api.gates.IActionParameter;

2
common/buildcraft/core/triggers/BCStatement.java → common/buildcraft/core/statements/BCStatement.java
View file

@ -6,7 +6,7 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.core.triggers; package buildcraft.core.statements;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;

2
common/buildcraft/core/triggers/BCTrigger.java → common/buildcraft/core/statements/BCTrigger.java
View file

@ -6,7 +6,7 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.core.triggers; package buildcraft.core.statements;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;

2
common/buildcraft/core/triggers/DefaultActionProvider.java → common/buildcraft/core/statements/DefaultActionProvider.java
View file

@ -6,7 +6,7 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.core.triggers; package buildcraft.core.statements;
import java.util.Collection; import java.util.Collection;
import java.util.LinkedList; import java.util.LinkedList;

2
common/buildcraft/core/triggers/DefaultTriggerProvider.java → common/buildcraft/core/statements/DefaultTriggerProvider.java
View file

@ -6,7 +6,7 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.core.triggers; package buildcraft.core.statements;
import java.util.LinkedList; import java.util.LinkedList;

2
common/buildcraft/core/triggers/StatementIconProvider.java → common/buildcraft/core/statements/StatementIconProvider.java
View file

@ -6,7 +6,7 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.core.triggers; package buildcraft.core.statements;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;

2
common/buildcraft/core/triggers/StatementParameterDirection.java → common/buildcraft/core/statements/StatementParameterDirection.java
View file

@ -6,7 +6,7 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.core.triggers; package buildcraft.core.statements;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;

2
common/buildcraft/core/triggers/TriggerEnergy.java → common/buildcraft/core/statements/TriggerEnergy.java
View file

@ -6,7 +6,7 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.core.triggers; package buildcraft.core.statements;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;

2
common/buildcraft/core/triggers/TriggerFluidContainer.java → common/buildcraft/core/statements/TriggerFluidContainer.java
View file

@ -6,7 +6,7 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.core.triggers; package buildcraft.core.statements;
import java.util.Locale; import java.util.Locale;

2
common/buildcraft/core/triggers/TriggerFluidContainerLevel.java → common/buildcraft/core/statements/TriggerFluidContainerLevel.java
View file

@ -6,7 +6,7 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.core.triggers; package buildcraft.core.statements;
import java.util.Locale; import java.util.Locale;

2
common/buildcraft/core/triggers/TriggerInventory.java → common/buildcraft/core/statements/TriggerInventory.java
View file

@ -6,7 +6,7 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.core.triggers; package buildcraft.core.statements;
import java.util.Locale; import java.util.Locale;

2
common/buildcraft/core/triggers/TriggerInventoryLevel.java → common/buildcraft/core/statements/TriggerInventoryLevel.java
View file

@ -6,7 +6,7 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.core.triggers; package buildcraft.core.statements;
import java.util.Locale; import java.util.Locale;

2
common/buildcraft/core/triggers/TriggerMachine.java → common/buildcraft/core/statements/TriggerMachine.java
View file

@ -6,7 +6,7 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.core.triggers; package buildcraft.core.statements;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;

2
common/buildcraft/core/triggers/TriggerRedstoneInput.java → common/buildcraft/core/statements/TriggerRedstoneInput.java
View file

@ -6,7 +6,7 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.core.triggers; package buildcraft.core.statements;
import buildcraft.api.gates.IGate; import buildcraft.api.gates.IGate;
import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.ITriggerParameter;

7
common/buildcraft/energy/triggers/TriggerEngineHeat.java → common/buildcraft/energy/statements/TriggerEngineHeat.java
View file

@ -6,20 +6,17 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.energy.triggers; package buildcraft.energy.statements;
import java.util.Locale; import java.util.Locale;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.ITriggerParameter;
import buildcraft.core.triggers.BCTrigger; import buildcraft.core.statements.BCTrigger;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
import buildcraft.energy.TileEngine; import buildcraft.energy.TileEngine;
import buildcraft.energy.TileEngine.EnergyStage; import buildcraft.energy.TileEngine.EnergyStage;

4
common/buildcraft/silicon/TileAdvancedCraftingTable.java
View file

@ -27,10 +27,8 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.WorldServer; import net.minecraft.world.WorldServer;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import buildcraft.BuildCraftSilicon; import buildcraft.BuildCraftSilicon;
import buildcraft.api.core.IInvSlot; import buildcraft.api.core.IInvSlot;
import buildcraft.api.power.ILaserTarget; import buildcraft.api.power.ILaserTarget;
@ -47,7 +45,7 @@ import buildcraft.core.inventory.filters.IStackFilter;
import buildcraft.core.network.PacketIds; import buildcraft.core.network.PacketIds;
import buildcraft.core.network.PacketSlotChange; import buildcraft.core.network.PacketSlotChange;
import buildcraft.core.proxy.CoreProxy; import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.triggers.ActionMachineControl; import buildcraft.core.statements.ActionMachineControl;
import buildcraft.core.utils.CraftingHelper; import buildcraft.core.utils.CraftingHelper;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
import buildcraft.core.utils.Utils; import buildcraft.core.utils.Utils;

5
common/buildcraft/silicon/TileAssemblyTable.java
View file

@ -18,13 +18,10 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTTagString; import net.minecraft.nbt.NBTTagString;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.Constants;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import buildcraft.api.core.NetworkData; import buildcraft.api.core.NetworkData;
import buildcraft.api.recipes.CraftingResult; import buildcraft.api.recipes.CraftingResult;
import buildcraft.api.recipes.IFlexibleCrafter; import buildcraft.api.recipes.IFlexibleCrafter;
@ -38,7 +35,7 @@ import buildcraft.core.recipes.AssemblyRecipeManager;
import buildcraft.core.robots.EntityRobot; import buildcraft.core.robots.EntityRobot;
import buildcraft.core.robots.ResourceIdAssemblyTable; import buildcraft.core.robots.ResourceIdAssemblyTable;
import buildcraft.core.robots.RobotRegistry; import buildcraft.core.robots.RobotRegistry;
import buildcraft.core.triggers.ActionMachineControl; import buildcraft.core.statements.ActionMachineControl;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
import buildcraft.core.utils.Utils; import buildcraft.core.utils.Utils;

4
common/buildcraft/silicon/TileIntegrationTable.java
View file

@ -10,10 +10,8 @@ package buildcraft.silicon;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import buildcraft.api.recipes.BuildcraftRecipeRegistry; import buildcraft.api.recipes.BuildcraftRecipeRegistry;
import buildcraft.api.recipes.CraftingResult; import buildcraft.api.recipes.CraftingResult;
import buildcraft.api.recipes.IFlexibleCrafter; import buildcraft.api.recipes.IFlexibleCrafter;
@ -24,7 +22,7 @@ import buildcraft.core.inventory.InventoryMapper;
import buildcraft.core.inventory.SimpleInventory; import buildcraft.core.inventory.SimpleInventory;
import buildcraft.core.inventory.StackHelper; import buildcraft.core.inventory.StackHelper;
import buildcraft.core.inventory.Transactor; import buildcraft.core.inventory.Transactor;
import buildcraft.core.triggers.ActionMachineControl; import buildcraft.core.statements.ActionMachineControl;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
public class TileIntegrationTable extends TileLaserTableBase implements IFlexibleCrafter { public class TileIntegrationTable extends TileLaserTableBase implements IFlexibleCrafter {

2
common/buildcraft/silicon/TileLaser.java
View file

@ -30,7 +30,7 @@ import buildcraft.core.IMachine;
import buildcraft.core.LaserData; import buildcraft.core.LaserData;
import buildcraft.core.RFBattery; import buildcraft.core.RFBattery;
import buildcraft.core.TileBuildCraft; import buildcraft.core.TileBuildCraft;
import buildcraft.core.triggers.ActionMachineControl; import buildcraft.core.statements.ActionMachineControl;
public class TileLaser extends TileBuildCraft implements IActionReceptor, IMachine { public class TileLaser extends TileBuildCraft implements IActionReceptor, IMachine {

3
common/buildcraft/silicon/TileLaserTableBase.java
View file

@ -14,7 +14,6 @@ import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import buildcraft.BuildCraftCore; import buildcraft.BuildCraftCore;
import buildcraft.api.gates.IAction; import buildcraft.api.gates.IAction;
import buildcraft.api.gates.IActionReceptor; import buildcraft.api.gates.IActionReceptor;
@ -22,7 +21,7 @@ import buildcraft.api.power.ILaserTarget;
import buildcraft.core.IMachine; import buildcraft.core.IMachine;
import buildcraft.core.TileBuildCraft; import buildcraft.core.TileBuildCraft;
import buildcraft.core.inventory.SimpleInventory; import buildcraft.core.inventory.SimpleInventory;
import buildcraft.core.triggers.ActionMachineControl; import buildcraft.core.statements.ActionMachineControl;
import buildcraft.core.utils.AverageUtil; import buildcraft.core.utils.AverageUtil;
public abstract class TileLaserTableBase extends TileBuildCraft implements ILaserTarget, IInventory, IActionReceptor, IMachine { public abstract class TileLaserTableBase extends TileBuildCraft implements ILaserTarget, IInventory, IActionReceptor, IMachine {

4
common/buildcraft/silicon/statements/ActionRobotFilter.java
View file

@ -13,10 +13,8 @@ import java.util.Collection;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import buildcraft.api.gates.ActionParameterItemStack; import buildcraft.api.gates.ActionParameterItemStack;
import buildcraft.api.gates.IActionParameter; import buildcraft.api.gates.IActionParameter;
import buildcraft.api.robots.IDockingStation; import buildcraft.api.robots.IDockingStation;
@ -28,7 +26,7 @@ import buildcraft.core.inventory.filters.PassThroughFluidFilter;
import buildcraft.core.inventory.filters.PassThroughStackFilter; import buildcraft.core.inventory.filters.PassThroughStackFilter;
import buildcraft.core.inventory.filters.StatementParameterStackFilter; import buildcraft.core.inventory.filters.StatementParameterStackFilter;
import buildcraft.core.robots.DockingStation; import buildcraft.core.robots.DockingStation;
import buildcraft.core.triggers.BCActionPassive; import buildcraft.core.statements.BCActionPassive;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
import buildcraft.transport.Pipe; import buildcraft.transport.Pipe;
import buildcraft.transport.gates.ActionIterator; import buildcraft.transport.gates.ActionIterator;

4
common/buildcraft/silicon/statements/ActionRobotGotoStation.java
View file

@ -10,9 +10,7 @@ package buildcraft.silicon.statements;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.api.core.BlockIndex; import buildcraft.api.core.BlockIndex;
import buildcraft.api.gates.ActionParameterItemStack; import buildcraft.api.gates.ActionParameterItemStack;
import buildcraft.api.gates.IActionParameter; import buildcraft.api.gates.IActionParameter;
@ -23,7 +21,7 @@ import buildcraft.core.robots.AIRobotGoAndLinkToDock;
import buildcraft.core.robots.DockingStation; import buildcraft.core.robots.DockingStation;
import buildcraft.core.robots.EntityRobot; import buildcraft.core.robots.EntityRobot;
import buildcraft.core.robots.RobotRegistry; import buildcraft.core.robots.RobotRegistry;
import buildcraft.core.triggers.BCActionActive; import buildcraft.core.statements.BCActionActive;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
import buildcraft.transport.Pipe; import buildcraft.transport.Pipe;
import buildcraft.transport.TileGenericPipe; import buildcraft.transport.TileGenericPipe;

3
common/buildcraft/silicon/statements/ActionRobotWakeUp.java
View file

@ -9,8 +9,7 @@
package buildcraft.silicon.statements; package buildcraft.silicon.statements;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import buildcraft.core.statements.BCActionPassive;
import buildcraft.core.triggers.BCActionPassive;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
public class ActionRobotWakeUp extends BCActionPassive { public class ActionRobotWakeUp extends BCActionPassive {

3
common/buildcraft/silicon/statements/ActionRobotWorkInArea.java
View file

@ -10,12 +10,11 @@ package buildcraft.silicon.statements;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import buildcraft.api.core.IZone; import buildcraft.api.core.IZone;
import buildcraft.api.gates.ActionParameterItemStack; import buildcraft.api.gates.ActionParameterItemStack;
import buildcraft.api.gates.IActionParameter; import buildcraft.api.gates.IActionParameter;
import buildcraft.core.ItemMapLocation; import buildcraft.core.ItemMapLocation;
import buildcraft.core.triggers.BCActionPassive; import buildcraft.core.statements.BCActionPassive;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
import buildcraft.transport.gates.ActionSlot; import buildcraft.transport.gates.ActionSlot;

3
common/buildcraft/silicon/statements/ActionStationAcceptFluids.java
View file

@ -9,10 +9,9 @@
package buildcraft.silicon.statements; package buildcraft.silicon.statements;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import buildcraft.api.gates.ActionParameterItemStack; import buildcraft.api.gates.ActionParameterItemStack;
import buildcraft.api.gates.IActionParameter; import buildcraft.api.gates.IActionParameter;
import buildcraft.core.triggers.BCActionPassive; import buildcraft.core.statements.BCActionPassive;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
public class ActionStationAcceptFluids extends BCActionPassive { public class ActionStationAcceptFluids extends BCActionPassive {

3
common/buildcraft/silicon/statements/ActionStationAllowCraft.java
View file

@ -9,10 +9,9 @@
package buildcraft.silicon.statements; package buildcraft.silicon.statements;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import buildcraft.api.gates.ActionParameterItemStack; import buildcraft.api.gates.ActionParameterItemStack;
import buildcraft.api.gates.IActionParameter; import buildcraft.api.gates.IActionParameter;
import buildcraft.core.triggers.BCActionPassive; import buildcraft.core.statements.BCActionPassive;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
public class ActionStationAllowCraft extends BCActionPassive { public class ActionStationAllowCraft extends BCActionPassive {

3
common/buildcraft/silicon/statements/ActionStationForbidRobot.java
View file

@ -10,13 +10,12 @@ package buildcraft.silicon.statements;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import buildcraft.api.gates.ActionParameterItemStack; import buildcraft.api.gates.ActionParameterItemStack;
import buildcraft.api.gates.IActionParameter; import buildcraft.api.gates.IActionParameter;
import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.robots.EntityRobotBase;
import buildcraft.core.ItemRobot; import buildcraft.core.ItemRobot;
import buildcraft.core.robots.DockingStation; import buildcraft.core.robots.DockingStation;
import buildcraft.core.triggers.BCActionPassive; import buildcraft.core.statements.BCActionPassive;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
import buildcraft.transport.gates.ActionIterator; import buildcraft.transport.gates.ActionIterator;
import buildcraft.transport.gates.ActionSlot; import buildcraft.transport.gates.ActionSlot;

2
common/buildcraft/silicon/statements/ActionStationInputItems.java
View file

@ -12,7 +12,7 @@ import buildcraft.api.core.IInvSlot;
import buildcraft.core.inventory.filters.StatementParameterStackFilter; import buildcraft.core.inventory.filters.StatementParameterStackFilter;
import buildcraft.core.robots.DockingStation; import buildcraft.core.robots.DockingStation;
import buildcraft.core.robots.EntityRobot; import buildcraft.core.robots.EntityRobot;
import buildcraft.core.triggers.BCActionPassive; import buildcraft.core.statements.BCActionPassive;
import buildcraft.transport.gates.ActionSlot; import buildcraft.transport.gates.ActionSlot;
public abstract class ActionStationInputItems extends BCActionPassive { public abstract class ActionStationInputItems extends BCActionPassive {

3
common/buildcraft/silicon/statements/ActionStationProvideFluids.java
View file

@ -9,10 +9,9 @@
package buildcraft.silicon.statements; package buildcraft.silicon.statements;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import buildcraft.api.gates.ActionParameterItemStack; import buildcraft.api.gates.ActionParameterItemStack;
import buildcraft.api.gates.IActionParameter; import buildcraft.api.gates.IActionParameter;
import buildcraft.core.triggers.BCActionPassive; import buildcraft.core.statements.BCActionPassive;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
public class ActionStationProvideFluids extends BCActionPassive { public class ActionStationProvideFluids extends BCActionPassive {

3
common/buildcraft/silicon/statements/ActionStationProvideItems.java
View file

@ -9,10 +9,9 @@
package buildcraft.silicon.statements; package buildcraft.silicon.statements;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import buildcraft.api.gates.ActionParameterItemStack; import buildcraft.api.gates.ActionParameterItemStack;
import buildcraft.api.gates.IActionParameter; import buildcraft.api.gates.IActionParameter;
import buildcraft.core.triggers.BCActionPassive; import buildcraft.core.statements.BCActionPassive;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
public class ActionStationProvideItems extends BCActionPassive { public class ActionStationProvideItems extends BCActionPassive {

3
common/buildcraft/silicon/statements/ActionStationRequestItemsMachine.java
View file

@ -9,8 +9,7 @@
package buildcraft.silicon.statements; package buildcraft.silicon.statements;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import buildcraft.core.statements.BCActionPassive;
import buildcraft.core.triggers.BCActionPassive;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
public class ActionStationRequestItemsMachine extends BCActionPassive { public class ActionStationRequestItemsMachine extends BCActionPassive {

4
common/buildcraft/silicon/statements/TriggerRobotSleep.java
View file

@ -9,15 +9,13 @@
package buildcraft.silicon.statements; package buildcraft.silicon.statements;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.api.gates.IGate; import buildcraft.api.gates.IGate;
import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.ITriggerParameter;
import buildcraft.core.robots.AIRobotSleep; import buildcraft.core.robots.AIRobotSleep;
import buildcraft.core.robots.DockingStation; import buildcraft.core.robots.DockingStation;
import buildcraft.core.robots.EntityRobot; import buildcraft.core.robots.EntityRobot;
import buildcraft.core.triggers.BCTrigger; import buildcraft.core.statements.BCTrigger;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
import buildcraft.transport.Pipe; import buildcraft.transport.Pipe;
import buildcraft.transport.TileGenericPipe; import buildcraft.transport.TileGenericPipe;

4
common/buildcraft/transport/Gate.java
View file

@ -36,13 +36,13 @@ import buildcraft.api.gates.TriggerParameterItemStack;
import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipe;
import buildcraft.api.transport.PipeWire; import buildcraft.api.transport.PipeWire;
import buildcraft.core.GuiIds; import buildcraft.core.GuiIds;
import buildcraft.core.triggers.ActionRedstoneOutput; import buildcraft.core.statements.ActionRedstoneOutput;
import buildcraft.transport.gates.ActionSlot; import buildcraft.transport.gates.ActionSlot;
import buildcraft.transport.gates.GateDefinition.GateLogic; import buildcraft.transport.gates.GateDefinition.GateLogic;
import buildcraft.transport.gates.GateDefinition.GateMaterial; import buildcraft.transport.gates.GateDefinition.GateMaterial;
import buildcraft.transport.gates.ItemGate; import buildcraft.transport.gates.ItemGate;
import buildcraft.transport.gui.ContainerGateInterface; import buildcraft.transport.gui.ContainerGateInterface;
import buildcraft.transport.triggers.ActionRedstoneFaderOutput; import buildcraft.transport.statements.ActionRedstoneFaderOutput;
public final class Gate implements IGate { public final class Gate implements IGate {

2
common/buildcraft/transport/Pipe.java
View file

@ -44,7 +44,7 @@ import buildcraft.core.utils.Utils;
import buildcraft.transport.gates.ActionSlot; import buildcraft.transport.gates.ActionSlot;
import buildcraft.transport.gates.GateFactory; import buildcraft.transport.gates.GateFactory;
import buildcraft.transport.pipes.events.PipeEvent; import buildcraft.transport.pipes.events.PipeEvent;
import buildcraft.transport.triggers.ActionValve.ValveState; import buildcraft.transport.statements.ActionValve.ValveState;
public abstract class Pipe<T extends PipeTransport> implements IDropControlInventory, IPipe { public abstract class Pipe<T extends PipeTransport> implements IDropControlInventory, IPipe {

5
common/buildcraft/transport/PipeTriggerProvider.java
View file

@ -12,16 +12,13 @@ import java.util.LinkedList;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyHandler;
import buildcraft.BuildCraftCore; import buildcraft.BuildCraftCore;
import buildcraft.api.gates.ITrigger; import buildcraft.api.gates.ITrigger;
import buildcraft.api.gates.ITriggerProvider; import buildcraft.api.gates.ITriggerProvider;
import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.IPipeTile;
import buildcraft.transport.triggers.TriggerPipeContents; import buildcraft.transport.statements.TriggerPipeContents;
public class PipeTriggerProvider implements ITriggerProvider { public class PipeTriggerProvider implements ITriggerProvider {

7
common/buildcraft/transport/gates/GateExpansionPulsar.java
View file

@ -12,18 +12,15 @@ import java.util.List;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyHandler;
import buildcraft.BuildCraftTransport; import buildcraft.BuildCraftTransport;
import buildcraft.api.gates.GateExpansionController; import buildcraft.api.gates.GateExpansionController;
import buildcraft.api.gates.IAction; import buildcraft.api.gates.IAction;
import buildcraft.api.gates.IGate; import buildcraft.api.gates.IGate;
import buildcraft.api.gates.IGateExpansion; import buildcraft.api.gates.IGateExpansion;
import buildcraft.transport.triggers.ActionEnergyPulsar; import buildcraft.transport.statements.ActionEnergyPulsar;
import buildcraft.transport.triggers.ActionSingleEnergyPulse; import buildcraft.transport.statements.ActionSingleEnergyPulse;
public final class GateExpansionPulsar extends GateExpansionBuildcraft implements IGateExpansion { public final class GateExpansionPulsar extends GateExpansionBuildcraft implements IGateExpansion {

5
common/buildcraft/transport/gates/GateExpansionTimer.java
View file

@ -11,15 +11,14 @@ package buildcraft.transport.gates;
import java.util.List; import java.util.List;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import buildcraft.BuildCraftTransport; import buildcraft.BuildCraftTransport;
import buildcraft.api.gates.GateExpansionController; import buildcraft.api.gates.GateExpansionController;
import buildcraft.api.gates.IGate; import buildcraft.api.gates.IGate;
import buildcraft.api.gates.IGateExpansion; import buildcraft.api.gates.IGateExpansion;
import buildcraft.api.gates.ITrigger; import buildcraft.api.gates.ITrigger;
import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.ITriggerParameter;
import buildcraft.transport.triggers.TriggerClockTimer; import buildcraft.transport.statements.TriggerClockTimer;
import buildcraft.transport.triggers.TriggerClockTimer.Time; import buildcraft.transport.statements.TriggerClockTimer.Time;
public final class GateExpansionTimer extends GateExpansionBuildcraft implements IGateExpansion { public final class GateExpansionTimer extends GateExpansionBuildcraft implements IGateExpansion {

5
common/buildcraft/transport/pipes/PipeFluidsIron.java
View file

@ -14,13 +14,10 @@ import java.util.LinkedList;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidHandler;
import buildcraft.BuildCraftTransport; import buildcraft.BuildCraftTransport;
import buildcraft.api.core.IIconProvider; import buildcraft.api.core.IIconProvider;
import buildcraft.api.gates.IAction; import buildcraft.api.gates.IAction;
@ -29,7 +26,7 @@ import buildcraft.transport.PipeIconProvider;
import buildcraft.transport.PipeTransportFluids; import buildcraft.transport.PipeTransportFluids;
import buildcraft.transport.TileGenericPipe; import buildcraft.transport.TileGenericPipe;
import buildcraft.transport.gates.ActionSlot; import buildcraft.transport.gates.ActionSlot;
import buildcraft.transport.triggers.ActionPipeDirection; import buildcraft.transport.statements.ActionPipeDirection;
public class PipeFluidsIron extends Pipe<PipeTransportFluids> { public class PipeFluidsIron extends Pipe<PipeTransportFluids> {

7
common/buildcraft/transport/pipes/PipeItemsDaizuli.java
View file

@ -17,12 +17,9 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.BuildCraftTransport; import buildcraft.BuildCraftTransport;
import buildcraft.api.core.EnumColor; import buildcraft.api.core.EnumColor;
import buildcraft.api.core.IIconProvider; import buildcraft.api.core.IIconProvider;
@ -37,8 +34,8 @@ import buildcraft.transport.TransportConstants;
import buildcraft.transport.TravelingItem; import buildcraft.transport.TravelingItem;
import buildcraft.transport.gates.ActionSlot; import buildcraft.transport.gates.ActionSlot;
import buildcraft.transport.pipes.events.PipeEventItem; import buildcraft.transport.pipes.events.PipeEventItem;
import buildcraft.transport.triggers.ActionPipeColor; import buildcraft.transport.statements.ActionPipeColor;
import buildcraft.transport.triggers.ActionPipeDirection; import buildcraft.transport.statements.ActionPipeDirection;
public class PipeItemsDaizuli extends Pipe<PipeTransportItems> { public class PipeItemsDaizuli extends Pipe<PipeTransportItems> {

5
common/buildcraft/transport/pipes/PipeItemsEmzuli.java
View file

@ -13,16 +13,13 @@ import java.util.Collection;
import java.util.LinkedList; import java.util.LinkedList;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.BuildCraftTransport; import buildcraft.BuildCraftTransport;
import buildcraft.api.core.EnumColor; import buildcraft.api.core.EnumColor;
import buildcraft.api.gates.IAction; import buildcraft.api.gates.IAction;
@ -34,7 +31,7 @@ import buildcraft.transport.BlockGenericPipe;
import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeIconProvider;
import buildcraft.transport.TravelingItem; import buildcraft.transport.TravelingItem;
import buildcraft.transport.gates.ActionSlot; import buildcraft.transport.gates.ActionSlot;
import buildcraft.transport.triggers.ActionExtractionPreset; import buildcraft.transport.statements.ActionExtractionPreset;
public class PipeItemsEmzuli extends PipeItemsWood implements IGuiReturnHandler { public class PipeItemsEmzuli extends PipeItemsWood implements IGuiReturnHandler {

5
common/buildcraft/transport/pipes/PipeItemsIron.java
View file

@ -15,12 +15,9 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.BuildCraftTransport; import buildcraft.BuildCraftTransport;
import buildcraft.api.core.IIconProvider; import buildcraft.api.core.IIconProvider;
import buildcraft.api.gates.IAction; import buildcraft.api.gates.IAction;
@ -29,7 +26,7 @@ import buildcraft.transport.PipeIconProvider;
import buildcraft.transport.PipeTransportItems; import buildcraft.transport.PipeTransportItems;
import buildcraft.transport.TileGenericPipe; import buildcraft.transport.TileGenericPipe;
import buildcraft.transport.gates.ActionSlot; import buildcraft.transport.gates.ActionSlot;
import buildcraft.transport.triggers.ActionPipeDirection; import buildcraft.transport.statements.ActionPipeDirection;
public class PipeItemsIron extends Pipe<PipeTransportItems> { public class PipeItemsIron extends Pipe<PipeTransportItems> {

5
common/buildcraft/transport/pipes/PipeItemsLapis.java
View file

@ -14,12 +14,9 @@ import java.util.LinkedList;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.BuildCraftTransport; import buildcraft.BuildCraftTransport;
import buildcraft.api.core.EnumColor; import buildcraft.api.core.EnumColor;
import buildcraft.api.core.IIconProvider; import buildcraft.api.core.IIconProvider;
@ -32,7 +29,7 @@ import buildcraft.transport.TransportConstants;
import buildcraft.transport.TravelingItem; import buildcraft.transport.TravelingItem;
import buildcraft.transport.gates.ActionSlot; import buildcraft.transport.gates.ActionSlot;
import buildcraft.transport.pipes.events.PipeEventItem; import buildcraft.transport.pipes.events.PipeEventItem;
import buildcraft.transport.triggers.ActionPipeColor; import buildcraft.transport.statements.ActionPipeColor;
public class PipeItemsLapis extends Pipe<PipeTransportItems> { public class PipeItemsLapis extends Pipe<PipeTransportItems> {

2
common/buildcraft/transport/pipes/PipePowerIron.java
View file

@ -27,7 +27,7 @@ import buildcraft.transport.Pipe;
import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeIconProvider;
import buildcraft.transport.PipeTransportPower; import buildcraft.transport.PipeTransportPower;
import buildcraft.transport.gates.ActionSlot; import buildcraft.transport.gates.ActionSlot;
import buildcraft.transport.triggers.ActionPowerLimiter; import buildcraft.transport.statements.ActionPowerLimiter;
public class PipePowerIron extends Pipe<PipeTransportPower> { public class PipePowerIron extends Pipe<PipeTransportPower> {

5
common/buildcraft/transport/triggers/ActionEnergyPulsar.java → common/buildcraft/transport/statements/ActionEnergyPulsar.java
View file

@ -6,11 +6,10 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.transport.triggers; package buildcraft.transport.statements;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import buildcraft.core.statements.BCActionPassive;
import buildcraft.core.triggers.BCActionPassive;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
public class ActionEnergyPulsar extends BCActionPassive { public class ActionEnergyPulsar extends BCActionPassive {

4
common/buildcraft/transport/triggers/ActionExtractionPreset.java → common/buildcraft/transport/statements/ActionExtractionPreset.java
View file

@ -6,13 +6,13 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.transport.triggers; package buildcraft.transport.statements;
import java.util.Locale; import java.util.Locale;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import buildcraft.api.core.EnumColor; import buildcraft.api.core.EnumColor;
import buildcraft.core.triggers.BCActionPassive; import buildcraft.core.statements.BCActionPassive;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
public class ActionExtractionPreset extends BCActionPassive { public class ActionExtractionPreset extends BCActionPassive {

5
common/buildcraft/transport/triggers/ActionParameterSignal.java → common/buildcraft/transport/statements/ActionParameterSignal.java
View file

@ -6,18 +6,17 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.transport.triggers; package buildcraft.transport.statements;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import buildcraft.api.core.NetworkData; import buildcraft.api.core.NetworkData;
import buildcraft.api.gates.IActionParameter; import buildcraft.api.gates.IActionParameter;
import buildcraft.api.gates.IStatement; import buildcraft.api.gates.IStatement;
import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.IPipeTile;
import buildcraft.api.transport.PipeWire; import buildcraft.api.transport.PipeWire;
import buildcraft.core.triggers.StatementIconProvider; import buildcraft.core.statements.StatementIconProvider;
public class ActionParameterSignal implements IActionParameter { public class ActionParameterSignal implements IActionParameter {

4
common/buildcraft/transport/triggers/ActionPipeColor.java → common/buildcraft/transport/statements/ActionPipeColor.java
View file

@ -6,13 +6,13 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.transport.triggers; package buildcraft.transport.statements;
import java.util.Locale; import java.util.Locale;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import buildcraft.api.core.EnumColor; import buildcraft.api.core.EnumColor;
import buildcraft.core.triggers.BCActionPassive; import buildcraft.core.statements.BCActionPassive;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
public class ActionPipeColor extends BCActionPassive { public class ActionPipeColor extends BCActionPassive {

6
common/buildcraft/transport/triggers/ActionPipeDirection.java → common/buildcraft/transport/statements/ActionPipeDirection.java
View file

@ -6,17 +6,15 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.transport.triggers; package buildcraft.transport.statements;
import java.util.Locale; import java.util.Locale;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.BuildCraftTransport; import buildcraft.BuildCraftTransport;
import buildcraft.api.gates.IAction; import buildcraft.api.gates.IAction;
import buildcraft.core.triggers.BCActionPassive; import buildcraft.core.statements.BCActionPassive;
public class ActionPipeDirection extends BCActionPassive { public class ActionPipeDirection extends BCActionPassive {

4
common/buildcraft/transport/triggers/ActionPowerLimiter.java → common/buildcraft/transport/statements/ActionPowerLimiter.java
View file

@ -6,13 +6,13 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.transport.triggers; package buildcraft.transport.statements;
import java.util.Locale; import java.util.Locale;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import buildcraft.core.PowerMode; import buildcraft.core.PowerMode;
import buildcraft.core.triggers.BCActionPassive; import buildcraft.core.statements.BCActionPassive;
public class ActionPowerLimiter extends BCActionPassive { public class ActionPowerLimiter extends BCActionPassive {

6
common/buildcraft/transport/triggers/ActionRedstoneFaderOutput.java → common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java
View file

@ -6,15 +6,13 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.transport.triggers; package buildcraft.transport.statements;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import buildcraft.core.statements.BCActionPassive;
import buildcraft.core.triggers.BCActionPassive;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
public class ActionRedstoneFaderOutput extends BCActionPassive { public class ActionRedstoneFaderOutput extends BCActionPassive {

6
common/buildcraft/transport/triggers/ActionSignalOutput.java → common/buildcraft/transport/statements/ActionSignalOutput.java
View file

@ -6,15 +6,15 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.transport.triggers; package buildcraft.transport.statements;
import java.util.Locale; import java.util.Locale;
import buildcraft.api.gates.IActionParameter; import buildcraft.api.gates.IActionParameter;
import buildcraft.api.gates.IGate; import buildcraft.api.gates.IGate;
import buildcraft.api.transport.PipeWire; import buildcraft.api.transport.PipeWire;
import buildcraft.core.triggers.BCActionActive; import buildcraft.core.statements.BCActionActive;
import buildcraft.core.triggers.StatementIconProvider; import buildcraft.core.statements.StatementIconProvider;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
import buildcraft.transport.Gate; import buildcraft.transport.Gate;

5
common/buildcraft/transport/triggers/ActionSingleEnergyPulse.java → common/buildcraft/transport/statements/ActionSingleEnergyPulse.java
View file

@ -6,11 +6,10 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.transport.triggers; package buildcraft.transport.statements;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import buildcraft.core.statements.BCActionPassive;
import buildcraft.core.triggers.BCActionPassive;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
public class ActionSingleEnergyPulse extends BCActionPassive { public class ActionSingleEnergyPulse extends BCActionPassive {

6
common/buildcraft/transport/triggers/ActionValve.java → common/buildcraft/transport/statements/ActionValve.java
View file

@ -6,7 +6,7 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.transport.triggers; package buildcraft.transport.statements;
import java.util.Locale; import java.util.Locale;
@ -15,8 +15,8 @@ import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.api.gates.IActionParameter; import buildcraft.api.gates.IActionParameter;
import buildcraft.api.gates.IGate; import buildcraft.api.gates.IGate;
import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipe;
import buildcraft.core.triggers.BCActionActive; import buildcraft.core.statements.BCActionActive;
import buildcraft.core.triggers.StatementParameterDirection; import buildcraft.core.statements.StatementParameterDirection;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
import buildcraft.transport.Pipe; import buildcraft.transport.Pipe;
import buildcraft.transport.PipeTransport; import buildcraft.transport.PipeTransport;

5
common/buildcraft/transport/triggers/TriggerClockTimer.java → common/buildcraft/transport/statements/TriggerClockTimer.java
View file

@ -6,13 +6,12 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.transport.triggers; package buildcraft.transport.statements;
import java.util.Locale; import java.util.Locale;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import buildcraft.core.statements.BCTrigger;
import buildcraft.core.triggers.BCTrigger;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
public class TriggerClockTimer extends BCTrigger { public class TriggerClockTimer extends BCTrigger {

5
common/buildcraft/transport/triggers/TriggerParameterSignal.java → common/buildcraft/transport/statements/TriggerParameterSignal.java
View file

@ -6,18 +6,17 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.transport.triggers; package buildcraft.transport.statements;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import buildcraft.api.core.NetworkData; import buildcraft.api.core.NetworkData;
import buildcraft.api.gates.IStatement; import buildcraft.api.gates.IStatement;
import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.ITriggerParameter;
import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.IPipeTile;
import buildcraft.api.transport.PipeWire; import buildcraft.api.transport.PipeWire;
import buildcraft.core.triggers.StatementIconProvider; import buildcraft.core.statements.StatementIconProvider;
public class TriggerParameterSignal implements ITriggerParameter { public class TriggerParameterSignal implements ITriggerParameter {

7
common/buildcraft/transport/triggers/TriggerPipeContents.java → common/buildcraft/transport/statements/TriggerPipeContents.java
View file

@ -6,24 +6,21 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.transport.triggers; package buildcraft.transport.statements;
import java.util.Locale; import java.util.Locale;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.FluidTankInfo;
import buildcraft.api.gates.IGate; import buildcraft.api.gates.IGate;
import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.ITriggerParameter;
import buildcraft.core.inventory.StackHelper; import buildcraft.core.inventory.StackHelper;
import buildcraft.core.triggers.BCTrigger; import buildcraft.core.statements.BCTrigger;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
import buildcraft.transport.Pipe; import buildcraft.transport.Pipe;
import buildcraft.transport.PipeTransportFluids; import buildcraft.transport.PipeTransportFluids;

6
common/buildcraft/transport/triggers/TriggerPipeSignal.java → common/buildcraft/transport/statements/TriggerPipeSignal.java
View file

@ -6,15 +6,15 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.transport.triggers; package buildcraft.transport.statements;
import java.util.Locale; import java.util.Locale;
import buildcraft.api.gates.IGate; import buildcraft.api.gates.IGate;
import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.ITriggerParameter;
import buildcraft.api.transport.PipeWire; import buildcraft.api.transport.PipeWire;
import buildcraft.core.triggers.BCTrigger; import buildcraft.core.statements.BCTrigger;
import buildcraft.core.triggers.StatementIconProvider; import buildcraft.core.statements.StatementIconProvider;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
import buildcraft.transport.Pipe; import buildcraft.transport.Pipe;

4
common/buildcraft/transport/triggers/TriggerRedstoneFaderInput.java → common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java
View file

@ -6,14 +6,14 @@
* License 1.0, or MMPL. Please check the contents of the license located in * License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt * http://www.mod-buildcraft.com/MMPL-1.0.txt
*/ */
package buildcraft.transport.triggers; package buildcraft.transport.statements;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import buildcraft.api.gates.IGate; import buildcraft.api.gates.IGate;
import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.ITriggerParameter;
import buildcraft.core.triggers.BCTrigger; import buildcraft.core.statements.BCTrigger;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
import buildcraft.transport.TileGenericPipe; import buildcraft.transport.TileGenericPipe;