From e146d1b46df939b81648b287ac9cacbdbb647961 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Wed, 29 Oct 2014 09:25:28 +0100 Subject: [PATCH] fix style and BitSetUtils --- api/buildcraft/api/gates/GateExpansionController.java | 5 +++-- api/buildcraft/api/gates/IGate.java | 3 ++- api/buildcraft/api/statements/IActionProvider.java | 1 - .../api/statements/IStatementParameter.java | 5 +++-- api/buildcraft/api/statements/ITriggerInternal.java | 4 ---- api/buildcraft/api/statements/ITriggerProvider.java | 1 - api/buildcraft/api/statements/StatementManager.java | 1 - api/buildcraft/api/transport/IPipe.java | 5 ++--- common/buildcraft/BuildCraftBuilders.java | 4 ++-- common/buildcraft/BuildCraftCore.java | 6 ------ common/buildcraft/builders/TileBuilder.java | 1 - common/buildcraft/builders/TileFiller.java | 5 ----- .../builders/statements/BuildersActionProvider.java | 2 -- .../core/robots/boards/BoardRobotMiner.java | 1 - .../core/statements/ActionMachineControl.java | 2 +- .../core/statements/DefaultActionProvider.java | 3 +-- .../core/statements/DefaultTriggerProvider.java | 2 -- .../core/statements/StatementParameterDirection.java | 1 - .../StatementParameterRedstoneGateSideOnly.java | 1 - common/buildcraft/core/utils/BitSetUtils.java | 5 +++-- common/buildcraft/energy/TileEngine.java | 3 --- common/buildcraft/energy/TileEngineIron.java | 3 --- common/buildcraft/energy/TileEngineStone.java | 3 --- .../energy/statements/EnergyStatementProvider.java | 11 ++++++++--- common/buildcraft/factory/TileMiningWell.java | 1 - common/buildcraft/factory/TilePump.java | 1 - common/buildcraft/factory/TileQuarry.java | 1 - common/buildcraft/factory/TileRefinery.java | 1 - .../buildcraft/silicon/TileAdvancedCraftingTable.java | 1 - common/buildcraft/silicon/TileAssemblyTable.java | 1 - common/buildcraft/silicon/TileIntegrationTable.java | 1 - common/buildcraft/silicon/TileLaser.java | 6 ------ common/buildcraft/silicon/TileLaserTableBase.java | 7 +------ .../silicon/statements/ActionRobotGotoStation.java | 2 -- .../statements/ActionStationAcceptItemsPipe.java | 1 - .../silicon/statements/RobotsActionProvider.java | 1 - .../silicon/statements/RobotsTriggerProvider.java | 2 -- common/buildcraft/transport/Gate.java | 2 +- common/buildcraft/transport/Pipe.java | 2 +- common/buildcraft/transport/PipeActionProvider.java | 2 -- common/buildcraft/transport/PipeTriggerProvider.java | 2 -- common/buildcraft/transport/TileFilteredBuffer.java | 3 --- common/buildcraft/transport/pipes/PipeFluidsIron.java | 1 - .../transport/statements/ActionExtractionPreset.java | 1 - .../transport/statements/ActionParameterSignal.java | 3 --- .../transport/statements/ActionSignalOutput.java | 3 --- .../buildcraft/transport/statements/ActionValve.java | 2 -- .../transport/statements/TriggerParameterSignal.java | 2 -- .../transport/statements/TriggerPipeContents.java | 1 - .../transport/stripes/StripesHandlerBucket.java | 1 - 50 files changed, 28 insertions(+), 101 deletions(-) diff --git a/api/buildcraft/api/gates/GateExpansionController.java b/api/buildcraft/api/gates/GateExpansionController.java index 50b45c3e..5a9eca25 100644 --- a/api/buildcraft/api/gates/GateExpansionController.java +++ b/api/buildcraft/api/gates/GateExpansionController.java @@ -10,12 +10,13 @@ package buildcraft.api.gates; import java.util.List; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; + import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; public abstract class GateExpansionController { diff --git a/api/buildcraft/api/gates/IGate.java b/api/buildcraft/api/gates/IGate.java index c0ffb59f..622511f6 100644 --- a/api/buildcraft/api/gates/IGate.java +++ b/api/buildcraft/api/gates/IGate.java @@ -1,8 +1,9 @@ package buildcraft.api.gates; -import buildcraft.api.transport.IPipe; import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.transport.IPipe; + public interface IGate { @Deprecated void setPulsing(boolean pulse); diff --git a/api/buildcraft/api/statements/IActionProvider.java b/api/buildcraft/api/statements/IActionProvider.java index a3c25bcc..761156f8 100644 --- a/api/buildcraft/api/statements/IActionProvider.java +++ b/api/buildcraft/api/statements/IActionProvider.java @@ -10,7 +10,6 @@ package buildcraft.api.statements; import java.util.Collection; -import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; diff --git a/api/buildcraft/api/statements/IStatementParameter.java b/api/buildcraft/api/statements/IStatementParameter.java index 76175053..332b0d97 100755 --- a/api/buildcraft/api/statements/IStatementParameter.java +++ b/api/buildcraft/api/statements/IStatementParameter.java @@ -8,13 +8,14 @@ */ package buildcraft.api.statements; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public interface IStatementParameter { /** diff --git a/api/buildcraft/api/statements/ITriggerInternal.java b/api/buildcraft/api/statements/ITriggerInternal.java index d095fe05..750331b5 100755 --- a/api/buildcraft/api/statements/ITriggerInternal.java +++ b/api/buildcraft/api/statements/ITriggerInternal.java @@ -8,10 +8,6 @@ */ package buildcraft.api.statements; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; - - public interface ITriggerInternal extends IStatement { boolean isTriggerActive(IStatementContainer source, IStatementParameter[] parameters); diff --git a/api/buildcraft/api/statements/ITriggerProvider.java b/api/buildcraft/api/statements/ITriggerProvider.java index b94b6694..92c15421 100644 --- a/api/buildcraft/api/statements/ITriggerProvider.java +++ b/api/buildcraft/api/statements/ITriggerProvider.java @@ -10,7 +10,6 @@ package buildcraft.api.statements; import java.util.Collection; -import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; diff --git a/api/buildcraft/api/statements/StatementManager.java b/api/buildcraft/api/statements/StatementManager.java index 4b266e13..25ebd9c0 100644 --- a/api/buildcraft/api/statements/StatementManager.java +++ b/api/buildcraft/api/statements/StatementManager.java @@ -14,7 +14,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; diff --git a/api/buildcraft/api/transport/IPipe.java b/api/buildcraft/api/transport/IPipe.java index 952dd0fe..368a6515 100755 --- a/api/buildcraft/api/transport/IPipe.java +++ b/api/buildcraft/api/transport/IPipe.java @@ -8,11 +8,10 @@ */ package buildcraft.api.transport; -import buildcraft.api.gates.IGate; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.gates.IGate; + public interface IPipe { int x(); diff --git a/common/buildcraft/BuildCraftBuilders.java b/common/buildcraft/BuildCraftBuilders.java index c0af6cbe..084d3dd0 100644 --- a/common/buildcraft/BuildCraftBuilders.java +++ b/common/buildcraft/BuildCraftBuilders.java @@ -236,9 +236,9 @@ public class BuildCraftBuilders extends BuildCraftMod { } if ("/".equals(File.separator)) { - result = result.replaceAll("\\", "/"); + result = result.replaceAll("\\\\", "/"); } else { - result = result.replaceAll("/", "\\"); + result = result.replaceAll("/", "\\\\"); } return result; diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index e33931ee..a4960d18 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -153,7 +153,6 @@ public class BuildCraftCore extends BuildCraftMod { public static final int trackedPassiveEntityId = 156; public static Block springBlock; - public static Item scienceBookItem; public static Item woodenGearItem; public static Item stoneGearItem; public static Item ironGearItem; @@ -446,11 +445,6 @@ public class BuildCraftCore extends BuildCraftMod { } public void loadRecipes() { - if (!NONRELEASED_BLOCKS) { - CoreProxy.proxy.addCraftingRecipe(new ItemStack(scienceBookItem), "R ", "B ", 'R', Blocks.redstone_torch, 'B', - Items.book); - } - CoreProxy.proxy.addCraftingRecipe(new ItemStack(wrenchItem), "I I", " G ", " I ", 'I', Items.iron_ingot, 'G', stoneGearItem); CoreProxy.proxy.addCraftingRecipe(new ItemStack(woodenGearItem), " S ", "S S", " S ", 'S', diff --git a/common/buildcraft/builders/TileBuilder.java b/common/buildcraft/builders/TileBuilder.java index 749862c7..eb561598 100644 --- a/common/buildcraft/builders/TileBuilder.java +++ b/common/buildcraft/builders/TileBuilder.java @@ -35,7 +35,6 @@ import buildcraft.api.core.Position; import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.robots.IRequestProvider; import buildcraft.api.robots.StackRequest; -import buildcraft.api.statements.IStatement; import buildcraft.api.tiles.IHasWork; import buildcraft.core.Box; import buildcraft.core.Box.Kind; diff --git a/common/buildcraft/builders/TileFiller.java b/common/buildcraft/builders/TileFiller.java index 1cb230fa..a63385b0 100644 --- a/common/buildcraft/builders/TileFiller.java +++ b/common/buildcraft/builders/TileFiller.java @@ -15,15 +15,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; -import buildcraft.BuildCraftCore; import buildcraft.api.core.IAreaProvider; import buildcraft.api.filler.FillerManager; -import buildcraft.api.statements.IActionReceptor; -import buildcraft.api.statements.IStatement; -import buildcraft.api.statements.IStatementParameter; import buildcraft.api.tiles.IControllable; import buildcraft.api.tiles.IHasWork; -import buildcraft.builders.statements.ActionFiller; import buildcraft.core.Box; import buildcraft.core.Box.Kind; import buildcraft.core.blueprints.BptBuilderTemplate; diff --git a/common/buildcraft/builders/statements/BuildersActionProvider.java b/common/buildcraft/builders/statements/BuildersActionProvider.java index 057d9fed..b71b283f 100644 --- a/common/buildcraft/builders/statements/BuildersActionProvider.java +++ b/common/buildcraft/builders/statements/BuildersActionProvider.java @@ -12,7 +12,6 @@ import java.util.Collection; import java.util.HashMap; import java.util.LinkedList; -import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.filler.FillerManager; @@ -21,7 +20,6 @@ import buildcraft.api.statements.IActionExternal; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IActionProvider; import buildcraft.api.statements.IStatementContainer; -import buildcraft.api.transport.IPipeTile; import buildcraft.builders.TileFiller; import buildcraft.core.builders.patterns.FillerPattern; diff --git a/common/buildcraft/core/robots/boards/BoardRobotMiner.java b/common/buildcraft/core/robots/boards/BoardRobotMiner.java index 4a4d9f45..32cfc308 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotMiner.java +++ b/common/buildcraft/core/robots/boards/BoardRobotMiner.java @@ -8,7 +8,6 @@ */ package buildcraft.core.robots.boards; -import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/common/buildcraft/core/statements/ActionMachineControl.java b/common/buildcraft/core/statements/ActionMachineControl.java index f48dc577..72fd7bf2 100644 --- a/common/buildcraft/core/statements/ActionMachineControl.java +++ b/common/buildcraft/core/statements/ActionMachineControl.java @@ -50,7 +50,7 @@ public class ActionMachineControl extends BCStatement implements IActionExternal public void actionActivate(TileEntity target, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { if (target instanceof IControllable) { - ((IControllable)target).setControlMode(mode); + ((IControllable) target).setControlMode(mode); } } } diff --git a/common/buildcraft/core/statements/DefaultActionProvider.java b/common/buildcraft/core/statements/DefaultActionProvider.java index 2d8ae761..f3f3dcd7 100644 --- a/common/buildcraft/core/statements/DefaultActionProvider.java +++ b/common/buildcraft/core/statements/DefaultActionProvider.java @@ -13,10 +13,9 @@ import java.util.LinkedList; import org.apache.logging.log4j.Level; -import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.FMLLog; +import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.api.statements.IActionExternal; import buildcraft.api.statements.IActionInternal; diff --git a/common/buildcraft/core/statements/DefaultTriggerProvider.java b/common/buildcraft/core/statements/DefaultTriggerProvider.java index 94d746d0..8d581f3a 100644 --- a/common/buildcraft/core/statements/DefaultTriggerProvider.java +++ b/common/buildcraft/core/statements/DefaultTriggerProvider.java @@ -10,7 +10,6 @@ package buildcraft.core.statements; import java.util.LinkedList; -import net.minecraft.block.Block; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; @@ -23,7 +22,6 @@ import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.ITriggerProvider; import buildcraft.api.tiles.IHasWork; -import buildcraft.api.transport.IPipeTile; public class DefaultTriggerProvider implements ITriggerProvider { diff --git a/common/buildcraft/core/statements/StatementParameterDirection.java b/common/buildcraft/core/statements/StatementParameterDirection.java index 91ff53b3..5642ea13 100644 --- a/common/buildcraft/core/statements/StatementParameterDirection.java +++ b/common/buildcraft/core/statements/StatementParameterDirection.java @@ -17,7 +17,6 @@ import buildcraft.api.core.NetworkData; import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.transport.IPipe; -import buildcraft.api.transport.IPipeTile; import buildcraft.core.utils.StringUtils; public class StatementParameterDirection implements IStatementParameter { diff --git a/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java b/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java index 2fdcc21b..fcda94e7 100644 --- a/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java +++ b/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java @@ -7,7 +7,6 @@ import net.minecraft.util.IIcon; import buildcraft.api.core.NetworkData; import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; -import buildcraft.api.transport.IPipeTile; import buildcraft.core.utils.StringUtils; public class StatementParameterRedstoneGateSideOnly implements diff --git a/common/buildcraft/core/utils/BitSetUtils.java b/common/buildcraft/core/utils/BitSetUtils.java index 67833c7d..419061b4 100644 --- a/common/buildcraft/core/utils/BitSetUtils.java +++ b/common/buildcraft/core/utils/BitSetUtils.java @@ -9,7 +9,7 @@ public final class BitSetUtils { } public static BitSet fromByteArray(byte[] bytes) { - BitSet bits = new BitSet(); + BitSet bits = new BitSet(bytes.length * 8); for (int i = 0; i < bytes.length * 8; i++) { if ((bytes[bytes.length - (i >> 3) - 1] & (1 << (i & 7))) > 0) { bits.set(i); @@ -19,7 +19,8 @@ public final class BitSetUtils { } public static byte[] toByteArray(BitSet bits) { - byte[] bytes = new byte[(bits.length() >> 3) + (bits.length() & 7) == 0 ? 0 : 1]; + byte[] bytes = new byte[(bits.length() + 7) >> 3]; + System.out.println(bits.length() + " " + bytes.length); for (int i = 0; i < bits.length(); i++) { if (bits.get(i)) { bytes[bytes.length - (i >> 3) - 1] |= 1 << (i & 7); diff --git a/common/buildcraft/energy/TileEngine.java b/common/buildcraft/energy/TileEngine.java index 8a41810a..8bce5f13 100644 --- a/common/buildcraft/energy/TileEngine.java +++ b/common/buildcraft/energy/TileEngine.java @@ -8,8 +8,6 @@ */ package buildcraft.energy; -import java.util.LinkedList; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.nbt.NBTTagCompound; @@ -17,7 +15,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyHandler; -import buildcraft.BuildCraftEnergy; import buildcraft.api.core.NetworkData; import buildcraft.api.power.IPowerEmitter; import buildcraft.api.power.IPowerReceptor; diff --git a/common/buildcraft/energy/TileEngineIron.java b/common/buildcraft/energy/TileEngineIron.java index d987c1af..6ee05fff 100644 --- a/common/buildcraft/energy/TileEngineIron.java +++ b/common/buildcraft/energy/TileEngineIron.java @@ -8,8 +8,6 @@ */ package buildcraft.energy; -import java.util.LinkedList; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.item.ItemStack; @@ -22,7 +20,6 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import buildcraft.BuildCraftCore; import buildcraft.BuildCraftEnergy; import buildcraft.api.core.StackKey; import buildcraft.api.fuels.BuildcraftFuelRegistry; diff --git a/common/buildcraft/energy/TileEngineStone.java b/common/buildcraft/energy/TileEngineStone.java index ebb5892c..5889bc3c 100644 --- a/common/buildcraft/energy/TileEngineStone.java +++ b/common/buildcraft/energy/TileEngineStone.java @@ -8,8 +8,6 @@ */ package buildcraft.energy; -import java.util.LinkedList; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.item.ItemStack; @@ -17,7 +15,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.BuildCraftCore; import buildcraft.BuildCraftEnergy; import buildcraft.core.GuiIds; import buildcraft.core.inventory.InvUtils; diff --git a/common/buildcraft/energy/statements/EnergyStatementProvider.java b/common/buildcraft/energy/statements/EnergyStatementProvider.java index 82b94bfd..44059312 100644 --- a/common/buildcraft/energy/statements/EnergyStatementProvider.java +++ b/common/buildcraft/energy/statements/EnergyStatementProvider.java @@ -1,18 +1,23 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ package buildcraft.energy.statements; import java.util.Collection; import java.util.LinkedList; -import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftEnergy; -import buildcraft.api.statements.IActionProvider; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.ITriggerProvider; -import buildcraft.api.transport.IPipeTile; import buildcraft.energy.TileEngine; public class EnergyStatementProvider implements ITriggerProvider { diff --git a/common/buildcraft/factory/TileMiningWell.java b/common/buildcraft/factory/TileMiningWell.java index 0fb8a007..b0bfc0d5 100644 --- a/common/buildcraft/factory/TileMiningWell.java +++ b/common/buildcraft/factory/TileMiningWell.java @@ -17,7 +17,6 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftFactory; -import buildcraft.api.statements.IStatement; import buildcraft.api.tiles.IHasWork; import buildcraft.api.transport.IPipeConnection; import buildcraft.api.transport.IPipeTile.PipeType; diff --git a/common/buildcraft/factory/TilePump.java b/common/buildcraft/factory/TilePump.java index ff1ad95a..9e252362 100644 --- a/common/buildcraft/factory/TilePump.java +++ b/common/buildcraft/factory/TilePump.java @@ -31,7 +31,6 @@ import buildcraft.BuildCraftCore; import buildcraft.BuildCraftFactory; import buildcraft.api.core.BlockIndex; import buildcraft.api.core.SafeTimeTracker; -import buildcraft.api.statements.IStatement; import buildcraft.api.tiles.IHasWork; import buildcraft.core.CoreConstants; import buildcraft.core.EntityBlock; diff --git a/common/buildcraft/factory/TileQuarry.java b/common/buildcraft/factory/TileQuarry.java index bf134736..19a895ef 100644 --- a/common/buildcraft/factory/TileQuarry.java +++ b/common/buildcraft/factory/TileQuarry.java @@ -36,7 +36,6 @@ import buildcraft.api.core.IAreaProvider; import buildcraft.api.core.NetworkData; import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.filler.FillerManager; -import buildcraft.api.statements.IStatement; import buildcraft.api.tiles.IHasWork; import buildcraft.core.Box; import buildcraft.core.Box.Kind; diff --git a/common/buildcraft/factory/TileRefinery.java b/common/buildcraft/factory/TileRefinery.java index c89c9b7c..e8d1f5d8 100644 --- a/common/buildcraft/factory/TileRefinery.java +++ b/common/buildcraft/factory/TileRefinery.java @@ -30,7 +30,6 @@ import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.recipes.CraftingResult; import buildcraft.api.recipes.IFlexibleCrafter; import buildcraft.api.recipes.IFlexibleRecipe; -import buildcraft.api.statements.IStatement; import buildcraft.api.tiles.IHasWork; import buildcraft.core.RFBattery; import buildcraft.core.TileBuildCraft; diff --git a/common/buildcraft/silicon/TileAdvancedCraftingTable.java b/common/buildcraft/silicon/TileAdvancedCraftingTable.java index e412d471..3a1378b1 100644 --- a/common/buildcraft/silicon/TileAdvancedCraftingTable.java +++ b/common/buildcraft/silicon/TileAdvancedCraftingTable.java @@ -46,7 +46,6 @@ import buildcraft.core.inventory.filters.IStackFilter; import buildcraft.core.network.PacketIds; import buildcraft.core.network.PacketSlotChange; import buildcraft.core.proxy.CoreProxy; -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 d26eead6..aefdba03 100644 --- a/common/buildcraft/silicon/TileAssemblyTable.java +++ b/common/buildcraft/silicon/TileAssemblyTable.java @@ -35,7 +35,6 @@ import buildcraft.core.recipes.AssemblyRecipeManager; import buildcraft.core.robots.EntityRobot; import buildcraft.core.robots.ResourceIdAssemblyTable; import buildcraft.core.robots.RobotRegistry; -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 b1893f72..b30b18a1 100644 --- a/common/buildcraft/silicon/TileIntegrationTable.java +++ b/common/buildcraft/silicon/TileIntegrationTable.java @@ -23,7 +23,6 @@ import buildcraft.core.inventory.InventoryMapper; import buildcraft.core.inventory.SimpleInventory; import buildcraft.core.inventory.StackHelper; import buildcraft.core.inventory.Transactor; -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 84254342..2b5821f0 100644 --- a/common/buildcraft/silicon/TileLaser.java +++ b/common/buildcraft/silicon/TileLaser.java @@ -16,16 +16,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.BuildCraftCore; import buildcraft.api.core.NetworkData; import buildcraft.api.core.Position; import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.power.ILaserTarget; import buildcraft.api.power.ILaserTargetBlock; -import buildcraft.api.statements.IActionInternal; -import buildcraft.api.statements.IActionReceptor; -import buildcraft.api.statements.IStatement; -import buildcraft.api.statements.IStatementParameter; import buildcraft.api.tiles.IControllable; import buildcraft.api.tiles.IHasWork; import buildcraft.core.Box; @@ -33,7 +28,6 @@ import buildcraft.core.EntityLaser; import buildcraft.core.LaserData; import buildcraft.core.RFBattery; import buildcraft.core.TileBuildCraft; -import buildcraft.core.statements.ActionMachineControl; public class TileLaser extends TileBuildCraft implements IHasWork, IControllable { diff --git a/common/buildcraft/silicon/TileLaserTableBase.java b/common/buildcraft/silicon/TileLaserTableBase.java index fc553028..963bbce7 100644 --- a/common/buildcraft/silicon/TileLaserTableBase.java +++ b/common/buildcraft/silicon/TileLaserTableBase.java @@ -14,17 +14,12 @@ 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.power.ILaserTarget; -import buildcraft.api.statements.IActionReceptor; -import buildcraft.api.statements.IStatement; -import buildcraft.api.statements.IStatementParameter; import buildcraft.api.tiles.IControllable; -import buildcraft.api.tiles.IHasWork; import buildcraft.api.tiles.IControllable.Mode; +import buildcraft.api.tiles.IHasWork; import buildcraft.core.TileBuildCraft; import buildcraft.core.inventory.SimpleInventory; -import buildcraft.core.statements.ActionMachineControl; import buildcraft.core.utils.AverageUtil; public abstract class TileLaserTableBase extends TileBuildCraft implements ILaserTarget, IInventory, IHasWork, IControllable { diff --git a/common/buildcraft/silicon/statements/ActionRobotGotoStation.java b/common/buildcraft/silicon/statements/ActionRobotGotoStation.java index 81fc54d1..49621077 100755 --- a/common/buildcraft/silicon/statements/ActionRobotGotoStation.java +++ b/common/buildcraft/silicon/statements/ActionRobotGotoStation.java @@ -10,7 +10,6 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.AIRobot; @@ -27,7 +26,6 @@ import buildcraft.core.statements.BCStatement; import buildcraft.core.utils.StringUtils; import buildcraft.transport.Gate; import buildcraft.transport.Pipe; -import buildcraft.transport.TileGenericPipe; public class ActionRobotGotoStation extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/silicon/statements/ActionStationAcceptItemsPipe.java b/common/buildcraft/silicon/statements/ActionStationAcceptItemsPipe.java index 9227ff35..2feea98a 100755 --- a/common/buildcraft/silicon/statements/ActionStationAcceptItemsPipe.java +++ b/common/buildcraft/silicon/statements/ActionStationAcceptItemsPipe.java @@ -10,7 +10,6 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; import buildcraft.api.core.IInvSlot; -import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.robots.DockingStation; diff --git a/common/buildcraft/silicon/statements/RobotsActionProvider.java b/common/buildcraft/silicon/statements/RobotsActionProvider.java index d5713fe8..42a74811 100755 --- a/common/buildcraft/silicon/statements/RobotsActionProvider.java +++ b/common/buildcraft/silicon/statements/RobotsActionProvider.java @@ -25,7 +25,6 @@ import buildcraft.api.statements.IActionExternal; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IActionProvider; import buildcraft.api.statements.IStatementContainer; -import buildcraft.api.transport.IPipeTile; import buildcraft.core.robots.DockingStation; import buildcraft.silicon.TileAssemblyTable; import buildcraft.transport.PipeTransportItems; diff --git a/common/buildcraft/silicon/statements/RobotsTriggerProvider.java b/common/buildcraft/silicon/statements/RobotsTriggerProvider.java index d5b4b882..478f0ab7 100755 --- a/common/buildcraft/silicon/statements/RobotsTriggerProvider.java +++ b/common/buildcraft/silicon/statements/RobotsTriggerProvider.java @@ -11,7 +11,6 @@ package buildcraft.silicon.statements; import java.util.Collection; import java.util.LinkedList; -import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftSilicon; @@ -19,7 +18,6 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.ITriggerProvider; -import buildcraft.api.transport.IPipeTile; import buildcraft.transport.TileGenericPipe; public class RobotsTriggerProvider implements ITriggerProvider { diff --git a/common/buildcraft/transport/Gate.java b/common/buildcraft/transport/Gate.java index 2828234a..ba7a72a2 100644 --- a/common/buildcraft/transport/Gate.java +++ b/common/buildcraft/transport/Gate.java @@ -41,10 +41,10 @@ import buildcraft.api.transport.PipeWire; import buildcraft.core.GuiIds; import buildcraft.core.statements.ActionRedstoneOutput; import buildcraft.core.statements.StatementParameterRedstoneGateSideOnly; -import buildcraft.transport.gates.StatementSlot; import buildcraft.transport.gates.GateDefinition.GateLogic; import buildcraft.transport.gates.GateDefinition.GateMaterial; import buildcraft.transport.gates.ItemGate; +import buildcraft.transport.gates.StatementSlot; import buildcraft.transport.gui.ContainerGateInterface; import buildcraft.transport.statements.ActionRedstoneFaderOutput; diff --git a/common/buildcraft/transport/Pipe.java b/common/buildcraft/transport/Pipe.java index 0e3dd998..431115c4 100644 --- a/common/buildcraft/transport/Pipe.java +++ b/common/buildcraft/transport/Pipe.java @@ -40,8 +40,8 @@ import buildcraft.core.IDropControlInventory; import buildcraft.core.inventory.InvUtils; import buildcraft.core.network.TilePacketWrapper; import buildcraft.core.utils.Utils; -import buildcraft.transport.gates.StatementSlot; import buildcraft.transport.gates.GateFactory; +import buildcraft.transport.gates.StatementSlot; import buildcraft.transport.pipes.events.PipeEvent; import buildcraft.transport.statements.ActionValve.ValveState; diff --git a/common/buildcraft/transport/PipeActionProvider.java b/common/buildcraft/transport/PipeActionProvider.java index 45c18073..ad077572 100644 --- a/common/buildcraft/transport/PipeActionProvider.java +++ b/common/buildcraft/transport/PipeActionProvider.java @@ -3,7 +3,6 @@ package buildcraft.transport; import java.util.Collection; import java.util.LinkedList; -import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.gates.IGate; @@ -11,7 +10,6 @@ import buildcraft.api.statements.IActionExternal; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IActionProvider; import buildcraft.api.statements.IStatementContainer; -import buildcraft.api.transport.IPipeTile; public class PipeActionProvider implements IActionProvider { diff --git a/common/buildcraft/transport/PipeTriggerProvider.java b/common/buildcraft/transport/PipeTriggerProvider.java index 42de4b28..d6db52c1 100644 --- a/common/buildcraft/transport/PipeTriggerProvider.java +++ b/common/buildcraft/transport/PipeTriggerProvider.java @@ -10,7 +10,6 @@ package buildcraft.transport; 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; @@ -19,7 +18,6 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.ITriggerProvider; -import buildcraft.api.transport.IPipeTile; import buildcraft.transport.statements.TriggerPipeContents; public class PipeTriggerProvider implements ITriggerProvider { diff --git a/common/buildcraft/transport/TileFilteredBuffer.java b/common/buildcraft/transport/TileFilteredBuffer.java index 153249db..7e4feeb9 100644 --- a/common/buildcraft/transport/TileFilteredBuffer.java +++ b/common/buildcraft/transport/TileFilteredBuffer.java @@ -8,13 +8,10 @@ */ package buildcraft.transport; -import java.util.LinkedList; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import buildcraft.BuildCraftCore; import buildcraft.core.TileBuildCraft; import buildcraft.core.inventory.SimpleInventory; diff --git a/common/buildcraft/transport/pipes/PipeFluidsIron.java b/common/buildcraft/transport/pipes/PipeFluidsIron.java index 0b14db9c..86f1639b 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsIron.java +++ b/common/buildcraft/transport/pipes/PipeFluidsIron.java @@ -21,7 +21,6 @@ import net.minecraftforge.fluids.IFluidHandler; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.statements.IActionInternal; -import buildcraft.api.statements.IStatement; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportFluids; diff --git a/common/buildcraft/transport/statements/ActionExtractionPreset.java b/common/buildcraft/transport/statements/ActionExtractionPreset.java index c793c0de..80d0af6e 100644 --- a/common/buildcraft/transport/statements/ActionExtractionPreset.java +++ b/common/buildcraft/transport/statements/ActionExtractionPreset.java @@ -15,7 +15,6 @@ import buildcraft.api.core.EnumColor; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; -import buildcraft.api.statements.ITriggerInternal; import buildcraft.core.statements.BCStatement; import buildcraft.core.utils.StringUtils; diff --git a/common/buildcraft/transport/statements/ActionParameterSignal.java b/common/buildcraft/transport/statements/ActionParameterSignal.java index 32803d82..87be3f7b 100644 --- a/common/buildcraft/transport/statements/ActionParameterSignal.java +++ b/common/buildcraft/transport/statements/ActionParameterSignal.java @@ -17,10 +17,7 @@ import net.minecraft.util.IIcon; import buildcraft.api.core.NetworkData; import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; -import buildcraft.api.transport.IPipe; -import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.PipeWire; -import buildcraft.core.statements.StatementIconProvider; import buildcraft.core.utils.StringUtils; public class ActionParameterSignal implements IStatementParameter { diff --git a/common/buildcraft/transport/statements/ActionSignalOutput.java b/common/buildcraft/transport/statements/ActionSignalOutput.java index 85aa6610..fa6cb613 100644 --- a/common/buildcraft/transport/statements/ActionSignalOutput.java +++ b/common/buildcraft/transport/statements/ActionSignalOutput.java @@ -10,12 +10,9 @@ package buildcraft.transport.statements; import java.util.Locale; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; -import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.PipeWire; import buildcraft.core.statements.BCStatement; import buildcraft.core.statements.StatementIconProvider; diff --git a/common/buildcraft/transport/statements/ActionValve.java b/common/buildcraft/transport/statements/ActionValve.java index 3a0409d1..bd26ab3b 100644 --- a/common/buildcraft/transport/statements/ActionValve.java +++ b/common/buildcraft/transport/statements/ActionValve.java @@ -11,13 +11,11 @@ package buildcraft.transport.statements; import java.util.Locale; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.transport.IPipe; -import buildcraft.api.transport.IPipeTile; import buildcraft.core.statements.BCStatement; import buildcraft.core.statements.StatementParameterDirection; import buildcraft.core.utils.StringUtils; diff --git a/common/buildcraft/transport/statements/TriggerParameterSignal.java b/common/buildcraft/transport/statements/TriggerParameterSignal.java index a2f6f3f5..c923cf7e 100644 --- a/common/buildcraft/transport/statements/TriggerParameterSignal.java +++ b/common/buildcraft/transport/statements/TriggerParameterSignal.java @@ -17,9 +17,7 @@ import net.minecraft.util.IIcon; import buildcraft.api.core.NetworkData; import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; -import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.PipeWire; -import buildcraft.core.statements.StatementIconProvider; import buildcraft.core.utils.StringUtils; public class TriggerParameterSignal implements IStatementParameter { diff --git a/common/buildcraft/transport/statements/TriggerPipeContents.java b/common/buildcraft/transport/statements/TriggerPipeContents.java index 9417dd10..5ad7a110 100644 --- a/common/buildcraft/transport/statements/TriggerPipeContents.java +++ b/common/buildcraft/transport/statements/TriggerPipeContents.java @@ -18,7 +18,6 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import buildcraft.api.gates.IGate; -import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; diff --git a/common/buildcraft/transport/stripes/StripesHandlerBucket.java b/common/buildcraft/transport/stripes/StripesHandlerBucket.java index be2104d4..16f6ec64 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerBucket.java +++ b/common/buildcraft/transport/stripes/StripesHandlerBucket.java @@ -6,7 +6,6 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemBucket; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid;