diff --git a/common/buildcraft/BuildCraftBuilders.java b/common/buildcraft/BuildCraftBuilders.java index 4240d923..080bc8cc 100644 --- a/common/buildcraft/BuildCraftBuilders.java +++ b/common/buildcraft/BuildCraftBuilders.java @@ -109,8 +109,8 @@ import buildcraft.builders.schematics.SchematicStone; import buildcraft.builders.schematics.SchematicTileCreative; import buildcraft.builders.schematics.SchematicTripWireHook; import buildcraft.builders.schematics.SchematicWallSide; -import buildcraft.builders.triggers.ActionFiller; -import buildcraft.builders.triggers.BuildersActionProvider; +import buildcraft.builders.statements.ActionFiller; +import buildcraft.builders.statements.BuildersActionProvider; import buildcraft.builders.urbanism.BlockUrbanist; import buildcraft.builders.urbanism.TileUrbanist; import buildcraft.builders.urbanism.UrbanistToolsIconProvider; diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index 291d77d3..92ec8dc9 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -95,20 +95,20 @@ import buildcraft.core.recipes.IntegrationRecipeManager; import buildcraft.core.recipes.RefineryRecipeManager; import buildcraft.core.render.BlockHighlightHandler; import buildcraft.core.robots.EntityRobot; -import buildcraft.core.triggers.ActionMachineControl; -import buildcraft.core.triggers.ActionMachineControl.Mode; -import buildcraft.core.triggers.ActionRedstoneOutput; -import buildcraft.core.triggers.DefaultActionProvider; -import buildcraft.core.triggers.DefaultTriggerProvider; -import buildcraft.core.triggers.StatementIconProvider; -import buildcraft.core.triggers.StatementParameterDirection; -import buildcraft.core.triggers.TriggerEnergy; -import buildcraft.core.triggers.TriggerFluidContainer; -import buildcraft.core.triggers.TriggerFluidContainerLevel; -import buildcraft.core.triggers.TriggerInventory; -import buildcraft.core.triggers.TriggerInventoryLevel; -import buildcraft.core.triggers.TriggerMachine; -import buildcraft.core.triggers.TriggerRedstoneInput; +import buildcraft.core.statements.ActionMachineControl; +import buildcraft.core.statements.ActionRedstoneOutput; +import buildcraft.core.statements.DefaultActionProvider; +import buildcraft.core.statements.DefaultTriggerProvider; +import buildcraft.core.statements.StatementIconProvider; +import buildcraft.core.statements.StatementParameterDirection; +import buildcraft.core.statements.TriggerEnergy; +import buildcraft.core.statements.TriggerFluidContainer; +import buildcraft.core.statements.TriggerFluidContainerLevel; +import buildcraft.core.statements.TriggerInventory; +import buildcraft.core.statements.TriggerInventoryLevel; +import buildcraft.core.statements.TriggerMachine; +import buildcraft.core.statements.TriggerRedstoneInput; +import buildcraft.core.statements.ActionMachineControl.Mode; import buildcraft.core.utils.CraftingHandler; import buildcraft.core.utils.WorldPropertyIsDirt; import buildcraft.core.utils.WorldPropertyIsFarmland; diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index 81f3f898..e573d839 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -68,7 +68,7 @@ import buildcraft.energy.TileEnergyEmitter; import buildcraft.energy.TileEnergyReceiver; import buildcraft.energy.TileEngine; import buildcraft.energy.TileEngine.EnergyStage; -import buildcraft.energy.triggers.TriggerEngineHeat; +import buildcraft.energy.statements.TriggerEngineHeat; import buildcraft.energy.worldgen.BiomeGenOilDesert; import buildcraft.energy.worldgen.BiomeGenOilOcean; import buildcraft.energy.worldgen.BiomeInitializer; diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index 4629e145..8afb702d 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -118,28 +118,28 @@ import buildcraft.transport.schematics.BptItemPipeFilters; import buildcraft.transport.schematics.BptPipeIron; import buildcraft.transport.schematics.BptPipeWooden; 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.StripesHandlerBucket; import buildcraft.transport.stripes.StripesHandlerRightClick; 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) public class BuildCraftTransport extends BuildCraftMod { diff --git a/common/buildcraft/builders/TileFiller.java b/common/buildcraft/builders/TileFiller.java index 83a7736a..e1d9c931 100644 --- a/common/buildcraft/builders/TileFiller.java +++ b/common/buildcraft/builders/TileFiller.java @@ -20,7 +20,7 @@ import buildcraft.api.core.IAreaProvider; import buildcraft.api.filler.FillerManager; import buildcraft.api.gates.IAction; import buildcraft.api.gates.IActionReceptor; -import buildcraft.builders.triggers.ActionFiller; +import buildcraft.builders.statements.ActionFiller; import buildcraft.core.Box; import buildcraft.core.Box.Kind; import buildcraft.core.IMachine; @@ -35,8 +35,8 @@ import buildcraft.core.network.PacketUpdate; import buildcraft.core.network.RPC; import buildcraft.core.network.RPCHandler; import buildcraft.core.network.RPCSide; -import buildcraft.core.triggers.ActionMachineControl; -import buildcraft.core.triggers.ActionMachineControl.Mode; +import buildcraft.core.statements.ActionMachineControl; +import buildcraft.core.statements.ActionMachineControl.Mode; import buildcraft.core.utils.Utils; public class TileFiller extends TileAbstractBuilder implements IMachine, IActionReceptor { diff --git a/common/buildcraft/builders/triggers/ActionFiller.java b/common/buildcraft/builders/statements/ActionFiller.java similarity index 89% rename from common/buildcraft/builders/triggers/ActionFiller.java rename to common/buildcraft/builders/statements/ActionFiller.java index 139eb03e..44a230c2 100644 --- a/common/buildcraft/builders/triggers/ActionFiller.java +++ b/common/buildcraft/builders/statements/ActionFiller.java @@ -6,11 +6,11 @@ * 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.builders.triggers; +package buildcraft.builders.statements; import net.minecraft.util.IIcon; import buildcraft.core.builders.patterns.FillerPattern; -import buildcraft.core.triggers.BCActionPassive; +import buildcraft.core.statements.BCActionPassive; public class ActionFiller extends BCActionPassive { diff --git a/common/buildcraft/builders/triggers/BuildersActionProvider.java b/common/buildcraft/builders/statements/BuildersActionProvider.java similarity index 97% rename from common/buildcraft/builders/triggers/BuildersActionProvider.java rename to common/buildcraft/builders/statements/BuildersActionProvider.java index e5af4722..f1895338 100644 --- a/common/buildcraft/builders/triggers/BuildersActionProvider.java +++ b/common/buildcraft/builders/statements/BuildersActionProvider.java @@ -6,7 +6,7 @@ * 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.builders.triggers; +package buildcraft.builders.statements; import java.util.Collection; import java.util.HashMap; diff --git a/common/buildcraft/core/blueprints/BlueprintBase.java b/common/buildcraft/core/blueprints/BlueprintBase.java index ba21da35..4b2f7355 100644 --- a/common/buildcraft/core/blueprints/BlueprintBase.java +++ b/common/buildcraft/core/blueprints/BlueprintBase.java @@ -23,7 +23,7 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.blueprints.BuildingPermission; import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.MappingRegistry; -import buildcraft.api.blueprints.SchematicBlockBase; +import buildcraft.api.blueprints.SchematicBlockShaped; import buildcraft.api.blueprints.Translation; import buildcraft.api.core.BCLog; import buildcraft.api.core.Position; @@ -36,7 +36,7 @@ public abstract class BlueprintBase { public ArrayList subBlueprintsNBT = new ArrayList(); - public SchematicBlockBase[][][] contents; + public SchematicBlockShaped[][][] contents; public int anchorX, anchorY, anchorZ; public int sizeX, sizeY, sizeZ; public BlueprintId id = new BlueprintId(); @@ -56,7 +56,7 @@ public abstract class BlueprintBase { } public BlueprintBase(int sizeX, int sizeY, int sizeZ) { - contents = new SchematicBlockBase[sizeX][sizeY][sizeZ]; + contents = new SchematicBlockShaped[sizeX][sizeY][sizeZ]; this.sizeX = sizeX; this.sizeY = sizeY; @@ -92,7 +92,7 @@ public abstract class BlueprintBase { } 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 y = 0; y < sizeY; ++y) { @@ -218,7 +218,7 @@ public abstract class BlueprintBase { excavate = true; } - contents = new SchematicBlockBase[sizeX][sizeY][sizeZ]; + contents = new SchematicBlockShaped[sizeX][sizeY][sizeZ]; try { loadContents(nbt); diff --git a/common/buildcraft/core/blueprints/BptBuilderTemplate.java b/common/buildcraft/core/blueprints/BptBuilderTemplate.java index adef07d2..40062581 100644 --- a/common/buildcraft/core/blueprints/BptBuilderTemplate.java +++ b/common/buildcraft/core/blueprints/BptBuilderTemplate.java @@ -14,7 +14,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.blueprints.BuilderAPI; -import buildcraft.api.blueprints.SchematicBlockBase; +import buildcraft.api.blueprints.SchematicBlockShaped; import buildcraft.api.core.BlockIndex; import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.core.IInvSlot; @@ -49,7 +49,7 @@ public class BptBuilderTemplate extends BptBuilderBase { continue; } - SchematicBlockBase slot = blueprint.contents[i][j][k]; + SchematicBlockShaped slot = blueprint.contents[i][j][k]; if (slot == null && !clearedLocations.contains(new BlockIndex( @@ -81,7 +81,7 @@ public class BptBuilderTemplate extends BptBuilderBase { 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))) { BuildingSlotBlock b = new BuildingSlotBlock(); diff --git a/common/buildcraft/core/builders/BuildingSlotBlock.java b/common/buildcraft/core/builders/BuildingSlotBlock.java index f235deb8..6458e3f5 100755 --- a/common/buildcraft/core/builders/BuildingSlotBlock.java +++ b/common/buildcraft/core/builders/BuildingSlotBlock.java @@ -18,7 +18,7 @@ import net.minecraftforge.common.util.Constants; import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.MappingNotFoundException; import buildcraft.api.blueprints.MappingRegistry; -import buildcraft.api.blueprints.SchematicBlockBase; +import buildcraft.api.blueprints.SchematicBlockShaped; import buildcraft.api.blueprints.SchematicFactory; import buildcraft.api.blueprints.SchematicMask; import buildcraft.api.core.Position; @@ -26,7 +26,7 @@ import buildcraft.api.core.Position; public class BuildingSlotBlock extends BuildingSlot { public int x, y, z; - public SchematicBlockBase schematic; + public SchematicBlockShaped schematic; public enum Mode { ClearIfInvalid, Build @@ -37,7 +37,7 @@ public class BuildingSlotBlock extends BuildingSlot { public int buildStage = 0; @Override - public SchematicBlockBase getSchematic () { + public SchematicBlockShaped getSchematic () { if (schematic == null) { return new SchematicMask(false); } else { @@ -145,7 +145,7 @@ public class BuildingSlotBlock extends BuildingSlot { z = nbt.getInteger("z"); if (nbt.hasKey("schematic")) { - schematic = (SchematicBlockBase) SchematicFactory + schematic = (SchematicBlockShaped) SchematicFactory .createSchematicFromWorldNBT(nbt.getCompoundTag("schematic"), registry); } diff --git a/common/buildcraft/core/triggers/ActionMachineControl.java b/common/buildcraft/core/statements/ActionMachineControl.java similarity index 96% rename from common/buildcraft/core/triggers/ActionMachineControl.java rename to common/buildcraft/core/statements/ActionMachineControl.java index 5ce114ba..57f6384e 100644 --- a/common/buildcraft/core/triggers/ActionMachineControl.java +++ b/common/buildcraft/core/statements/ActionMachineControl.java @@ -6,7 +6,7 @@ * 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.core.triggers; +package buildcraft.core.statements; import java.util.Locale; diff --git a/common/buildcraft/core/triggers/ActionRedstoneOutput.java b/common/buildcraft/core/statements/ActionRedstoneOutput.java similarity index 94% rename from common/buildcraft/core/triggers/ActionRedstoneOutput.java rename to common/buildcraft/core/statements/ActionRedstoneOutput.java index d0bab0af..1879fec4 100644 --- a/common/buildcraft/core/triggers/ActionRedstoneOutput.java +++ b/common/buildcraft/core/statements/ActionRedstoneOutput.java @@ -6,7 +6,7 @@ * 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.core.triggers; +package buildcraft.core.statements; public class ActionRedstoneOutput extends BCActionPassive { diff --git a/common/buildcraft/core/triggers/BCActionActive.java b/common/buildcraft/core/statements/BCActionActive.java similarity index 94% rename from common/buildcraft/core/triggers/BCActionActive.java rename to common/buildcraft/core/statements/BCActionActive.java index 31c427b6..e79bd8da 100644 --- a/common/buildcraft/core/triggers/BCActionActive.java +++ b/common/buildcraft/core/statements/BCActionActive.java @@ -6,7 +6,7 @@ * 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.core.triggers; +package buildcraft.core.statements; import buildcraft.api.gates.IAction; import buildcraft.api.gates.IActionParameter; diff --git a/common/buildcraft/core/triggers/BCActionPassive.java b/common/buildcraft/core/statements/BCActionPassive.java similarity index 95% rename from common/buildcraft/core/triggers/BCActionPassive.java rename to common/buildcraft/core/statements/BCActionPassive.java index 39862799..550a6263 100755 --- a/common/buildcraft/core/triggers/BCActionPassive.java +++ b/common/buildcraft/core/statements/BCActionPassive.java @@ -6,7 +6,7 @@ * 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.core.triggers; +package buildcraft.core.statements; import buildcraft.api.gates.IAction; import buildcraft.api.gates.IActionParameter; diff --git a/common/buildcraft/core/triggers/BCStatement.java b/common/buildcraft/core/statements/BCStatement.java similarity index 97% rename from common/buildcraft/core/triggers/BCStatement.java rename to common/buildcraft/core/statements/BCStatement.java index 2eaaa1c5..e786ad59 100755 --- a/common/buildcraft/core/triggers/BCStatement.java +++ b/common/buildcraft/core/statements/BCStatement.java @@ -6,7 +6,7 @@ * 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.core.triggers; +package buildcraft.core.statements; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; diff --git a/common/buildcraft/core/triggers/BCTrigger.java b/common/buildcraft/core/statements/BCTrigger.java similarity index 97% rename from common/buildcraft/core/triggers/BCTrigger.java rename to common/buildcraft/core/statements/BCTrigger.java index 67f06937..646bf39f 100644 --- a/common/buildcraft/core/triggers/BCTrigger.java +++ b/common/buildcraft/core/statements/BCTrigger.java @@ -6,7 +6,7 @@ * 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.core.triggers; +package buildcraft.core.statements; import net.minecraft.tileentity.TileEntity; diff --git a/common/buildcraft/core/triggers/DefaultActionProvider.java b/common/buildcraft/core/statements/DefaultActionProvider.java similarity index 97% rename from common/buildcraft/core/triggers/DefaultActionProvider.java rename to common/buildcraft/core/statements/DefaultActionProvider.java index 596bddec..16c26e68 100644 --- a/common/buildcraft/core/triggers/DefaultActionProvider.java +++ b/common/buildcraft/core/statements/DefaultActionProvider.java @@ -6,7 +6,7 @@ * 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.core.triggers; +package buildcraft.core.statements; import java.util.Collection; import java.util.LinkedList; diff --git a/common/buildcraft/core/triggers/DefaultTriggerProvider.java b/common/buildcraft/core/statements/DefaultTriggerProvider.java similarity index 98% rename from common/buildcraft/core/triggers/DefaultTriggerProvider.java rename to common/buildcraft/core/statements/DefaultTriggerProvider.java index f671be4d..40f3140e 100644 --- a/common/buildcraft/core/triggers/DefaultTriggerProvider.java +++ b/common/buildcraft/core/statements/DefaultTriggerProvider.java @@ -6,7 +6,7 @@ * 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.core.triggers; +package buildcraft.core.statements; import java.util.LinkedList; diff --git a/common/buildcraft/core/triggers/StatementIconProvider.java b/common/buildcraft/core/statements/StatementIconProvider.java similarity index 99% rename from common/buildcraft/core/triggers/StatementIconProvider.java rename to common/buildcraft/core/statements/StatementIconProvider.java index daecd387..061f6d45 100644 --- a/common/buildcraft/core/triggers/StatementIconProvider.java +++ b/common/buildcraft/core/statements/StatementIconProvider.java @@ -6,7 +6,7 @@ * 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.core.triggers; +package buildcraft.core.statements; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; diff --git a/common/buildcraft/core/triggers/StatementParameterDirection.java b/common/buildcraft/core/statements/StatementParameterDirection.java similarity index 98% rename from common/buildcraft/core/triggers/StatementParameterDirection.java rename to common/buildcraft/core/statements/StatementParameterDirection.java index 552593ee..cab7fbc5 100644 --- a/common/buildcraft/core/triggers/StatementParameterDirection.java +++ b/common/buildcraft/core/statements/StatementParameterDirection.java @@ -6,7 +6,7 @@ * 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.core.triggers; +package buildcraft.core.statements; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/common/buildcraft/core/triggers/TriggerEnergy.java b/common/buildcraft/core/statements/TriggerEnergy.java similarity index 98% rename from common/buildcraft/core/triggers/TriggerEnergy.java rename to common/buildcraft/core/statements/TriggerEnergy.java index cc5f6a33..c50239e3 100755 --- a/common/buildcraft/core/triggers/TriggerEnergy.java +++ b/common/buildcraft/core/statements/TriggerEnergy.java @@ -6,7 +6,7 @@ * 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.core.triggers; +package buildcraft.core.statements; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; diff --git a/common/buildcraft/core/triggers/TriggerFluidContainer.java b/common/buildcraft/core/statements/TriggerFluidContainer.java similarity index 98% rename from common/buildcraft/core/triggers/TriggerFluidContainer.java rename to common/buildcraft/core/statements/TriggerFluidContainer.java index d3acedbb..c89f343b 100644 --- a/common/buildcraft/core/triggers/TriggerFluidContainer.java +++ b/common/buildcraft/core/statements/TriggerFluidContainer.java @@ -6,7 +6,7 @@ * 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.core.triggers; +package buildcraft.core.statements; import java.util.Locale; diff --git a/common/buildcraft/core/triggers/TriggerFluidContainerLevel.java b/common/buildcraft/core/statements/TriggerFluidContainerLevel.java similarity index 98% rename from common/buildcraft/core/triggers/TriggerFluidContainerLevel.java rename to common/buildcraft/core/statements/TriggerFluidContainerLevel.java index 900a3b36..fbfd5ee0 100644 --- a/common/buildcraft/core/triggers/TriggerFluidContainerLevel.java +++ b/common/buildcraft/core/statements/TriggerFluidContainerLevel.java @@ -6,7 +6,7 @@ * 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.core.triggers; +package buildcraft.core.statements; import java.util.Locale; diff --git a/common/buildcraft/core/triggers/TriggerInventory.java b/common/buildcraft/core/statements/TriggerInventory.java similarity index 98% rename from common/buildcraft/core/triggers/TriggerInventory.java rename to common/buildcraft/core/statements/TriggerInventory.java index ec0146f7..0d3c05a8 100644 --- a/common/buildcraft/core/triggers/TriggerInventory.java +++ b/common/buildcraft/core/statements/TriggerInventory.java @@ -6,7 +6,7 @@ * 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.core.triggers; +package buildcraft.core.statements; import java.util.Locale; diff --git a/common/buildcraft/core/triggers/TriggerInventoryLevel.java b/common/buildcraft/core/statements/TriggerInventoryLevel.java similarity index 98% rename from common/buildcraft/core/triggers/TriggerInventoryLevel.java rename to common/buildcraft/core/statements/TriggerInventoryLevel.java index 77244d29..c867d415 100644 --- a/common/buildcraft/core/triggers/TriggerInventoryLevel.java +++ b/common/buildcraft/core/statements/TriggerInventoryLevel.java @@ -6,7 +6,7 @@ * 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.core.triggers; +package buildcraft.core.statements; import java.util.Locale; diff --git a/common/buildcraft/core/triggers/TriggerMachine.java b/common/buildcraft/core/statements/TriggerMachine.java similarity index 97% rename from common/buildcraft/core/triggers/TriggerMachine.java rename to common/buildcraft/core/statements/TriggerMachine.java index 60302809..bf0cd4bb 100644 --- a/common/buildcraft/core/triggers/TriggerMachine.java +++ b/common/buildcraft/core/statements/TriggerMachine.java @@ -6,7 +6,7 @@ * 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.core.triggers; +package buildcraft.core.statements; import net.minecraft.tileentity.TileEntity; diff --git a/common/buildcraft/core/triggers/TriggerRedstoneInput.java b/common/buildcraft/core/statements/TriggerRedstoneInput.java similarity index 97% rename from common/buildcraft/core/triggers/TriggerRedstoneInput.java rename to common/buildcraft/core/statements/TriggerRedstoneInput.java index 9e511c8e..003279dd 100644 --- a/common/buildcraft/core/triggers/TriggerRedstoneInput.java +++ b/common/buildcraft/core/statements/TriggerRedstoneInput.java @@ -6,7 +6,7 @@ * 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.core.triggers; +package buildcraft.core.statements; import buildcraft.api.gates.IGate; import buildcraft.api.gates.ITriggerParameter; diff --git a/common/buildcraft/energy/triggers/TriggerEngineHeat.java b/common/buildcraft/energy/statements/TriggerEngineHeat.java similarity index 95% rename from common/buildcraft/energy/triggers/TriggerEngineHeat.java rename to common/buildcraft/energy/statements/TriggerEngineHeat.java index abae94c2..583bcbe8 100644 --- a/common/buildcraft/energy/triggers/TriggerEngineHeat.java +++ b/common/buildcraft/energy/statements/TriggerEngineHeat.java @@ -6,20 +6,17 @@ * 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.energy.triggers; +package buildcraft.energy.statements; import java.util.Locale; import net.minecraft.client.renderer.texture.IIconRegister; 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.core.triggers.BCTrigger; +import buildcraft.core.statements.BCTrigger; import buildcraft.core.utils.StringUtils; import buildcraft.energy.TileEngine; import buildcraft.energy.TileEngine.EnergyStage; diff --git a/common/buildcraft/silicon/TileAdvancedCraftingTable.java b/common/buildcraft/silicon/TileAdvancedCraftingTable.java index 7ea64105..a1050d14 100644 --- a/common/buildcraft/silicon/TileAdvancedCraftingTable.java +++ b/common/buildcraft/silicon/TileAdvancedCraftingTable.java @@ -27,10 +27,8 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.WorldServer; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; - import buildcraft.BuildCraftSilicon; import buildcraft.api.core.IInvSlot; import buildcraft.api.power.ILaserTarget; @@ -47,7 +45,7 @@ import buildcraft.core.inventory.filters.IStackFilter; import buildcraft.core.network.PacketIds; import buildcraft.core.network.PacketSlotChange; import buildcraft.core.proxy.CoreProxy; -import buildcraft.core.triggers.ActionMachineControl; +import buildcraft.core.statements.ActionMachineControl; import buildcraft.core.utils.CraftingHelper; import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.Utils; diff --git a/common/buildcraft/silicon/TileAssemblyTable.java b/common/buildcraft/silicon/TileAssemblyTable.java index 8d24e712..5ca0e493 100644 --- a/common/buildcraft/silicon/TileAssemblyTable.java +++ b/common/buildcraft/silicon/TileAssemblyTable.java @@ -18,13 +18,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; - import cpw.mods.fml.common.FMLCommonHandler; - import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; - import buildcraft.api.core.NetworkData; import buildcraft.api.recipes.CraftingResult; import buildcraft.api.recipes.IFlexibleCrafter; @@ -38,7 +35,7 @@ import buildcraft.core.recipes.AssemblyRecipeManager; import buildcraft.core.robots.EntityRobot; import buildcraft.core.robots.ResourceIdAssemblyTable; import buildcraft.core.robots.RobotRegistry; -import buildcraft.core.triggers.ActionMachineControl; +import buildcraft.core.statements.ActionMachineControl; import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.Utils; diff --git a/common/buildcraft/silicon/TileIntegrationTable.java b/common/buildcraft/silicon/TileIntegrationTable.java index ddc2873d..3a474e41 100644 --- a/common/buildcraft/silicon/TileIntegrationTable.java +++ b/common/buildcraft/silicon/TileIntegrationTable.java @@ -10,10 +10,8 @@ package buildcraft.silicon; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; - import buildcraft.api.recipes.BuildcraftRecipeRegistry; import buildcraft.api.recipes.CraftingResult; import buildcraft.api.recipes.IFlexibleCrafter; @@ -24,7 +22,7 @@ import buildcraft.core.inventory.InventoryMapper; import buildcraft.core.inventory.SimpleInventory; import buildcraft.core.inventory.StackHelper; import buildcraft.core.inventory.Transactor; -import buildcraft.core.triggers.ActionMachineControl; +import buildcraft.core.statements.ActionMachineControl; import buildcraft.core.utils.StringUtils; public class TileIntegrationTable extends TileLaserTableBase implements IFlexibleCrafter { diff --git a/common/buildcraft/silicon/TileLaser.java b/common/buildcraft/silicon/TileLaser.java index 2bf6e90e..bcef548f 100644 --- a/common/buildcraft/silicon/TileLaser.java +++ b/common/buildcraft/silicon/TileLaser.java @@ -30,7 +30,7 @@ import buildcraft.core.IMachine; import buildcraft.core.LaserData; import buildcraft.core.RFBattery; import buildcraft.core.TileBuildCraft; -import buildcraft.core.triggers.ActionMachineControl; +import buildcraft.core.statements.ActionMachineControl; public class TileLaser extends TileBuildCraft implements IActionReceptor, IMachine { diff --git a/common/buildcraft/silicon/TileLaserTableBase.java b/common/buildcraft/silicon/TileLaserTableBase.java index 0484806e..5cbf7730 100644 --- a/common/buildcraft/silicon/TileLaserTableBase.java +++ b/common/buildcraft/silicon/TileLaserTableBase.java @@ -14,7 +14,6 @@ import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - import buildcraft.BuildCraftCore; import buildcraft.api.gates.IAction; import buildcraft.api.gates.IActionReceptor; @@ -22,7 +21,7 @@ import buildcraft.api.power.ILaserTarget; import buildcraft.core.IMachine; import buildcraft.core.TileBuildCraft; import buildcraft.core.inventory.SimpleInventory; -import buildcraft.core.triggers.ActionMachineControl; +import buildcraft.core.statements.ActionMachineControl; import buildcraft.core.utils.AverageUtil; public abstract class TileLaserTableBase extends TileBuildCraft implements ILaserTarget, IInventory, IActionReceptor, IMachine { diff --git a/common/buildcraft/silicon/statements/ActionRobotFilter.java b/common/buildcraft/silicon/statements/ActionRobotFilter.java index 38c466e3..9434fc91 100755 --- a/common/buildcraft/silicon/statements/ActionRobotFilter.java +++ b/common/buildcraft/silicon/statements/ActionRobotFilter.java @@ -13,10 +13,8 @@ import java.util.Collection; 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.robots.IDockingStation; @@ -28,7 +26,7 @@ import buildcraft.core.inventory.filters.PassThroughFluidFilter; import buildcraft.core.inventory.filters.PassThroughStackFilter; import buildcraft.core.inventory.filters.StatementParameterStackFilter; import buildcraft.core.robots.DockingStation; -import buildcraft.core.triggers.BCActionPassive; +import buildcraft.core.statements.BCActionPassive; import buildcraft.core.utils.StringUtils; import buildcraft.transport.Pipe; import buildcraft.transport.gates.ActionIterator; diff --git a/common/buildcraft/silicon/statements/ActionRobotGotoStation.java b/common/buildcraft/silicon/statements/ActionRobotGotoStation.java index a12552a1..87ce5370 100755 --- a/common/buildcraft/silicon/statements/ActionRobotGotoStation.java +++ b/common/buildcraft/silicon/statements/ActionRobotGotoStation.java @@ -10,9 +10,7 @@ package buildcraft.silicon.statements; 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; @@ -23,7 +21,7 @@ import buildcraft.core.robots.AIRobotGoAndLinkToDock; import buildcraft.core.robots.DockingStation; import buildcraft.core.robots.EntityRobot; import buildcraft.core.robots.RobotRegistry; -import buildcraft.core.triggers.BCActionActive; +import buildcraft.core.statements.BCActionActive; import buildcraft.core.utils.StringUtils; import buildcraft.transport.Pipe; import buildcraft.transport.TileGenericPipe; diff --git a/common/buildcraft/silicon/statements/ActionRobotWakeUp.java b/common/buildcraft/silicon/statements/ActionRobotWakeUp.java index 3db5e2f9..f3a14789 100755 --- a/common/buildcraft/silicon/statements/ActionRobotWakeUp.java +++ b/common/buildcraft/silicon/statements/ActionRobotWakeUp.java @@ -9,8 +9,7 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; - -import buildcraft.core.triggers.BCActionPassive; +import buildcraft.core.statements.BCActionPassive; import buildcraft.core.utils.StringUtils; public class ActionRobotWakeUp extends BCActionPassive { diff --git a/common/buildcraft/silicon/statements/ActionRobotWorkInArea.java b/common/buildcraft/silicon/statements/ActionRobotWorkInArea.java index 092fe1e1..6ce827b9 100755 --- a/common/buildcraft/silicon/statements/ActionRobotWorkInArea.java +++ b/common/buildcraft/silicon/statements/ActionRobotWorkInArea.java @@ -10,12 +10,11 @@ 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.core.ItemMapLocation; -import buildcraft.core.triggers.BCActionPassive; +import buildcraft.core.statements.BCActionPassive; import buildcraft.core.utils.StringUtils; import buildcraft.transport.gates.ActionSlot; diff --git a/common/buildcraft/silicon/statements/ActionStationAcceptFluids.java b/common/buildcraft/silicon/statements/ActionStationAcceptFluids.java index c5d2134c..44068409 100755 --- a/common/buildcraft/silicon/statements/ActionStationAcceptFluids.java +++ b/common/buildcraft/silicon/statements/ActionStationAcceptFluids.java @@ -9,10 +9,9 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; - import buildcraft.api.gates.ActionParameterItemStack; import buildcraft.api.gates.IActionParameter; -import buildcraft.core.triggers.BCActionPassive; +import buildcraft.core.statements.BCActionPassive; import buildcraft.core.utils.StringUtils; public class ActionStationAcceptFluids extends BCActionPassive { diff --git a/common/buildcraft/silicon/statements/ActionStationAllowCraft.java b/common/buildcraft/silicon/statements/ActionStationAllowCraft.java index c72a66af..5dd8ee88 100755 --- a/common/buildcraft/silicon/statements/ActionStationAllowCraft.java +++ b/common/buildcraft/silicon/statements/ActionStationAllowCraft.java @@ -9,10 +9,9 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; - import buildcraft.api.gates.ActionParameterItemStack; import buildcraft.api.gates.IActionParameter; -import buildcraft.core.triggers.BCActionPassive; +import buildcraft.core.statements.BCActionPassive; import buildcraft.core.utils.StringUtils; public class ActionStationAllowCraft extends BCActionPassive { diff --git a/common/buildcraft/silicon/statements/ActionStationForbidRobot.java b/common/buildcraft/silicon/statements/ActionStationForbidRobot.java index 38498c3d..8181424f 100755 --- a/common/buildcraft/silicon/statements/ActionStationForbidRobot.java +++ b/common/buildcraft/silicon/statements/ActionStationForbidRobot.java @@ -10,13 +10,12 @@ 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.robots.EntityRobotBase; import buildcraft.core.ItemRobot; import buildcraft.core.robots.DockingStation; -import buildcraft.core.triggers.BCActionPassive; +import buildcraft.core.statements.BCActionPassive; import buildcraft.core.utils.StringUtils; import buildcraft.transport.gates.ActionIterator; import buildcraft.transport.gates.ActionSlot; diff --git a/common/buildcraft/silicon/statements/ActionStationInputItems.java b/common/buildcraft/silicon/statements/ActionStationInputItems.java index dc2331c6..44ff6ddc 100755 --- a/common/buildcraft/silicon/statements/ActionStationInputItems.java +++ b/common/buildcraft/silicon/statements/ActionStationInputItems.java @@ -12,7 +12,7 @@ import buildcraft.api.core.IInvSlot; import buildcraft.core.inventory.filters.StatementParameterStackFilter; import buildcraft.core.robots.DockingStation; import buildcraft.core.robots.EntityRobot; -import buildcraft.core.triggers.BCActionPassive; +import buildcraft.core.statements.BCActionPassive; import buildcraft.transport.gates.ActionSlot; public abstract class ActionStationInputItems extends BCActionPassive { diff --git a/common/buildcraft/silicon/statements/ActionStationProvideFluids.java b/common/buildcraft/silicon/statements/ActionStationProvideFluids.java index 2aa00b1e..918b3a14 100755 --- a/common/buildcraft/silicon/statements/ActionStationProvideFluids.java +++ b/common/buildcraft/silicon/statements/ActionStationProvideFluids.java @@ -9,10 +9,9 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; - import buildcraft.api.gates.ActionParameterItemStack; import buildcraft.api.gates.IActionParameter; -import buildcraft.core.triggers.BCActionPassive; +import buildcraft.core.statements.BCActionPassive; import buildcraft.core.utils.StringUtils; public class ActionStationProvideFluids extends BCActionPassive { diff --git a/common/buildcraft/silicon/statements/ActionStationProvideItems.java b/common/buildcraft/silicon/statements/ActionStationProvideItems.java index 4297af77..f6b84ee5 100755 --- a/common/buildcraft/silicon/statements/ActionStationProvideItems.java +++ b/common/buildcraft/silicon/statements/ActionStationProvideItems.java @@ -9,10 +9,9 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; - import buildcraft.api.gates.ActionParameterItemStack; import buildcraft.api.gates.IActionParameter; -import buildcraft.core.triggers.BCActionPassive; +import buildcraft.core.statements.BCActionPassive; import buildcraft.core.utils.StringUtils; public class ActionStationProvideItems extends BCActionPassive { diff --git a/common/buildcraft/silicon/statements/ActionStationRequestItemsMachine.java b/common/buildcraft/silicon/statements/ActionStationRequestItemsMachine.java index 2b9883f5..9cf78d9d 100755 --- a/common/buildcraft/silicon/statements/ActionStationRequestItemsMachine.java +++ b/common/buildcraft/silicon/statements/ActionStationRequestItemsMachine.java @@ -9,8 +9,7 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; - -import buildcraft.core.triggers.BCActionPassive; +import buildcraft.core.statements.BCActionPassive; import buildcraft.core.utils.StringUtils; public class ActionStationRequestItemsMachine extends BCActionPassive { diff --git a/common/buildcraft/silicon/statements/TriggerRobotSleep.java b/common/buildcraft/silicon/statements/TriggerRobotSleep.java index 981caa58..a89b0cae 100755 --- a/common/buildcraft/silicon/statements/TriggerRobotSleep.java +++ b/common/buildcraft/silicon/statements/TriggerRobotSleep.java @@ -9,15 +9,13 @@ 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.core.robots.AIRobotSleep; import buildcraft.core.robots.DockingStation; import buildcraft.core.robots.EntityRobot; -import buildcraft.core.triggers.BCTrigger; +import buildcraft.core.statements.BCTrigger; import buildcraft.core.utils.StringUtils; import buildcraft.transport.Pipe; import buildcraft.transport.TileGenericPipe; diff --git a/common/buildcraft/transport/Gate.java b/common/buildcraft/transport/Gate.java index fd52f1ef..03aab079 100644 --- a/common/buildcraft/transport/Gate.java +++ b/common/buildcraft/transport/Gate.java @@ -36,13 +36,13 @@ import buildcraft.api.gates.TriggerParameterItemStack; import buildcraft.api.transport.IPipe; import buildcraft.api.transport.PipeWire; import buildcraft.core.GuiIds; -import buildcraft.core.triggers.ActionRedstoneOutput; +import buildcraft.core.statements.ActionRedstoneOutput; import buildcraft.transport.gates.ActionSlot; import buildcraft.transport.gates.GateDefinition.GateLogic; import buildcraft.transport.gates.GateDefinition.GateMaterial; import buildcraft.transport.gates.ItemGate; import buildcraft.transport.gui.ContainerGateInterface; -import buildcraft.transport.triggers.ActionRedstoneFaderOutput; +import buildcraft.transport.statements.ActionRedstoneFaderOutput; public final class Gate implements IGate { diff --git a/common/buildcraft/transport/Pipe.java b/common/buildcraft/transport/Pipe.java index dd9ea947..25d298bd 100644 --- a/common/buildcraft/transport/Pipe.java +++ b/common/buildcraft/transport/Pipe.java @@ -44,7 +44,7 @@ import buildcraft.core.utils.Utils; import buildcraft.transport.gates.ActionSlot; import buildcraft.transport.gates.GateFactory; import buildcraft.transport.pipes.events.PipeEvent; -import buildcraft.transport.triggers.ActionValve.ValveState; +import buildcraft.transport.statements.ActionValve.ValveState; public abstract class Pipe implements IDropControlInventory, IPipe { diff --git a/common/buildcraft/transport/PipeTriggerProvider.java b/common/buildcraft/transport/PipeTriggerProvider.java index 677514cf..37c0bbeb 100644 --- a/common/buildcraft/transport/PipeTriggerProvider.java +++ b/common/buildcraft/transport/PipeTriggerProvider.java @@ -12,16 +12,13 @@ import java.util.LinkedList; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import cofh.api.energy.IEnergyHandler; - import buildcraft.BuildCraftCore; import buildcraft.api.gates.ITrigger; import buildcraft.api.gates.ITriggerProvider; import buildcraft.api.transport.IPipeTile; -import buildcraft.transport.triggers.TriggerPipeContents; +import buildcraft.transport.statements.TriggerPipeContents; public class PipeTriggerProvider implements ITriggerProvider { diff --git a/common/buildcraft/transport/gates/GateExpansionPulsar.java b/common/buildcraft/transport/gates/GateExpansionPulsar.java index d367022f..94fd80d2 100644 --- a/common/buildcraft/transport/gates/GateExpansionPulsar.java +++ b/common/buildcraft/transport/gates/GateExpansionPulsar.java @@ -12,18 +12,15 @@ import java.util.List; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import cofh.api.energy.IEnergyHandler; - import buildcraft.BuildCraftTransport; import buildcraft.api.gates.GateExpansionController; import buildcraft.api.gates.IAction; import buildcraft.api.gates.IGate; import buildcraft.api.gates.IGateExpansion; -import buildcraft.transport.triggers.ActionEnergyPulsar; -import buildcraft.transport.triggers.ActionSingleEnergyPulse; +import buildcraft.transport.statements.ActionEnergyPulsar; +import buildcraft.transport.statements.ActionSingleEnergyPulse; public final class GateExpansionPulsar extends GateExpansionBuildcraft implements IGateExpansion { diff --git a/common/buildcraft/transport/gates/GateExpansionTimer.java b/common/buildcraft/transport/gates/GateExpansionTimer.java index b5175a62..f21168db 100644 --- a/common/buildcraft/transport/gates/GateExpansionTimer.java +++ b/common/buildcraft/transport/gates/GateExpansionTimer.java @@ -11,15 +11,14 @@ package buildcraft.transport.gates; import java.util.List; import net.minecraft.tileentity.TileEntity; - import buildcraft.BuildCraftTransport; import buildcraft.api.gates.GateExpansionController; import buildcraft.api.gates.IGate; import buildcraft.api.gates.IGateExpansion; import buildcraft.api.gates.ITrigger; import buildcraft.api.gates.ITriggerParameter; -import buildcraft.transport.triggers.TriggerClockTimer; -import buildcraft.transport.triggers.TriggerClockTimer.Time; +import buildcraft.transport.statements.TriggerClockTimer; +import buildcraft.transport.statements.TriggerClockTimer.Time; public final class GateExpansionTimer extends GateExpansionBuildcraft implements IGateExpansion { diff --git a/common/buildcraft/transport/pipes/PipeFluidsIron.java b/common/buildcraft/transport/pipes/PipeFluidsIron.java index 8bb61b96..b7009188 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsIron.java +++ b/common/buildcraft/transport/pipes/PipeFluidsIron.java @@ -14,13 +14,10 @@ import java.util.LinkedList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.gates.IAction; @@ -29,7 +26,7 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportFluids; import buildcraft.transport.TileGenericPipe; import buildcraft.transport.gates.ActionSlot; -import buildcraft.transport.triggers.ActionPipeDirection; +import buildcraft.transport.statements.ActionPipeDirection; public class PipeFluidsIron extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipeItemsDaizuli.java b/common/buildcraft/transport/pipes/PipeItemsDaizuli.java index 8e5a7d3c..d59734ff 100644 --- a/common/buildcraft/transport/pipes/PipeItemsDaizuli.java +++ b/common/buildcraft/transport/pipes/PipeItemsDaizuli.java @@ -17,12 +17,9 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; 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.BuildCraftTransport; import buildcraft.api.core.EnumColor; import buildcraft.api.core.IIconProvider; @@ -37,8 +34,8 @@ import buildcraft.transport.TransportConstants; import buildcraft.transport.TravelingItem; import buildcraft.transport.gates.ActionSlot; import buildcraft.transport.pipes.events.PipeEventItem; -import buildcraft.transport.triggers.ActionPipeColor; -import buildcraft.transport.triggers.ActionPipeDirection; +import buildcraft.transport.statements.ActionPipeColor; +import buildcraft.transport.statements.ActionPipeDirection; public class PipeItemsDaizuli extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipeItemsEmzuli.java b/common/buildcraft/transport/pipes/PipeItemsEmzuli.java index 0b1997a3..fa844c81 100644 --- a/common/buildcraft/transport/pipes/PipeItemsEmzuli.java +++ b/common/buildcraft/transport/pipes/PipeItemsEmzuli.java @@ -13,16 +13,13 @@ import java.util.Collection; import java.util.LinkedList; import io.netty.buffer.ByteBuf; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.EnumColor; import buildcraft.api.gates.IAction; @@ -34,7 +31,7 @@ import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.TravelingItem; import buildcraft.transport.gates.ActionSlot; -import buildcraft.transport.triggers.ActionExtractionPreset; +import buildcraft.transport.statements.ActionExtractionPreset; public class PipeItemsEmzuli extends PipeItemsWood implements IGuiReturnHandler { diff --git a/common/buildcraft/transport/pipes/PipeItemsIron.java b/common/buildcraft/transport/pipes/PipeItemsIron.java index 14b20ff8..97fb0596 100644 --- a/common/buildcraft/transport/pipes/PipeItemsIron.java +++ b/common/buildcraft/transport/pipes/PipeItemsIron.java @@ -15,12 +15,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; 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.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.gates.IAction; @@ -29,7 +26,7 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.TileGenericPipe; import buildcraft.transport.gates.ActionSlot; -import buildcraft.transport.triggers.ActionPipeDirection; +import buildcraft.transport.statements.ActionPipeDirection; public class PipeItemsIron extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipeItemsLapis.java b/common/buildcraft/transport/pipes/PipeItemsLapis.java index 44ca1f62..952f5740 100644 --- a/common/buildcraft/transport/pipes/PipeItemsLapis.java +++ b/common/buildcraft/transport/pipes/PipeItemsLapis.java @@ -14,12 +14,9 @@ import java.util.LinkedList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.EnumColor; import buildcraft.api.core.IIconProvider; @@ -32,7 +29,7 @@ import buildcraft.transport.TransportConstants; import buildcraft.transport.TravelingItem; import buildcraft.transport.gates.ActionSlot; import buildcraft.transport.pipes.events.PipeEventItem; -import buildcraft.transport.triggers.ActionPipeColor; +import buildcraft.transport.statements.ActionPipeColor; public class PipeItemsLapis extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipePowerIron.java b/common/buildcraft/transport/pipes/PipePowerIron.java index a455c51f..42393929 100644 --- a/common/buildcraft/transport/pipes/PipePowerIron.java +++ b/common/buildcraft/transport/pipes/PipePowerIron.java @@ -27,7 +27,7 @@ import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportPower; import buildcraft.transport.gates.ActionSlot; -import buildcraft.transport.triggers.ActionPowerLimiter; +import buildcraft.transport.statements.ActionPowerLimiter; public class PipePowerIron extends Pipe { diff --git a/common/buildcraft/transport/triggers/ActionEnergyPulsar.java b/common/buildcraft/transport/statements/ActionEnergyPulsar.java similarity index 89% rename from common/buildcraft/transport/triggers/ActionEnergyPulsar.java rename to common/buildcraft/transport/statements/ActionEnergyPulsar.java index eff75db1..527a5c4e 100644 --- a/common/buildcraft/transport/triggers/ActionEnergyPulsar.java +++ b/common/buildcraft/transport/statements/ActionEnergyPulsar.java @@ -6,11 +6,10 @@ * 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.transport.triggers; +package buildcraft.transport.statements; import net.minecraft.client.renderer.texture.IIconRegister; - -import buildcraft.core.triggers.BCActionPassive; +import buildcraft.core.statements.BCActionPassive; import buildcraft.core.utils.StringUtils; public class ActionEnergyPulsar extends BCActionPassive { diff --git a/common/buildcraft/transport/triggers/ActionExtractionPreset.java b/common/buildcraft/transport/statements/ActionExtractionPreset.java similarity index 92% rename from common/buildcraft/transport/triggers/ActionExtractionPreset.java rename to common/buildcraft/transport/statements/ActionExtractionPreset.java index 2dfd10e6..2a42c79b 100644 --- a/common/buildcraft/transport/triggers/ActionExtractionPreset.java +++ b/common/buildcraft/transport/statements/ActionExtractionPreset.java @@ -6,13 +6,13 @@ * 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.transport.triggers; +package buildcraft.transport.statements; import java.util.Locale; import net.minecraft.client.renderer.texture.IIconRegister; import buildcraft.api.core.EnumColor; -import buildcraft.core.triggers.BCActionPassive; +import buildcraft.core.statements.BCActionPassive; import buildcraft.core.utils.StringUtils; public class ActionExtractionPreset extends BCActionPassive { diff --git a/common/buildcraft/transport/triggers/ActionParameterSignal.java b/common/buildcraft/transport/statements/ActionParameterSignal.java similarity index 95% rename from common/buildcraft/transport/triggers/ActionParameterSignal.java rename to common/buildcraft/transport/statements/ActionParameterSignal.java index 8780af9c..0091bba9 100755 --- a/common/buildcraft/transport/triggers/ActionParameterSignal.java +++ b/common/buildcraft/transport/statements/ActionParameterSignal.java @@ -6,18 +6,17 @@ * 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.transport.triggers; +package buildcraft.transport.statements; 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.IStatement; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.PipeWire; -import buildcraft.core.triggers.StatementIconProvider; +import buildcraft.core.statements.StatementIconProvider; public class ActionParameterSignal implements IActionParameter { diff --git a/common/buildcraft/transport/triggers/ActionPipeColor.java b/common/buildcraft/transport/statements/ActionPipeColor.java similarity index 91% rename from common/buildcraft/transport/triggers/ActionPipeColor.java rename to common/buildcraft/transport/statements/ActionPipeColor.java index 358f6124..0201b417 100644 --- a/common/buildcraft/transport/triggers/ActionPipeColor.java +++ b/common/buildcraft/transport/statements/ActionPipeColor.java @@ -6,13 +6,13 @@ * 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.transport.triggers; +package buildcraft.transport.statements; import java.util.Locale; import net.minecraft.client.renderer.texture.IIconRegister; import buildcraft.api.core.EnumColor; -import buildcraft.core.triggers.BCActionPassive; +import buildcraft.core.statements.BCActionPassive; import buildcraft.core.utils.StringUtils; public class ActionPipeColor extends BCActionPassive { diff --git a/common/buildcraft/transport/triggers/ActionPipeDirection.java b/common/buildcraft/transport/statements/ActionPipeDirection.java similarity index 93% rename from common/buildcraft/transport/triggers/ActionPipeDirection.java rename to common/buildcraft/transport/statements/ActionPipeDirection.java index c63bfaf9..b4d80f8a 100644 --- a/common/buildcraft/transport/triggers/ActionPipeDirection.java +++ b/common/buildcraft/transport/statements/ActionPipeDirection.java @@ -6,17 +6,15 @@ * 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.transport.triggers; +package buildcraft.transport.statements; import java.util.Locale; import net.minecraft.client.renderer.texture.IIconRegister; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.gates.IAction; -import buildcraft.core.triggers.BCActionPassive; +import buildcraft.core.statements.BCActionPassive; public class ActionPipeDirection extends BCActionPassive { diff --git a/common/buildcraft/transport/triggers/ActionPowerLimiter.java b/common/buildcraft/transport/statements/ActionPowerLimiter.java similarity index 91% rename from common/buildcraft/transport/triggers/ActionPowerLimiter.java rename to common/buildcraft/transport/statements/ActionPowerLimiter.java index 11d31f3b..36432bda 100644 --- a/common/buildcraft/transport/triggers/ActionPowerLimiter.java +++ b/common/buildcraft/transport/statements/ActionPowerLimiter.java @@ -6,13 +6,13 @@ * 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.transport.triggers; +package buildcraft.transport.statements; import java.util.Locale; import net.minecraft.client.renderer.texture.IIconRegister; import buildcraft.core.PowerMode; -import buildcraft.core.triggers.BCActionPassive; +import buildcraft.core.statements.BCActionPassive; public class ActionPowerLimiter extends BCActionPassive { diff --git a/common/buildcraft/transport/triggers/ActionRedstoneFaderOutput.java b/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java similarity index 92% rename from common/buildcraft/transport/triggers/ActionRedstoneFaderOutput.java rename to common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java index e03b9064..40720e77 100644 --- a/common/buildcraft/transport/triggers/ActionRedstoneFaderOutput.java +++ b/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java @@ -6,15 +6,13 @@ * 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.transport.triggers; +package buildcraft.transport.statements; 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.core.triggers.BCActionPassive; +import buildcraft.core.statements.BCActionPassive; import buildcraft.core.utils.StringUtils; public class ActionRedstoneFaderOutput extends BCActionPassive { diff --git a/common/buildcraft/transport/triggers/ActionSignalOutput.java b/common/buildcraft/transport/statements/ActionSignalOutput.java similarity index 93% rename from common/buildcraft/transport/triggers/ActionSignalOutput.java rename to common/buildcraft/transport/statements/ActionSignalOutput.java index 12a2e39b..3c2af707 100644 --- a/common/buildcraft/transport/triggers/ActionSignalOutput.java +++ b/common/buildcraft/transport/statements/ActionSignalOutput.java @@ -6,15 +6,15 @@ * 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.transport.triggers; +package buildcraft.transport.statements; import java.util.Locale; import buildcraft.api.gates.IActionParameter; import buildcraft.api.gates.IGate; import buildcraft.api.transport.PipeWire; -import buildcraft.core.triggers.BCActionActive; -import buildcraft.core.triggers.StatementIconProvider; +import buildcraft.core.statements.BCActionActive; +import buildcraft.core.statements.StatementIconProvider; import buildcraft.core.utils.StringUtils; import buildcraft.transport.Gate; diff --git a/common/buildcraft/transport/triggers/ActionSingleEnergyPulse.java b/common/buildcraft/transport/statements/ActionSingleEnergyPulse.java similarity index 90% rename from common/buildcraft/transport/triggers/ActionSingleEnergyPulse.java rename to common/buildcraft/transport/statements/ActionSingleEnergyPulse.java index 27b5d354..0a438ef0 100644 --- a/common/buildcraft/transport/triggers/ActionSingleEnergyPulse.java +++ b/common/buildcraft/transport/statements/ActionSingleEnergyPulse.java @@ -6,11 +6,10 @@ * 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.transport.triggers; +package buildcraft.transport.statements; import net.minecraft.client.renderer.texture.IIconRegister; - -import buildcraft.core.triggers.BCActionPassive; +import buildcraft.core.statements.BCActionPassive; import buildcraft.core.utils.StringUtils; public class ActionSingleEnergyPulse extends BCActionPassive { diff --git a/common/buildcraft/transport/triggers/ActionValve.java b/common/buildcraft/transport/statements/ActionValve.java similarity index 94% rename from common/buildcraft/transport/triggers/ActionValve.java rename to common/buildcraft/transport/statements/ActionValve.java index aa7cf5e1..c96f2c42 100644 --- a/common/buildcraft/transport/triggers/ActionValve.java +++ b/common/buildcraft/transport/statements/ActionValve.java @@ -6,7 +6,7 @@ * 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.transport.triggers; +package buildcraft.transport.statements; import java.util.Locale; @@ -15,8 +15,8 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.gates.IActionParameter; import buildcraft.api.gates.IGate; import buildcraft.api.transport.IPipe; -import buildcraft.core.triggers.BCActionActive; -import buildcraft.core.triggers.StatementParameterDirection; +import buildcraft.core.statements.BCActionActive; +import buildcraft.core.statements.StatementParameterDirection; import buildcraft.core.utils.StringUtils; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransport; diff --git a/common/buildcraft/transport/triggers/TriggerClockTimer.java b/common/buildcraft/transport/statements/TriggerClockTimer.java similarity index 93% rename from common/buildcraft/transport/triggers/TriggerClockTimer.java rename to common/buildcraft/transport/statements/TriggerClockTimer.java index 425e46a6..d393f482 100644 --- a/common/buildcraft/transport/triggers/TriggerClockTimer.java +++ b/common/buildcraft/transport/statements/TriggerClockTimer.java @@ -6,13 +6,12 @@ * 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.transport.triggers; +package buildcraft.transport.statements; import java.util.Locale; import net.minecraft.client.renderer.texture.IIconRegister; - -import buildcraft.core.triggers.BCTrigger; +import buildcraft.core.statements.BCTrigger; import buildcraft.core.utils.StringUtils; public class TriggerClockTimer extends BCTrigger { diff --git a/common/buildcraft/transport/triggers/TriggerParameterSignal.java b/common/buildcraft/transport/statements/TriggerParameterSignal.java similarity index 96% rename from common/buildcraft/transport/triggers/TriggerParameterSignal.java rename to common/buildcraft/transport/statements/TriggerParameterSignal.java index e6d79c20..b8e3cba4 100755 --- a/common/buildcraft/transport/triggers/TriggerParameterSignal.java +++ b/common/buildcraft/transport/statements/TriggerParameterSignal.java @@ -6,18 +6,17 @@ * 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.transport.triggers; +package buildcraft.transport.statements; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; - import buildcraft.api.core.NetworkData; import buildcraft.api.gates.IStatement; import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.PipeWire; -import buildcraft.core.triggers.StatementIconProvider; +import buildcraft.core.statements.StatementIconProvider; public class TriggerParameterSignal implements ITriggerParameter { diff --git a/common/buildcraft/transport/triggers/TriggerPipeContents.java b/common/buildcraft/transport/statements/TriggerPipeContents.java similarity index 98% rename from common/buildcraft/transport/triggers/TriggerPipeContents.java rename to common/buildcraft/transport/statements/TriggerPipeContents.java index 231bf462..3a7be66f 100644 --- a/common/buildcraft/transport/triggers/TriggerPipeContents.java +++ b/common/buildcraft/transport/statements/TriggerPipeContents.java @@ -6,24 +6,21 @@ * 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.transport.triggers; +package buildcraft.transport.statements; import java.util.Locale; import net.minecraft.client.renderer.texture.IIconRegister; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; 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.core.inventory.StackHelper; -import buildcraft.core.triggers.BCTrigger; +import buildcraft.core.statements.BCTrigger; import buildcraft.core.utils.StringUtils; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportFluids; diff --git a/common/buildcraft/transport/triggers/TriggerPipeSignal.java b/common/buildcraft/transport/statements/TriggerPipeSignal.java similarity index 95% rename from common/buildcraft/transport/triggers/TriggerPipeSignal.java rename to common/buildcraft/transport/statements/TriggerPipeSignal.java index 5f20fcf7..b669bf53 100644 --- a/common/buildcraft/transport/triggers/TriggerPipeSignal.java +++ b/common/buildcraft/transport/statements/TriggerPipeSignal.java @@ -6,15 +6,15 @@ * 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.transport.triggers; +package buildcraft.transport.statements; import java.util.Locale; import buildcraft.api.gates.IGate; import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.transport.PipeWire; -import buildcraft.core.triggers.BCTrigger; -import buildcraft.core.triggers.StatementIconProvider; +import buildcraft.core.statements.BCTrigger; +import buildcraft.core.statements.StatementIconProvider; import buildcraft.core.utils.StringUtils; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/triggers/TriggerRedstoneFaderInput.java b/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java similarity index 94% rename from common/buildcraft/transport/triggers/TriggerRedstoneFaderInput.java rename to common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java index 8a1a9e52..ea049887 100644 --- a/common/buildcraft/transport/triggers/TriggerRedstoneFaderInput.java +++ b/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java @@ -6,14 +6,14 @@ * 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.transport.triggers; +package buildcraft.transport.statements; 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.core.triggers.BCTrigger; +import buildcraft.core.statements.BCTrigger; import buildcraft.core.utils.StringUtils; import buildcraft.transport.TileGenericPipe;