From 50e2127e5516db61aa83a5069a7e50a909d06d1c Mon Sep 17 00:00:00 2001 From: marcin212 Date: Mon, 22 Dec 2014 12:08:17 +0100 Subject: [PATCH] fixed checkstyle --- .../api/blueprints/BlueprintDeployer.java | 1 + .../api/blueprints/IBuilderContext.java | 1 + .../api/blueprints/MappingRegistry.java | 2 ++ api/buildcraft/api/blueprints/Schematic.java | 1 + .../api/blueprints/SchematicBlock.java | 1 + .../api/blueprints/SchematicEntity.java | 2 ++ .../api/blueprints/SchematicFluid.java | 1 + .../api/blueprints/SchematicMask.java | 1 + .../api/blueprints/SchematicTile.java | 1 + api/buildcraft/api/blueprints/package-info.java | 1 + api/buildcraft/api/boards/package-info.java | 1 + api/buildcraft/api/core/JavaTools.java | 12 +++++------- api/buildcraft/api/core/Position.java | 1 + api/buildcraft/api/core/StackKey.java | 1 + api/buildcraft/api/core/package-info.java | 1 + api/buildcraft/api/core/render/ICullable.java | 1 + api/buildcraft/api/events/package-info.java | 1 + api/buildcraft/api/facades/package-info.java | 1 + api/buildcraft/api/filler/package-info.java | 1 + api/buildcraft/api/fuels/ISolidCoolant.java | 1 + api/buildcraft/api/fuels/package-info.java | 1 + api/buildcraft/api/package-info.java | 1 + .../api/power/IRedstoneEngineReceiver.java | 2 +- api/buildcraft/api/power/package-info.java | 1 + api/buildcraft/api/robots/package-info.java | 1 + .../api/statements/IActionExternal.java | 1 + .../api/statements/IActionProvider.java | 1 + .../api/statements/ITriggerExternal.java | 1 + .../api/statements/ITriggerProvider.java | 1 + .../api/statements/StatementManager.java | 2 ++ api/buildcraft/api/tools/package-info.java | 1 + api/buildcraft/api/transport/IInjectable.java | 2 ++ api/buildcraft/api/transport/IPipe.java | 1 + api/buildcraft/api/transport/IPipeTile.java | 2 ++ .../api/transport/IStripesHandler.java | 1 + api/buildcraft/api/transport/IStripesPipe.java | 1 + api/buildcraft/api/transport/PipeManager.java | 1 + .../transport/pluggable/IPipePluggableItem.java | 2 ++ .../pluggable/IPipePluggableRenderer.java | 2 ++ .../api/transport/pluggable/PipePluggable.java | 2 ++ api/cofh/api/energy/TileEnergyHandler.java | 1 + api/cofh/api/energy/package-info.java | 3 ++- common/buildcraft/BCCompatHooks.java | 2 ++ common/buildcraft/BuildCraftBuilders.java | 3 +++ common/buildcraft/BuildCraftCore.java | 6 +++--- common/buildcraft/BuildCraftEnergy.java | 3 +++ common/buildcraft/BuildCraftFactory.java | 3 +++ common/buildcraft/BuildCraftMod.java | 2 ++ common/buildcraft/BuildCraftSilicon.java | 3 +++ common/buildcraft/BuildCraftTransport.java | 17 ++++++++++------- .../builders/BlockBlueprintLibrary.java | 2 ++ .../buildcraft/builders/BuilderProxyClient.java | 1 + .../builders/EventHandlerBuilders.java | 1 + .../builders/HeuristicBlockDetection.java | 2 ++ common/buildcraft/builders/RenderArchitect.java | 1 + .../builders/RenderConstructionMarker.java | 1 + common/buildcraft/builders/TileArchitect.java | 2 ++ .../builders/TileBlueprintLibrary.java | 2 ++ common/buildcraft/builders/TileBuilder.java | 4 ++++ .../builders/TileConstructionMarker.java | 4 ++++ common/buildcraft/builders/TileFiller.java | 3 +++ common/buildcraft/builders/TileMarker.java | 1 + common/buildcraft/builders/TilePathMarker.java | 1 + .../builders/blueprints/BlueprintDatabase.java | 2 ++ .../builders/blueprints/BlueprintId.java | 1 + .../builders/gui/ContainerBuilder.java | 1 + .../buildcraft/builders/gui/GuiArchitect.java | 2 ++ common/buildcraft/builders/gui/GuiBuilder.java | 1 + common/buildcraft/builders/gui/GuiFiller.java | 1 + .../builders/schematics/SchematicAir.java | 2 ++ .../builders/schematics/SchematicDoor.java | 1 + .../schematics/SchematicFactoryBlock.java | 1 + .../schematics/SchematicFactoryEntity.java | 1 + .../schematics/SchematicFactoryMask.java | 1 + .../builders/statements/ActionFiller.java | 2 ++ .../statements/BuildersActionProvider.java | 2 ++ .../builders/urbanism/AnchoredBox.java | 2 ++ .../builders/urbanism/TileUrbanist.java | 2 ++ .../builders/urbanism/UrbanistToolBlock.java | 1 + .../builders/urbanism/UrbanistToolFiller.java | 2 ++ .../commander/ContainerRequester.java | 2 ++ .../buildcraft/commander/ContainerZonePlan.java | 2 ++ common/buildcraft/commander/GuiZonePlan.java | 2 ++ common/buildcraft/commander/TileRequester.java | 2 ++ common/buildcraft/commander/TileZonePlan.java | 1 + common/buildcraft/core/BlockBuildCraft.java | 2 ++ common/buildcraft/core/BlockSpring.java | 1 + common/buildcraft/core/ChunkIndex.java | 2 ++ .../buildcraft/core/EntityBuildCraftItem.java | 4 ++-- common/buildcraft/core/InterModComms.java | 3 +++ common/buildcraft/core/ItemBuildCraft.java | 1 + common/buildcraft/core/LaserData.java | 1 + common/buildcraft/core/StackAtPosition.java | 2 ++ common/buildcraft/core/TickHandlerCore.java | 2 ++ common/buildcraft/core/TileBuildCraft.java | 4 ++++ common/buildcraft/core/ZoneChunk.java | 2 ++ common/buildcraft/core/ZonePlan.java | 1 + .../buildcraft/core/blueprints/Blueprint.java | 2 ++ .../core/blueprints/BlueprintBase.java | 2 ++ .../blueprints/BlueprintReadConfiguration.java | 2 ++ .../core/blueprints/BptBuilderBase.java | 2 ++ .../core/blueprints/BptBuilderBlueprint.java | 2 ++ .../core/blueprints/BptBuilderTemplate.java | 2 ++ .../buildcraft/core/blueprints/BptContext.java | 1 + .../core/blueprints/SchematicRegistry.java | 2 ++ .../buildcraft/core/builders/BuildingItem.java | 3 +++ .../buildcraft/core/builders/BuildingSlot.java | 1 + .../core/builders/BuildingSlotBlock.java | 2 ++ .../core/builders/BuildingSlotEntity.java | 1 + .../core/builders/TileAbstractBuilder.java | 3 +++ .../core/builders/patterns/FillerPattern.java | 1 + .../core/builders/patterns/PatternBox.java | 1 + .../core/builders/patterns/PatternClear.java | 1 + .../core/builders/patterns/PatternCylinder.java | 1 + .../core/builders/patterns/PatternFlatten.java | 1 + .../core/builders/patterns/PatternFrame.java | 1 + .../core/builders/patterns/PatternHorizon.java | 1 + common/buildcraft/core/gui/ContainerList.java | 2 ++ .../core/gui/slots/SlotArchitect.java | 1 + .../buildcraft/core/inventory/Transactor.java | 1 + .../core/inventory/TransactorRoundRobin.java | 2 ++ .../core/inventory/filters/CraftingFilter.java | 1 + .../filters/StatementParameterStackFilter.java | 1 + .../buildcraft/core/network/CommandTarget.java | 1 + .../core/network/CommandTargetContainer.java | 1 + .../core/network/CommandTargetEntity.java | 1 + .../core/network/CommandTargetTile.java | 1 + .../core/network/ICommandReceiver.java | 1 + .../buildcraft/core/network/PacketCommand.java | 4 ++++ .../core/network/PacketTileState.java | 1 + .../core/network/PacketTileUpdate.java | 1 + .../buildcraft/core/network/PacketUpdate.java | 1 + .../buildcraft/core/network/Serializable.java | 1 + .../core/recipes/AssemblyRecipeManager.java | 1 + .../buildcraft/core/recipes/FlexibleRecipe.java | 2 ++ .../core/recipes/RefineryRecipeManager.java | 2 ++ .../core/render/RenderBoxProvider.java | 1 + .../buildcraft/core/render/RenderBuilder.java | 1 + .../core/render/RenderBuildingItems.java | 1 + .../core/render/RenderEntityBlock.java | 4 ++-- common/buildcraft/core/render/RenderRobot.java | 2 ++ .../core/robots/AIRobotSearchStackRequest.java | 2 ++ common/buildcraft/core/robots/EntityRobot.java | 4 ++++ .../core/robots/RobotIntegrationRecipe.java | 1 + .../buildcraft/core/robots/RobotRegistry.java | 15 +++++++-------- .../core/robots/boards/BoardRobotBuilder.java | 1 + .../boards/BoardRobotGenericBreakBlock.java | 1 + .../core/robots/boards/BoardRobotPump.java | 2 ++ .../core/statements/ActionMachineControl.java | 3 +++ .../core/statements/ActionRedstoneOutput.java | 2 ++ .../buildcraft/core/statements/BCStatement.java | 2 ++ .../core/statements/DefaultActionProvider.java | 2 ++ .../core/statements/DefaultTriggerProvider.java | 3 +++ .../statements/StatementParameterDirection.java | 2 ++ .../StatementParameterRedstoneGateSideOnly.java | 1 + .../core/statements/TriggerEnergy.java | 4 ++++ .../core/statements/TriggerFluidContainer.java | 2 ++ .../statements/TriggerFluidContainerLevel.java | 2 ++ .../core/statements/TriggerInventory.java | 2 ++ .../core/statements/TriggerInventoryLevel.java | 2 ++ .../core/statements/TriggerMachine.java | 2 ++ .../core/statements/TriggerRedstoneInput.java | 1 + common/buildcraft/core/utils/BlockUtils.java | 1 - common/buildcraft/core/utils/ColorUtils.java | 1 + common/buildcraft/core/utils/FluidUtils.java | 1 + common/buildcraft/core/utils/WorldProperty.java | 1 + .../core/utils/WorldPropertyIsOre.java | 1 + common/buildcraft/energy/EnergyProxyClient.java | 1 + common/buildcraft/energy/TileEngine.java | 4 ++++ .../buildcraft/energy/TileEngineCreative.java | 3 +++ common/buildcraft/energy/TileEngineIron.java | 2 ++ common/buildcraft/energy/TileEngineStone.java | 2 ++ common/buildcraft/energy/TileEngineWood.java | 4 +++- .../buildcraft/energy/fuels/CoolantManager.java | 1 + .../buildcraft/energy/gui/ContainerEngine.java | 1 + .../statements/EnergyStatementProvider.java | 2 ++ .../energy/statements/TriggerEngineHeat.java | 3 +++ .../energy/worldgen/GenLayerBiomeReplacer.java | 1 + common/buildcraft/factory/BlockFrame.java | 3 +++ common/buildcraft/factory/BlockMiner.java | 3 +++ .../buildcraft/factory/FactoryProxyClient.java | 2 ++ common/buildcraft/factory/TileHopper.java | 2 ++ common/buildcraft/factory/TileMiningWell.java | 2 ++ common/buildcraft/factory/TilePump.java | 3 +++ common/buildcraft/factory/TileQuarry.java | 3 +++ common/buildcraft/factory/TileRefinery.java | 3 +++ .../buildcraft/factory/render/RenderHopper.java | 4 ++-- common/buildcraft/silicon/BlockLaserTable.java | 2 ++ common/buildcraft/silicon/GuiHandler.java | 1 + .../silicon/TileAdvancedCraftingTable.java | 2 ++ .../buildcraft/silicon/TileAssemblyTable.java | 4 ++++ .../buildcraft/silicon/TileChargingTable.java | 3 +++ .../silicon/TileIntegrationTable.java | 3 ++- common/buildcraft/silicon/TileLaser.java | 3 +++ .../buildcraft/silicon/TileLaserTableBase.java | 3 +-- .../silicon/gui/ContainerChargingTable.java | 1 + .../silicon/gui/GuiChargingTable.java | 1 + .../silicon/render/RenderLaserBlock.java | 4 ++-- .../silicon/statements/ActionRobotFilter.java | 2 ++ .../statements/ActionRobotGotoStation.java | 2 ++ .../silicon/statements/ActionRobotWakeUp.java | 1 + .../statements/ActionRobotWorkInArea.java | 1 + .../statements/ActionStationAcceptFluids.java | 1 + .../statements/ActionStationAcceptItemsInv.java | 2 ++ .../ActionStationAcceptItemsPipe.java | 1 + .../statements/ActionStationAllowCraft.java | 1 + .../statements/ActionStationForbidRobot.java | 1 + .../statements/ActionStationProvideFluids.java | 1 + .../statements/ActionStationProvideItems.java | 1 + .../statements/ActionStationRequestItems.java | 2 ++ .../ActionStationRequestItemsMachine.java | 1 + .../statements/RobotsActionProvider.java | 2 ++ .../statements/RobotsTriggerProvider.java | 2 ++ .../statements/StateStationProvideItems.java | 1 + .../statements/StateStationRequestItems.java | 1 + .../silicon/statements/TriggerRobotSleep.java | 2 ++ .../buildcraft/transport/BlockGenericPipe.java | 7 +++++-- .../buildcraft/transport/FacadePluggable.java | 3 +++ common/buildcraft/transport/Gate.java | 2 ++ common/buildcraft/transport/IDiamondPipe.java | 1 + common/buildcraft/transport/IFilteredPipe.java | 1 + common/buildcraft/transport/ItemFacade.java | 7 +++++-- common/buildcraft/transport/ItemGateCopier.java | 2 ++ common/buildcraft/transport/ItemPipe.java | 2 ++ .../buildcraft/transport/LensFilterHandler.java | 2 ++ common/buildcraft/transport/Pipe.java | 3 +++ .../transport/PipeActionProvider.java | 2 ++ .../transport/PipeColoringRecipe.java | 1 + common/buildcraft/transport/PipeEventBus.java | 1 + .../transport/PipePluggableState.java | 4 +++- .../transport/PipeToolTipManager.java | 1 + common/buildcraft/transport/PipeTransport.java | 2 ++ .../transport/PipeTransportFluids.java | 2 ++ .../transport/PipeTransportItems.java | 2 ++ .../transport/PipeTransportPower.java | 3 +++ .../transport/PipeTriggerProvider.java | 3 +++ .../transport/TileFilteredBuffer.java | 1 + .../buildcraft/transport/TileGenericPipe.java | 15 ++++++++++----- .../gates/GateExpansionBuildcraft.java | 1 + .../transport/gates/GateExpansionPulsar.java | 3 +++ .../gates/GateExpansionRedstoneFader.java | 1 + .../transport/gates/GateExpansionTimer.java | 1 + .../buildcraft/transport/gates/GateFactory.java | 2 ++ .../transport/gates/GatePluggable.java | 4 ++++ common/buildcraft/transport/gates/ItemGate.java | 5 ++++- .../gui/ContainerEmeraldFluidPipe.java | 1 + .../transport/gui/ContainerGateInterface.java | 3 +++ .../transport/gui/GuiEmeraldFluidPipe.java | 2 ++ .../buildcraft/transport/gui/GuiEmzuliPipe.java | 1 - .../transport/gui/GuiGateInterface.java | 2 ++ .../transport/network/PacketFluidUpdate.java | 3 +++ .../network/PacketPipeTransportTraveler.java | 1 + .../transport/pipes/PipeFluidsDiamond.java | 6 +++++- .../transport/pipes/PipeFluidsEmerald.java | 4 +++- .../transport/pipes/PipeFluidsIron.java | 3 +++ .../transport/pipes/PipeFluidsWood.java | 3 ++- .../transport/pipes/PipeItemsClay.java | 4 ++++ .../transport/pipes/PipeItemsDaizuli.java | 12 ++++++++---- .../transport/pipes/PipeItemsEmerald.java | 2 +- .../transport/pipes/PipeItemsEmzuli.java | 3 +++ .../transport/pipes/PipeItemsIron.java | 3 +++ .../transport/pipes/PipeItemsLapis.java | 3 +++ .../transport/pipes/PipeItemsStripes.java | 3 +++ .../transport/pipes/PipePowerIron.java | 3 +++ .../transport/pipes/PipePowerSandstone.java | 3 +++ .../transport/pipes/PipePowerWood.java | 4 ++++ .../transport/pipes/events/PipeEventFluid.java | 2 +- .../transport/pipes/events/PipeEventItem.java | 2 ++ .../transport/pluggable/ItemLens.java | 7 +++++-- .../transport/pluggable/ItemPowerAdapter.java | 4 ++++ .../transport/pluggable/LensPluggable.java | 5 +++-- .../transport/pluggable/PlugPluggable.java | 5 +++-- .../pluggable/PowerAdapterPluggable.java | 6 ++++-- .../pluggable/RobotStationPluggable.java | 6 +++--- .../transport/recipes/AdvancedFacadeRecipe.java | 2 ++ .../transport/recipes/GateExpansionRecipe.java | 1 + .../transport/render/FacadeItemRenderer.java | 5 +++-- .../transport/render/FacadeRenderHelper.java | 3 +-- .../buildcraft/transport/render/FakeBlock.java | 1 + .../transport/render/GateItemRenderer.java | 2 ++ .../transport/render/PipeItemRenderer.java | 2 ++ .../transport/render/PipeRendererTESR.java | 9 +++++---- .../transport/render/PipeRendererWorld.java | 3 +++ .../transport/render/TextureStateManager.java | 1 + .../transport/schematics/BptPipeIron.java | 2 ++ .../transport/schematics/BptPipeWooden.java | 2 ++ .../transport/schematics/SchematicPipe.java | 2 ++ .../statements/ActionEnergyPulsar.java | 1 + .../statements/ActionExtractionPreset.java | 1 + .../statements/ActionParameterSignal.java | 1 + .../transport/statements/ActionPipeColor.java | 1 + .../statements/ActionPipeDirection.java | 2 ++ .../statements/ActionPowerLimiter.java | 1 + .../statements/ActionRedstoneFaderOutput.java | 2 ++ .../statements/ActionSignalOutput.java | 1 + .../statements/ActionSingleEnergyPulse.java | 1 + .../transport/statements/ActionValve.java | 2 ++ .../transport/statements/TriggerClockTimer.java | 1 + .../statements/TriggerParameterSignal.java | 1 + .../statements/TriggerPipeContents.java | 3 +++ .../transport/statements/TriggerPipeSignal.java | 1 + .../statements/TriggerRedstoneFaderInput.java | 2 ++ .../transport/stripes/StripesHandlerArrow.java | 2 ++ .../transport/stripes/StripesHandlerBucket.java | 2 ++ .../stripes/StripesHandlerRightClick.java | 2 ++ .../transport/stripes/StripesHandlerShears.java | 2 ++ 306 files changed, 590 insertions(+), 80 deletions(-) diff --git a/api/buildcraft/api/blueprints/BlueprintDeployer.java b/api/buildcraft/api/blueprints/BlueprintDeployer.java index 20dcb345..aa5f1d28 100755 --- a/api/buildcraft/api/blueprints/BlueprintDeployer.java +++ b/api/buildcraft/api/blueprints/BlueprintDeployer.java @@ -11,6 +11,7 @@ package buildcraft.api.blueprints; import java.io.File; import net.minecraft.world.World; + import net.minecraftforge.common.util.ForgeDirection; /** diff --git a/api/buildcraft/api/blueprints/IBuilderContext.java b/api/buildcraft/api/blueprints/IBuilderContext.java index a1f9cbad..c6eaab5a 100644 --- a/api/buildcraft/api/blueprints/IBuilderContext.java +++ b/api/buildcraft/api/blueprints/IBuilderContext.java @@ -9,6 +9,7 @@ package buildcraft.api.blueprints; import net.minecraft.world.World; + import buildcraft.api.core.IBox; import buildcraft.api.core.Position; diff --git a/api/buildcraft/api/blueprints/MappingRegistry.java b/api/buildcraft/api/blueprints/MappingRegistry.java index bf1efe96..ec0b13c4 100755 --- a/api/buildcraft/api/blueprints/MappingRegistry.java +++ b/api/buildcraft/api/blueprints/MappingRegistry.java @@ -20,7 +20,9 @@ import net.minecraft.nbt.NBTTagByte; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagShort; + import net.minecraftforge.common.util.Constants; + import buildcraft.api.core.BCLog; public class MappingRegistry { diff --git a/api/buildcraft/api/blueprints/Schematic.java b/api/buildcraft/api/blueprints/Schematic.java index 76aa852c..9c23acd9 100755 --- a/api/buildcraft/api/blueprints/Schematic.java +++ b/api/buildcraft/api/blueprints/Schematic.java @@ -13,6 +13,7 @@ import java.util.LinkedList; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import buildcraft.api.core.IInvSlot; /** diff --git a/api/buildcraft/api/blueprints/SchematicBlock.java b/api/buildcraft/api/blueprints/SchematicBlock.java index 28910632..a89d36d4 100755 --- a/api/buildcraft/api/blueprints/SchematicBlock.java +++ b/api/buildcraft/api/blueprints/SchematicBlock.java @@ -18,6 +18,7 @@ import net.minecraft.block.BlockLiquid; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; + import net.minecraftforge.common.util.Constants; import net.minecraftforge.fluids.BlockFluidBase; diff --git a/api/buildcraft/api/blueprints/SchematicEntity.java b/api/buildcraft/api/blueprints/SchematicEntity.java index 4f902728..55a47279 100755 --- a/api/buildcraft/api/blueprints/SchematicEntity.java +++ b/api/buildcraft/api/blueprints/SchematicEntity.java @@ -20,7 +20,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagDouble; import net.minecraft.nbt.NBTTagFloat; import net.minecraft.nbt.NBTTagList; + import net.minecraftforge.common.util.Constants; + import buildcraft.api.core.Position; public class SchematicEntity extends Schematic { diff --git a/api/buildcraft/api/blueprints/SchematicFluid.java b/api/buildcraft/api/blueprints/SchematicFluid.java index d168a680..41874dda 100644 --- a/api/buildcraft/api/blueprints/SchematicFluid.java +++ b/api/buildcraft/api/blueprints/SchematicFluid.java @@ -11,6 +11,7 @@ package buildcraft.api.blueprints; import java.util.LinkedList; import net.minecraft.item.ItemStack; + import net.minecraftforge.fluids.FluidStack; public class SchematicFluid extends SchematicBlock { diff --git a/api/buildcraft/api/blueprints/SchematicMask.java b/api/buildcraft/api/blueprints/SchematicMask.java index 7d737d2d..1abc1368 100755 --- a/api/buildcraft/api/blueprints/SchematicMask.java +++ b/api/buildcraft/api/blueprints/SchematicMask.java @@ -14,6 +14,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.WorldServer; + import buildcraft.api.core.BuildCraftAPI; public class SchematicMask extends SchematicBlockBase { diff --git a/api/buildcraft/api/blueprints/SchematicTile.java b/api/buildcraft/api/blueprints/SchematicTile.java index 2daec51b..e37bf490 100755 --- a/api/buildcraft/api/blueprints/SchematicTile.java +++ b/api/buildcraft/api/blueprints/SchematicTile.java @@ -15,6 +15,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; + import buildcraft.api.core.JavaTools; public class SchematicTile extends SchematicBlock { diff --git a/api/buildcraft/api/blueprints/package-info.java b/api/buildcraft/api/blueprints/package-info.java index 12cfc7df..49179a48 100644 --- a/api/buildcraft/api/blueprints/package-info.java +++ b/api/buildcraft/api/blueprints/package-info.java @@ -9,3 +9,4 @@ @API(apiVersion = "1.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|blueprints") package buildcraft.api.blueprints; import cpw.mods.fml.common.API; + diff --git a/api/buildcraft/api/boards/package-info.java b/api/buildcraft/api/boards/package-info.java index ccaa82d9..2c97919e 100644 --- a/api/buildcraft/api/boards/package-info.java +++ b/api/buildcraft/api/boards/package-info.java @@ -9,3 +9,4 @@ @API(apiVersion = "1.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|boards") package buildcraft.api.boards; import cpw.mods.fml.common.API; + diff --git a/api/buildcraft/api/core/JavaTools.java b/api/buildcraft/api/core/JavaTools.java index 065905bf..3bbd90de 100755 --- a/api/buildcraft/api/core/JavaTools.java +++ b/api/buildcraft/api/core/JavaTools.java @@ -8,15 +8,13 @@ */ package buildcraft.api.core; -import java.lang.reflect.Array; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; -import java.util.List; -public class JavaTools { +public final class JavaTools { + private JavaTools(){ + + } + public static T[] concat(T[] first, T[] second) { T[] result = Arrays.copyOf(first, first.length + second.length); System.arraycopy(second, 0, result, first.length, second.length); diff --git a/api/buildcraft/api/core/Position.java b/api/buildcraft/api/core/Position.java index b76377fb..f4ad825c 100644 --- a/api/buildcraft/api/core/Position.java +++ b/api/buildcraft/api/core/Position.java @@ -9,6 +9,7 @@ package buildcraft.api.core; import io.netty.buffer.ByteBuf; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/api/buildcraft/api/core/StackKey.java b/api/buildcraft/api/core/StackKey.java index a06827fc..257d8449 100644 --- a/api/buildcraft/api/core/StackKey.java +++ b/api/buildcraft/api/core/StackKey.java @@ -11,6 +11,7 @@ package buildcraft.api.core; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; + import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; diff --git a/api/buildcraft/api/core/package-info.java b/api/buildcraft/api/core/package-info.java index afe844cb..d9e45bc9 100644 --- a/api/buildcraft/api/core/package-info.java +++ b/api/buildcraft/api/core/package-info.java @@ -9,3 +9,4 @@ @API(apiVersion = "1.4", owner = "BuildCraft|Core", provides = "BuildCraftAPI|core") package buildcraft.api.core; import cpw.mods.fml.common.API; + diff --git a/api/buildcraft/api/core/render/ICullable.java b/api/buildcraft/api/core/render/ICullable.java index b6e06747..5bdec019 100644 --- a/api/buildcraft/api/core/render/ICullable.java +++ b/api/buildcraft/api/core/render/ICullable.java @@ -9,6 +9,7 @@ package buildcraft.api.core.render; import net.minecraft.world.IBlockAccess; + import net.minecraftforge.common.util.ForgeDirection; /* diff --git a/api/buildcraft/api/events/package-info.java b/api/buildcraft/api/events/package-info.java index 680e346c..e51668a3 100644 --- a/api/buildcraft/api/events/package-info.java +++ b/api/buildcraft/api/events/package-info.java @@ -9,3 +9,4 @@ @API(apiVersion = "1.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|events") package buildcraft.api.events; import cpw.mods.fml.common.API; + diff --git a/api/buildcraft/api/facades/package-info.java b/api/buildcraft/api/facades/package-info.java index a4186f2e..dc9bc18d 100644 --- a/api/buildcraft/api/facades/package-info.java +++ b/api/buildcraft/api/facades/package-info.java @@ -9,3 +9,4 @@ @API(apiVersion = "1.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|facades") package buildcraft.api.facades; import cpw.mods.fml.common.API; + diff --git a/api/buildcraft/api/filler/package-info.java b/api/buildcraft/api/filler/package-info.java index 1e630fdd..c05647b4 100644 --- a/api/buildcraft/api/filler/package-info.java +++ b/api/buildcraft/api/filler/package-info.java @@ -9,3 +9,4 @@ @API(apiVersion = "2.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|filler") package buildcraft.api.filler; import cpw.mods.fml.common.API; + diff --git a/api/buildcraft/api/fuels/ISolidCoolant.java b/api/buildcraft/api/fuels/ISolidCoolant.java index 7604cec0..573203ad 100644 --- a/api/buildcraft/api/fuels/ISolidCoolant.java +++ b/api/buildcraft/api/fuels/ISolidCoolant.java @@ -9,6 +9,7 @@ package buildcraft.api.fuels; import net.minecraft.item.ItemStack; + import net.minecraftforge.fluids.FluidStack; public interface ISolidCoolant { diff --git a/api/buildcraft/api/fuels/package-info.java b/api/buildcraft/api/fuels/package-info.java index 08a01258..99a808c1 100644 --- a/api/buildcraft/api/fuels/package-info.java +++ b/api/buildcraft/api/fuels/package-info.java @@ -9,3 +9,4 @@ @API(apiVersion = "2.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|fuels") package buildcraft.api.fuels; import cpw.mods.fml.common.API; + diff --git a/api/buildcraft/api/package-info.java b/api/buildcraft/api/package-info.java index a68339fe..8aef8a3d 100644 --- a/api/buildcraft/api/package-info.java +++ b/api/buildcraft/api/package-info.java @@ -9,3 +9,4 @@ @API(apiVersion = "1.0", owner = "BuildCraft|Core", provides = "BuildCraftAPI|core") package buildcraft.api; import cpw.mods.fml.common.API; + diff --git a/api/buildcraft/api/power/IRedstoneEngineReceiver.java b/api/buildcraft/api/power/IRedstoneEngineReceiver.java index 81e3fc7a..3890512d 100644 --- a/api/buildcraft/api/power/IRedstoneEngineReceiver.java +++ b/api/buildcraft/api/power/IRedstoneEngineReceiver.java @@ -1,7 +1,7 @@ package buildcraft.api.power; import net.minecraftforge.common.util.ForgeDirection; -import cofh.api.energy.IEnergyConnection; + import cofh.api.energy.IEnergyReceiver; /** diff --git a/api/buildcraft/api/power/package-info.java b/api/buildcraft/api/power/package-info.java index f9f5d1f0..a764949f 100644 --- a/api/buildcraft/api/power/package-info.java +++ b/api/buildcraft/api/power/package-info.java @@ -9,3 +9,4 @@ @API(apiVersion = "1.3", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|power") package buildcraft.api.power; import cpw.mods.fml.common.API; + diff --git a/api/buildcraft/api/robots/package-info.java b/api/buildcraft/api/robots/package-info.java index 17c00094..e6ac77fd 100644 --- a/api/buildcraft/api/robots/package-info.java +++ b/api/buildcraft/api/robots/package-info.java @@ -9,3 +9,4 @@ @API(apiVersion = "1.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|robots") package buildcraft.api.robots; import cpw.mods.fml.common.API; + diff --git a/api/buildcraft/api/statements/IActionExternal.java b/api/buildcraft/api/statements/IActionExternal.java index cd5685a0..520ea897 100644 --- a/api/buildcraft/api/statements/IActionExternal.java +++ b/api/buildcraft/api/statements/IActionExternal.java @@ -9,6 +9,7 @@ package buildcraft.api.statements; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; public interface IActionExternal extends IStatement { diff --git a/api/buildcraft/api/statements/IActionProvider.java b/api/buildcraft/api/statements/IActionProvider.java index 6c93ada8..d5df6250 100644 --- a/api/buildcraft/api/statements/IActionProvider.java +++ b/api/buildcraft/api/statements/IActionProvider.java @@ -11,6 +11,7 @@ package buildcraft.api.statements; import java.util.Collection; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; public interface IActionProvider { diff --git a/api/buildcraft/api/statements/ITriggerExternal.java b/api/buildcraft/api/statements/ITriggerExternal.java index 7cbd327e..6b268d19 100644 --- a/api/buildcraft/api/statements/ITriggerExternal.java +++ b/api/buildcraft/api/statements/ITriggerExternal.java @@ -9,6 +9,7 @@ package buildcraft.api.statements; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; public interface ITriggerExternal extends IStatement { diff --git a/api/buildcraft/api/statements/ITriggerProvider.java b/api/buildcraft/api/statements/ITriggerProvider.java index 204221ef..cc105957 100644 --- a/api/buildcraft/api/statements/ITriggerProvider.java +++ b/api/buildcraft/api/statements/ITriggerProvider.java @@ -11,6 +11,7 @@ package buildcraft.api.statements; import java.util.Collection; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; public interface ITriggerProvider { diff --git a/api/buildcraft/api/statements/StatementManager.java b/api/buildcraft/api/statements/StatementManager.java index 734dc32f..167fa00d 100644 --- a/api/buildcraft/api/statements/StatementManager.java +++ b/api/buildcraft/api/statements/StatementManager.java @@ -16,8 +16,10 @@ import java.util.Map; 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; public final class StatementManager { diff --git a/api/buildcraft/api/tools/package-info.java b/api/buildcraft/api/tools/package-info.java index 92e55d7b..196f6388 100644 --- a/api/buildcraft/api/tools/package-info.java +++ b/api/buildcraft/api/tools/package-info.java @@ -9,3 +9,4 @@ @API(apiVersion = "1.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|tools") package buildcraft.api.tools; import cpw.mods.fml.common.API; + diff --git a/api/buildcraft/api/transport/IInjectable.java b/api/buildcraft/api/transport/IInjectable.java index 6e55cd24..1a62f70a 100644 --- a/api/buildcraft/api/transport/IInjectable.java +++ b/api/buildcraft/api/transport/IInjectable.java @@ -1,7 +1,9 @@ package buildcraft.api.transport; import net.minecraft.item.ItemStack; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.core.EnumColor; public interface IInjectable { diff --git a/api/buildcraft/api/transport/IPipe.java b/api/buildcraft/api/transport/IPipe.java index 2e96eeb2..75b5691b 100755 --- a/api/buildcraft/api/transport/IPipe.java +++ b/api/buildcraft/api/transport/IPipe.java @@ -9,6 +9,7 @@ package buildcraft.api.transport; import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.gates.IGate; public interface IPipe { diff --git a/api/buildcraft/api/transport/IPipeTile.java b/api/buildcraft/api/transport/IPipeTile.java index dabc77ec..f4902562 100644 --- a/api/buildcraft/api/transport/IPipeTile.java +++ b/api/buildcraft/api/transport/IPipeTile.java @@ -12,7 +12,9 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.core.EnumColor; import buildcraft.api.transport.pluggable.PipePluggable; diff --git a/api/buildcraft/api/transport/IStripesHandler.java b/api/buildcraft/api/transport/IStripesHandler.java index 8ad66dfe..a2610ee4 100644 --- a/api/buildcraft/api/transport/IStripesHandler.java +++ b/api/buildcraft/api/transport/IStripesHandler.java @@ -11,6 +11,7 @@ package buildcraft.api.transport; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import net.minecraftforge.common.util.ForgeDirection; public interface IStripesHandler { diff --git a/api/buildcraft/api/transport/IStripesPipe.java b/api/buildcraft/api/transport/IStripesPipe.java index f2159bf4..da8b2291 100644 --- a/api/buildcraft/api/transport/IStripesPipe.java +++ b/api/buildcraft/api/transport/IStripesPipe.java @@ -9,6 +9,7 @@ package buildcraft.api.transport; import net.minecraft.item.ItemStack; + import net.minecraftforge.common.util.ForgeDirection; public interface IStripesPipe extends IPipe { diff --git a/api/buildcraft/api/transport/PipeManager.java b/api/buildcraft/api/transport/PipeManager.java index 3c208547..be3a551d 100755 --- a/api/buildcraft/api/transport/PipeManager.java +++ b/api/buildcraft/api/transport/PipeManager.java @@ -14,6 +14,7 @@ import java.util.List; import java.util.Map; import net.minecraft.world.World; + import buildcraft.api.transport.pluggable.PipePluggable; public abstract class PipeManager { diff --git a/api/buildcraft/api/transport/pluggable/IPipePluggableItem.java b/api/buildcraft/api/transport/pluggable/IPipePluggableItem.java index d8505a9f..695f61ae 100644 --- a/api/buildcraft/api/transport/pluggable/IPipePluggableItem.java +++ b/api/buildcraft/api/transport/pluggable/IPipePluggableItem.java @@ -1,7 +1,9 @@ package buildcraft.api.transport.pluggable; import net.minecraft.item.ItemStack; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.transport.IPipe; public interface IPipePluggableItem { diff --git a/api/buildcraft/api/transport/pluggable/IPipePluggableRenderer.java b/api/buildcraft/api/transport/pluggable/IPipePluggableRenderer.java index 35d945d0..a09303f1 100644 --- a/api/buildcraft/api/transport/pluggable/IPipePluggableRenderer.java +++ b/api/buildcraft/api/transport/pluggable/IPipePluggableRenderer.java @@ -1,7 +1,9 @@ package buildcraft.api.transport.pluggable; import net.minecraft.client.renderer.RenderBlocks; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.core.render.ITextureStates; import buildcraft.api.transport.IPipe; diff --git a/api/buildcraft/api/transport/pluggable/PipePluggable.java b/api/buildcraft/api/transport/pluggable/PipePluggable.java index e3f6af9c..c84700d1 100755 --- a/api/buildcraft/api/transport/pluggable/PipePluggable.java +++ b/api/buildcraft/api/transport/pluggable/PipePluggable.java @@ -13,7 +13,9 @@ import net.minecraft.util.AxisAlignedBB; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.core.INBTStoreable; import buildcraft.api.core.ISerializable; import buildcraft.api.transport.IPipeTile; diff --git a/api/cofh/api/energy/TileEnergyHandler.java b/api/cofh/api/energy/TileEnergyHandler.java index 7cc655e9..48b6b005 100644 --- a/api/cofh/api/energy/TileEnergyHandler.java +++ b/api/cofh/api/energy/TileEnergyHandler.java @@ -2,6 +2,7 @@ package cofh.api.energy; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; /** diff --git a/api/cofh/api/energy/package-info.java b/api/cofh/api/energy/package-info.java index 7379702b..86aa7ad8 100644 --- a/api/cofh/api/energy/package-info.java +++ b/api/cofh/api/energy/package-info.java @@ -5,6 +5,7 @@ @API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHAPI", provides = "CoFHAPI|energy") package cofh.api.energy; -import cofh.api.CoFHAPIProps; import cpw.mods.fml.common.API; +import cofh.api.CoFHAPIProps; + diff --git a/common/buildcraft/BCCompatHooks.java b/common/buildcraft/BCCompatHooks.java index ae3b683a..21befcd2 100644 --- a/common/buildcraft/BCCompatHooks.java +++ b/common/buildcraft/BCCompatHooks.java @@ -9,7 +9,9 @@ package buildcraft; import net.minecraft.tileentity.TileEntity; + import cpw.mods.fml.common.Loader; + import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.TileGenericPipe; diff --git a/common/buildcraft/BuildCraftBuilders.java b/common/buildcraft/BuildCraftBuilders.java index c750944c..fedf53c4 100644 --- a/common/buildcraft/BuildCraftBuilders.java +++ b/common/buildcraft/BuildCraftBuilders.java @@ -25,6 +25,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.launchwrapper.Launch; + import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInterModComms; @@ -37,10 +38,12 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; + import buildcraft.api.blueprints.BlueprintDeployer; import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.blueprints.ISchematicRegistry; diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index 21b86af0..ecbf1345 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -13,7 +13,6 @@ import java.nio.ByteBuffer; import java.nio.FloatBuffer; import java.nio.IntBuffer; import java.util.HashSet; -import java.util.TreeMap; import java.util.UUID; import com.mojang.authlib.GameProfile; @@ -32,6 +31,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.IIcon; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; @@ -44,6 +44,7 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.AchievementPage; @@ -54,9 +55,9 @@ import net.minecraftforge.common.config.Property; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.oredict.OreDictionary; + import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.core.BCLog; -import buildcraft.api.core.BlockIndex; import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.core.EnumColor; import buildcraft.api.core.IIconProvider; @@ -91,7 +92,6 @@ import buildcraft.core.blueprints.SchematicRegistry; import buildcraft.core.network.BuildCraftChannelHandler; import buildcraft.core.network.EntityIds; import buildcraft.core.network.PacketHandler; -import buildcraft.core.network.PacketUpdate; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.recipes.AssemblyRecipeManager; import buildcraft.core.recipes.IntegrationRecipeManager; diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index 5fe899ab..9c1ab4ca 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -20,6 +20,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.biome.BiomeGenBase; + import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInterModComms; @@ -29,6 +30,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.MinecraftForge; @@ -38,6 +40,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; + import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.core.BCLog; import buildcraft.api.core.JavaTools; diff --git a/common/buildcraft/BuildCraftFactory.java b/common/buildcraft/BuildCraftFactory.java index 0aec9099..ed10b276 100644 --- a/common/buildcraft/BuildCraftFactory.java +++ b/common/buildcraft/BuildCraftFactory.java @@ -18,6 +18,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInterModComms; @@ -27,12 +28,14 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.ForgeChunkManager.Ticket; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; + import buildcraft.api.blueprints.BuilderAPI; import buildcraft.builders.schematics.SchematicIgnoreMeta; import buildcraft.core.DefaultProps; diff --git a/common/buildcraft/BuildCraftMod.java b/common/buildcraft/BuildCraftMod.java index 5989e4a2..8ba5c465 100644 --- a/common/buildcraft/BuildCraftMod.java +++ b/common/buildcraft/BuildCraftMod.java @@ -15,11 +15,13 @@ import org.apache.logging.log4j.Level; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; + import cpw.mods.fml.common.network.FMLEmbeddedChannel; import cpw.mods.fml.common.network.FMLOutboundHandler; import cpw.mods.fml.common.network.FMLOutboundHandler.OutboundTarget; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; + import buildcraft.api.core.BCLog; import buildcraft.core.DefaultProps; import buildcraft.core.network.BuildCraftPacket; diff --git a/common/buildcraft/BuildCraftSilicon.java b/common/buildcraft/BuildCraftSilicon.java index 88fff813..e14b6bd7 100644 --- a/common/buildcraft/BuildCraftSilicon.java +++ b/common/buildcraft/BuildCraftSilicon.java @@ -12,6 +12,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; + import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInterModComms; @@ -19,7 +20,9 @@ import cpw.mods.fml.common.event.FMLMissingMappingsEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; + import net.minecraftforge.oredict.OreDictionary; + import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.boards.RedstoneBoardRegistry; import buildcraft.api.recipes.BuildcraftRecipeRegistry; diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index 256cfcd2..87f0b839 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -19,6 +19,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; + import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; @@ -28,10 +29,12 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; + import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.RecipeSorter; + import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.core.EnumColor; import buildcraft.api.core.IIconProvider; @@ -59,20 +62,13 @@ import buildcraft.transport.FacadePluggable; import buildcraft.transport.GuiHandler; import buildcraft.transport.ItemFacade; import buildcraft.transport.ItemGateCopier; -import buildcraft.transport.pluggable.ItemLens; import buildcraft.transport.ItemPipe; import buildcraft.transport.ItemPipeWire; -import buildcraft.transport.pluggable.ItemPlug; -import buildcraft.transport.pluggable.ItemPowerAdapter; -import buildcraft.transport.pluggable.ItemRobotStation; -import buildcraft.transport.pluggable.LensPluggable; import buildcraft.transport.Pipe; import buildcraft.transport.PipeActionProvider; import buildcraft.transport.PipeColoringRecipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTriggerProvider; -import buildcraft.transport.pluggable.PlugPluggable; -import buildcraft.transport.pluggable.RobotStationPluggable; import buildcraft.transport.TileFilteredBuffer; import buildcraft.transport.TileGenericPipe; import buildcraft.transport.TransportProxy; @@ -121,6 +117,13 @@ import buildcraft.transport.pipes.PipePowerSandstone; import buildcraft.transport.pipes.PipePowerStone; import buildcraft.transport.pipes.PipePowerWood; import buildcraft.transport.pipes.PipeStructureCobblestone; +import buildcraft.transport.pluggable.ItemLens; +import buildcraft.transport.pluggable.ItemPlug; +import buildcraft.transport.pluggable.ItemPowerAdapter; +import buildcraft.transport.pluggable.ItemRobotStation; +import buildcraft.transport.pluggable.LensPluggable; +import buildcraft.transport.pluggable.PlugPluggable; +import buildcraft.transport.pluggable.RobotStationPluggable; import buildcraft.transport.recipes.AdvancedFacadeRecipe; import buildcraft.transport.recipes.GateExpansionRecipe; import buildcraft.transport.recipes.GateLogicSwapRecipe; diff --git a/common/buildcraft/builders/BlockBlueprintLibrary.java b/common/buildcraft/builders/BlockBlueprintLibrary.java index 9a02f5f3..6fad8f45 100644 --- a/common/buildcraft/builders/BlockBlueprintLibrary.java +++ b/common/buildcraft/builders/BlockBlueprintLibrary.java @@ -14,9 +14,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import buildcraft.BuildCraftBuilders; import buildcraft.api.events.BlockInteractionEvent; import buildcraft.core.BlockBuildCraft; diff --git a/common/buildcraft/builders/BuilderProxyClient.java b/common/buildcraft/builders/BuilderProxyClient.java index 5e5dfddd..6934d767 100644 --- a/common/buildcraft/builders/BuilderProxyClient.java +++ b/common/buildcraft/builders/BuilderProxyClient.java @@ -9,6 +9,7 @@ package buildcraft.builders; import cpw.mods.fml.client.registry.ClientRegistry; + import buildcraft.builders.urbanism.TileUrbanist; import buildcraft.core.render.RenderBoxProvider; import buildcraft.core.render.RenderBuilder; diff --git a/common/buildcraft/builders/EventHandlerBuilders.java b/common/buildcraft/builders/EventHandlerBuilders.java index 27ea7402..945ab686 100644 --- a/common/buildcraft/builders/EventHandlerBuilders.java +++ b/common/buildcraft/builders/EventHandlerBuilders.java @@ -11,6 +11,7 @@ package buildcraft.builders; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; + import net.minecraftforge.event.world.WorldEvent; public class EventHandlerBuilders { diff --git a/common/buildcraft/builders/HeuristicBlockDetection.java b/common/buildcraft/builders/HeuristicBlockDetection.java index 6acba8ee..e0214c95 100644 --- a/common/buildcraft/builders/HeuristicBlockDetection.java +++ b/common/buildcraft/builders/HeuristicBlockDetection.java @@ -5,8 +5,10 @@ import java.util.Iterator; import net.minecraft.block.Block; import net.minecraft.init.Blocks; + import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; + import buildcraft.api.blueprints.SchematicBlock; import buildcraft.api.blueprints.SchematicFluid; import buildcraft.builders.schematics.SchematicBlockCreative; diff --git a/common/buildcraft/builders/RenderArchitect.java b/common/buildcraft/builders/RenderArchitect.java index 8ae5a57c..db3f8f5b 100755 --- a/common/buildcraft/builders/RenderArchitect.java +++ b/common/buildcraft/builders/RenderArchitect.java @@ -12,6 +12,7 @@ import org.lwjgl.opengl.GL11; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.tileentity.TileEntity; + import buildcraft.core.EntityLaser; import buildcraft.core.LaserData; import buildcraft.core.render.RenderBoxProvider; diff --git a/common/buildcraft/builders/RenderConstructionMarker.java b/common/buildcraft/builders/RenderConstructionMarker.java index 320eb645..697f1152 100755 --- a/common/buildcraft/builders/RenderConstructionMarker.java +++ b/common/buildcraft/builders/RenderConstructionMarker.java @@ -18,6 +18,7 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; + import buildcraft.core.EntityLaser; import buildcraft.core.render.RenderBoxProvider; import buildcraft.core.render.RenderBuildingItems; diff --git a/common/buildcraft/builders/TileArchitect.java b/common/buildcraft/builders/TileArchitect.java index 23987fb4..cc55921e 100644 --- a/common/buildcraft/builders/TileArchitect.java +++ b/common/buildcraft/builders/TileArchitect.java @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.LinkedList; import io.netty.buffer.ByteBuf; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -21,6 +22,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import cpw.mods.fml.relauncher.Side; + import net.minecraftforge.common.util.Constants; import buildcraft.BuildCraftCore; diff --git a/common/buildcraft/builders/TileBlueprintLibrary.java b/common/buildcraft/builders/TileBlueprintLibrary.java index 66d89b3e..e5a502d1 100644 --- a/common/buildcraft/builders/TileBlueprintLibrary.java +++ b/common/buildcraft/builders/TileBlueprintLibrary.java @@ -12,6 +12,7 @@ import java.io.IOException; import java.util.ArrayList; import io.netty.buffer.ByteBuf; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -20,6 +21,7 @@ import net.minecraft.nbt.NBTSizeTracker; import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.relauncher.Side; + import buildcraft.BuildCraftBuilders; import buildcraft.BuildCraftCore; import buildcraft.builders.blueprints.BlueprintId; diff --git a/common/buildcraft/builders/TileBuilder.java b/common/buildcraft/builders/TileBuilder.java index 2988864d..f87c2996 100644 --- a/common/buildcraft/builders/TileBuilder.java +++ b/common/buildcraft/builders/TileBuilder.java @@ -14,6 +14,7 @@ import java.util.Iterator; import java.util.LinkedList; import io.netty.buffer.ByteBuf; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -21,7 +22,9 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.WorldSettings.GameType; + import cpw.mods.fml.relauncher.Side; + import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; @@ -29,6 +32,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + import buildcraft.BuildCraftBuilders; import buildcraft.BuildCraftCore; import buildcraft.api.core.BlockIndex; diff --git a/common/buildcraft/builders/TileConstructionMarker.java b/common/buildcraft/builders/TileConstructionMarker.java index 0b6105b9..f582828c 100755 --- a/common/buildcraft/builders/TileConstructionMarker.java +++ b/common/buildcraft/builders/TileConstructionMarker.java @@ -12,12 +12,16 @@ import java.util.ArrayList; import java.util.HashSet; import io.netty.buffer.ByteBuf; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; + import cpw.mods.fml.relauncher.Side; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.BuildCraftCore; import buildcraft.api.core.Position; import buildcraft.core.Box; diff --git a/common/buildcraft/builders/TileFiller.java b/common/buildcraft/builders/TileFiller.java index a50d4bcd..8b6ba61b 100644 --- a/common/buildcraft/builders/TileFiller.java +++ b/common/buildcraft/builders/TileFiller.java @@ -9,11 +9,14 @@ package buildcraft.builders; import io.netty.buffer.ByteBuf; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; + import cpw.mods.fml.relauncher.Side; + import buildcraft.BuildCraftCore; import buildcraft.api.core.IAreaProvider; import buildcraft.api.filler.FillerManager; diff --git a/common/buildcraft/builders/TileMarker.java b/common/buildcraft/builders/TileMarker.java index 64e916e7..ef087e60 100644 --- a/common/buildcraft/builders/TileMarker.java +++ b/common/buildcraft/builders/TileMarker.java @@ -9,6 +9,7 @@ package buildcraft.builders; import io.netty.buffer.ByteBuf; + import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/common/buildcraft/builders/TilePathMarker.java b/common/buildcraft/builders/TilePathMarker.java index 458d05e0..8de728cc 100644 --- a/common/buildcraft/builders/TilePathMarker.java +++ b/common/buildcraft/builders/TilePathMarker.java @@ -13,6 +13,7 @@ import java.util.LinkedList; import java.util.TreeSet; import io.netty.buffer.ByteBuf; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/common/buildcraft/builders/blueprints/BlueprintDatabase.java b/common/buildcraft/builders/blueprints/BlueprintDatabase.java index 8bf434ac..242e997d 100644 --- a/common/buildcraft/builders/blueprints/BlueprintDatabase.java +++ b/common/buildcraft/builders/blueprints/BlueprintDatabase.java @@ -18,9 +18,11 @@ import java.util.ArrayList; import java.util.Locale; import java.util.Set; import java.util.TreeSet; + import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTSizeTracker; import net.minecraft.nbt.NBTTagCompound; + import buildcraft.BuildCraftBuilders; import buildcraft.api.core.BCLog; import buildcraft.builders.blueprints.BlueprintId.Kind; diff --git a/common/buildcraft/builders/blueprints/BlueprintId.java b/common/buildcraft/builders/blueprints/BlueprintId.java index c2c3ca51..05c35cb6 100644 --- a/common/buildcraft/builders/blueprints/BlueprintId.java +++ b/common/buildcraft/builders/blueprints/BlueprintId.java @@ -15,6 +15,7 @@ import java.util.Arrays; import org.apache.commons.lang3.ArrayUtils; import io.netty.buffer.ByteBuf; + import net.minecraft.nbt.NBTTagCompound; import buildcraft.BuildCraftBuilders; diff --git a/common/buildcraft/builders/gui/ContainerBuilder.java b/common/buildcraft/builders/gui/ContainerBuilder.java index 210933db..ada40ace 100644 --- a/common/buildcraft/builders/gui/ContainerBuilder.java +++ b/common/buildcraft/builders/gui/ContainerBuilder.java @@ -12,6 +12,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; + import buildcraft.builders.TileBuilder; import buildcraft.core.gui.BuildCraftContainer; diff --git a/common/buildcraft/builders/gui/GuiArchitect.java b/common/buildcraft/builders/gui/GuiArchitect.java index 9c2e101d..1587c293 100644 --- a/common/buildcraft/builders/gui/GuiArchitect.java +++ b/common/buildcraft/builders/gui/GuiArchitect.java @@ -12,10 +12,12 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import io.netty.buffer.ByteBuf; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; + import buildcraft.BuildCraftBuilders; import buildcraft.BuildCraftCore; import buildcraft.builders.TileArchitect; diff --git a/common/buildcraft/builders/gui/GuiBuilder.java b/common/buildcraft/builders/gui/GuiBuilder.java index 7f17942f..d9ac0c0e 100644 --- a/common/buildcraft/builders/gui/GuiBuilder.java +++ b/common/buildcraft/builders/gui/GuiBuilder.java @@ -13,6 +13,7 @@ import java.util.Collection; import org.lwjgl.opengl.GL11; import io.netty.buffer.ByteBuf; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.inventory.IInventory; diff --git a/common/buildcraft/builders/gui/GuiFiller.java b/common/buildcraft/builders/gui/GuiFiller.java index fff9f4c1..f758225c 100644 --- a/common/buildcraft/builders/gui/GuiFiller.java +++ b/common/buildcraft/builders/gui/GuiFiller.java @@ -11,6 +11,7 @@ package buildcraft.builders.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; + import buildcraft.api.filler.FillerManager; import buildcraft.builders.TileFiller; import buildcraft.core.DefaultProps; diff --git a/common/buildcraft/builders/schematics/SchematicAir.java b/common/buildcraft/builders/schematics/SchematicAir.java index e2449826..5f0ae79d 100644 --- a/common/buildcraft/builders/schematics/SchematicAir.java +++ b/common/buildcraft/builders/schematics/SchematicAir.java @@ -1,7 +1,9 @@ package buildcraft.builders.schematics; import java.util.LinkedList; + import net.minecraft.item.ItemStack; + import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicDoor.java b/common/buildcraft/builders/schematics/SchematicDoor.java index 1405d32a..633eb500 100644 --- a/common/buildcraft/builders/schematics/SchematicDoor.java +++ b/common/buildcraft/builders/schematics/SchematicDoor.java @@ -12,6 +12,7 @@ import java.util.LinkedList; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.MappingRegistry; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicFactoryBlock.java b/common/buildcraft/builders/schematics/SchematicFactoryBlock.java index ed44ee0b..a441d121 100755 --- a/common/buildcraft/builders/schematics/SchematicFactoryBlock.java +++ b/common/buildcraft/builders/schematics/SchematicFactoryBlock.java @@ -11,6 +11,7 @@ package buildcraft.builders.schematics; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; + import buildcraft.api.blueprints.MappingNotFoundException; import buildcraft.api.blueprints.MappingRegistry; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicFactoryEntity.java b/common/buildcraft/builders/schematics/SchematicFactoryEntity.java index 35ae977f..3beead96 100755 --- a/common/buildcraft/builders/schematics/SchematicFactoryEntity.java +++ b/common/buildcraft/builders/schematics/SchematicFactoryEntity.java @@ -9,6 +9,7 @@ package buildcraft.builders.schematics; import net.minecraft.nbt.NBTTagCompound; + import buildcraft.api.blueprints.MappingNotFoundException; import buildcraft.api.blueprints.MappingRegistry; import buildcraft.api.blueprints.SchematicEntity; diff --git a/common/buildcraft/builders/schematics/SchematicFactoryMask.java b/common/buildcraft/builders/schematics/SchematicFactoryMask.java index 6378098b..0f5e67e3 100755 --- a/common/buildcraft/builders/schematics/SchematicFactoryMask.java +++ b/common/buildcraft/builders/schematics/SchematicFactoryMask.java @@ -9,6 +9,7 @@ package buildcraft.builders.schematics; import net.minecraft.nbt.NBTTagCompound; + import buildcraft.api.blueprints.MappingRegistry; import buildcraft.api.blueprints.SchematicFactory; import buildcraft.api.blueprints.SchematicMask; diff --git a/common/buildcraft/builders/statements/ActionFiller.java b/common/buildcraft/builders/statements/ActionFiller.java index 5e45da0b..32843ec3 100644 --- a/common/buildcraft/builders/statements/ActionFiller.java +++ b/common/buildcraft/builders/statements/ActionFiller.java @@ -10,7 +10,9 @@ package buildcraft.builders.statements; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.statements.IActionExternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/builders/statements/BuildersActionProvider.java b/common/buildcraft/builders/statements/BuildersActionProvider.java index b71b283f..36b40e4b 100644 --- a/common/buildcraft/builders/statements/BuildersActionProvider.java +++ b/common/buildcraft/builders/statements/BuildersActionProvider.java @@ -13,7 +13,9 @@ import java.util.HashMap; import java.util.LinkedList; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.filler.FillerManager; import buildcraft.api.filler.IFillerPattern; import buildcraft.api.statements.IActionExternal; diff --git a/common/buildcraft/builders/urbanism/AnchoredBox.java b/common/buildcraft/builders/urbanism/AnchoredBox.java index 18b26047..32073793 100755 --- a/common/buildcraft/builders/urbanism/AnchoredBox.java +++ b/common/buildcraft/builders/urbanism/AnchoredBox.java @@ -9,7 +9,9 @@ package buildcraft.builders.urbanism; import io.netty.buffer.ByteBuf; + import net.minecraft.nbt.NBTTagCompound; + import buildcraft.api.core.ISerializable; import buildcraft.core.Box; diff --git a/common/buildcraft/builders/urbanism/TileUrbanist.java b/common/buildcraft/builders/urbanism/TileUrbanist.java index ca7465a1..0b2e3bfc 100755 --- a/common/buildcraft/builders/urbanism/TileUrbanist.java +++ b/common/buildcraft/builders/urbanism/TileUrbanist.java @@ -11,6 +11,7 @@ package buildcraft.builders.urbanism; import java.util.ArrayList; import io.netty.buffer.ByteBuf; + import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -21,6 +22,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import cpw.mods.fml.relauncher.Side; + import buildcraft.BuildCraftCore; import buildcraft.core.Box; import buildcraft.core.Box.Kind; diff --git a/common/buildcraft/builders/urbanism/UrbanistToolBlock.java b/common/buildcraft/builders/urbanism/UrbanistToolBlock.java index aca5b6b1..bc6f248d 100755 --- a/common/buildcraft/builders/urbanism/UrbanistToolBlock.java +++ b/common/buildcraft/builders/urbanism/UrbanistToolBlock.java @@ -11,6 +11,7 @@ package buildcraft.builders.urbanism; import net.minecraft.client.Minecraft; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; + import buildcraft.core.DefaultProps; class UrbanistToolBlock extends UrbanistTool { diff --git a/common/buildcraft/builders/urbanism/UrbanistToolFiller.java b/common/buildcraft/builders/urbanism/UrbanistToolFiller.java index f4a2a9a5..fa66b189 100755 --- a/common/buildcraft/builders/urbanism/UrbanistToolFiller.java +++ b/common/buildcraft/builders/urbanism/UrbanistToolFiller.java @@ -15,8 +15,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import buildcraft.api.filler.IFillerPattern; import buildcraft.core.Box; import buildcraft.core.DefaultProps; diff --git a/common/buildcraft/commander/ContainerRequester.java b/common/buildcraft/commander/ContainerRequester.java index 52f490af..aa2eb1d7 100755 --- a/common/buildcraft/commander/ContainerRequester.java +++ b/common/buildcraft/commander/ContainerRequester.java @@ -9,12 +9,14 @@ package buildcraft.commander; import io.netty.buffer.ByteBuf; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import cpw.mods.fml.relauncher.Side; + import buildcraft.BuildCraftCore; import buildcraft.core.gui.BuildCraftContainer; import buildcraft.core.network.CommandWriter; diff --git a/common/buildcraft/commander/ContainerZonePlan.java b/common/buildcraft/commander/ContainerZonePlan.java index 0ba49dce..97cec3ae 100755 --- a/common/buildcraft/commander/ContainerZonePlan.java +++ b/common/buildcraft/commander/ContainerZonePlan.java @@ -9,12 +9,14 @@ package buildcraft.commander; import io.netty.buffer.ByteBuf; + import net.minecraft.block.material.MapColor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import cpw.mods.fml.relauncher.Side; + import buildcraft.BuildCraftCore; import buildcraft.core.BCDynamicTexture; import buildcraft.core.ZonePlan; diff --git a/common/buildcraft/commander/GuiZonePlan.java b/common/buildcraft/commander/GuiZonePlan.java index 96bb652a..251bd90e 100755 --- a/common/buildcraft/commander/GuiZonePlan.java +++ b/common/buildcraft/commander/GuiZonePlan.java @@ -14,10 +14,12 @@ import java.util.List; import org.lwjgl.opengl.GL11; import io.netty.buffer.ByteBuf; + import net.minecraft.client.gui.GuiButton; import net.minecraft.inventory.IInventory; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; + import buildcraft.BuildCraftCore; import buildcraft.api.core.EnumColor; import buildcraft.core.BCDynamicTexture; diff --git a/common/buildcraft/commander/TileRequester.java b/common/buildcraft/commander/TileRequester.java index c2412470..e7bdc72a 100755 --- a/common/buildcraft/commander/TileRequester.java +++ b/common/buildcraft/commander/TileRequester.java @@ -9,12 +9,14 @@ package buildcraft.commander; import io.netty.buffer.ByteBuf; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.relauncher.Side; + import buildcraft.BuildCraftCore; import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.robots.IRequestProvider; diff --git a/common/buildcraft/commander/TileZonePlan.java b/common/buildcraft/commander/TileZonePlan.java index e6d12c08..927e0e10 100644 --- a/common/buildcraft/commander/TileZonePlan.java +++ b/common/buildcraft/commander/TileZonePlan.java @@ -9,6 +9,7 @@ package buildcraft.commander; import io.netty.buffer.ByteBuf; + import net.minecraft.block.material.MapColor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/common/buildcraft/core/BlockBuildCraft.java b/common/buildcraft/core/BlockBuildCraft.java index 34e14daa..e94de2a8 100644 --- a/common/buildcraft/core/BlockBuildCraft.java +++ b/common/buildcraft/core/BlockBuildCraft.java @@ -19,7 +19,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import cpw.mods.fml.common.FMLCommonHandler; + import buildcraft.api.events.BlockPlacedDownEvent; import buildcraft.api.tiles.IHasWork; import buildcraft.core.utils.Utils; diff --git a/common/buildcraft/core/BlockSpring.java b/common/buildcraft/core/BlockSpring.java index 95ff6306..e4b6aa7e 100644 --- a/common/buildcraft/core/BlockSpring.java +++ b/common/buildcraft/core/BlockSpring.java @@ -19,6 +19,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/buildcraft/core/ChunkIndex.java b/common/buildcraft/core/ChunkIndex.java index 12ab2c23..c1ad0d8e 100755 --- a/common/buildcraft/core/ChunkIndex.java +++ b/common/buildcraft/core/ChunkIndex.java @@ -9,7 +9,9 @@ package buildcraft.core; import io.netty.buffer.ByteBuf; + import net.minecraft.nbt.NBTTagCompound; + import buildcraft.api.core.ISerializable; public class ChunkIndex implements ISerializable { diff --git a/common/buildcraft/core/EntityBuildCraftItem.java b/common/buildcraft/core/EntityBuildCraftItem.java index c51d052b..2186a9dc 100644 --- a/common/buildcraft/core/EntityBuildCraftItem.java +++ b/common/buildcraft/core/EntityBuildCraftItem.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; public class EntityBuildCraftItem extends EntityItem { - public EntityBuildCraftItem(World p_i1710_1_, double p_i1710_2_, double p_i1710_4_, double p_i1710_6_, ItemStack p_i1710_8_) { - super(p_i1710_1_, p_i1710_2_, p_i1710_4_, p_i1710_6_, p_i1710_8_); + public EntityBuildCraftItem(World world, double x, double y, double z, ItemStack stack) { + super(world, x, y, z, stack); } } diff --git a/common/buildcraft/core/InterModComms.java b/common/buildcraft/core/InterModComms.java index 743dc3fc..921a3142 100644 --- a/common/buildcraft/core/InterModComms.java +++ b/common/buildcraft/core/InterModComms.java @@ -21,9 +21,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.biome.BiomeGenBase; + import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; + import net.minecraftforge.fluids.FluidStack; + import buildcraft.BuildCraftTransport; import buildcraft.api.core.BCLog; import buildcraft.api.gates.GateExpansions; diff --git a/common/buildcraft/core/ItemBuildCraft.java b/common/buildcraft/core/ItemBuildCraft.java index bb820738..77b2d76b 100644 --- a/common/buildcraft/core/ItemBuildCraft.java +++ b/common/buildcraft/core/ItemBuildCraft.java @@ -12,6 +12,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.world.World; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/buildcraft/core/LaserData.java b/common/buildcraft/core/LaserData.java index ae9329e4..d8e7624e 100755 --- a/common/buildcraft/core/LaserData.java +++ b/common/buildcraft/core/LaserData.java @@ -9,6 +9,7 @@ package buildcraft.core; import io.netty.buffer.ByteBuf; + import net.minecraft.nbt.NBTTagCompound; import buildcraft.api.core.ISerializable; diff --git a/common/buildcraft/core/StackAtPosition.java b/common/buildcraft/core/StackAtPosition.java index d0107536..d81c9305 100755 --- a/common/buildcraft/core/StackAtPosition.java +++ b/common/buildcraft/core/StackAtPosition.java @@ -9,7 +9,9 @@ package buildcraft.core; import io.netty.buffer.ByteBuf; + import net.minecraft.item.ItemStack; + import buildcraft.api.core.ISerializable; import buildcraft.api.core.Position; import buildcraft.core.utils.Utils; diff --git a/common/buildcraft/core/TickHandlerCore.java b/common/buildcraft/core/TickHandlerCore.java index 6758305b..f5998615 100644 --- a/common/buildcraft/core/TickHandlerCore.java +++ b/common/buildcraft/core/TickHandlerCore.java @@ -10,10 +10,12 @@ package buildcraft.core; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ChatComponentTranslation; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import buildcraft.core.proxy.CoreProxy; public class TickHandlerCore { diff --git a/common/buildcraft/core/TileBuildCraft.java b/common/buildcraft/core/TileBuildCraft.java index 637e8ca3..d2eeee90 100644 --- a/common/buildcraft/core/TileBuildCraft.java +++ b/common/buildcraft/core/TileBuildCraft.java @@ -11,6 +11,7 @@ package buildcraft.core; import java.util.HashSet; import io.netty.buffer.ByteBuf; + import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -18,8 +19,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.Packet; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; + import cofh.api.energy.IEnergyHandler; + import buildcraft.BuildCraftCore; import buildcraft.api.core.ISerializable; import buildcraft.api.tiles.IControllable; diff --git a/common/buildcraft/core/ZoneChunk.java b/common/buildcraft/core/ZoneChunk.java index fe3197fd..3dc64344 100755 --- a/common/buildcraft/core/ZoneChunk.java +++ b/common/buildcraft/core/ZoneChunk.java @@ -12,7 +12,9 @@ import java.util.BitSet; import java.util.Random; import io.netty.buffer.ByteBuf; + import net.minecraft.nbt.NBTTagCompound; + import buildcraft.api.core.BlockIndex; import buildcraft.api.core.ISerializable; import buildcraft.core.utils.BitSetUtils; diff --git a/common/buildcraft/core/ZonePlan.java b/common/buildcraft/core/ZonePlan.java index 4d74d3a2..b36eb79d 100755 --- a/common/buildcraft/core/ZonePlan.java +++ b/common/buildcraft/core/ZonePlan.java @@ -13,6 +13,7 @@ import java.util.Map; import java.util.Random; import io.netty.buffer.ByteBuf; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/common/buildcraft/core/blueprints/Blueprint.java b/common/buildcraft/core/blueprints/Blueprint.java index 6f680d86..e3682280 100644 --- a/common/buildcraft/core/blueprints/Blueprint.java +++ b/common/buildcraft/core/blueprints/Blueprint.java @@ -16,7 +16,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.Constants; + import buildcraft.BuildCraftBuilders; import buildcraft.api.blueprints.BuildingPermission; import buildcraft.api.blueprints.IBuilderContext; diff --git a/common/buildcraft/core/blueprints/BlueprintBase.java b/common/buildcraft/core/blueprints/BlueprintBase.java index ba21da35..16026486 100644 --- a/common/buildcraft/core/blueprints/BlueprintBase.java +++ b/common/buildcraft/core/blueprints/BlueprintBase.java @@ -18,8 +18,10 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraft.world.WorldSettings.GameType; + import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.blueprints.BuildingPermission; import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.MappingRegistry; diff --git a/common/buildcraft/core/blueprints/BlueprintReadConfiguration.java b/common/buildcraft/core/blueprints/BlueprintReadConfiguration.java index 2ec7b702..4be26793 100755 --- a/common/buildcraft/core/blueprints/BlueprintReadConfiguration.java +++ b/common/buildcraft/core/blueprints/BlueprintReadConfiguration.java @@ -9,7 +9,9 @@ package buildcraft.core.blueprints; import io.netty.buffer.ByteBuf; + import net.minecraft.nbt.NBTTagCompound; + import buildcraft.api.core.ISerializable; public class BlueprintReadConfiguration implements ISerializable { diff --git a/common/buildcraft/core/blueprints/BptBuilderBase.java b/common/buildcraft/core/blueprints/BptBuilderBase.java index aa836f3d..7a43121b 100644 --- a/common/buildcraft/core/blueprints/BptBuilderBase.java +++ b/common/buildcraft/core/blueprints/BptBuilderBase.java @@ -20,7 +20,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; + import net.minecraftforge.common.util.Constants; + import buildcraft.BuildCraftBuilders; import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.blueprints.IBuilderContext; diff --git a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java index 29f19d20..f66ae785 100644 --- a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java +++ b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java @@ -26,11 +26,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraft.world.WorldSettings.GameType; + import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; + import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.blueprints.Schematic; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/core/blueprints/BptBuilderTemplate.java b/common/buildcraft/core/blueprints/BptBuilderTemplate.java index 443c94c6..dfa3c0c8 100644 --- a/common/buildcraft/core/blueprints/BptBuilderTemplate.java +++ b/common/buildcraft/core/blueprints/BptBuilderTemplate.java @@ -12,7 +12,9 @@ import java.util.LinkedList; 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.core.BlockIndex; diff --git a/common/buildcraft/core/blueprints/BptContext.java b/common/buildcraft/core/blueprints/BptContext.java index 7587dbc0..48e05d5c 100644 --- a/common/buildcraft/core/blueprints/BptContext.java +++ b/common/buildcraft/core/blueprints/BptContext.java @@ -9,6 +9,7 @@ package buildcraft.core.blueprints; import net.minecraft.world.World; + import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.MappingRegistry; import buildcraft.api.core.IBox; diff --git a/common/buildcraft/core/blueprints/SchematicRegistry.java b/common/buildcraft/core/blueprints/SchematicRegistry.java index 45e72692..d72a73e7 100644 --- a/common/buildcraft/core/blueprints/SchematicRegistry.java +++ b/common/buildcraft/core/blueprints/SchematicRegistry.java @@ -15,8 +15,10 @@ import java.util.HashSet; import net.minecraft.block.Block; import net.minecraft.entity.Entity; + import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; + import buildcraft.api.blueprints.ISchematicRegistry; import buildcraft.api.blueprints.Schematic; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/core/builders/BuildingItem.java b/common/buildcraft/core/builders/BuildingItem.java index 09da57a7..280896c7 100755 --- a/common/buildcraft/core/builders/BuildingItem.java +++ b/common/buildcraft/core/builders/BuildingItem.java @@ -12,11 +12,14 @@ import java.util.Date; import java.util.LinkedList; import io.netty.buffer.ByteBuf; + import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; + import net.minecraftforge.common.util.Constants; + import buildcraft.BuildCraftBuilders; import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.MappingNotFoundException; diff --git a/common/buildcraft/core/builders/BuildingSlot.java b/common/buildcraft/core/builders/BuildingSlot.java index 9f26a679..9f928a35 100755 --- a/common/buildcraft/core/builders/BuildingSlot.java +++ b/common/buildcraft/core/builders/BuildingSlot.java @@ -12,6 +12,7 @@ import java.util.LinkedList; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.MappingNotFoundException; import buildcraft.api.blueprints.MappingRegistry; diff --git a/common/buildcraft/core/builders/BuildingSlotBlock.java b/common/buildcraft/core/builders/BuildingSlotBlock.java index 3f1bc882..4d2d166a 100755 --- a/common/buildcraft/core/builders/BuildingSlotBlock.java +++ b/common/buildcraft/core/builders/BuildingSlotBlock.java @@ -16,7 +16,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.Constants; + import buildcraft.api.blueprints.BuildingPermission; import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.MappingNotFoundException; diff --git a/common/buildcraft/core/builders/BuildingSlotEntity.java b/common/buildcraft/core/builders/BuildingSlotEntity.java index 7b99960b..ceaaa3be 100755 --- a/common/buildcraft/core/builders/BuildingSlotEntity.java +++ b/common/buildcraft/core/builders/BuildingSlotEntity.java @@ -14,6 +14,7 @@ import java.util.LinkedList; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; + import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.MappingNotFoundException; import buildcraft.api.blueprints.MappingRegistry; diff --git a/common/buildcraft/core/builders/TileAbstractBuilder.java b/common/buildcraft/core/builders/TileAbstractBuilder.java index b1690987..c2bdd2b0 100755 --- a/common/buildcraft/core/builders/TileAbstractBuilder.java +++ b/common/buildcraft/core/builders/TileAbstractBuilder.java @@ -12,10 +12,13 @@ import java.util.ArrayList; import java.util.LinkedList; import io.netty.buffer.ByteBuf; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.nbt.NBTTagCompound; + import cpw.mods.fml.relauncher.Side; + import buildcraft.BuildCraftCore; import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.blueprints.ITileBuilder; diff --git a/common/buildcraft/core/builders/patterns/FillerPattern.java b/common/buildcraft/core/builders/patterns/FillerPattern.java index 94689077..6ba18110 100644 --- a/common/buildcraft/core/builders/patterns/FillerPattern.java +++ b/common/buildcraft/core/builders/patterns/FillerPattern.java @@ -15,6 +15,7 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; + import buildcraft.api.blueprints.SchematicMask; import buildcraft.api.filler.IFillerPattern; import buildcraft.core.Box; diff --git a/common/buildcraft/core/builders/patterns/PatternBox.java b/common/buildcraft/core/builders/patterns/PatternBox.java index 5f0bc7cc..5d96c6aa 100644 --- a/common/buildcraft/core/builders/patterns/PatternBox.java +++ b/common/buildcraft/core/builders/patterns/PatternBox.java @@ -9,6 +9,7 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; + import buildcraft.core.Box; import buildcraft.core.blueprints.Template; diff --git a/common/buildcraft/core/builders/patterns/PatternClear.java b/common/buildcraft/core/builders/patterns/PatternClear.java index 072c8aac..1104e6a4 100644 --- a/common/buildcraft/core/builders/patterns/PatternClear.java +++ b/common/buildcraft/core/builders/patterns/PatternClear.java @@ -9,6 +9,7 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; + import buildcraft.core.Box; import buildcraft.core.blueprints.Template; diff --git a/common/buildcraft/core/builders/patterns/PatternCylinder.java b/common/buildcraft/core/builders/patterns/PatternCylinder.java index ee93c2b9..fddad785 100644 --- a/common/buildcraft/core/builders/patterns/PatternCylinder.java +++ b/common/buildcraft/core/builders/patterns/PatternCylinder.java @@ -9,6 +9,7 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; + import buildcraft.core.Box; import buildcraft.core.blueprints.Template; diff --git a/common/buildcraft/core/builders/patterns/PatternFlatten.java b/common/buildcraft/core/builders/patterns/PatternFlatten.java index 26bab18a..966f1ff3 100644 --- a/common/buildcraft/core/builders/patterns/PatternFlatten.java +++ b/common/buildcraft/core/builders/patterns/PatternFlatten.java @@ -9,6 +9,7 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; + import buildcraft.api.blueprints.SchematicMask; import buildcraft.core.Box; import buildcraft.core.blueprints.BptBuilderTemplate; diff --git a/common/buildcraft/core/builders/patterns/PatternFrame.java b/common/buildcraft/core/builders/patterns/PatternFrame.java index 460f7ed4..0202caf9 100755 --- a/common/buildcraft/core/builders/patterns/PatternFrame.java +++ b/common/buildcraft/core/builders/patterns/PatternFrame.java @@ -9,6 +9,7 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; + import buildcraft.api.blueprints.SchematicMask; import buildcraft.core.Box; import buildcraft.core.blueprints.Template; diff --git a/common/buildcraft/core/builders/patterns/PatternHorizon.java b/common/buildcraft/core/builders/patterns/PatternHorizon.java index 8d50325c..d6543099 100644 --- a/common/buildcraft/core/builders/patterns/PatternHorizon.java +++ b/common/buildcraft/core/builders/patterns/PatternHorizon.java @@ -9,6 +9,7 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; + import buildcraft.api.blueprints.SchematicMask; import buildcraft.core.Box; import buildcraft.core.blueprints.BptBuilderTemplate; diff --git a/common/buildcraft/core/gui/ContainerList.java b/common/buildcraft/core/gui/ContainerList.java index d34d1ee2..ffe4ca75 100755 --- a/common/buildcraft/core/gui/ContainerList.java +++ b/common/buildcraft/core/gui/ContainerList.java @@ -9,11 +9,13 @@ package buildcraft.core.gui; import io.netty.buffer.ByteBuf; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import cpw.mods.fml.relauncher.Side; + import buildcraft.BuildCraftCore; import buildcraft.core.ItemList; import buildcraft.core.network.CommandWriter; diff --git a/common/buildcraft/core/gui/slots/SlotArchitect.java b/common/buildcraft/core/gui/slots/SlotArchitect.java index e955d322..6f0747d0 100644 --- a/common/buildcraft/core/gui/slots/SlotArchitect.java +++ b/common/buildcraft/core/gui/slots/SlotArchitect.java @@ -10,6 +10,7 @@ package buildcraft.core.gui.slots; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; + import buildcraft.builders.TileArchitect; public class SlotArchitect extends SlotBase { diff --git a/common/buildcraft/core/inventory/Transactor.java b/common/buildcraft/core/inventory/Transactor.java index fdc48175..c1aedb1e 100644 --- a/common/buildcraft/core/inventory/Transactor.java +++ b/common/buildcraft/core/inventory/Transactor.java @@ -11,6 +11,7 @@ package buildcraft.core.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; + import net.minecraftforge.common.util.ForgeDirection; public abstract class Transactor implements ITransactor { diff --git a/common/buildcraft/core/inventory/TransactorRoundRobin.java b/common/buildcraft/core/inventory/TransactorRoundRobin.java index 2dcef7c7..14427fd7 100644 --- a/common/buildcraft/core/inventory/TransactorRoundRobin.java +++ b/common/buildcraft/core/inventory/TransactorRoundRobin.java @@ -10,7 +10,9 @@ package buildcraft.core.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.core.IInvSlot; public class TransactorRoundRobin extends TransactorSimple { diff --git a/common/buildcraft/core/inventory/filters/CraftingFilter.java b/common/buildcraft/core/inventory/filters/CraftingFilter.java index 0f57bc96..944ab5ae 100644 --- a/common/buildcraft/core/inventory/filters/CraftingFilter.java +++ b/common/buildcraft/core/inventory/filters/CraftingFilter.java @@ -9,6 +9,7 @@ package buildcraft.core.inventory.filters; import net.minecraft.item.ItemStack; + import buildcraft.core.inventory.StackHelper; /** diff --git a/common/buildcraft/core/inventory/filters/StatementParameterStackFilter.java b/common/buildcraft/core/inventory/filters/StatementParameterStackFilter.java index 07991b45..c8b9192b 100755 --- a/common/buildcraft/core/inventory/filters/StatementParameterStackFilter.java +++ b/common/buildcraft/core/inventory/filters/StatementParameterStackFilter.java @@ -11,6 +11,7 @@ package buildcraft.core.inventory.filters; import java.util.ArrayList; import net.minecraft.item.ItemStack; + import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; diff --git a/common/buildcraft/core/network/CommandTarget.java b/common/buildcraft/core/network/CommandTarget.java index c9ee74f7..70107414 100644 --- a/common/buildcraft/core/network/CommandTarget.java +++ b/common/buildcraft/core/network/CommandTarget.java @@ -9,6 +9,7 @@ package buildcraft.core.network; import io.netty.buffer.ByteBuf; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/common/buildcraft/core/network/CommandTargetContainer.java b/common/buildcraft/core/network/CommandTargetContainer.java index fb37577e..cf375c91 100644 --- a/common/buildcraft/core/network/CommandTargetContainer.java +++ b/common/buildcraft/core/network/CommandTargetContainer.java @@ -9,6 +9,7 @@ package buildcraft.core.network; import io.netty.buffer.ByteBuf; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.world.World; diff --git a/common/buildcraft/core/network/CommandTargetEntity.java b/common/buildcraft/core/network/CommandTargetEntity.java index 41236df2..82466587 100644 --- a/common/buildcraft/core/network/CommandTargetEntity.java +++ b/common/buildcraft/core/network/CommandTargetEntity.java @@ -9,6 +9,7 @@ package buildcraft.core.network; import io.netty.buffer.ByteBuf; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/common/buildcraft/core/network/CommandTargetTile.java b/common/buildcraft/core/network/CommandTargetTile.java index aa492d5b..ffaff308 100644 --- a/common/buildcraft/core/network/CommandTargetTile.java +++ b/common/buildcraft/core/network/CommandTargetTile.java @@ -9,6 +9,7 @@ package buildcraft.core.network; import io.netty.buffer.ByteBuf; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/common/buildcraft/core/network/ICommandReceiver.java b/common/buildcraft/core/network/ICommandReceiver.java index e19eb731..9e332a36 100644 --- a/common/buildcraft/core/network/ICommandReceiver.java +++ b/common/buildcraft/core/network/ICommandReceiver.java @@ -9,6 +9,7 @@ package buildcraft.core.network; import io.netty.buffer.ByteBuf; + import cpw.mods.fml.relauncher.Side; public interface ICommandReceiver { diff --git a/common/buildcraft/core/network/PacketCommand.java b/common/buildcraft/core/network/PacketCommand.java index 413881c9..cc9b0475 100644 --- a/common/buildcraft/core/network/PacketCommand.java +++ b/common/buildcraft/core/network/PacketCommand.java @@ -9,9 +9,13 @@ package buildcraft.core.network; import java.util.ArrayList; + import io.netty.buffer.ByteBuf; + import net.minecraft.entity.player.EntityPlayer; + import cpw.mods.fml.common.FMLCommonHandler; + import buildcraft.core.utils.Utils; public class PacketCommand extends BuildCraftPacket { diff --git a/common/buildcraft/core/network/PacketTileState.java b/common/buildcraft/core/network/PacketTileState.java index 82fc6082..55b9c40b 100644 --- a/common/buildcraft/core/network/PacketTileState.java +++ b/common/buildcraft/core/network/PacketTileState.java @@ -14,6 +14,7 @@ import java.util.List; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; + import buildcraft.api.core.ISerializable; public class PacketTileState extends PacketCoordinates { diff --git a/common/buildcraft/core/network/PacketTileUpdate.java b/common/buildcraft/core/network/PacketTileUpdate.java index 3997101b..464b7a77 100644 --- a/common/buildcraft/core/network/PacketTileUpdate.java +++ b/common/buildcraft/core/network/PacketTileUpdate.java @@ -10,6 +10,7 @@ package buildcraft.core.network; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; + import buildcraft.api.core.ISerializable; public class PacketTileUpdate extends PacketUpdate { diff --git a/common/buildcraft/core/network/PacketUpdate.java b/common/buildcraft/core/network/PacketUpdate.java index e4fdbeff..6b7218ea 100644 --- a/common/buildcraft/core/network/PacketUpdate.java +++ b/common/buildcraft/core/network/PacketUpdate.java @@ -9,6 +9,7 @@ package buildcraft.core.network; import io.netty.buffer.ByteBuf; + import buildcraft.api.core.ISerializable; public class PacketUpdate extends BuildCraftPacket { diff --git a/common/buildcraft/core/network/Serializable.java b/common/buildcraft/core/network/Serializable.java index d0dc7a2c..af3d6a4c 100644 --- a/common/buildcraft/core/network/Serializable.java +++ b/common/buildcraft/core/network/Serializable.java @@ -1,6 +1,7 @@ package buildcraft.core.network; import io.netty.buffer.ByteBuf; + import buildcraft.api.core.ISerializable; public class Serializable implements ISerializable { diff --git a/common/buildcraft/core/recipes/AssemblyRecipeManager.java b/common/buildcraft/core/recipes/AssemblyRecipeManager.java index a0cd7801..b3d34472 100644 --- a/common/buildcraft/core/recipes/AssemblyRecipeManager.java +++ b/common/buildcraft/core/recipes/AssemblyRecipeManager.java @@ -14,6 +14,7 @@ import java.util.Map; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; + import buildcraft.BuildCraftCore; import buildcraft.api.recipes.IAssemblyRecipeManager; import buildcraft.api.recipes.IFlexibleRecipe; diff --git a/common/buildcraft/core/recipes/FlexibleRecipe.java b/common/buildcraft/core/recipes/FlexibleRecipe.java index e761ee96..e9d326a8 100644 --- a/common/buildcraft/core/recipes/FlexibleRecipe.java +++ b/common/buildcraft/core/recipes/FlexibleRecipe.java @@ -15,8 +15,10 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; + import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; + import buildcraft.api.recipes.CraftingResult; import buildcraft.api.recipes.IFlexibleCrafter; import buildcraft.api.recipes.IFlexibleRecipe; diff --git a/common/buildcraft/core/recipes/RefineryRecipeManager.java b/common/buildcraft/core/recipes/RefineryRecipeManager.java index 96e2a042..ceead523 100644 --- a/common/buildcraft/core/recipes/RefineryRecipeManager.java +++ b/common/buildcraft/core/recipes/RefineryRecipeManager.java @@ -11,7 +11,9 @@ package buildcraft.core.recipes; import java.util.Collection; import java.util.Collections; import java.util.HashMap; + import net.minecraftforge.fluids.FluidStack; + import buildcraft.BuildCraftCore; import buildcraft.api.core.BCLog; import buildcraft.api.recipes.IFlexibleRecipe; diff --git a/common/buildcraft/core/render/RenderBoxProvider.java b/common/buildcraft/core/render/RenderBoxProvider.java index 08ce05aa..060f4d42 100755 --- a/common/buildcraft/core/render/RenderBoxProvider.java +++ b/common/buildcraft/core/render/RenderBoxProvider.java @@ -14,6 +14,7 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; + import buildcraft.core.Box; import buildcraft.core.DefaultProps; import buildcraft.core.IBoxProvider; diff --git a/common/buildcraft/core/render/RenderBuilder.java b/common/buildcraft/core/render/RenderBuilder.java index 3ca6e89e..e6734106 100755 --- a/common/buildcraft/core/render/RenderBuilder.java +++ b/common/buildcraft/core/render/RenderBuilder.java @@ -12,6 +12,7 @@ import org.lwjgl.opengl.GL11; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.tileentity.TileEntity; + import buildcraft.core.EntityLaser; import buildcraft.core.LaserData; import buildcraft.core.builders.TileAbstractBuilder; diff --git a/common/buildcraft/core/render/RenderBuildingItems.java b/common/buildcraft/core/render/RenderBuildingItems.java index d7079c14..d0f3c84e 100755 --- a/common/buildcraft/core/render/RenderBuildingItems.java +++ b/common/buildcraft/core/render/RenderBuildingItems.java @@ -14,6 +14,7 @@ import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.item.EntityItem; import net.minecraft.tileentity.TileEntity; + import buildcraft.core.StackAtPosition; import buildcraft.core.builders.BuildingItem; import buildcraft.core.builders.IBuildingItemsProvider; diff --git a/common/buildcraft/core/render/RenderEntityBlock.java b/common/buildcraft/core/render/RenderEntityBlock.java index 19f19119..f0fafe00 100644 --- a/common/buildcraft/core/render/RenderEntityBlock.java +++ b/common/buildcraft/core/render/RenderEntityBlock.java @@ -10,6 +10,8 @@ package buildcraft.core.render; import java.util.Arrays; +import org.lwjgl.opengl.GL11; + import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -21,8 +23,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; -import org.lwjgl.opengl.GL11; - import buildcraft.core.EntityBlock; public final class RenderEntityBlock extends Render { diff --git a/common/buildcraft/core/render/RenderRobot.java b/common/buildcraft/core/render/RenderRobot.java index 28b667a7..ce9780b9 100644 --- a/common/buildcraft/core/render/RenderRobot.java +++ b/common/buildcraft/core/render/RenderRobot.java @@ -23,7 +23,9 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.client.IItemRenderer; + import buildcraft.BuildCraftSilicon; import buildcraft.core.DefaultProps; import buildcraft.core.EntityLaser; diff --git a/common/buildcraft/core/robots/AIRobotSearchStackRequest.java b/common/buildcraft/core/robots/AIRobotSearchStackRequest.java index 06322414..287ff1fb 100755 --- a/common/buildcraft/core/robots/AIRobotSearchStackRequest.java +++ b/common/buildcraft/core/robots/AIRobotSearchStackRequest.java @@ -12,7 +12,9 @@ import java.util.Collection; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.robots.IRequestProvider; diff --git a/common/buildcraft/core/robots/EntityRobot.java b/common/buildcraft/core/robots/EntityRobot.java index 0d2dcff8..8eb1bbde 100644 --- a/common/buildcraft/core/robots/EntityRobot.java +++ b/common/buildcraft/core/robots/EntityRobot.java @@ -12,6 +12,7 @@ import java.util.Date; import java.util.WeakHashMap; import io.netty.buffer.ByteBuf; + import net.minecraft.client.Minecraft; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -27,9 +28,11 @@ import net.minecraft.util.EntityDamageSource; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3; import net.minecraft.world.World; + import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; @@ -37,6 +40,7 @@ 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.BuildCraftSilicon; import buildcraft.api.boards.RedstoneBoardNBT; diff --git a/common/buildcraft/core/robots/RobotIntegrationRecipe.java b/common/buildcraft/core/robots/RobotIntegrationRecipe.java index 013f75e8..b92c29aa 100755 --- a/common/buildcraft/core/robots/RobotIntegrationRecipe.java +++ b/common/buildcraft/core/robots/RobotIntegrationRecipe.java @@ -9,6 +9,7 @@ package buildcraft.core.robots; import net.minecraft.item.ItemStack; + import buildcraft.BuildCraftSilicon; import buildcraft.api.recipes.CraftingResult; import buildcraft.core.ItemRobot; diff --git a/common/buildcraft/core/robots/RobotRegistry.java b/common/buildcraft/core/robots/RobotRegistry.java index 8dc86f6e..2197f5c0 100755 --- a/common/buildcraft/core/robots/RobotRegistry.java +++ b/common/buildcraft/core/robots/RobotRegistry.java @@ -21,6 +21,7 @@ import net.minecraft.world.World; import net.minecraft.world.WorldSavedData; import cpw.mods.fml.common.eventhandler.SubscribeEvent; + import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; @@ -211,8 +212,7 @@ public class RobotRegistry extends WorldSavedData implements IRobotRegistry { if (!d.canRelease()) { if (forceAll) { d.unsafeRelease(robot); - } - else if (resetMainLink && d.isMainStation() && d.robotIdTaking() == robot.getRobotId()) { + } else if (resetMainLink && d.isMainStation() && d.robotIdTaking() == robot.getRobotId()) { d.invalidateRobotTakingEntity(); } } else { @@ -306,7 +306,7 @@ public class RobotRegistry extends WorldSavedData implements IRobotRegistry { MinecraftForge.EVENT_BUS.register(newRegistry); registries.put(world.provider.dimensionId, newRegistry); - + return newRegistry; } @@ -372,13 +372,12 @@ public class RobotRegistry extends WorldSavedData implements IRobotRegistry { } @SubscribeEvent - public void onChunkUnload(ChunkEvent.Unload e) - { - if(e.world == this.world) - { + public void onChunkUnload(ChunkEvent.Unload e) { + if (e.world == this.world) { for (EntityRobot robot : new ArrayList(robotsLoaded.values())) { - if(!e.world.loadedEntityList.contains(robot)) + if (!e.world.loadedEntityList.contains(robot)) { robot.onChunkUnload(); + } } } } diff --git a/common/buildcraft/core/robots/boards/BoardRobotBuilder.java b/common/buildcraft/core/robots/boards/BoardRobotBuilder.java index 272cbf56..873cdbfb 100644 --- a/common/buildcraft/core/robots/boards/BoardRobotBuilder.java +++ b/common/buildcraft/core/robots/boards/BoardRobotBuilder.java @@ -12,6 +12,7 @@ import java.util.LinkedList; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.AIRobot; diff --git a/common/buildcraft/core/robots/boards/BoardRobotGenericBreakBlock.java b/common/buildcraft/core/robots/boards/BoardRobotGenericBreakBlock.java index 3a2dc441..528d38b0 100644 --- a/common/buildcraft/core/robots/boards/BoardRobotGenericBreakBlock.java +++ b/common/buildcraft/core/robots/boards/BoardRobotGenericBreakBlock.java @@ -15,6 +15,7 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; + import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.AIRobot; diff --git a/common/buildcraft/core/robots/boards/BoardRobotPump.java b/common/buildcraft/core/robots/boards/BoardRobotPump.java index 6fefe874..f39fe345 100644 --- a/common/buildcraft/core/robots/boards/BoardRobotPump.java +++ b/common/buildcraft/core/robots/boards/BoardRobotPump.java @@ -13,11 +13,13 @@ import java.util.ArrayList; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; + import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.core.BlockIndex; diff --git a/common/buildcraft/core/statements/ActionMachineControl.java b/common/buildcraft/core/statements/ActionMachineControl.java index b9f8667b..537a5533 100644 --- a/common/buildcraft/core/statements/ActionMachineControl.java +++ b/common/buildcraft/core/statements/ActionMachineControl.java @@ -12,9 +12,12 @@ 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.statements.IActionExternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/core/statements/ActionRedstoneOutput.java b/common/buildcraft/core/statements/ActionRedstoneOutput.java index 3f90ca56..c8819e90 100644 --- a/common/buildcraft/core/statements/ActionRedstoneOutput.java +++ b/common/buildcraft/core/statements/ActionRedstoneOutput.java @@ -9,8 +9,10 @@ package buildcraft.core.statements; import net.minecraft.client.renderer.texture.IIconRegister; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/core/statements/BCStatement.java b/common/buildcraft/core/statements/BCStatement.java index 66836384..fff0b2ba 100644 --- a/common/buildcraft/core/statements/BCStatement.java +++ b/common/buildcraft/core/statements/BCStatement.java @@ -10,8 +10,10 @@ package buildcraft.core.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.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementManager; diff --git a/common/buildcraft/core/statements/DefaultActionProvider.java b/common/buildcraft/core/statements/DefaultActionProvider.java index d000f060..8030bf81 100644 --- a/common/buildcraft/core/statements/DefaultActionProvider.java +++ b/common/buildcraft/core/statements/DefaultActionProvider.java @@ -12,7 +12,9 @@ import java.util.Collection; import java.util.LinkedList; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.BuildCraftCore; import buildcraft.api.core.BCLog; import buildcraft.api.statements.IActionExternal; diff --git a/common/buildcraft/core/statements/DefaultTriggerProvider.java b/common/buildcraft/core/statements/DefaultTriggerProvider.java index d1640eda..e885f893 100644 --- a/common/buildcraft/core/statements/DefaultTriggerProvider.java +++ b/common/buildcraft/core/statements/DefaultTriggerProvider.java @@ -12,13 +12,16 @@ import java.util.LinkedList; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + import cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyProvider; import cofh.api.energy.IEnergyReceiver; + import buildcraft.BuildCraftCore; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; diff --git a/common/buildcraft/core/statements/StatementParameterDirection.java b/common/buildcraft/core/statements/StatementParameterDirection.java index 04501f14..90e91626 100644 --- a/common/buildcraft/core/statements/StatementParameterDirection.java +++ b/common/buildcraft/core/statements/StatementParameterDirection.java @@ -12,7 +12,9 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java b/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java index 1d3d97e5..78d6ffe3 100644 --- a/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java +++ b/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java @@ -4,6 +4,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; + import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/core/statements/TriggerEnergy.java b/common/buildcraft/core/statements/TriggerEnergy.java index a4527679..64f6b3ea 100644 --- a/common/buildcraft/core/statements/TriggerEnergy.java +++ b/common/buildcraft/core/statements/TriggerEnergy.java @@ -10,13 +10,17 @@ package buildcraft.core.statements; 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 cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyProvider; import cofh.api.energy.IEnergyReceiver; + import buildcraft.api.gates.IGate; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/core/statements/TriggerFluidContainer.java b/common/buildcraft/core/statements/TriggerFluidContainer.java index 244be6ee..c9f10198 100644 --- a/common/buildcraft/core/statements/TriggerFluidContainer.java +++ b/common/buildcraft/core/statements/TriggerFluidContainer.java @@ -12,11 +12,13 @@ import java.util.Locale; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; diff --git a/common/buildcraft/core/statements/TriggerFluidContainerLevel.java b/common/buildcraft/core/statements/TriggerFluidContainerLevel.java index 700c947d..2d34b52c 100644 --- a/common/buildcraft/core/statements/TriggerFluidContainerLevel.java +++ b/common/buildcraft/core/statements/TriggerFluidContainerLevel.java @@ -12,11 +12,13 @@ import java.util.Locale; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; diff --git a/common/buildcraft/core/statements/TriggerInventory.java b/common/buildcraft/core/statements/TriggerInventory.java index 969b1c24..65cd7c7b 100644 --- a/common/buildcraft/core/statements/TriggerInventory.java +++ b/common/buildcraft/core/statements/TriggerInventory.java @@ -14,7 +14,9 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.core.IInvSlot; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/core/statements/TriggerInventoryLevel.java b/common/buildcraft/core/statements/TriggerInventoryLevel.java index 03d8b824..57c1a308 100644 --- a/common/buildcraft/core/statements/TriggerInventoryLevel.java +++ b/common/buildcraft/core/statements/TriggerInventoryLevel.java @@ -14,7 +14,9 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.core.IInvSlot; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/core/statements/TriggerMachine.java b/common/buildcraft/core/statements/TriggerMachine.java index bde98a3b..0ae0e71e 100644 --- a/common/buildcraft/core/statements/TriggerMachine.java +++ b/common/buildcraft/core/statements/TriggerMachine.java @@ -10,7 +10,9 @@ package buildcraft.core.statements; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; diff --git a/common/buildcraft/core/statements/TriggerRedstoneInput.java b/common/buildcraft/core/statements/TriggerRedstoneInput.java index aaba7eaf..9c36822d 100644 --- a/common/buildcraft/core/statements/TriggerRedstoneInput.java +++ b/common/buildcraft/core/statements/TriggerRedstoneInput.java @@ -9,6 +9,7 @@ package buildcraft.core.statements; import net.minecraft.client.renderer.texture.IIconRegister; + import buildcraft.api.gates.IGate; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/core/utils/BlockUtils.java b/common/buildcraft/core/utils/BlockUtils.java index 72e0bcd0..fadf1668 100644 --- a/common/buildcraft/core/utils/BlockUtils.java +++ b/common/buildcraft/core/utils/BlockUtils.java @@ -24,7 +24,6 @@ import net.minecraft.world.ChunkPosition; import net.minecraft.world.Explosion; import net.minecraft.world.World; import net.minecraft.world.WorldServer; -import net.minecraft.world.chunk.Chunk; import cpw.mods.fml.common.FMLCommonHandler; diff --git a/common/buildcraft/core/utils/ColorUtils.java b/common/buildcraft/core/utils/ColorUtils.java index 5d8d9af8..bbe3c05c 100644 --- a/common/buildcraft/core/utils/ColorUtils.java +++ b/common/buildcraft/core/utils/ColorUtils.java @@ -10,6 +10,7 @@ package buildcraft.core.utils; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; + import net.minecraftforge.oredict.OreDictionary; public final class ColorUtils { diff --git a/common/buildcraft/core/utils/FluidUtils.java b/common/buildcraft/core/utils/FluidUtils.java index 5b539120..9219daca 100644 --- a/common/buildcraft/core/utils/FluidUtils.java +++ b/common/buildcraft/core/utils/FluidUtils.java @@ -3,6 +3,7 @@ package buildcraft.core.utils; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; + import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; diff --git a/common/buildcraft/core/utils/WorldProperty.java b/common/buildcraft/core/utils/WorldProperty.java index dae5ab84..62c5cd67 100644 --- a/common/buildcraft/core/utils/WorldProperty.java +++ b/common/buildcraft/core/utils/WorldProperty.java @@ -13,6 +13,7 @@ import java.util.HashMap; import net.minecraft.block.Block; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import buildcraft.api.core.IWorldProperty; public abstract class WorldProperty implements IWorldProperty { diff --git a/common/buildcraft/core/utils/WorldPropertyIsOre.java b/common/buildcraft/core/utils/WorldPropertyIsOre.java index 9d830019..ab2d0bff 100755 --- a/common/buildcraft/core/utils/WorldPropertyIsOre.java +++ b/common/buildcraft/core/utils/WorldPropertyIsOre.java @@ -14,6 +14,7 @@ import java.util.HashSet; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; + import net.minecraftforge.oredict.OreDictionary; public class WorldPropertyIsOre extends WorldProperty { diff --git a/common/buildcraft/energy/EnergyProxyClient.java b/common/buildcraft/energy/EnergyProxyClient.java index 66d421e0..91226c09 100644 --- a/common/buildcraft/energy/EnergyProxyClient.java +++ b/common/buildcraft/energy/EnergyProxyClient.java @@ -9,6 +9,7 @@ package buildcraft.energy; import cpw.mods.fml.client.registry.ClientRegistry; + import buildcraft.BuildCraftEnergy; import buildcraft.core.render.RenderingEntityBlocks; import buildcraft.core.render.RenderingEntityBlocks.EntityRenderIndex; diff --git a/common/buildcraft/energy/TileEngine.java b/common/buildcraft/energy/TileEngine.java index cf3cd07b..526d582f 100644 --- a/common/buildcraft/energy/TileEngine.java +++ b/common/buildcraft/energy/TileEngine.java @@ -9,15 +9,19 @@ package buildcraft.energy; import io.netty.buffer.ByteBuf; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.common.util.ForgeDirection; + import cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyReceiver; + import buildcraft.BuildCraftEnergy; import buildcraft.api.power.IEngine; import buildcraft.api.tiles.IHeatable; diff --git a/common/buildcraft/energy/TileEngineCreative.java b/common/buildcraft/energy/TileEngineCreative.java index d7244797..bc973003 100644 --- a/common/buildcraft/energy/TileEngineCreative.java +++ b/common/buildcraft/energy/TileEngineCreative.java @@ -9,12 +9,15 @@ package buildcraft.energy; import io.netty.buffer.ByteBuf; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.tools.IToolWrench; import buildcraft.core.PowerMode; import buildcraft.core.utils.StringUtils; diff --git a/common/buildcraft/energy/TileEngineIron.java b/common/buildcraft/energy/TileEngineIron.java index 3b91b31e..f113ac24 100644 --- a/common/buildcraft/energy/TileEngineIron.java +++ b/common/buildcraft/energy/TileEngineIron.java @@ -14,12 +14,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraft.world.biome.BiomeGenBase; + import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + 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 d2d9e428..f72dada5 100644 --- a/common/buildcraft/energy/TileEngineStone.java +++ b/common/buildcraft/energy/TileEngineStone.java @@ -15,7 +15,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.BuildCraftEnergy; import buildcraft.core.GuiIds; import buildcraft.core.inventory.InvUtils; diff --git a/common/buildcraft/energy/TileEngineWood.java b/common/buildcraft/energy/TileEngineWood.java index 4b433c36..dffb2caf 100644 --- a/common/buildcraft/energy/TileEngineWood.java +++ b/common/buildcraft/energy/TileEngineWood.java @@ -10,9 +10,11 @@ package buildcraft.energy; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.transport.IPipeTile; + import buildcraft.api.power.IRedstoneEngineReceiver; +import buildcraft.api.transport.IPipeTile; public class TileEngineWood extends TileEngine { diff --git a/common/buildcraft/energy/fuels/CoolantManager.java b/common/buildcraft/energy/fuels/CoolantManager.java index e88a6d9c..c3148dce 100644 --- a/common/buildcraft/energy/fuels/CoolantManager.java +++ b/common/buildcraft/energy/fuels/CoolantManager.java @@ -13,6 +13,7 @@ import java.util.LinkedList; import java.util.List; import net.minecraft.item.ItemStack; + import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/common/buildcraft/energy/gui/ContainerEngine.java b/common/buildcraft/energy/gui/ContainerEngine.java index 9666230e..55c20dd3 100644 --- a/common/buildcraft/energy/gui/ContainerEngine.java +++ b/common/buildcraft/energy/gui/ContainerEngine.java @@ -12,6 +12,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; + import buildcraft.core.gui.BuildCraftContainer; import buildcraft.energy.TileEngineStone; import buildcraft.energy.TileEngineWithInventory; diff --git a/common/buildcraft/energy/statements/EnergyStatementProvider.java b/common/buildcraft/energy/statements/EnergyStatementProvider.java index 014c3131..2d8907c3 100644 --- a/common/buildcraft/energy/statements/EnergyStatementProvider.java +++ b/common/buildcraft/energy/statements/EnergyStatementProvider.java @@ -12,7 +12,9 @@ import java.util.Collection; import java.util.LinkedList; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.BuildCraftEnergy; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; diff --git a/common/buildcraft/energy/statements/TriggerEngineHeat.java b/common/buildcraft/energy/statements/TriggerEngineHeat.java index 7974258d..60c473e9 100644 --- a/common/buildcraft/energy/statements/TriggerEngineHeat.java +++ b/common/buildcraft/energy/statements/TriggerEngineHeat.java @@ -12,9 +12,12 @@ 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.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; diff --git a/common/buildcraft/energy/worldgen/GenLayerBiomeReplacer.java b/common/buildcraft/energy/worldgen/GenLayerBiomeReplacer.java index 89851ab9..da273ada 100644 --- a/common/buildcraft/energy/worldgen/GenLayerBiomeReplacer.java +++ b/common/buildcraft/energy/worldgen/GenLayerBiomeReplacer.java @@ -9,6 +9,7 @@ package buildcraft.energy.worldgen; import java.util.Random; + import net.minecraft.world.gen.layer.GenLayer; import net.minecraft.world.gen.layer.IntCache; diff --git a/common/buildcraft/factory/BlockFrame.java b/common/buildcraft/factory/BlockFrame.java index 16114c73..0297b046 100644 --- a/common/buildcraft/factory/BlockFrame.java +++ b/common/buildcraft/factory/BlockFrame.java @@ -24,9 +24,12 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.BuildCraftCore; import buildcraft.core.CoreConstants; import buildcraft.core.IFramePipeConnection; diff --git a/common/buildcraft/factory/BlockMiner.java b/common/buildcraft/factory/BlockMiner.java index 8e93bbb8..6cbd8270 100644 --- a/common/buildcraft/factory/BlockMiner.java +++ b/common/buildcraft/factory/BlockMiner.java @@ -1,15 +1,18 @@ package buildcraft.factory; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraft.world.WorldServer; + import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.world.BlockEvent; + import buildcraft.BuildCraftCore; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.BlockUtils; diff --git a/common/buildcraft/factory/FactoryProxyClient.java b/common/buildcraft/factory/FactoryProxyClient.java index 50b35942..3c478b51 100644 --- a/common/buildcraft/factory/FactoryProxyClient.java +++ b/common/buildcraft/factory/FactoryProxyClient.java @@ -12,8 +12,10 @@ import java.lang.reflect.Method; import net.minecraft.util.IIcon; import net.minecraft.world.World; + import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; + import buildcraft.BuildCraftFactory; import buildcraft.api.core.BCLog; import buildcraft.core.EntityBlock; diff --git a/common/buildcraft/factory/TileHopper.java b/common/buildcraft/factory/TileHopper.java index fe9adc3f..c45ea8dc 100644 --- a/common/buildcraft/factory/TileHopper.java +++ b/common/buildcraft/factory/TileHopper.java @@ -13,7 +13,9 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.core.TileBuildCraft; import buildcraft.core.inventory.ITransactor; import buildcraft.core.inventory.SimpleInventory; diff --git a/common/buildcraft/factory/TileMiningWell.java b/common/buildcraft/factory/TileMiningWell.java index 400e8b60..24491345 100644 --- a/common/buildcraft/factory/TileMiningWell.java +++ b/common/buildcraft/factory/TileMiningWell.java @@ -9,7 +9,9 @@ package buildcraft.factory; import net.minecraft.world.World; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.BuildCraftFactory; import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.tiles.IControllable; diff --git a/common/buildcraft/factory/TilePump.java b/common/buildcraft/factory/TilePump.java index 71a63025..9f642a86 100644 --- a/common/buildcraft/factory/TilePump.java +++ b/common/buildcraft/factory/TilePump.java @@ -15,9 +15,11 @@ import java.util.Set; import java.util.TreeMap; import io.netty.buffer.ByteBuf; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.nbt.NBTTagCompound; + import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -25,6 +27,7 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + import buildcraft.BuildCraftCore; import buildcraft.BuildCraftFactory; import buildcraft.api.core.BlockIndex; diff --git a/common/buildcraft/factory/TileQuarry.java b/common/buildcraft/factory/TileQuarry.java index 2437e545..17bd65fc 100644 --- a/common/buildcraft/factory/TileQuarry.java +++ b/common/buildcraft/factory/TileQuarry.java @@ -16,6 +16,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import io.netty.buffer.ByteBuf; + import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -25,10 +26,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentText; import net.minecraft.world.ChunkCoordIntPair; + import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.ForgeChunkManager.Ticket; import net.minecraftforge.common.ForgeChunkManager.Type; import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.BuildCraftFactory; import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.core.BuildCraftAPI; diff --git a/common/buildcraft/factory/TileRefinery.java b/common/buildcraft/factory/TileRefinery.java index 7dc23f07..b2ed3f42 100644 --- a/common/buildcraft/factory/TileRefinery.java +++ b/common/buildcraft/factory/TileRefinery.java @@ -9,12 +9,14 @@ package buildcraft.factory; import io.netty.buffer.ByteBuf; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -22,6 +24,7 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + import buildcraft.BuildCraftCore; import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.recipes.CraftingResult; diff --git a/common/buildcraft/factory/render/RenderHopper.java b/common/buildcraft/factory/render/RenderHopper.java index fa5fe286..ed19edc2 100644 --- a/common/buildcraft/factory/render/RenderHopper.java +++ b/common/buildcraft/factory/render/RenderHopper.java @@ -8,6 +8,8 @@ */ package buildcraft.factory.render; +import org.lwjgl.opengl.GL11; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.Tessellator; @@ -16,8 +18,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; - import buildcraft.BuildCraftCore; import buildcraft.BuildCraftCore.RenderMode; import buildcraft.core.DefaultProps; diff --git a/common/buildcraft/silicon/BlockLaserTable.java b/common/buildcraft/silicon/BlockLaserTable.java index a53d055a..fbad553c 100644 --- a/common/buildcraft/silicon/BlockLaserTable.java +++ b/common/buildcraft/silicon/BlockLaserTable.java @@ -20,9 +20,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import buildcraft.BuildCraftSilicon; import buildcraft.api.events.BlockInteractionEvent; import buildcraft.api.power.ILaserTargetBlock; diff --git a/common/buildcraft/silicon/GuiHandler.java b/common/buildcraft/silicon/GuiHandler.java index 4e02ef9b..430aa1ae 100644 --- a/common/buildcraft/silicon/GuiHandler.java +++ b/common/buildcraft/silicon/GuiHandler.java @@ -13,6 +13,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import cpw.mods.fml.common.network.IGuiHandler; + import buildcraft.silicon.gui.ContainerAdvancedCraftingTable; import buildcraft.silicon.gui.ContainerAssemblyTable; import buildcraft.silicon.gui.ContainerChargingTable; diff --git a/common/buildcraft/silicon/TileAdvancedCraftingTable.java b/common/buildcraft/silicon/TileAdvancedCraftingTable.java index 9fd37eb5..996c0c8a 100644 --- a/common/buildcraft/silicon/TileAdvancedCraftingTable.java +++ b/common/buildcraft/silicon/TileAdvancedCraftingTable.java @@ -27,8 +27,10 @@ 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; diff --git a/common/buildcraft/silicon/TileAssemblyTable.java b/common/buildcraft/silicon/TileAssemblyTable.java index e1361040..c27e20ae 100644 --- a/common/buildcraft/silicon/TileAssemblyTable.java +++ b/common/buildcraft/silicon/TileAssemblyTable.java @@ -13,17 +13,21 @@ import java.util.LinkedList; import java.util.List; import io.netty.buffer.ByteBuf; + import net.minecraft.entity.item.EntityItem; import net.minecraft.inventory.IInventory; 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 cpw.mods.fml.relauncher.Side; + import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; + import buildcraft.BuildCraftCore; import buildcraft.api.recipes.CraftingResult; import buildcraft.api.recipes.IFlexibleCrafter; diff --git a/common/buildcraft/silicon/TileChargingTable.java b/common/buildcraft/silicon/TileChargingTable.java index 037de48b..5b54f9d6 100644 --- a/common/buildcraft/silicon/TileChargingTable.java +++ b/common/buildcraft/silicon/TileChargingTable.java @@ -1,8 +1,11 @@ package buildcraft.silicon; import net.minecraft.item.ItemStack; + import cpw.mods.fml.common.FMLCommonHandler; + import cofh.api.energy.IEnergyContainerItem; + import buildcraft.api.tiles.IHasWork; import buildcraft.core.utils.StringUtils; diff --git a/common/buildcraft/silicon/TileIntegrationTable.java b/common/buildcraft/silicon/TileIntegrationTable.java index 9731fa20..e818776c 100644 --- a/common/buildcraft/silicon/TileIntegrationTable.java +++ b/common/buildcraft/silicon/TileIntegrationTable.java @@ -10,14 +10,15 @@ 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; import buildcraft.api.recipes.IFlexibleRecipe; import buildcraft.api.recipes.IIntegrationRecipe; -import buildcraft.api.tiles.IControllable; import buildcraft.core.inventory.ITransactor; import buildcraft.core.inventory.InventoryMapper; import buildcraft.core.inventory.SimpleInventory; diff --git a/common/buildcraft/silicon/TileLaser.java b/common/buildcraft/silicon/TileLaser.java index a2a0e332..432904ba 100644 --- a/common/buildcraft/silicon/TileLaser.java +++ b/common/buildcraft/silicon/TileLaser.java @@ -12,11 +12,14 @@ import java.util.LinkedList; import java.util.List; import io.netty.buffer.ByteBuf; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.core.Position; import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.power.ILaserTarget; diff --git a/common/buildcraft/silicon/TileLaserTableBase.java b/common/buildcraft/silicon/TileLaserTableBase.java index ca690944..2846d864 100644 --- a/common/buildcraft/silicon/TileLaserTableBase.java +++ b/common/buildcraft/silicon/TileLaserTableBase.java @@ -14,9 +14,8 @@ import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import buildcraft.api.power.ILaserTarget; -import buildcraft.api.tiles.IControllable; -import buildcraft.api.tiles.IControllable.Mode; import buildcraft.api.tiles.IHasWork; import buildcraft.core.TileBuildCraft; import buildcraft.core.inventory.SimpleInventory; diff --git a/common/buildcraft/silicon/gui/ContainerChargingTable.java b/common/buildcraft/silicon/gui/ContainerChargingTable.java index eb6b4660..f28321b7 100644 --- a/common/buildcraft/silicon/gui/ContainerChargingTable.java +++ b/common/buildcraft/silicon/gui/ContainerChargingTable.java @@ -12,6 +12,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; + import buildcraft.core.gui.BuildCraftContainer; import buildcraft.core.gui.slots.SlotValidated; import buildcraft.silicon.TileChargingTable; diff --git a/common/buildcraft/silicon/gui/GuiChargingTable.java b/common/buildcraft/silicon/gui/GuiChargingTable.java index 6b2e9dce..f720bc21 100644 --- a/common/buildcraft/silicon/gui/GuiChargingTable.java +++ b/common/buildcraft/silicon/gui/GuiChargingTable.java @@ -10,6 +10,7 @@ package buildcraft.silicon.gui; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; + import buildcraft.core.DefaultProps; import buildcraft.silicon.TileChargingTable; diff --git a/common/buildcraft/silicon/render/RenderLaserBlock.java b/common/buildcraft/silicon/render/RenderLaserBlock.java index 96301cd6..33ec0cca 100755 --- a/common/buildcraft/silicon/render/RenderLaserBlock.java +++ b/common/buildcraft/silicon/render/RenderLaserBlock.java @@ -8,12 +8,12 @@ */ package buildcraft.silicon.render; +import org.lwjgl.opengl.GL11; + import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import org.lwjgl.opengl.GL11; - import buildcraft.core.render.RenderLaser; import buildcraft.silicon.TileLaser; diff --git a/common/buildcraft/silicon/statements/ActionRobotFilter.java b/common/buildcraft/silicon/statements/ActionRobotFilter.java index dc92fcd8..2ac63a8e 100755 --- a/common/buildcraft/silicon/statements/ActionRobotFilter.java +++ b/common/buildcraft/silicon/statements/ActionRobotFilter.java @@ -13,8 +13,10 @@ 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.robots.IDockingStation; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; diff --git a/common/buildcraft/silicon/statements/ActionRobotGotoStation.java b/common/buildcraft/silicon/statements/ActionRobotGotoStation.java index 7d1250d7..8f15285a 100644 --- a/common/buildcraft/silicon/statements/ActionRobotGotoStation.java +++ b/common/buildcraft/silicon/statements/ActionRobotGotoStation.java @@ -10,7 +10,9 @@ 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.robots.AIRobot; import buildcraft.api.statements.IActionInternal; diff --git a/common/buildcraft/silicon/statements/ActionRobotWakeUp.java b/common/buildcraft/silicon/statements/ActionRobotWakeUp.java index ddd8a690..4f226d10 100755 --- a/common/buildcraft/silicon/statements/ActionRobotWakeUp.java +++ b/common/buildcraft/silicon/statements/ActionRobotWakeUp.java @@ -9,6 +9,7 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; + import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/silicon/statements/ActionRobotWorkInArea.java b/common/buildcraft/silicon/statements/ActionRobotWorkInArea.java index 25e6a96f..b2cc70c2 100755 --- a/common/buildcraft/silicon/statements/ActionRobotWorkInArea.java +++ b/common/buildcraft/silicon/statements/ActionRobotWorkInArea.java @@ -10,6 +10,7 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; + import buildcraft.api.core.IZone; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; diff --git a/common/buildcraft/silicon/statements/ActionStationAcceptFluids.java b/common/buildcraft/silicon/statements/ActionStationAcceptFluids.java index ccfe882c..fd7f8c72 100755 --- a/common/buildcraft/silicon/statements/ActionStationAcceptFluids.java +++ b/common/buildcraft/silicon/statements/ActionStationAcceptFluids.java @@ -9,6 +9,7 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; + import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/silicon/statements/ActionStationAcceptItemsInv.java b/common/buildcraft/silicon/statements/ActionStationAcceptItemsInv.java index 9beb7a0c..2faee0af 100755 --- a/common/buildcraft/silicon/statements/ActionStationAcceptItemsInv.java +++ b/common/buildcraft/silicon/statements/ActionStationAcceptItemsInv.java @@ -12,7 +12,9 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.core.IInvSlot; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; diff --git a/common/buildcraft/silicon/statements/ActionStationAcceptItemsPipe.java b/common/buildcraft/silicon/statements/ActionStationAcceptItemsPipe.java index 2feea98a..0bdb63fa 100755 --- a/common/buildcraft/silicon/statements/ActionStationAcceptItemsPipe.java +++ b/common/buildcraft/silicon/statements/ActionStationAcceptItemsPipe.java @@ -9,6 +9,7 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; + import buildcraft.api.core.IInvSlot; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; diff --git a/common/buildcraft/silicon/statements/ActionStationAllowCraft.java b/common/buildcraft/silicon/statements/ActionStationAllowCraft.java index a94d5f45..15b79ef3 100755 --- a/common/buildcraft/silicon/statements/ActionStationAllowCraft.java +++ b/common/buildcraft/silicon/statements/ActionStationAllowCraft.java @@ -9,6 +9,7 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; + import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/silicon/statements/ActionStationForbidRobot.java b/common/buildcraft/silicon/statements/ActionStationForbidRobot.java index 55d156d9..0a080058 100755 --- a/common/buildcraft/silicon/statements/ActionStationForbidRobot.java +++ b/common/buildcraft/silicon/statements/ActionStationForbidRobot.java @@ -10,6 +10,7 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; + import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; diff --git a/common/buildcraft/silicon/statements/ActionStationProvideFluids.java b/common/buildcraft/silicon/statements/ActionStationProvideFluids.java index 8e89b0c2..e0ccef75 100755 --- a/common/buildcraft/silicon/statements/ActionStationProvideFluids.java +++ b/common/buildcraft/silicon/statements/ActionStationProvideFluids.java @@ -9,6 +9,7 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; + import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/silicon/statements/ActionStationProvideItems.java b/common/buildcraft/silicon/statements/ActionStationProvideItems.java index f0d617b3..1244a57e 100755 --- a/common/buildcraft/silicon/statements/ActionStationProvideItems.java +++ b/common/buildcraft/silicon/statements/ActionStationProvideItems.java @@ -9,6 +9,7 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; + import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/silicon/statements/ActionStationRequestItems.java b/common/buildcraft/silicon/statements/ActionStationRequestItems.java index e51e21bb..a45b1985 100755 --- a/common/buildcraft/silicon/statements/ActionStationRequestItems.java +++ b/common/buildcraft/silicon/statements/ActionStationRequestItems.java @@ -12,7 +12,9 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.core.IInvSlot; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; diff --git a/common/buildcraft/silicon/statements/ActionStationRequestItemsMachine.java b/common/buildcraft/silicon/statements/ActionStationRequestItemsMachine.java index e4b74c2a..372e99bf 100755 --- a/common/buildcraft/silicon/statements/ActionStationRequestItemsMachine.java +++ b/common/buildcraft/silicon/statements/ActionStationRequestItemsMachine.java @@ -9,6 +9,7 @@ package buildcraft.silicon.statements; import net.minecraft.client.renderer.texture.IIconRegister; + import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/silicon/statements/RobotsActionProvider.java b/common/buildcraft/silicon/statements/RobotsActionProvider.java index 42a74811..ac0cce86 100755 --- a/common/buildcraft/silicon/statements/RobotsActionProvider.java +++ b/common/buildcraft/silicon/statements/RobotsActionProvider.java @@ -17,8 +17,10 @@ import net.minecraft.block.BlockWorkbench; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; + import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; + import buildcraft.BuildCraftSilicon; import buildcraft.api.robots.IRequestProvider; import buildcraft.api.statements.IActionExternal; diff --git a/common/buildcraft/silicon/statements/RobotsTriggerProvider.java b/common/buildcraft/silicon/statements/RobotsTriggerProvider.java index 478f0ab7..77f709b9 100755 --- a/common/buildcraft/silicon/statements/RobotsTriggerProvider.java +++ b/common/buildcraft/silicon/statements/RobotsTriggerProvider.java @@ -12,7 +12,9 @@ import java.util.Collection; import java.util.LinkedList; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.BuildCraftSilicon; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; diff --git a/common/buildcraft/silicon/statements/StateStationProvideItems.java b/common/buildcraft/silicon/statements/StateStationProvideItems.java index a69e1a5b..24b4db5f 100755 --- a/common/buildcraft/silicon/statements/StateStationProvideItems.java +++ b/common/buildcraft/silicon/statements/StateStationProvideItems.java @@ -11,6 +11,7 @@ package buildcraft.silicon.statements; import java.util.LinkedList; import net.minecraft.item.ItemStack; + import buildcraft.api.statements.ActionState; import buildcraft.core.inventory.filters.IStackFilter; diff --git a/common/buildcraft/silicon/statements/StateStationRequestItems.java b/common/buildcraft/silicon/statements/StateStationRequestItems.java index 59f86af8..2eb437ee 100755 --- a/common/buildcraft/silicon/statements/StateStationRequestItems.java +++ b/common/buildcraft/silicon/statements/StateStationRequestItems.java @@ -11,6 +11,7 @@ package buildcraft.silicon.statements; import java.util.LinkedList; import net.minecraft.item.ItemStack; + import buildcraft.api.statements.ActionState; import buildcraft.core.inventory.filters.IStackFilter; diff --git a/common/buildcraft/silicon/statements/TriggerRobotSleep.java b/common/buildcraft/silicon/statements/TriggerRobotSleep.java index 1f6b2f33..02a07a80 100755 --- a/common/buildcraft/silicon/statements/TriggerRobotSleep.java +++ b/common/buildcraft/silicon/statements/TriggerRobotSleep.java @@ -9,7 +9,9 @@ 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.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 3b37257d..acb47377 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -39,11 +39,14 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.registry.GameRegistry; 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.BCLog; import buildcraft.api.core.BlockIndex; @@ -52,11 +55,11 @@ import buildcraft.api.events.PipePlacedEvent; import buildcraft.api.events.RobotPlacementEvent; import buildcraft.api.gates.GateExpansions; import buildcraft.api.gates.IGateExpansion; -import buildcraft.api.transport.pluggable.IPipePluggableItem; -import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.tools.IToolWrench; import buildcraft.api.transport.PipeWire; +import buildcraft.api.transport.pluggable.IPipePluggableItem; +import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.BlockBuildCraft; import buildcraft.core.CoreConstants; import buildcraft.core.CreativeTabBuildCraft; diff --git a/common/buildcraft/transport/FacadePluggable.java b/common/buildcraft/transport/FacadePluggable.java index 74822b2e..48df87b4 100644 --- a/common/buildcraft/transport/FacadePluggable.java +++ b/common/buildcraft/transport/FacadePluggable.java @@ -1,12 +1,15 @@ package buildcraft.transport; import io.netty.buffer.ByteBuf; + import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; + import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.pluggable.IPipePluggableRenderer; import buildcraft.api.transport.pluggable.PipePluggable; diff --git a/common/buildcraft/transport/Gate.java b/common/buildcraft/transport/Gate.java index 9e3cf2ab..cf9bba33 100644 --- a/common/buildcraft/transport/Gate.java +++ b/common/buildcraft/transport/Gate.java @@ -20,7 +20,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.BuildCraftTransport; import buildcraft.api.gates.GateExpansionController; import buildcraft.api.gates.IGate; diff --git a/common/buildcraft/transport/IDiamondPipe.java b/common/buildcraft/transport/IDiamondPipe.java index 8667eaa7..e149eedf 100644 --- a/common/buildcraft/transport/IDiamondPipe.java +++ b/common/buildcraft/transport/IDiamondPipe.java @@ -9,6 +9,7 @@ package buildcraft.transport; import net.minecraft.inventory.IInventory; + import buildcraft.api.core.ISerializable; public interface IDiamondPipe extends ISerializable { diff --git a/common/buildcraft/transport/IFilteredPipe.java b/common/buildcraft/transport/IFilteredPipe.java index d3d8d43d..8df1acf9 100644 --- a/common/buildcraft/transport/IFilteredPipe.java +++ b/common/buildcraft/transport/IFilteredPipe.java @@ -9,6 +9,7 @@ package buildcraft.transport; import net.minecraft.inventory.IInventory; + import buildcraft.api.core.ISerializable; public interface IFilteredPipe extends ISerializable { diff --git a/common/buildcraft/transport/ItemFacade.java b/common/buildcraft/transport/ItemFacade.java index 3ea122f8..fd2754c9 100644 --- a/common/buildcraft/transport/ItemFacade.java +++ b/common/buildcraft/transport/ItemFacade.java @@ -26,19 +26,22 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.BuildCraftTransport; import buildcraft.api.core.JavaTools; import buildcraft.api.facades.FacadeType; import buildcraft.api.facades.IFacadeItem; +import buildcraft.api.recipes.BuildcraftRecipeRegistry; import buildcraft.api.transport.IPipe; +import buildcraft.api.transport.PipeWire; import buildcraft.api.transport.pluggable.IPipePluggableItem; import buildcraft.api.transport.pluggable.PipePluggable; -import buildcraft.api.recipes.BuildcraftRecipeRegistry; -import buildcraft.api.transport.PipeWire; import buildcraft.core.BlockSpring; import buildcraft.core.CreativeTabBuildCraft; import buildcraft.core.ItemBuildCraft; diff --git a/common/buildcraft/transport/ItemGateCopier.java b/common/buildcraft/transport/ItemGateCopier.java index aecfcd64..167fad82 100644 --- a/common/buildcraft/transport/ItemGateCopier.java +++ b/common/buildcraft/transport/ItemGateCopier.java @@ -9,8 +9,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.IIcon; import net.minecraft.world.World; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.ItemBuildCraft; import buildcraft.core.utils.NBTUtils; diff --git a/common/buildcraft/transport/ItemPipe.java b/common/buildcraft/transport/ItemPipe.java index f1ff169d..d1ab82f8 100644 --- a/common/buildcraft/transport/ItemPipe.java +++ b/common/buildcraft/transport/ItemPipe.java @@ -21,8 +21,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.world.World; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import buildcraft.BuildCraftTransport; import buildcraft.api.core.BCLog; import buildcraft.api.core.IIconProvider; diff --git a/common/buildcraft/transport/LensFilterHandler.java b/common/buildcraft/transport/LensFilterHandler.java index add60104..000e5731 100644 --- a/common/buildcraft/transport/LensFilterHandler.java +++ b/common/buildcraft/transport/LensFilterHandler.java @@ -1,7 +1,9 @@ package buildcraft.transport; import java.util.LinkedList; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.pluggable.PipePluggable; diff --git a/common/buildcraft/transport/Pipe.java b/common/buildcraft/transport/Pipe.java index 33509a25..f34667ff 100644 --- a/common/buildcraft/transport/Pipe.java +++ b/common/buildcraft/transport/Pipe.java @@ -22,9 +22,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; + 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.IGate; diff --git a/common/buildcraft/transport/PipeActionProvider.java b/common/buildcraft/transport/PipeActionProvider.java index ad077572..bc70472b 100644 --- a/common/buildcraft/transport/PipeActionProvider.java +++ b/common/buildcraft/transport/PipeActionProvider.java @@ -4,7 +4,9 @@ import java.util.Collection; import java.util.LinkedList; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.gates.IGate; import buildcraft.api.statements.IActionExternal; import buildcraft.api.statements.IActionInternal; diff --git a/common/buildcraft/transport/PipeColoringRecipe.java b/common/buildcraft/transport/PipeColoringRecipe.java index 937d0252..20f89cbf 100644 --- a/common/buildcraft/transport/PipeColoringRecipe.java +++ b/common/buildcraft/transport/PipeColoringRecipe.java @@ -5,6 +5,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; + import buildcraft.core.utils.ColorUtils; public class PipeColoringRecipe implements IRecipe { diff --git a/common/buildcraft/transport/PipeEventBus.java b/common/buildcraft/transport/PipeEventBus.java index bc3e2d5f..12c08a55 100644 --- a/common/buildcraft/transport/PipeEventBus.java +++ b/common/buildcraft/transport/PipeEventBus.java @@ -6,6 +6,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; + import buildcraft.transport.pipes.events.PipeEvent; public class PipeEventBus { diff --git a/common/buildcraft/transport/PipePluggableState.java b/common/buildcraft/transport/PipePluggableState.java index 95cfca53..e0b7bff7 100644 --- a/common/buildcraft/transport/PipePluggableState.java +++ b/common/buildcraft/transport/PipePluggableState.java @@ -1,7 +1,9 @@ package buildcraft.transport; import io.netty.buffer.ByteBuf; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.core.ISerializable; import buildcraft.api.transport.PipeManager; import buildcraft.api.transport.pluggable.PipePluggable; @@ -47,7 +49,7 @@ public class PipePluggableState implements ISerializable { PipePluggable p = PipeManager.pipePluggables.get(data.readUnsignedShort()).newInstance(); p.readData(data); pluggables[dir.ordinal()] = p; - } catch(Exception e) { + } catch (Exception e) { e.printStackTrace(); } } else { diff --git a/common/buildcraft/transport/PipeToolTipManager.java b/common/buildcraft/transport/PipeToolTipManager.java index 7aa0615f..a32f9495 100644 --- a/common/buildcraft/transport/PipeToolTipManager.java +++ b/common/buildcraft/transport/PipeToolTipManager.java @@ -14,6 +14,7 @@ import java.util.List; import java.util.Map; import net.minecraft.client.gui.GuiScreen; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/buildcraft/transport/PipeTransport.java b/common/buildcraft/transport/PipeTransport.java index d4609a08..944d88cc 100644 --- a/common/buildcraft/transport/PipeTransport.java +++ b/common/buildcraft/transport/PipeTransport.java @@ -16,7 +16,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.transport.IPipeTile; import buildcraft.core.utils.BitSetUtils; diff --git a/common/buildcraft/transport/PipeTransportFluids.java b/common/buildcraft/transport/PipeTransportFluids.java index 75da4559..fd63d792 100644 --- a/common/buildcraft/transport/PipeTransportFluids.java +++ b/common/buildcraft/transport/PipeTransportFluids.java @@ -15,6 +15,7 @@ import java.util.Map; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -22,6 +23,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + import buildcraft.BuildCraftCore; import buildcraft.BuildCraftTransport; import buildcraft.api.core.SafeTimeTracker; diff --git a/common/buildcraft/transport/PipeTransportItems.java b/common/buildcraft/transport/PipeTransportItems.java index bfe6d121..4d39addd 100644 --- a/common/buildcraft/transport/PipeTransportItems.java +++ b/common/buildcraft/transport/PipeTransportItems.java @@ -23,8 +23,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.BuildCraftTransport; import buildcraft.api.core.BCLog; import buildcraft.api.core.Position; diff --git a/common/buildcraft/transport/PipeTransportPower.java b/common/buildcraft/transport/PipeTransportPower.java index 79ed67da..8fa63e5b 100644 --- a/common/buildcraft/transport/PipeTransportPower.java +++ b/common/buildcraft/transport/PipeTransportPower.java @@ -14,10 +14,13 @@ import java.util.Map; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; + import cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyReceiver; + import buildcraft.BuildCraftCore; import buildcraft.BuildCraftTransport; import buildcraft.api.core.SafeTimeTracker; diff --git a/common/buildcraft/transport/PipeTriggerProvider.java b/common/buildcraft/transport/PipeTriggerProvider.java index d6db52c1..15eed318 100644 --- a/common/buildcraft/transport/PipeTriggerProvider.java +++ b/common/buildcraft/transport/PipeTriggerProvider.java @@ -11,8 +11,11 @@ package buildcraft.transport; import java.util.LinkedList; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; + import cofh.api.energy.IEnergyHandler; + import buildcraft.BuildCraftCore; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; diff --git a/common/buildcraft/transport/TileFilteredBuffer.java b/common/buildcraft/transport/TileFilteredBuffer.java index 7e4feeb9..959bf8f7 100644 --- a/common/buildcraft/transport/TileFilteredBuffer.java +++ b/common/buildcraft/transport/TileFilteredBuffer.java @@ -12,6 +12,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import buildcraft.core.TileBuildCraft; import buildcraft.core.inventory.SimpleInventory; diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index 63a5dfd8..33bf3a83 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -11,6 +11,7 @@ package buildcraft.transport; import org.apache.logging.log4j.Level; import io.netty.buffer.ByteBuf; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -21,35 +22,39 @@ import net.minecraft.network.Packet; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraft.world.WorldServer; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + import cofh.api.energy.IEnergyHandler; + import buildcraft.BuildCraftCore; import buildcraft.BuildCraftTransport; import buildcraft.api.core.BCLog; import buildcraft.api.core.EnumColor; import buildcraft.api.core.IIconProvider; +import buildcraft.api.core.ISerializable; import buildcraft.api.core.Position; import buildcraft.api.gates.IGateExpansion; import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipeConnection; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.PipeManager; -import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.api.transport.PipeWire; +import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.DefaultProps; import buildcraft.core.IDropControlInventory; import buildcraft.core.ITileBufferHolder; import buildcraft.core.TileBuffer; import buildcraft.core.inventory.InvUtils; import buildcraft.core.network.BuildCraftPacket; -import buildcraft.api.core.ISerializable; import buildcraft.core.network.IGuiReturnHandler; import buildcraft.core.network.ISyncedTile; import buildcraft.core.network.PacketTileState; @@ -771,9 +776,9 @@ public class TileGenericPipe extends TileEntity implements IFluidHandler, } if (pluggable instanceof IPipeConnection) { - IPipe pipe = getNeighborPipe(side); - if (pipe != null) { - IPipeConnection.ConnectOverride override = ((IPipeConnection) pluggable).overridePipeConnection(pipe.getTile().getPipeType(), side); + IPipe neighborPipe = getNeighborPipe(side); + if (neighborPipe != null) { + IPipeConnection.ConnectOverride override = ((IPipeConnection) pluggable).overridePipeConnection(neighborPipe.getTile().getPipeType(), side); if (override == IPipeConnection.ConnectOverride.CONNECT) { return true; } else if (override == IPipeConnection.ConnectOverride.DISCONNECT) { diff --git a/common/buildcraft/transport/gates/GateExpansionBuildcraft.java b/common/buildcraft/transport/gates/GateExpansionBuildcraft.java index a51241cc..405c4aa7 100644 --- a/common/buildcraft/transport/gates/GateExpansionBuildcraft.java +++ b/common/buildcraft/transport/gates/GateExpansionBuildcraft.java @@ -10,6 +10,7 @@ package buildcraft.transport.gates; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; + import buildcraft.api.gates.IGateExpansion; import buildcraft.core.utils.StringUtils; diff --git a/common/buildcraft/transport/gates/GateExpansionPulsar.java b/common/buildcraft/transport/gates/GateExpansionPulsar.java index a3f73918..60886b81 100644 --- a/common/buildcraft/transport/gates/GateExpansionPulsar.java +++ b/common/buildcraft/transport/gates/GateExpansionPulsar.java @@ -12,8 +12,11 @@ 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.IGate; diff --git a/common/buildcraft/transport/gates/GateExpansionRedstoneFader.java b/common/buildcraft/transport/gates/GateExpansionRedstoneFader.java index f07a08ce..3dbbce43 100644 --- a/common/buildcraft/transport/gates/GateExpansionRedstoneFader.java +++ b/common/buildcraft/transport/gates/GateExpansionRedstoneFader.java @@ -12,6 +12,7 @@ import java.util.Arrays; import java.util.List; import net.minecraft.tileentity.TileEntity; + import buildcraft.BuildCraftTransport; import buildcraft.api.gates.GateExpansionController; import buildcraft.api.gates.IGateExpansion; diff --git a/common/buildcraft/transport/gates/GateExpansionTimer.java b/common/buildcraft/transport/gates/GateExpansionTimer.java index b25eed83..7f61d908 100644 --- a/common/buildcraft/transport/gates/GateExpansionTimer.java +++ b/common/buildcraft/transport/gates/GateExpansionTimer.java @@ -11,6 +11,7 @@ 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; diff --git a/common/buildcraft/transport/gates/GateFactory.java b/common/buildcraft/transport/gates/GateFactory.java index 531e49fb..45aa1987 100644 --- a/common/buildcraft/transport/gates/GateFactory.java +++ b/common/buildcraft/transport/gates/GateFactory.java @@ -11,8 +11,10 @@ package buildcraft.transport.gates; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; + import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.gates.GateExpansionController; import buildcraft.api.gates.GateExpansions; import buildcraft.api.gates.IGateExpansion; diff --git a/common/buildcraft/transport/gates/GatePluggable.java b/common/buildcraft/transport/gates/GatePluggable.java index 531ee1b6..5e24997e 100644 --- a/common/buildcraft/transport/gates/GatePluggable.java +++ b/common/buildcraft/transport/gates/GatePluggable.java @@ -1,14 +1,18 @@ package buildcraft.transport.gates; import java.util.Set; + import io.netty.buffer.ByteBuf; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraft.util.AxisAlignedBB; + import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.gates.GateExpansions; import buildcraft.api.gates.IGateExpansion; import buildcraft.api.transport.IPipeTile; diff --git a/common/buildcraft/transport/gates/ItemGate.java b/common/buildcraft/transport/gates/ItemGate.java index 230ad49b..efa387d7 100755 --- a/common/buildcraft/transport/gates/ItemGate.java +++ b/common/buildcraft/transport/gates/ItemGate.java @@ -23,17 +23,20 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.BuildCraftTransport; import buildcraft.api.gates.GateExpansions; import buildcraft.api.gates.IGateExpansion; +import buildcraft.api.statements.StatementManager; import buildcraft.api.transport.IPipe; import buildcraft.api.transport.pluggable.IPipePluggableItem; import buildcraft.api.transport.pluggable.PipePluggable; -import buildcraft.api.statements.StatementManager; import buildcraft.core.ItemBuildCraft; import buildcraft.core.inventory.InvUtils; import buildcraft.core.utils.StringUtils; diff --git a/common/buildcraft/transport/gui/ContainerEmeraldFluidPipe.java b/common/buildcraft/transport/gui/ContainerEmeraldFluidPipe.java index 23c8f9e3..7cdbef08 100644 --- a/common/buildcraft/transport/gui/ContainerEmeraldFluidPipe.java +++ b/common/buildcraft/transport/gui/ContainerEmeraldFluidPipe.java @@ -11,6 +11,7 @@ package buildcraft.transport.gui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; + import buildcraft.core.gui.BuildCraftContainer; import buildcraft.core.gui.slots.SlotPhantom; import buildcraft.transport.pipes.PipeFluidsEmerald; diff --git a/common/buildcraft/transport/gui/ContainerGateInterface.java b/common/buildcraft/transport/gui/ContainerGateInterface.java index 4134c5b3..c97af439 100644 --- a/common/buildcraft/transport/gui/ContainerGateInterface.java +++ b/common/buildcraft/transport/gui/ContainerGateInterface.java @@ -15,13 +15,16 @@ import java.util.NavigableSet; import java.util.TreeSet; import io.netty.buffer.ByteBuf; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; + import cpw.mods.fml.relauncher.Side; + import buildcraft.BuildCraftCore; import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/transport/gui/GuiEmeraldFluidPipe.java b/common/buildcraft/transport/gui/GuiEmeraldFluidPipe.java index d02da364..8c7d6ad8 100644 --- a/common/buildcraft/transport/gui/GuiEmeraldFluidPipe.java +++ b/common/buildcraft/transport/gui/GuiEmeraldFluidPipe.java @@ -9,8 +9,10 @@ package buildcraft.transport.gui; import org.lwjgl.opengl.GL11; + import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; + import buildcraft.core.DefaultProps; import buildcraft.core.gui.GuiBuildCraft; import buildcraft.core.utils.StringUtils; diff --git a/common/buildcraft/transport/gui/GuiEmzuliPipe.java b/common/buildcraft/transport/gui/GuiEmzuliPipe.java index c7e30a1e..feaa1ab2 100644 --- a/common/buildcraft/transport/gui/GuiEmzuliPipe.java +++ b/common/buildcraft/transport/gui/GuiEmzuliPipe.java @@ -11,7 +11,6 @@ package buildcraft.transport.gui; import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; - import buildcraft.core.DefaultProps; import buildcraft.core.gui.GuiBuildCraft; import buildcraft.core.utils.StringUtils; diff --git a/common/buildcraft/transport/gui/GuiGateInterface.java b/common/buildcraft/transport/gui/GuiGateInterface.java index a51a8844..73a957f1 100644 --- a/common/buildcraft/transport/gui/GuiGateInterface.java +++ b/common/buildcraft/transport/gui/GuiGateInterface.java @@ -17,8 +17,10 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementMouseClick; diff --git a/common/buildcraft/transport/network/PacketFluidUpdate.java b/common/buildcraft/transport/network/PacketFluidUpdate.java index 0be8a768..fdae58a5 100644 --- a/common/buildcraft/transport/network/PacketFluidUpdate.java +++ b/common/buildcraft/transport/network/PacketFluidUpdate.java @@ -11,10 +11,13 @@ package buildcraft.transport.network; import java.util.BitSet; import io.netty.buffer.ByteBuf; + import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; + import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; + import buildcraft.core.network.PacketCoordinates; import buildcraft.core.network.PacketIds; import buildcraft.core.proxy.CoreProxy; diff --git a/common/buildcraft/transport/network/PacketPipeTransportTraveler.java b/common/buildcraft/transport/network/PacketPipeTransportTraveler.java index 62b6ae5e..9a7dc4be 100644 --- a/common/buildcraft/transport/network/PacketPipeTransportTraveler.java +++ b/common/buildcraft/transport/network/PacketPipeTransportTraveler.java @@ -13,6 +13,7 @@ import io.netty.buffer.ByteBuf; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.core.EnumColor; import buildcraft.core.network.BuildCraftPacket; import buildcraft.core.network.PacketIds; diff --git a/common/buildcraft/transport/pipes/PipeFluidsDiamond.java b/common/buildcraft/transport/pipes/PipeFluidsDiamond.java index a68e77d6..684fb6e6 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsDiamond.java +++ b/common/buildcraft/transport/pipes/PipeFluidsDiamond.java @@ -10,18 +10,22 @@ package buildcraft.transport.pipes; import java.util.ArrayList; import java.util.List; + 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 cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidTankInfo; + import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.core.GuiIds; diff --git a/common/buildcraft/transport/pipes/PipeFluidsEmerald.java b/common/buildcraft/transport/pipes/PipeFluidsEmerald.java index 2a087b8f..0448acc0 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsEmerald.java +++ b/common/buildcraft/transport/pipes/PipeFluidsEmerald.java @@ -9,6 +9,7 @@ package buildcraft.transport.pipes; import io.netty.buffer.ByteBuf; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -19,10 +20,11 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; + import buildcraft.BuildCraftTransport; +import buildcraft.api.core.ISerializable; import buildcraft.core.GuiIds; import buildcraft.core.inventory.SimpleInventory; -import buildcraft.api.core.ISerializable; import buildcraft.core.utils.FluidUtils; import buildcraft.core.utils.Utils; import buildcraft.transport.BlockGenericPipe; diff --git a/common/buildcraft/transport/pipes/PipeFluidsIron.java b/common/buildcraft/transport/pipes/PipeFluidsIron.java index 1d71d7d9..168a2c4e 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsIron.java +++ b/common/buildcraft/transport/pipes/PipeFluidsIron.java @@ -14,10 +14,13 @@ 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.statements.IActionInternal; diff --git a/common/buildcraft/transport/pipes/PipeFluidsWood.java b/common/buildcraft/transport/pipes/PipeFluidsWood.java index 4ec9eee2..b9ecca8e 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsWood.java +++ b/common/buildcraft/transport/pipes/PipeFluidsWood.java @@ -9,6 +9,7 @@ package buildcraft.transport.pipes; import io.netty.buffer.ByteBuf; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; @@ -25,9 +26,9 @@ import cofh.api.energy.IEnergyHandler; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; +import buildcraft.api.core.ISerializable; import buildcraft.api.transport.IPipeTile; import buildcraft.core.RFBattery; -import buildcraft.api.core.ISerializable; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportFluids; diff --git a/common/buildcraft/transport/pipes/PipeItemsClay.java b/common/buildcraft/transport/pipes/PipeItemsClay.java index 5b6f96f9..bf6a18fb 100644 --- a/common/buildcraft/transport/pipes/PipeItemsClay.java +++ b/common/buildcraft/transport/pipes/PipeItemsClay.java @@ -9,11 +9,15 @@ package buildcraft.transport.pipes; import java.util.LinkedList; + 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.transport.IPipeTile; diff --git a/common/buildcraft/transport/pipes/PipeItemsDaizuli.java b/common/buildcraft/transport/pipes/PipeItemsDaizuli.java index 0fe2dfc4..c2460833 100644 --- a/common/buildcraft/transport/pipes/PipeItemsDaizuli.java +++ b/common/buildcraft/transport/pipes/PipeItemsDaizuli.java @@ -13,20 +13,24 @@ import java.util.Collection; import java.util.LinkedList; import io.netty.buffer.ByteBuf; + import net.minecraft.entity.player.EntityPlayer; 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; +import buildcraft.api.core.ISerializable; import buildcraft.api.statements.IActionInternal; import buildcraft.api.tools.IToolWrench; -import buildcraft.api.core.ISerializable; import buildcraft.core.utils.ColorUtils; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; @@ -92,9 +96,9 @@ public class PipeItemsDaizuli extends Pipe implements ISeria } } - int color = ColorUtils.getColorIDFromDye(player.getCurrentEquippedItem()); - if (color >= 0 && color < 16) { - setColor(EnumColor.fromId(15 - color)); + int newColor = ColorUtils.getColorIDFromDye(player.getCurrentEquippedItem()); + if (newColor >= 0 && newColor < 16) { + setColor(EnumColor.fromId(15 - newColor)); return true; } diff --git a/common/buildcraft/transport/pipes/PipeItemsEmerald.java b/common/buildcraft/transport/pipes/PipeItemsEmerald.java index e6c09444..f344495d 100644 --- a/common/buildcraft/transport/pipes/PipeItemsEmerald.java +++ b/common/buildcraft/transport/pipes/PipeItemsEmerald.java @@ -21,12 +21,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftTransport; +import buildcraft.api.core.ISerializable; import buildcraft.core.GuiIds; import buildcraft.core.inventory.InvUtils; import buildcraft.core.inventory.InventoryWrapper; import buildcraft.core.inventory.SimpleInventory; import buildcraft.core.inventory.StackHelper; -import buildcraft.api.core.ISerializable; import buildcraft.core.network.IGuiReturnHandler; import buildcraft.core.utils.Utils; import buildcraft.transport.BlockGenericPipe; diff --git a/common/buildcraft/transport/pipes/PipeItemsEmzuli.java b/common/buildcraft/transport/pipes/PipeItemsEmzuli.java index 5d797ca6..aef5459f 100644 --- a/common/buildcraft/transport/pipes/PipeItemsEmzuli.java +++ b/common/buildcraft/transport/pipes/PipeItemsEmzuli.java @@ -13,13 +13,16 @@ 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.statements.IActionInternal; diff --git a/common/buildcraft/transport/pipes/PipeItemsIron.java b/common/buildcraft/transport/pipes/PipeItemsIron.java index 2aa349dc..e541a749 100644 --- a/common/buildcraft/transport/pipes/PipeItemsIron.java +++ b/common/buildcraft/transport/pipes/PipeItemsIron.java @@ -15,9 +15,12 @@ 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.statements.IActionInternal; diff --git a/common/buildcraft/transport/pipes/PipeItemsLapis.java b/common/buildcraft/transport/pipes/PipeItemsLapis.java index 8f5a31ea..cbcbd00d 100644 --- a/common/buildcraft/transport/pipes/PipeItemsLapis.java +++ b/common/buildcraft/transport/pipes/PipeItemsLapis.java @@ -14,9 +14,12 @@ 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; diff --git a/common/buildcraft/transport/pipes/PipeItemsStripes.java b/common/buildcraft/transport/pipes/PipeItemsStripes.java index 01013af9..731f772e 100644 --- a/common/buildcraft/transport/pipes/PipeItemsStripes.java +++ b/common/buildcraft/transport/pipes/PipeItemsStripes.java @@ -18,8 +18,11 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.WorldServer; + import net.minecraftforge.common.util.ForgeDirection; + import cofh.api.energy.IEnergyHandler; + import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; diff --git a/common/buildcraft/transport/pipes/PipePowerIron.java b/common/buildcraft/transport/pipes/PipePowerIron.java index 8ea3f679..daca6700 100644 --- a/common/buildcraft/transport/pipes/PipePowerIron.java +++ b/common/buildcraft/transport/pipes/PipePowerIron.java @@ -14,9 +14,12 @@ import java.util.LinkedList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.util.ChatComponentText; + 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.statements.IActionInternal; diff --git a/common/buildcraft/transport/pipes/PipePowerSandstone.java b/common/buildcraft/transport/pipes/PipePowerSandstone.java index 18f15191..4744b143 100644 --- a/common/buildcraft/transport/pipes/PipePowerSandstone.java +++ b/common/buildcraft/transport/pipes/PipePowerSandstone.java @@ -10,9 +10,12 @@ package buildcraft.transport.pipes; 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.transport.IPipeConnectionForced; diff --git a/common/buildcraft/transport/pipes/PipePowerWood.java b/common/buildcraft/transport/pipes/PipePowerWood.java index ff0ff12f..0287f231 100644 --- a/common/buildcraft/transport/pipes/PipePowerWood.java +++ b/common/buildcraft/transport/pipes/PipePowerWood.java @@ -11,10 +11,14 @@ package buildcraft.transport.pipes; 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 cofh.api.energy.IEnergyHandler; + import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.transport.IPipeTile; diff --git a/common/buildcraft/transport/pipes/events/PipeEventFluid.java b/common/buildcraft/transport/pipes/events/PipeEventFluid.java index f245dc10..6aab28e6 100644 --- a/common/buildcraft/transport/pipes/events/PipeEventFluid.java +++ b/common/buildcraft/transport/pipes/events/PipeEventFluid.java @@ -1,8 +1,8 @@ package buildcraft.transport.pipes.events; import java.util.List; + import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; public abstract class PipeEventFluid extends PipeEvent { diff --git a/common/buildcraft/transport/pipes/events/PipeEventItem.java b/common/buildcraft/transport/pipes/events/PipeEventItem.java index 65ba104a..5e7282a6 100644 --- a/common/buildcraft/transport/pipes/events/PipeEventItem.java +++ b/common/buildcraft/transport/pipes/events/PipeEventItem.java @@ -12,7 +12,9 @@ import java.util.List; import net.minecraft.entity.item.EntityItem; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.transport.TravelingItem; public abstract class PipeEventItem extends PipeEvent { diff --git a/common/buildcraft/transport/pluggable/ItemLens.java b/common/buildcraft/transport/pluggable/ItemLens.java index dc20436a..cda41fdf 100755 --- a/common/buildcraft/transport/pluggable/ItemLens.java +++ b/common/buildcraft/transport/pluggable/ItemLens.java @@ -9,6 +9,7 @@ package buildcraft.transport.pluggable; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -16,9 +17,12 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.pluggable.IPipePluggableItem; @@ -43,8 +47,7 @@ public class ItemLens extends ItemBuildCraft implements IPipePluggableItem { @Override @SideOnly(Side.CLIENT) - public boolean requiresMultipleRenderPasses() - { + public boolean requiresMultipleRenderPasses() { return true; } diff --git a/common/buildcraft/transport/pluggable/ItemPowerAdapter.java b/common/buildcraft/transport/pluggable/ItemPowerAdapter.java index 4126244e..d1b5971f 100755 --- a/common/buildcraft/transport/pluggable/ItemPowerAdapter.java +++ b/common/buildcraft/transport/pluggable/ItemPowerAdapter.java @@ -12,10 +12,14 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import net.minecraftforge.common.util.ForgeDirection; + import cofh.api.energy.IEnergyHandler; + import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.pluggable.IPipePluggableItem; diff --git a/common/buildcraft/transport/pluggable/LensPluggable.java b/common/buildcraft/transport/pluggable/LensPluggable.java index 21e5f1b8..9ca2eed6 100644 --- a/common/buildcraft/transport/pluggable/LensPluggable.java +++ b/common/buildcraft/transport/pluggable/LensPluggable.java @@ -1,13 +1,14 @@ package buildcraft.transport.pluggable; import io.netty.buffer.ByteBuf; + import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; -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.render.ITextureStates; diff --git a/common/buildcraft/transport/pluggable/PlugPluggable.java b/common/buildcraft/transport/pluggable/PlugPluggable.java index 4befab79..0f8c45ad 100644 --- a/common/buildcraft/transport/pluggable/PlugPluggable.java +++ b/common/buildcraft/transport/pluggable/PlugPluggable.java @@ -1,13 +1,14 @@ package buildcraft.transport.pluggable; import io.netty.buffer.ByteBuf; + import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; -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.render.ITextureStates; import buildcraft.api.transport.IPipe; diff --git a/common/buildcraft/transport/pluggable/PowerAdapterPluggable.java b/common/buildcraft/transport/pluggable/PowerAdapterPluggable.java index b59e59ec..bd66d84a 100644 --- a/common/buildcraft/transport/pluggable/PowerAdapterPluggable.java +++ b/common/buildcraft/transport/pluggable/PowerAdapterPluggable.java @@ -1,14 +1,16 @@ package buildcraft.transport.pluggable; import io.netty.buffer.ByteBuf; + import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + import net.minecraftforge.common.util.ForgeDirection; + import cofh.api.energy.IEnergyHandler; + import buildcraft.BuildCraftTransport; import buildcraft.api.core.render.ITextureStates; import buildcraft.api.transport.IPipe; diff --git a/common/buildcraft/transport/pluggable/RobotStationPluggable.java b/common/buildcraft/transport/pluggable/RobotStationPluggable.java index 1625c0bc..63b10b2c 100644 --- a/common/buildcraft/transport/pluggable/RobotStationPluggable.java +++ b/common/buildcraft/transport/pluggable/RobotStationPluggable.java @@ -1,13 +1,14 @@ package buildcraft.transport.pluggable; import io.netty.buffer.ByteBuf; + import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; -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.render.ITextureStates; import buildcraft.api.transport.IPipe; @@ -237,7 +238,6 @@ public class RobotStationPluggable extends PipePluggable implements IPipePluggab @Override public void writeData(ByteBuf data) { - DockingStation station = getStation(); this.renderState = station.isTaken() ? (station.isMainStation() ? RobotStationState.Linked : RobotStationState.Reserved) : RobotStationState.Available; diff --git a/common/buildcraft/transport/recipes/AdvancedFacadeRecipe.java b/common/buildcraft/transport/recipes/AdvancedFacadeRecipe.java index 6f42bbf6..3fe5d4d3 100644 --- a/common/buildcraft/transport/recipes/AdvancedFacadeRecipe.java +++ b/common/buildcraft/transport/recipes/AdvancedFacadeRecipe.java @@ -9,7 +9,9 @@ package buildcraft.transport.recipes; import net.minecraft.item.ItemStack; + import net.minecraftforge.oredict.OreDictionary; + import buildcraft.BuildCraftTransport; import buildcraft.api.core.JavaTools; import buildcraft.api.facades.FacadeType; diff --git a/common/buildcraft/transport/recipes/GateExpansionRecipe.java b/common/buildcraft/transport/recipes/GateExpansionRecipe.java index 17715795..35c1b302 100644 --- a/common/buildcraft/transport/recipes/GateExpansionRecipe.java +++ b/common/buildcraft/transport/recipes/GateExpansionRecipe.java @@ -9,6 +9,7 @@ package buildcraft.transport.recipes; import net.minecraft.item.ItemStack; + import buildcraft.BuildCraftTransport; import buildcraft.api.gates.IGateExpansion; import buildcraft.api.recipes.CraftingResult; diff --git a/common/buildcraft/transport/render/FacadeItemRenderer.java b/common/buildcraft/transport/render/FacadeItemRenderer.java index b92fc73d..5e3ff3fe 100644 --- a/common/buildcraft/transport/render/FacadeItemRenderer.java +++ b/common/buildcraft/transport/render/FacadeItemRenderer.java @@ -8,15 +8,16 @@ */ package buildcraft.transport.render; +import org.lwjgl.opengl.GL11; + import net.minecraft.block.Block; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import net.minecraftforge.client.IItemRenderer; -import org.lwjgl.opengl.GL11; +import net.minecraftforge.client.IItemRenderer; import buildcraft.BuildCraftTransport; import buildcraft.api.facades.FacadeType; diff --git a/common/buildcraft/transport/render/FacadeRenderHelper.java b/common/buildcraft/transport/render/FacadeRenderHelper.java index 7b9c063f..2c5b0dba 100644 --- a/common/buildcraft/transport/render/FacadeRenderHelper.java +++ b/common/buildcraft/transport/render/FacadeRenderHelper.java @@ -10,9 +10,8 @@ package buildcraft.transport.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; + import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftTransport; diff --git a/common/buildcraft/transport/render/FakeBlock.java b/common/buildcraft/transport/render/FakeBlock.java index b315992b..50001652 100644 --- a/common/buildcraft/transport/render/FakeBlock.java +++ b/common/buildcraft/transport/render/FakeBlock.java @@ -17,6 +17,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.core.render.ITextureStates; import buildcraft.transport.BlockGenericPipe; diff --git a/common/buildcraft/transport/render/GateItemRenderer.java b/common/buildcraft/transport/render/GateItemRenderer.java index 751d7c70..2125120d 100644 --- a/common/buildcraft/transport/render/GateItemRenderer.java +++ b/common/buildcraft/transport/render/GateItemRenderer.java @@ -19,7 +19,9 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; + import net.minecraftforge.client.IItemRenderer; + import buildcraft.api.gates.IGateExpansion; import buildcraft.transport.gates.ItemGate; diff --git a/common/buildcraft/transport/render/PipeItemRenderer.java b/common/buildcraft/transport/render/PipeItemRenderer.java index ffae5392..afaa6ba3 100644 --- a/common/buildcraft/transport/render/PipeItemRenderer.java +++ b/common/buildcraft/transport/render/PipeItemRenderer.java @@ -17,7 +17,9 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; + import net.minecraftforge.client.IItemRenderer; + import buildcraft.BuildCraftTransport; import buildcraft.core.CoreConstants; import buildcraft.core.utils.ColorUtils; diff --git a/common/buildcraft/transport/render/PipeRendererTESR.java b/common/buildcraft/transport/render/PipeRendererTESR.java index f50cebc3..e87ff32d 100644 --- a/common/buildcraft/transport/render/PipeRendererTESR.java +++ b/common/buildcraft/transport/render/PipeRendererTESR.java @@ -10,6 +10,10 @@ package buildcraft.transport.render; import java.util.HashMap; +import com.google.common.collect.Maps; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.OpenGlHelper; @@ -24,13 +28,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; + import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import org.lwjgl.opengl.GL11; - import buildcraft.BuildCraftCore; import buildcraft.BuildCraftCore.RenderMode; import buildcraft.BuildCraftTransport; @@ -54,8 +57,6 @@ import buildcraft.transport.TileGenericPipe; import buildcraft.transport.TravelingItem; import buildcraft.transport.gates.GatePluggable; -import com.google.common.collect.Maps; - public class PipeRendererTESR extends TileEntitySpecialRenderer { public static final float DISPLAY_MULTIPLIER = 0.1f; public static final int POWER_STAGES = 100; diff --git a/common/buildcraft/transport/render/PipeRendererWorld.java b/common/buildcraft/transport/render/PipeRendererWorld.java index 0e1a09c1..10619b98 100644 --- a/common/buildcraft/transport/render/PipeRendererWorld.java +++ b/common/buildcraft/transport/render/PipeRendererWorld.java @@ -13,8 +13,11 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.core.IIconProvider; import buildcraft.api.core.render.ITextureStates; import buildcraft.api.transport.pluggable.IPipePluggableRenderer; diff --git a/common/buildcraft/transport/render/TextureStateManager.java b/common/buildcraft/transport/render/TextureStateManager.java index 0a8421e1..6e3ca378 100644 --- a/common/buildcraft/transport/render/TextureStateManager.java +++ b/common/buildcraft/transport/render/TextureStateManager.java @@ -12,6 +12,7 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import buildcraft.api.core.render.ITextureStateManager; /* diff --git a/common/buildcraft/transport/schematics/BptPipeIron.java b/common/buildcraft/transport/schematics/BptPipeIron.java index 9f70c92d..12aa5eb7 100644 --- a/common/buildcraft/transport/schematics/BptPipeIron.java +++ b/common/buildcraft/transport/schematics/BptPipeIron.java @@ -9,7 +9,9 @@ package buildcraft.transport.schematics; import net.minecraft.item.Item; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicTile; diff --git a/common/buildcraft/transport/schematics/BptPipeWooden.java b/common/buildcraft/transport/schematics/BptPipeWooden.java index dfaf7cff..b6649b4b 100644 --- a/common/buildcraft/transport/schematics/BptPipeWooden.java +++ b/common/buildcraft/transport/schematics/BptPipeWooden.java @@ -9,7 +9,9 @@ package buildcraft.transport.schematics; import net.minecraft.item.Item; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicTile; diff --git a/common/buildcraft/transport/schematics/SchematicPipe.java b/common/buildcraft/transport/schematics/SchematicPipe.java index 9a8d1663..c7910ad0 100644 --- a/common/buildcraft/transport/schematics/SchematicPipe.java +++ b/common/buildcraft/transport/schematics/SchematicPipe.java @@ -15,7 +15,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.blueprints.BuildingPermission; import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.MappingNotFoundException; diff --git a/common/buildcraft/transport/statements/ActionEnergyPulsar.java b/common/buildcraft/transport/statements/ActionEnergyPulsar.java index 650f4107..69ab472b 100644 --- a/common/buildcraft/transport/statements/ActionEnergyPulsar.java +++ b/common/buildcraft/transport/statements/ActionEnergyPulsar.java @@ -9,6 +9,7 @@ package buildcraft.transport.statements; import net.minecraft.client.renderer.texture.IIconRegister; + import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/transport/statements/ActionExtractionPreset.java b/common/buildcraft/transport/statements/ActionExtractionPreset.java index 80d0af6e..74d5b52b 100644 --- a/common/buildcraft/transport/statements/ActionExtractionPreset.java +++ b/common/buildcraft/transport/statements/ActionExtractionPreset.java @@ -11,6 +11,7 @@ package buildcraft.transport.statements; import java.util.Locale; import net.minecraft.client.renderer.texture.IIconRegister; + import buildcraft.api.core.EnumColor; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; diff --git a/common/buildcraft/transport/statements/ActionParameterSignal.java b/common/buildcraft/transport/statements/ActionParameterSignal.java index 6aee70b2..bf90e737 100644 --- a/common/buildcraft/transport/statements/ActionParameterSignal.java +++ b/common/buildcraft/transport/statements/ActionParameterSignal.java @@ -14,6 +14,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; + import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/transport/statements/ActionPipeColor.java b/common/buildcraft/transport/statements/ActionPipeColor.java index 7259ec5d..53b2579a 100644 --- a/common/buildcraft/transport/statements/ActionPipeColor.java +++ b/common/buildcraft/transport/statements/ActionPipeColor.java @@ -11,6 +11,7 @@ package buildcraft.transport.statements; import java.util.Locale; import net.minecraft.client.renderer.texture.IIconRegister; + import buildcraft.api.core.EnumColor; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; diff --git a/common/buildcraft/transport/statements/ActionPipeDirection.java b/common/buildcraft/transport/statements/ActionPipeDirection.java index 26063102..eab58c69 100644 --- a/common/buildcraft/transport/statements/ActionPipeDirection.java +++ b/common/buildcraft/transport/statements/ActionPipeDirection.java @@ -11,7 +11,9 @@ 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.statements.IActionInternal; import buildcraft.api.statements.IStatement; diff --git a/common/buildcraft/transport/statements/ActionPowerLimiter.java b/common/buildcraft/transport/statements/ActionPowerLimiter.java index e6b82222..a90804fe 100644 --- a/common/buildcraft/transport/statements/ActionPowerLimiter.java +++ b/common/buildcraft/transport/statements/ActionPowerLimiter.java @@ -11,6 +11,7 @@ package buildcraft.transport.statements; import java.util.Locale; import net.minecraft.client.renderer.texture.IIconRegister; + import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java b/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java index 531f72cd..cefd3e3f 100644 --- a/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java +++ b/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java @@ -10,8 +10,10 @@ 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.api.statements.IActionInternal; import buildcraft.core.statements.ActionRedstoneOutput; import buildcraft.core.utils.StringUtils; diff --git a/common/buildcraft/transport/statements/ActionSignalOutput.java b/common/buildcraft/transport/statements/ActionSignalOutput.java index f4936783..b6edb642 100644 --- a/common/buildcraft/transport/statements/ActionSignalOutput.java +++ b/common/buildcraft/transport/statements/ActionSignalOutput.java @@ -11,6 +11,7 @@ package buildcraft.transport.statements; import java.util.Locale; import net.minecraft.client.renderer.texture.IIconRegister; + import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/transport/statements/ActionSingleEnergyPulse.java b/common/buildcraft/transport/statements/ActionSingleEnergyPulse.java index ace74863..0c88eb14 100644 --- a/common/buildcraft/transport/statements/ActionSingleEnergyPulse.java +++ b/common/buildcraft/transport/statements/ActionSingleEnergyPulse.java @@ -9,6 +9,7 @@ package buildcraft.transport.statements; import net.minecraft.client.renderer.texture.IIconRegister; + import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/transport/statements/ActionValve.java b/common/buildcraft/transport/statements/ActionValve.java index a446839f..e3279b18 100644 --- a/common/buildcraft/transport/statements/ActionValve.java +++ b/common/buildcraft/transport/statements/ActionValve.java @@ -11,7 +11,9 @@ package buildcraft.transport.statements; import java.util.Locale; import net.minecraft.client.renderer.texture.IIconRegister; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/transport/statements/TriggerClockTimer.java b/common/buildcraft/transport/statements/TriggerClockTimer.java index 9e62f222..57f94697 100644 --- a/common/buildcraft/transport/statements/TriggerClockTimer.java +++ b/common/buildcraft/transport/statements/TriggerClockTimer.java @@ -11,6 +11,7 @@ package buildcraft.transport.statements; import java.util.Locale; import net.minecraft.client.renderer.texture.IIconRegister; + import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; diff --git a/common/buildcraft/transport/statements/TriggerParameterSignal.java b/common/buildcraft/transport/statements/TriggerParameterSignal.java index 361abb39..e33c23ae 100644 --- a/common/buildcraft/transport/statements/TriggerParameterSignal.java +++ b/common/buildcraft/transport/statements/TriggerParameterSignal.java @@ -14,6 +14,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; + import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/transport/statements/TriggerPipeContents.java b/common/buildcraft/transport/statements/TriggerPipeContents.java index 0a56e422..3281579a 100644 --- a/common/buildcraft/transport/statements/TriggerPipeContents.java +++ b/common/buildcraft/transport/statements/TriggerPipeContents.java @@ -11,12 +11,15 @@ 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.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/transport/statements/TriggerPipeSignal.java b/common/buildcraft/transport/statements/TriggerPipeSignal.java index 7612de0e..7adada46 100644 --- a/common/buildcraft/transport/statements/TriggerPipeSignal.java +++ b/common/buildcraft/transport/statements/TriggerPipeSignal.java @@ -11,6 +11,7 @@ package buildcraft.transport.statements; import java.util.Locale; import net.minecraft.client.renderer.texture.IIconRegister; + import buildcraft.api.gates.IGate; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java b/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java index 172cc744..0ded3ea7 100644 --- a/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java +++ b/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java @@ -9,8 +9,10 @@ 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.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/transport/stripes/StripesHandlerArrow.java b/common/buildcraft/transport/stripes/StripesHandlerArrow.java index ec1c2e2d..cdcb9db0 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerArrow.java +++ b/common/buildcraft/transport/stripes/StripesHandlerArrow.java @@ -5,7 +5,9 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.transport.IStripesHandler; import buildcraft.api.transport.IStripesPipe; diff --git a/common/buildcraft/transport/stripes/StripesHandlerBucket.java b/common/buildcraft/transport/stripes/StripesHandlerBucket.java index 2c7edfbd..c460f927 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerBucket.java +++ b/common/buildcraft/transport/stripes/StripesHandlerBucket.java @@ -7,11 +7,13 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemBucket; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; + import buildcraft.api.transport.IStripesHandler; import buildcraft.api.transport.IStripesPipe; diff --git a/common/buildcraft/transport/stripes/StripesHandlerRightClick.java b/common/buildcraft/transport/stripes/StripesHandlerRightClick.java index 4be16121..99b05acc 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerRightClick.java +++ b/common/buildcraft/transport/stripes/StripesHandlerRightClick.java @@ -5,7 +5,9 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemPotion; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.transport.IStripesHandler; import buildcraft.api.transport.IStripesPipe; diff --git a/common/buildcraft/transport/stripes/StripesHandlerShears.java b/common/buildcraft/transport/stripes/StripesHandlerShears.java index eb88b487..342d03e3 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerShears.java +++ b/common/buildcraft/transport/stripes/StripesHandlerShears.java @@ -6,7 +6,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemShears; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.transport.IStripesHandler; import buildcraft.api.transport.IStripesPipe;