From 7260d9445d9b271563901a2b9c6611d93fdea3f9 Mon Sep 17 00:00:00 2001 From: Krapht Date: Sat, 23 Mar 2013 09:40:22 +0100 Subject: [PATCH] Organizing imports --- common/buildcraft/BuildCraftCore.java | 11 +++++------ common/buildcraft/BuildCraftEnergy.java | 1 - common/buildcraft/BuildCraftFactory.java | 1 - common/buildcraft/BuildCraftTransport.java | 4 ---- common/buildcraft/api/filler/IFillerPattern.java | 4 ++-- common/buildcraft/api/gates/ActionManager.java | 2 -- common/buildcraft/api/gates/IAction.java | 2 +- common/buildcraft/api/gates/ITrigger.java | 4 ++-- common/buildcraft/builders/BlockArchitect.java | 6 ++---- .../buildcraft/builders/BlockBlueprintLibrary.java | 6 ++---- common/buildcraft/builders/BlockBuilder.java | 6 ++---- common/buildcraft/builders/BlockFiller.java | 6 ++---- common/buildcraft/builders/BlockMarker.java | 6 ++---- common/buildcraft/builders/BlockPathMarker.java | 5 ++--- common/buildcraft/builders/FillerFillAll.java | 5 ++--- common/buildcraft/builders/FillerFillPyramid.java | 5 ++--- common/buildcraft/builders/FillerFillStairs.java | 5 ++--- common/buildcraft/builders/FillerFillWalls.java | 5 ++--- common/buildcraft/builders/FillerFlattener.java | 5 ++--- common/buildcraft/builders/FillerPattern.java | 4 ++-- common/buildcraft/builders/FillerRemover.java | 5 ++--- common/buildcraft/builders/ItemBptBase.java | 4 ---- common/buildcraft/builders/ItemBptBluePrint.java | 4 ++-- common/buildcraft/core/BlockSpring.java | 5 ++--- common/buildcraft/core/CoreIconProvider.java | 2 +- common/buildcraft/core/CreativeTabBuildCraft.java | 2 +- common/buildcraft/core/EntityBlock.java | 4 ++-- common/buildcraft/core/ItemBuildCraft.java | 4 ++-- common/buildcraft/core/ItemRedstoneChipset.java | 5 ++--- common/buildcraft/core/SpringPopulate.java | 3 +-- common/buildcraft/core/proxy/CoreProxyClient.java | 3 --- .../buildcraft/core/render/RenderEntityBlock.java | 3 --- common/buildcraft/core/render/RenderLaser.java | 1 - common/buildcraft/core/render/RenderRobot.java | 1 - .../core/triggers/ActionMachineControl.java | 4 +--- .../core/triggers/ActionRedstoneOutput.java | 2 -- .../core/triggers/ActionTriggerIconProvider.java | 2 +- common/buildcraft/core/triggers/BCAction.java | 2 +- common/buildcraft/core/triggers/BCTrigger.java | 4 ++-- .../buildcraft/core/triggers/TriggerInventory.java | 6 ++---- .../core/triggers/TriggerLiquidContainer.java | 6 ++---- .../buildcraft/core/triggers/TriggerMachine.java | 6 ++---- common/buildcraft/core/utils/BlockUtil.java | 3 +-- common/buildcraft/energy/BlockEngine.java | 5 ++--- common/buildcraft/energy/BlockOilFlowing.java | 1 - common/buildcraft/energy/BlockOilStill.java | 1 - common/buildcraft/energy/BlockPollution.java | 7 ++----- common/buildcraft/energy/ItemBucketOil.java | 5 ++--- common/buildcraft/energy/OilPopulate.java | 4 ++-- common/buildcraft/energy/TriggerEngineHeat.java | 6 ++---- .../buildcraft/energy/gui/GuiCombustionEngine.java | 3 --- common/buildcraft/energy/render/RenderEngine.java | 1 - common/buildcraft/factory/BlockAutoWorkbench.java | 5 ++--- common/buildcraft/factory/BlockFrame.java | 6 ++---- common/buildcraft/factory/BlockHopper.java | 6 ++---- common/buildcraft/factory/BlockMiningWell.java | 6 ++---- common/buildcraft/factory/BlockPlainPipe.java | 6 ++---- common/buildcraft/factory/BlockPump.java | 6 ++---- common/buildcraft/factory/BlockQuarry.java | 6 ++---- common/buildcraft/factory/BlockRefinery.java | 5 ++--- common/buildcraft/factory/BlockTank.java | 6 ++---- common/buildcraft/factory/EntityMechanicalArm.java | 1 - common/buildcraft/factory/FactoryProxyClient.java | 1 - common/buildcraft/factory/TileAutoWorkbench.java | 3 +-- common/buildcraft/factory/TileHopper.java | 2 +- common/buildcraft/factory/TilePump.java | 1 - common/buildcraft/factory/TileTank.java | 2 +- common/buildcraft/factory/render/RenderHopper.java | 1 - .../buildcraft/factory/render/RenderRefinery.java | 1 - common/buildcraft/factory/render/RenderTank.java | 8 -------- common/buildcraft/silicon/BlockAssemblyTable.java | 6 ++---- common/buildcraft/silicon/BlockLaser.java | 6 ++---- .../silicon/TileAssemblyAdvancedWorkbench.java | 3 +-- .../silicon/gui/GuiAssemblyAdvancedWorkbench.java | 2 +- .../buildcraft/silicon/gui/GuiAssemblyTable.java | 2 +- common/buildcraft/transport/BlockGenericPipe.java | 10 ++-------- common/buildcraft/transport/GateIconProvider.java | 2 +- common/buildcraft/transport/GuiHandler.java | 2 +- common/buildcraft/transport/IPipeRenderState.java | 1 - common/buildcraft/transport/ItemGate.java | 6 ++---- common/buildcraft/transport/ItemPipe.java | 6 +++--- common/buildcraft/transport/Pipe.java | 8 +++----- common/buildcraft/transport/PipeIconProvider.java | 2 +- common/buildcraft/transport/PipeRenderState.java | 7 ++----- .../buildcraft/transport/PipeTransportItems.java | 1 + common/buildcraft/transport/TileGenericPipe.java | 7 ++----- .../buildcraft/transport/TransportProxyClient.java | 3 --- common/buildcraft/transport/WireIconProvider.java | 2 +- .../buildcraft/transport/gui/GuiGateInterface.java | 5 ++--- .../transport/render/TileEntityPickupFX.java | 14 ++++++++------ .../transport/triggers/ActionEnergyPulser.java | 6 ++---- .../transport/triggers/ActionSignalOutput.java | 6 ++---- .../transport/triggers/TriggerPipeContents.java | 6 ++---- .../transport/triggers/TriggerPipeSignal.java | 6 ++---- .../transport/triggers/TriggerRedstoneInput.java | 6 ++---- .../buildcraft/transport/utils/FacadeMatrix.java | 1 - 96 files changed, 138 insertions(+), 267 deletions(-) diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index 562eb79f..fd8476ac 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -15,7 +15,6 @@ import java.util.logging.Logger; import net.minecraft.block.Block; import net.minecraft.block.BlockFluid; import net.minecraft.client.Minecraft; -import net.minecraft.command.CommandHandler; import net.minecraft.entity.EntityList; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -23,7 +22,9 @@ import net.minecraft.util.Icon; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.IPlantable; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.Property; +import net.minecraftforge.event.ForgeSubscribe; import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.core.IIconProvider; import buildcraft.api.gates.ActionManager; @@ -32,11 +33,11 @@ import buildcraft.core.BlockIndex; import buildcraft.core.BlockSpring; import buildcraft.core.BuildCraftConfiguration; import buildcraft.core.CommandBuildCraft; +import buildcraft.core.CoreIconProvider; import buildcraft.core.DefaultProps; import buildcraft.core.EntityEnergyLaser; import buildcraft.core.EntityPowerLaser; import buildcraft.core.EntityRobot; -import buildcraft.core.CoreIconProvider; import buildcraft.core.ItemBuildCraft; import buildcraft.core.ItemWrench; import buildcraft.core.RedstonePowerFramework; @@ -50,12 +51,12 @@ import buildcraft.core.network.PacketUpdate; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.triggers.ActionMachineControl; import buildcraft.core.triggers.ActionMachineControl.Mode; +import buildcraft.core.triggers.ActionRedstoneOutput; import buildcraft.core.triggers.ActionTriggerIconProvider; import buildcraft.core.triggers.BCAction; -import buildcraft.core.triggers.ActionRedstoneOutput; +import buildcraft.core.triggers.BCTrigger; import buildcraft.core.triggers.DefaultActionProvider; import buildcraft.core.triggers.DefaultTriggerProvider; -import buildcraft.core.triggers.BCTrigger; import buildcraft.core.triggers.TriggerInventory; import buildcraft.core.triggers.TriggerLiquidContainer; import buildcraft.core.triggers.TriggerMachine; @@ -79,8 +80,6 @@ import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.common.registry.TickRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.ForgeSubscribe; @Mod(name = "BuildCraft", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Core", dependencies = "required-after:Forge@[6.5.0.0,)") @NetworkMod(channels = { DefaultProps.NET_CHANNEL_NAME }, packetHandler = PacketHandler.class, clientSideRequired = true, serverSideRequired = true) diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index 0233570e..c178fb0c 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -12,7 +12,6 @@ import java.util.TreeMap; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.Configuration; diff --git a/common/buildcraft/BuildCraftFactory.java b/common/buildcraft/BuildCraftFactory.java index 9ee94192..340da1ee 100644 --- a/common/buildcraft/BuildCraftFactory.java +++ b/common/buildcraft/BuildCraftFactory.java @@ -13,7 +13,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.ForgeChunkManager; diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index 66d65c2d..c30f92d3 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -13,10 +13,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import net.minecraft.block.Block; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.Property; @@ -97,8 +95,6 @@ import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @Mod(version = Version.VERSION, modid = "BuildCraft|Transport", name = "Buildcraft Transport", dependencies = DefaultProps.DEPENDENCY_CORE) @NetworkMod(channels = { DefaultProps.NET_CHANNEL_NAME }, packetHandler = PacketHandlerTransport.class) diff --git a/common/buildcraft/api/filler/IFillerPattern.java b/common/buildcraft/api/filler/IFillerPattern.java index 862742b7..71b1e411 100644 --- a/common/buildcraft/api/filler/IFillerPattern.java +++ b/common/buildcraft/api/filler/IFillerPattern.java @@ -1,11 +1,11 @@ package buildcraft.api.filler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import buildcraft.api.core.IBox; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public interface IFillerPattern { diff --git a/common/buildcraft/api/gates/ActionManager.java b/common/buildcraft/api/gates/ActionManager.java index 4c79dede..34a558ec 100644 --- a/common/buildcraft/api/gates/ActionManager.java +++ b/common/buildcraft/api/gates/ActionManager.java @@ -5,8 +5,6 @@ import java.util.LinkedList; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import buildcraft.api.transport.IPipe; -import buildcraft.core.triggers.BCAction; -import buildcraft.core.triggers.BCTrigger; public class ActionManager { diff --git a/common/buildcraft/api/gates/IAction.java b/common/buildcraft/api/gates/IAction.java index c57efc69..80c68657 100644 --- a/common/buildcraft/api/gates/IAction.java +++ b/common/buildcraft/api/gates/IAction.java @@ -1,9 +1,9 @@ package buildcraft.api.gates; +import net.minecraft.util.Icon; import buildcraft.api.core.IIconProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.Icon; public interface IAction { diff --git a/common/buildcraft/api/gates/ITrigger.java b/common/buildcraft/api/gates/ITrigger.java index 017e7ec2..4095b2f4 100644 --- a/common/buildcraft/api/gates/ITrigger.java +++ b/common/buildcraft/api/gates/ITrigger.java @@ -1,10 +1,10 @@ package buildcraft.api.gates; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import buildcraft.api.core.IIconProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; public interface ITrigger { diff --git a/common/buildcraft/builders/BlockArchitect.java b/common/buildcraft/builders/BlockArchitect.java index 289fca1a..aa176351 100644 --- a/common/buildcraft/builders/BlockArchitect.java +++ b/common/buildcraft/builders/BlockArchitect.java @@ -11,9 +11,6 @@ package buildcraft.builders; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -30,10 +27,11 @@ import buildcraft.BuildCraftBuilders; import buildcraft.api.core.Position; import buildcraft.api.tools.IToolWrench; import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.DefaultProps; import buildcraft.core.GuiIds; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockArchitect extends BlockContainer { diff --git a/common/buildcraft/builders/BlockBlueprintLibrary.java b/common/buildcraft/builders/BlockBlueprintLibrary.java index cf0c4318..7f3d443d 100644 --- a/common/buildcraft/builders/BlockBlueprintLibrary.java +++ b/common/buildcraft/builders/BlockBlueprintLibrary.java @@ -11,9 +11,6 @@ package buildcraft.builders; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -25,9 +22,10 @@ import net.minecraft.util.Icon; import net.minecraft.world.World; import buildcraft.BuildCraftBuilders; import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.DefaultProps; import buildcraft.core.GuiIds; import buildcraft.core.proxy.CoreProxy; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockBlueprintLibrary extends BlockContainer { diff --git a/common/buildcraft/builders/BlockBuilder.java b/common/buildcraft/builders/BlockBuilder.java index 4161befb..1bd86ba1 100644 --- a/common/buildcraft/builders/BlockBuilder.java +++ b/common/buildcraft/builders/BlockBuilder.java @@ -11,9 +11,6 @@ package buildcraft.builders; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -29,10 +26,11 @@ import buildcraft.BuildCraftBuilders; import buildcraft.api.core.Position; import buildcraft.api.tools.IToolWrench; import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.DefaultProps; import buildcraft.core.GuiIds; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockBuilder extends BlockContainer { diff --git a/common/buildcraft/builders/BlockFiller.java b/common/buildcraft/builders/BlockFiller.java index c0ee0daf..2c4b0e53 100644 --- a/common/buildcraft/builders/BlockFiller.java +++ b/common/buildcraft/builders/BlockFiller.java @@ -11,9 +11,6 @@ package buildcraft.builders; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -26,10 +23,11 @@ import net.minecraft.world.World; import buildcraft.BuildCraftBuilders; import buildcraft.api.filler.IFillerPattern; import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.DefaultProps; import buildcraft.core.GuiIds; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockFiller extends BlockContainer { diff --git a/common/buildcraft/builders/BlockMarker.java b/common/buildcraft/builders/BlockMarker.java index 02c7395b..d327a860 100644 --- a/common/buildcraft/builders/BlockMarker.java +++ b/common/buildcraft/builders/BlockMarker.java @@ -11,9 +11,6 @@ package buildcraft.builders; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -30,8 +27,9 @@ import net.minecraft.world.World; import buildcraft.BuildCraftBuilders; import buildcraft.BuildCraftCore; import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.DefaultProps; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockMarker extends BlockContainer { diff --git a/common/buildcraft/builders/BlockPathMarker.java b/common/buildcraft/builders/BlockPathMarker.java index 249afe33..23595389 100644 --- a/common/buildcraft/builders/BlockPathMarker.java +++ b/common/buildcraft/builders/BlockPathMarker.java @@ -11,9 +11,6 @@ package buildcraft.builders; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -21,6 +18,8 @@ import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockPathMarker extends BlockMarker { diff --git a/common/buildcraft/builders/FillerFillAll.java b/common/buildcraft/builders/FillerFillAll.java index 05ded6e8..b74c271a 100644 --- a/common/buildcraft/builders/FillerFillAll.java +++ b/common/buildcraft/builders/FillerFillAll.java @@ -9,13 +9,12 @@ package buildcraft.builders; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import buildcraft.api.core.IBox; -import buildcraft.core.DefaultProps; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class FillerFillAll extends FillerPattern { diff --git a/common/buildcraft/builders/FillerFillPyramid.java b/common/buildcraft/builders/FillerFillPyramid.java index d3d8f79f..293348a2 100644 --- a/common/buildcraft/builders/FillerFillPyramid.java +++ b/common/buildcraft/builders/FillerFillPyramid.java @@ -9,13 +9,12 @@ package buildcraft.builders; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import buildcraft.api.core.IBox; -import buildcraft.core.DefaultProps; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class FillerFillPyramid extends FillerPattern { diff --git a/common/buildcraft/builders/FillerFillStairs.java b/common/buildcraft/builders/FillerFillStairs.java index 6f398860..dca31535 100644 --- a/common/buildcraft/builders/FillerFillStairs.java +++ b/common/buildcraft/builders/FillerFillStairs.java @@ -9,13 +9,12 @@ package buildcraft.builders; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import buildcraft.api.core.IBox; -import buildcraft.core.DefaultProps; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class FillerFillStairs extends FillerPattern { diff --git a/common/buildcraft/builders/FillerFillWalls.java b/common/buildcraft/builders/FillerFillWalls.java index 59f5b674..f057e14a 100644 --- a/common/buildcraft/builders/FillerFillWalls.java +++ b/common/buildcraft/builders/FillerFillWalls.java @@ -9,13 +9,12 @@ package buildcraft.builders; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import buildcraft.api.core.IBox; -import buildcraft.core.DefaultProps; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class FillerFillWalls extends FillerPattern { diff --git a/common/buildcraft/builders/FillerFlattener.java b/common/buildcraft/builders/FillerFlattener.java index b278dbe3..19725688 100644 --- a/common/buildcraft/builders/FillerFlattener.java +++ b/common/buildcraft/builders/FillerFlattener.java @@ -9,15 +9,14 @@ package buildcraft.builders; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import buildcraft.api.core.IBox; -import buildcraft.core.DefaultProps; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.BlockUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class FillerFlattener extends FillerPattern { diff --git a/common/buildcraft/builders/FillerPattern.java b/common/buildcraft/builders/FillerPattern.java index af060b07..68b72660 100644 --- a/common/buildcraft/builders/FillerPattern.java +++ b/common/buildcraft/builders/FillerPattern.java @@ -9,8 +9,6 @@ package buildcraft.builders; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; @@ -20,6 +18,8 @@ import buildcraft.api.core.IBox; import buildcraft.api.filler.IFillerPattern; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.BlockUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public abstract class FillerPattern implements IFillerPattern { diff --git a/common/buildcraft/builders/FillerRemover.java b/common/buildcraft/builders/FillerRemover.java index 68b1b08a..226ab765 100644 --- a/common/buildcraft/builders/FillerRemover.java +++ b/common/buildcraft/builders/FillerRemover.java @@ -9,13 +9,12 @@ package buildcraft.builders; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import buildcraft.api.core.IBox; -import buildcraft.core.DefaultProps; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class FillerRemover extends FillerPattern { diff --git a/common/buildcraft/builders/ItemBptBase.java b/common/buildcraft/builders/ItemBptBase.java index 9d89570a..44509d71 100644 --- a/common/buildcraft/builders/ItemBptBase.java +++ b/common/buildcraft/builders/ItemBptBase.java @@ -11,10 +11,6 @@ package buildcraft.builders; import java.util.List; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/builders/ItemBptBluePrint.java b/common/buildcraft/builders/ItemBptBluePrint.java index b9e76c34..7c97379e 100644 --- a/common/buildcraft/builders/ItemBptBluePrint.java +++ b/common/buildcraft/builders/ItemBptBluePrint.java @@ -9,10 +9,10 @@ package buildcraft.builders; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.Icon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemBptBluePrint extends ItemBptBase { diff --git a/common/buildcraft/core/BlockSpring.java b/common/buildcraft/core/BlockSpring.java index 02b19630..72bd0434 100644 --- a/common/buildcraft/core/BlockSpring.java +++ b/common/buildcraft/core/BlockSpring.java @@ -2,13 +2,12 @@ package buildcraft.core; import java.util.Random; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockSpring extends Block { diff --git a/common/buildcraft/core/CoreIconProvider.java b/common/buildcraft/core/CoreIconProvider.java index 23c1497f..69de9650 100644 --- a/common/buildcraft/core/CoreIconProvider.java +++ b/common/buildcraft/core/CoreIconProvider.java @@ -2,9 +2,9 @@ package buildcraft.core; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.Icon; +import buildcraft.api.core.IIconProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.api.core.IIconProvider; public class CoreIconProvider implements IIconProvider { diff --git a/common/buildcraft/core/CreativeTabBuildCraft.java b/common/buildcraft/core/CreativeTabBuildCraft.java index dcb77115..d0e81c30 100644 --- a/common/buildcraft/core/CreativeTabBuildCraft.java +++ b/common/buildcraft/core/CreativeTabBuildCraft.java @@ -1,8 +1,8 @@ package buildcraft.core; -import buildcraft.BuildCraftCore; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; +import buildcraft.BuildCraftCore; public class CreativeTabBuildCraft extends CreativeTabs { diff --git a/common/buildcraft/core/EntityBlock.java b/common/buildcraft/core/EntityBlock.java index 118ea6d0..2ca8871f 100644 --- a/common/buildcraft/core/EntityBlock.java +++ b/common/buildcraft/core/EntityBlock.java @@ -9,12 +9,12 @@ package buildcraft.core; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Icon; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class EntityBlock extends Entity { diff --git a/common/buildcraft/core/ItemBuildCraft.java b/common/buildcraft/core/ItemBuildCraft.java index 9a8fe405..04fc657e 100644 --- a/common/buildcraft/core/ItemBuildCraft.java +++ b/common/buildcraft/core/ItemBuildCraft.java @@ -9,12 +9,12 @@ package buildcraft.core; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import buildcraft.core.utils.StringUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemBuildCraft extends Item { diff --git a/common/buildcraft/core/ItemRedstoneChipset.java b/common/buildcraft/core/ItemRedstoneChipset.java index c6a39fcd..374180f1 100644 --- a/common/buildcraft/core/ItemRedstoneChipset.java +++ b/common/buildcraft/core/ItemRedstoneChipset.java @@ -2,13 +2,12 @@ package buildcraft.core; import java.util.List; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemRedstoneChipset extends ItemBuildCraft { diff --git a/common/buildcraft/core/SpringPopulate.java b/common/buildcraft/core/SpringPopulate.java index 9ef30faa..309692d3 100644 --- a/common/buildcraft/core/SpringPopulate.java +++ b/common/buildcraft/core/SpringPopulate.java @@ -9,14 +9,13 @@ package buildcraft.core; import java.util.Random; -import buildcraft.BuildCraftCore; - import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.terraingen.PopulateChunkEvent; import net.minecraftforge.event.terraingen.TerrainGen; +import buildcraft.BuildCraftCore; public class SpringPopulate { diff --git a/common/buildcraft/core/proxy/CoreProxyClient.java b/common/buildcraft/core/proxy/CoreProxyClient.java index c6e14d0f..cea72fab 100644 --- a/common/buildcraft/core/proxy/CoreProxyClient.java +++ b/common/buildcraft/core/proxy/CoreProxyClient.java @@ -15,7 +15,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; -import net.minecraft.client.renderer.RenderEngine; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -28,9 +27,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.StringTranslate; import net.minecraft.world.World; -import net.minecraftforge.client.MinecraftForgeClient; import buildcraft.BuildCraftCore; -import buildcraft.core.DefaultProps; import buildcraft.core.EntityBlock; import buildcraft.core.EntityEnergyLaser; import buildcraft.core.EntityPowerLaser; diff --git a/common/buildcraft/core/render/RenderEntityBlock.java b/common/buildcraft/core/render/RenderEntityBlock.java index aad4bf4b..75181375 100644 --- a/common/buildcraft/core/render/RenderEntityBlock.java +++ b/common/buildcraft/core/render/RenderEntityBlock.java @@ -10,7 +10,6 @@ package buildcraft.core.render; import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; @@ -18,11 +17,9 @@ import net.minecraft.entity.Entity; import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.client.ForgeHooksClient; import org.lwjgl.opengl.GL11; -import buildcraft.core.DefaultProps; import buildcraft.core.EntityBlock; public class RenderEntityBlock extends Render { diff --git a/common/buildcraft/core/render/RenderLaser.java b/common/buildcraft/core/render/RenderLaser.java index c7ff3b38..82052715 100644 --- a/common/buildcraft/core/render/RenderLaser.java +++ b/common/buildcraft/core/render/RenderLaser.java @@ -4,7 +4,6 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; -import net.minecraftforge.client.ForgeHooksClient; import org.lwjgl.opengl.GL11; diff --git a/common/buildcraft/core/render/RenderRobot.java b/common/buildcraft/core/render/RenderRobot.java index d191fe1a..f2ea96c7 100644 --- a/common/buildcraft/core/render/RenderRobot.java +++ b/common/buildcraft/core/render/RenderRobot.java @@ -4,7 +4,6 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; -import net.minecraftforge.client.ForgeHooksClient; import org.lwjgl.opengl.GL11; diff --git a/common/buildcraft/core/triggers/ActionMachineControl.java b/common/buildcraft/core/triggers/ActionMachineControl.java index b609d636..a8ba5bc0 100644 --- a/common/buildcraft/core/triggers/ActionMachineControl.java +++ b/common/buildcraft/core/triggers/ActionMachineControl.java @@ -1,10 +1,8 @@ package buildcraft.core.triggers; +import net.minecraft.util.Icon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.Icon; -import buildcraft.BuildCraftTransport; -import buildcraft.core.DefaultProps; public class ActionMachineControl extends BCAction { diff --git a/common/buildcraft/core/triggers/ActionRedstoneOutput.java b/common/buildcraft/core/triggers/ActionRedstoneOutput.java index 199e7b9b..93364bf4 100644 --- a/common/buildcraft/core/triggers/ActionRedstoneOutput.java +++ b/common/buildcraft/core/triggers/ActionRedstoneOutput.java @@ -12,8 +12,6 @@ package buildcraft.core.triggers; import net.minecraft.util.Icon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.BuildCraftTransport; -import buildcraft.core.DefaultProps; public class ActionRedstoneOutput extends BCAction { diff --git a/common/buildcraft/core/triggers/ActionTriggerIconProvider.java b/common/buildcraft/core/triggers/ActionTriggerIconProvider.java index 6a01d88c..3901fd4b 100644 --- a/common/buildcraft/core/triggers/ActionTriggerIconProvider.java +++ b/common/buildcraft/core/triggers/ActionTriggerIconProvider.java @@ -2,9 +2,9 @@ package buildcraft.core.triggers; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.Icon; +import buildcraft.api.core.IIconProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.api.core.IIconProvider; public class ActionTriggerIconProvider implements IIconProvider { diff --git a/common/buildcraft/core/triggers/BCAction.java b/common/buildcraft/core/triggers/BCAction.java index 2feb3fd1..a46683fd 100644 --- a/common/buildcraft/core/triggers/BCAction.java +++ b/common/buildcraft/core/triggers/BCAction.java @@ -9,13 +9,13 @@ package buildcraft.core.triggers; +import net.minecraft.util.Icon; import buildcraft.BuildCraftCore; import buildcraft.api.core.IIconProvider; import buildcraft.api.gates.ActionManager; import buildcraft.api.gates.IAction; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.Icon; public abstract class BCAction implements IAction { diff --git a/common/buildcraft/core/triggers/BCTrigger.java b/common/buildcraft/core/triggers/BCTrigger.java index 7e607abf..8aff1721 100644 --- a/common/buildcraft/core/triggers/BCTrigger.java +++ b/common/buildcraft/core/triggers/BCTrigger.java @@ -9,6 +9,8 @@ package buildcraft.core.triggers; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import buildcraft.BuildCraftCore; import buildcraft.api.core.IIconProvider; import buildcraft.api.gates.ActionManager; @@ -17,8 +19,6 @@ import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.TriggerParameter; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; /** * This class has to be implemented to create new triggers kinds to BuildCraft gates. There is an instance per kind, which will get called wherever the trigger diff --git a/common/buildcraft/core/triggers/TriggerInventory.java b/common/buildcraft/core/triggers/TriggerInventory.java index 515d95f0..d77c6a3a 100644 --- a/common/buildcraft/core/triggers/TriggerInventory.java +++ b/common/buildcraft/core/triggers/TriggerInventory.java @@ -9,20 +9,18 @@ package buildcraft.core.triggers; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ISidedInventory; -import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerDirectional; import buildcraft.api.gates.ITriggerParameter; -import buildcraft.core.DefaultProps; import buildcraft.core.utils.SidedInventoryAdapter; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TriggerInventory extends BCTrigger implements ITriggerDirectional { diff --git a/common/buildcraft/core/triggers/TriggerLiquidContainer.java b/common/buildcraft/core/triggers/TriggerLiquidContainer.java index 35153105..6aef454d 100644 --- a/common/buildcraft/core/triggers/TriggerLiquidContainer.java +++ b/common/buildcraft/core/triggers/TriggerLiquidContainer.java @@ -9,8 +9,6 @@ package buildcraft.core.triggers; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; @@ -18,9 +16,9 @@ import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.ITankContainer; import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; -import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; -import buildcraft.core.DefaultProps; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TriggerLiquidContainer extends BCTrigger { diff --git a/common/buildcraft/core/triggers/TriggerMachine.java b/common/buildcraft/core/triggers/TriggerMachine.java index 132b2186..556df3fe 100644 --- a/common/buildcraft/core/triggers/TriggerMachine.java +++ b/common/buildcraft/core/triggers/TriggerMachine.java @@ -9,14 +9,12 @@ package buildcraft.core.triggers; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; -import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; -import buildcraft.core.DefaultProps; import buildcraft.core.IMachine; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TriggerMachine extends BCTrigger { diff --git a/common/buildcraft/core/utils/BlockUtil.java b/common/buildcraft/core/utils/BlockUtil.java index 12cbe5c3..bd9bd1bf 100644 --- a/common/buildcraft/core/utils/BlockUtil.java +++ b/common/buildcraft/core/utils/BlockUtil.java @@ -10,8 +10,6 @@ package buildcraft.core.utils; import java.util.List; -import cpw.mods.fml.common.FMLCommonHandler; - import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -24,6 +22,7 @@ import net.minecraft.world.World; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftEnergy; import buildcraft.api.core.BuildCraftAPI; +import cpw.mods.fml.common.FMLCommonHandler; public class BlockUtil { diff --git a/common/buildcraft/energy/BlockEngine.java b/common/buildcraft/energy/BlockEngine.java index 5c690db0..419a9cfb 100644 --- a/common/buildcraft/energy/BlockEngine.java +++ b/common/buildcraft/energy/BlockEngine.java @@ -12,9 +12,6 @@ package buildcraft.energy; import java.util.List; import java.util.Random; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -32,6 +29,8 @@ import buildcraft.core.CreativeTabBuildCraft; import buildcraft.core.GuiIds; import buildcraft.core.IItemPipe; import buildcraft.core.proxy.CoreProxy; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockEngine extends BlockContainer { diff --git a/common/buildcraft/energy/BlockOilFlowing.java b/common/buildcraft/energy/BlockOilFlowing.java index b1fc5449..d36fd971 100644 --- a/common/buildcraft/energy/BlockOilFlowing.java +++ b/common/buildcraft/energy/BlockOilFlowing.java @@ -18,7 +18,6 @@ import net.minecraft.world.World; import net.minecraftforge.liquids.ILiquid; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftEnergy; -import buildcraft.core.DefaultProps; public class BlockOilFlowing extends BlockFluid implements ILiquid { diff --git a/common/buildcraft/energy/BlockOilStill.java b/common/buildcraft/energy/BlockOilStill.java index 5245e302..8b33d7a8 100644 --- a/common/buildcraft/energy/BlockOilStill.java +++ b/common/buildcraft/energy/BlockOilStill.java @@ -15,7 +15,6 @@ import net.minecraft.world.World; import net.minecraftforge.liquids.ILiquid; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftEnergy; -import buildcraft.core.DefaultProps; public class BlockOilStill extends BlockStationary implements ILiquid { diff --git a/common/buildcraft/energy/BlockPollution.java b/common/buildcraft/energy/BlockPollution.java index e579e7bd..5b3887c4 100644 --- a/common/buildcraft/energy/BlockPollution.java +++ b/common/buildcraft/energy/BlockPollution.java @@ -9,16 +9,13 @@ package buildcraft.energy; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import buildcraft.core.DefaultProps; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockPollution extends BlockContainer { diff --git a/common/buildcraft/energy/ItemBucketOil.java b/common/buildcraft/energy/ItemBucketOil.java index 894320f2..eb617b09 100644 --- a/common/buildcraft/energy/ItemBucketOil.java +++ b/common/buildcraft/energy/ItemBucketOil.java @@ -9,15 +9,14 @@ package buildcraft.energy; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.ItemBucket; import net.minecraft.item.ItemStack; import buildcraft.BuildCraftEnergy; import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.DefaultProps; import buildcraft.core.utils.StringUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemBucketOil extends ItemBucket { diff --git a/common/buildcraft/energy/OilPopulate.java b/common/buildcraft/energy/OilPopulate.java index 3bcef8f6..c7ce17aa 100644 --- a/common/buildcraft/energy/OilPopulate.java +++ b/common/buildcraft/energy/OilPopulate.java @@ -12,11 +12,11 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; -import buildcraft.BuildCraftCore; -import buildcraft.BuildCraftEnergy; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.terraingen.PopulateChunkEvent; import net.minecraftforge.event.terraingen.TerrainGen; +import buildcraft.BuildCraftCore; +import buildcraft.BuildCraftEnergy; public class OilPopulate { diff --git a/common/buildcraft/energy/TriggerEngineHeat.java b/common/buildcraft/energy/TriggerEngineHeat.java index db723c3c..57b466a3 100644 --- a/common/buildcraft/energy/TriggerEngineHeat.java +++ b/common/buildcraft/energy/TriggerEngineHeat.java @@ -9,15 +9,13 @@ package buildcraft.energy; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; -import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; -import buildcraft.core.DefaultProps; import buildcraft.core.triggers.ActionTriggerIconProvider; import buildcraft.core.triggers.BCTrigger; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TriggerEngineHeat extends BCTrigger { diff --git a/common/buildcraft/energy/gui/GuiCombustionEngine.java b/common/buildcraft/energy/gui/GuiCombustionEngine.java index 0473f6a9..c0db49db 100644 --- a/common/buildcraft/energy/gui/GuiCombustionEngine.java +++ b/common/buildcraft/energy/gui/GuiCombustionEngine.java @@ -9,10 +9,7 @@ package buildcraft.energy.gui; -import net.minecraft.block.Block; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.Item; -import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.liquids.LiquidStack; import org.lwjgl.opengl.GL11; diff --git a/common/buildcraft/energy/render/RenderEngine.java b/common/buildcraft/energy/render/RenderEngine.java index 304a211b..4e965087 100644 --- a/common/buildcraft/energy/render/RenderEngine.java +++ b/common/buildcraft/energy/render/RenderEngine.java @@ -14,7 +14,6 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.common.ForgeDirection; import org.lwjgl.opengl.GL11; diff --git a/common/buildcraft/factory/BlockAutoWorkbench.java b/common/buildcraft/factory/BlockAutoWorkbench.java index 89c61258..872451b4 100644 --- a/common/buildcraft/factory/BlockAutoWorkbench.java +++ b/common/buildcraft/factory/BlockAutoWorkbench.java @@ -11,9 +11,6 @@ package buildcraft.factory; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -26,6 +23,8 @@ import buildcraft.core.BlockBuildCraft; import buildcraft.core.GuiIds; import buildcraft.core.IItemPipe; import buildcraft.core.proxy.CoreProxy; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockAutoWorkbench extends BlockBuildCraft { diff --git a/common/buildcraft/factory/BlockFrame.java b/common/buildcraft/factory/BlockFrame.java index f3c59261..d7dfcca7 100644 --- a/common/buildcraft/factory/BlockFrame.java +++ b/common/buildcraft/factory/BlockFrame.java @@ -13,9 +13,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -27,9 +24,10 @@ import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import buildcraft.BuildCraftCore; -import buildcraft.core.DefaultProps; import buildcraft.core.IFramePipeConnection; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockFrame extends Block implements IFramePipeConnection { diff --git a/common/buildcraft/factory/BlockHopper.java b/common/buildcraft/factory/BlockHopper.java index fe8d6f17..254c47fd 100644 --- a/common/buildcraft/factory/BlockHopper.java +++ b/common/buildcraft/factory/BlockHopper.java @@ -2,15 +2,11 @@ package buildcraft.factory; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; import net.minecraft.world.World; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftFactory; @@ -18,6 +14,8 @@ import buildcraft.core.BlockBuildCraft; import buildcraft.core.GuiIds; import buildcraft.core.IItemPipe; import buildcraft.core.proxy.CoreProxy; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockHopper extends BlockBuildCraft { diff --git a/common/buildcraft/factory/BlockMiningWell.java b/common/buildcraft/factory/BlockMiningWell.java index 2ef00f97..afbcee18 100644 --- a/common/buildcraft/factory/BlockMiningWell.java +++ b/common/buildcraft/factory/BlockMiningWell.java @@ -11,9 +11,6 @@ package buildcraft.factory; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.EntityLiving; @@ -24,8 +21,9 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftFactory; import buildcraft.api.core.Position; -import buildcraft.core.DefaultProps; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockMiningWell extends BlockMachineRoot { diff --git a/common/buildcraft/factory/BlockPlainPipe.java b/common/buildcraft/factory/BlockPlainPipe.java index 92016cf9..a70cf2e6 100644 --- a/common/buildcraft/factory/BlockPlainPipe.java +++ b/common/buildcraft/factory/BlockPlainPipe.java @@ -12,17 +12,15 @@ package buildcraft.factory; import java.util.ArrayList; import java.util.Random; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; -import buildcraft.core.DefaultProps; import buildcraft.core.IFramePipeConnection; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockPlainPipe extends Block implements IFramePipeConnection { diff --git a/common/buildcraft/factory/BlockPump.java b/common/buildcraft/factory/BlockPump.java index fe195834..d580920b 100644 --- a/common/buildcraft/factory/BlockPump.java +++ b/common/buildcraft/factory/BlockPump.java @@ -11,9 +11,6 @@ package buildcraft.factory; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -22,8 +19,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.DefaultProps; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockPump extends BlockContainer { diff --git a/common/buildcraft/factory/BlockQuarry.java b/common/buildcraft/factory/BlockQuarry.java index 6d71933e..3e4704ea 100644 --- a/common/buildcraft/factory/BlockQuarry.java +++ b/common/buildcraft/factory/BlockQuarry.java @@ -11,9 +11,6 @@ package buildcraft.factory; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.EntityLiving; @@ -28,9 +25,10 @@ import buildcraft.BuildCraftFactory; import buildcraft.api.core.Position; import buildcraft.api.tools.IToolWrench; import buildcraft.core.Box; -import buildcraft.core.DefaultProps; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockQuarry extends BlockMachineRoot { diff --git a/common/buildcraft/factory/BlockRefinery.java b/common/buildcraft/factory/BlockRefinery.java index 9c0d8f01..bcbb2f74 100644 --- a/common/buildcraft/factory/BlockRefinery.java +++ b/common/buildcraft/factory/BlockRefinery.java @@ -11,9 +11,6 @@ package buildcraft.factory; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -34,6 +31,8 @@ import buildcraft.core.CreativeTabBuildCraft; import buildcraft.core.GuiIds; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockRefinery extends BlockContainer { diff --git a/common/buildcraft/factory/BlockTank.java b/common/buildcraft/factory/BlockTank.java index db4a03d2..7998573e 100644 --- a/common/buildcraft/factory/BlockTank.java +++ b/common/buildcraft/factory/BlockTank.java @@ -11,9 +11,6 @@ package buildcraft.factory; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -28,8 +25,9 @@ import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; import buildcraft.BuildCraftCore; import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.DefaultProps; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockTank extends BlockContainer { diff --git a/common/buildcraft/factory/EntityMechanicalArm.java b/common/buildcraft/factory/EntityMechanicalArm.java index a0b1104c..6137e288 100644 --- a/common/buildcraft/factory/EntityMechanicalArm.java +++ b/common/buildcraft/factory/EntityMechanicalArm.java @@ -13,7 +13,6 @@ import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import buildcraft.BuildCraftFactory; import buildcraft.core.EntityBlock; public class EntityMechanicalArm extends Entity { diff --git a/common/buildcraft/factory/FactoryProxyClient.java b/common/buildcraft/factory/FactoryProxyClient.java index 0597c045..faae3588 100644 --- a/common/buildcraft/factory/FactoryProxyClient.java +++ b/common/buildcraft/factory/FactoryProxyClient.java @@ -6,7 +6,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.Icon; import net.minecraft.world.World; - import buildcraft.BuildCraftCore; import buildcraft.BuildCraftFactory; import buildcraft.core.EntityBlock; diff --git a/common/buildcraft/factory/TileAutoWorkbench.java b/common/buildcraft/factory/TileAutoWorkbench.java index 7f3cc17e..170ca502 100644 --- a/common/buildcraft/factory/TileAutoWorkbench.java +++ b/common/buildcraft/factory/TileAutoWorkbench.java @@ -16,7 +16,6 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -28,9 +27,9 @@ import buildcraft.api.core.Position; import buildcraft.api.inventory.ISpecialInventory; import buildcraft.core.inventory.TransactorRoundRobin; import buildcraft.core.proxy.CoreProxy; +import buildcraft.core.utils.CraftingHelper; import buildcraft.core.utils.SidedInventoryAdapter; import buildcraft.core.utils.Utils; -import buildcraft.core.utils.CraftingHelper; public class TileAutoWorkbench extends TileEntity implements ISpecialInventory { diff --git a/common/buildcraft/factory/TileHopper.java b/common/buildcraft/factory/TileHopper.java index d88e0949..c476b953 100644 --- a/common/buildcraft/factory/TileHopper.java +++ b/common/buildcraft/factory/TileHopper.java @@ -6,9 +6,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; +import buildcraft.core.TileBuildCraft; import buildcraft.core.inventory.ITransactor; import buildcraft.core.inventory.Transactor; -import buildcraft.core.TileBuildCraft; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.SimpleInventory; diff --git a/common/buildcraft/factory/TilePump.java b/common/buildcraft/factory/TilePump.java index b3ad8813..0f1d8471 100644 --- a/common/buildcraft/factory/TilePump.java +++ b/common/buildcraft/factory/TilePump.java @@ -23,7 +23,6 @@ import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.liquids.LiquidTank; import buildcraft.BuildCraftCore; -import buildcraft.BuildCraftFactory; import buildcraft.api.core.Position; import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerReceptor; diff --git a/common/buildcraft/factory/TileTank.java b/common/buildcraft/factory/TileTank.java index 2e50da29..6ccd32e4 100644 --- a/common/buildcraft/factory/TileTank.java +++ b/common/buildcraft/factory/TileTank.java @@ -8,6 +8,7 @@ package buildcraft.factory; import static net.minecraftforge.common.ForgeDirection.DOWN; +import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; @@ -23,7 +24,6 @@ import buildcraft.core.TileBuildCraft; import buildcraft.core.network.PacketPayload; import buildcraft.core.network.PacketUpdate; import buildcraft.core.proxy.CoreProxy; -import net.minecraft.item.Item; public class TileTank extends TileBuildCraft implements ITankContainer { diff --git a/common/buildcraft/factory/render/RenderHopper.java b/common/buildcraft/factory/render/RenderHopper.java index e8e93f7e..0b855d2a 100644 --- a/common/buildcraft/factory/render/RenderHopper.java +++ b/common/buildcraft/factory/render/RenderHopper.java @@ -6,7 +6,6 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.client.ForgeHooksClient; import org.lwjgl.opengl.GL11; diff --git a/common/buildcraft/factory/render/RenderRefinery.java b/common/buildcraft/factory/render/RenderRefinery.java index 8eb66de9..bef16b51 100644 --- a/common/buildcraft/factory/render/RenderRefinery.java +++ b/common/buildcraft/factory/render/RenderRefinery.java @@ -20,7 +20,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.client.ForgeHooksClient; import org.lwjgl.opengl.GL11; diff --git a/common/buildcraft/factory/render/RenderTank.java b/common/buildcraft/factory/render/RenderTank.java index ae64d980..9d137daf 100644 --- a/common/buildcraft/factory/render/RenderTank.java +++ b/common/buildcraft/factory/render/RenderTank.java @@ -9,26 +9,18 @@ package buildcraft.factory.render; -import java.util.Arrays; import java.util.HashMap; -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.liquids.LiquidDictionary; import net.minecraftforge.liquids.LiquidStack; import org.lwjgl.opengl.GL11; -import com.google.common.base.Joiner; -import com.google.common.primitives.Ints; -import com.google.common.primitives.Primitives; - import buildcraft.core.render.RenderEntityBlock; import buildcraft.core.render.RenderEntityBlock.BlockInterface; import buildcraft.factory.TileTank; diff --git a/common/buildcraft/silicon/BlockAssemblyTable.java b/common/buildcraft/silicon/BlockAssemblyTable.java index 2abc72c4..a66c7a94 100644 --- a/common/buildcraft/silicon/BlockAssemblyTable.java +++ b/common/buildcraft/silicon/BlockAssemblyTable.java @@ -2,9 +2,6 @@ package buildcraft.silicon; import java.util.List; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -16,9 +13,10 @@ import net.minecraft.util.Icon; import net.minecraft.world.World; import buildcraft.BuildCraftSilicon; import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.DefaultProps; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockAssemblyTable extends BlockContainer { diff --git a/common/buildcraft/silicon/BlockLaser.java b/common/buildcraft/silicon/BlockLaser.java index 60ab4379..cba892e3 100644 --- a/common/buildcraft/silicon/BlockLaser.java +++ b/common/buildcraft/silicon/BlockLaser.java @@ -11,9 +11,6 @@ package buildcraft.silicon; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -23,7 +20,8 @@ import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.DefaultProps; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockLaser extends BlockContainer { diff --git a/common/buildcraft/silicon/TileAssemblyAdvancedWorkbench.java b/common/buildcraft/silicon/TileAssemblyAdvancedWorkbench.java index 04c8f17b..16ead5c0 100644 --- a/common/buildcraft/silicon/TileAssemblyAdvancedWorkbench.java +++ b/common/buildcraft/silicon/TileAssemblyAdvancedWorkbench.java @@ -11,7 +11,6 @@ import net.minecraft.inventory.InventoryCraftResult; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.inventory.SlotCrafting; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -22,9 +21,9 @@ import buildcraft.core.IMachine; import buildcraft.core.network.PacketIds; import buildcraft.core.network.PacketSlotChange; import buildcraft.core.proxy.CoreProxy; +import buildcraft.core.utils.CraftingHelper; import buildcraft.core.utils.SimpleInventory; import buildcraft.core.utils.Utils; -import buildcraft.core.utils.CraftingHelper; import com.google.common.collect.Lists; diff --git a/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java b/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java index 2d694495..55a9567d 100644 --- a/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java +++ b/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java @@ -9,8 +9,8 @@ import net.minecraft.item.crafting.IRecipe; import org.lwjgl.opengl.GL11; import buildcraft.BuildCraftCore; -import buildcraft.core.DefaultProps; import buildcraft.core.CoreIconProvider; +import buildcraft.core.DefaultProps; import buildcraft.core.gui.GuiAdvancedInterface; import buildcraft.core.utils.StringUtil; import buildcraft.silicon.TileAssemblyAdvancedWorkbench; diff --git a/common/buildcraft/silicon/gui/GuiAssemblyTable.java b/common/buildcraft/silicon/gui/GuiAssemblyTable.java index 0afe8355..8ee5e60b 100644 --- a/common/buildcraft/silicon/gui/GuiAssemblyTable.java +++ b/common/buildcraft/silicon/gui/GuiAssemblyTable.java @@ -20,8 +20,8 @@ import org.lwjgl.opengl.GL11; import buildcraft.BuildCraftCore; import buildcraft.api.recipes.AssemblyRecipe; -import buildcraft.core.DefaultProps; import buildcraft.core.CoreIconProvider; +import buildcraft.core.DefaultProps; import buildcraft.core.gui.GuiAdvancedInterface; import buildcraft.core.network.PacketCoordinates; import buildcraft.core.network.PacketIds; diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index b6f87d5e..3ffe6c1a 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -14,9 +14,6 @@ import java.util.List; import java.util.Random; import java.util.TreeMap; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -36,18 +33,15 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftTransport; -import buildcraft.api.gates.ActionManager; -import buildcraft.api.gates.IAction; -import buildcraft.api.gates.ITrigger; import buildcraft.api.tools.IToolWrench; import buildcraft.api.transport.IPipe; import buildcraft.core.BlockIndex; -import buildcraft.core.DefaultProps; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; import buildcraft.transport.render.PipeWorldRenderer; -import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockGenericPipe extends BlockContainer { static enum Part { diff --git a/common/buildcraft/transport/GateIconProvider.java b/common/buildcraft/transport/GateIconProvider.java index eec13b8d..0e62c9aa 100644 --- a/common/buildcraft/transport/GateIconProvider.java +++ b/common/buildcraft/transport/GateIconProvider.java @@ -2,9 +2,9 @@ package buildcraft.transport; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.Icon; +import buildcraft.api.core.IIconProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.api.core.IIconProvider; public class GateIconProvider implements IIconProvider { diff --git a/common/buildcraft/transport/GuiHandler.java b/common/buildcraft/transport/GuiHandler.java index 35d2cb65..7beeb17c 100644 --- a/common/buildcraft/transport/GuiHandler.java +++ b/common/buildcraft/transport/GuiHandler.java @@ -1,6 +1,7 @@ package buildcraft.transport; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import buildcraft.core.GuiIds; @@ -12,7 +13,6 @@ import buildcraft.transport.gui.GuiEmeraldPipe; import buildcraft.transport.gui.GuiGateInterface; import buildcraft.transport.pipes.PipeLogicDiamond; import cpw.mods.fml.common.network.IGuiHandler; -import net.minecraft.inventory.IInventory; public class GuiHandler implements IGuiHandler { diff --git a/common/buildcraft/transport/IPipeRenderState.java b/common/buildcraft/transport/IPipeRenderState.java index 8c748259..3170b31c 100644 --- a/common/buildcraft/transport/IPipeRenderState.java +++ b/common/buildcraft/transport/IPipeRenderState.java @@ -3,7 +3,6 @@ package buildcraft.transport; import buildcraft.api.core.IIconProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.Icon; public interface IPipeRenderState { public PipeRenderState getRenderState(); diff --git a/common/buildcraft/transport/ItemGate.java b/common/buildcraft/transport/ItemGate.java index 65bca78f..5474cc7e 100644 --- a/common/buildcraft/transport/ItemGate.java +++ b/common/buildcraft/transport/ItemGate.java @@ -2,19 +2,17 @@ package buildcraft.transport; import java.util.List; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; -import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ActionManager; import buildcraft.api.gates.IAction; import buildcraft.api.gates.ITrigger; import buildcraft.core.CreativeTabBuildCraft; import buildcraft.core.ItemBuildCraft; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemGate extends ItemBuildCraft { diff --git a/common/buildcraft/transport/ItemPipe.java b/common/buildcraft/transport/ItemPipe.java index 5cea1bd7..01abc785 100644 --- a/common/buildcraft/transport/ItemPipe.java +++ b/common/buildcraft/transport/ItemPipe.java @@ -9,20 +9,20 @@ package buildcraft.transport; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.World; +import buildcraft.BuildCraftCore; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.core.CreativeTabBuildCraft; import buildcraft.core.IItemPipe; import buildcraft.core.ItemBuildCraft; -import buildcraft.BuildCraftCore; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemPipe extends ItemBuildCraft implements IItemPipe { diff --git a/common/buildcraft/transport/Pipe.java b/common/buildcraft/transport/Pipe.java index 410b1e24..640082a4 100644 --- a/common/buildcraft/transport/Pipe.java +++ b/common/buildcraft/transport/Pipe.java @@ -14,9 +14,6 @@ import java.util.LinkedList; import java.util.Map; import java.util.Random; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.item.EntityItem; @@ -24,7 +21,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; @@ -40,13 +36,15 @@ import buildcraft.api.gates.TriggerParameter; import buildcraft.api.transport.IPipe; import buildcraft.core.IDropControlInventory; import buildcraft.core.network.TilePacketWrapper; -import buildcraft.core.triggers.BCAction; import buildcraft.core.triggers.ActionRedstoneOutput; +import buildcraft.core.triggers.BCAction; import buildcraft.core.triggers.BCTrigger; import buildcraft.core.utils.Utils; import buildcraft.transport.Gate.GateConditional; import buildcraft.transport.pipes.PipeLogic; import buildcraft.transport.triggers.ActionSignalOutput; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public abstract class Pipe implements IPipe, IDropControlInventory { diff --git a/common/buildcraft/transport/PipeIconProvider.java b/common/buildcraft/transport/PipeIconProvider.java index f231d7b5..f6f3f38c 100644 --- a/common/buildcraft/transport/PipeIconProvider.java +++ b/common/buildcraft/transport/PipeIconProvider.java @@ -2,9 +2,9 @@ package buildcraft.transport; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.Icon; +import buildcraft.api.core.IIconProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.api.core.IIconProvider; public class PipeIconProvider implements IIconProvider { diff --git a/common/buildcraft/transport/PipeRenderState.java b/common/buildcraft/transport/PipeRenderState.java index 9d83e485..e283b30a 100644 --- a/common/buildcraft/transport/PipeRenderState.java +++ b/common/buildcraft/transport/PipeRenderState.java @@ -4,17 +4,14 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.util.Icon; - -import buildcraft.core.DefaultProps; import buildcraft.core.network.IClientState; import buildcraft.transport.utils.ConnectionMatrix; import buildcraft.transport.utils.FacadeMatrix; import buildcraft.transport.utils.TextureMatrix; import buildcraft.transport.utils.WireMatrix; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PipeRenderState implements IClientState { diff --git a/common/buildcraft/transport/PipeTransportItems.java b/common/buildcraft/transport/PipeTransportItems.java index f67cdffb..e8878a63 100644 --- a/common/buildcraft/transport/PipeTransportItems.java +++ b/common/buildcraft/transport/PipeTransportItems.java @@ -18,6 +18,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; + import net.minecraft.entity.item.EntityItem; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index 1c7286d8..267ac8e7 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -14,15 +14,11 @@ import java.io.DataOutputStream; import java.io.IOException; import java.util.LinkedList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.ILiquidTank; @@ -38,7 +34,6 @@ import buildcraft.api.gates.ITrigger; import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.transport.IPipe; -import buildcraft.api.transport.IPipe.WireColor; import buildcraft.api.transport.IPipeConnection; import buildcraft.api.transport.IPipeEntry; import buildcraft.api.transport.IPipeTile; @@ -54,6 +49,8 @@ import buildcraft.core.network.PacketTileState; import buildcraft.core.utils.Utils; import buildcraft.transport.Gate.GateKind; import buildcraft.transport.network.PipeRenderStatePacket; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITankContainer, IPipeEntry, IPipeTile, IOverrideDefaultTriggers, ITileBufferHolder, IPipeConnection, IDropControlInventory, IPipeRenderState, ISyncedTile { diff --git a/common/buildcraft/transport/TransportProxyClient.java b/common/buildcraft/transport/TransportProxyClient.java index 88bb0a4e..6741010f 100644 --- a/common/buildcraft/transport/TransportProxyClient.java +++ b/common/buildcraft/transport/TransportProxyClient.java @@ -1,8 +1,5 @@ package buildcraft.transport; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.util.Icon; import net.minecraftforge.client.MinecraftForgeClient; import buildcraft.BuildCraftTransport; import buildcraft.transport.render.FacadeItemRenderer; diff --git a/common/buildcraft/transport/WireIconProvider.java b/common/buildcraft/transport/WireIconProvider.java index 010a04cb..f9e6dbe6 100644 --- a/common/buildcraft/transport/WireIconProvider.java +++ b/common/buildcraft/transport/WireIconProvider.java @@ -2,9 +2,9 @@ package buildcraft.transport; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.Icon; +import buildcraft.api.core.IIconProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.api.core.IIconProvider; public class WireIconProvider implements IIconProvider { diff --git a/common/buildcraft/transport/gui/GuiGateInterface.java b/common/buildcraft/transport/gui/GuiGateInterface.java index d53abad5..ac0a2f39 100644 --- a/common/buildcraft/transport/gui/GuiGateInterface.java +++ b/common/buildcraft/transport/gui/GuiGateInterface.java @@ -17,9 +17,6 @@ import net.minecraft.util.Icon; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.api.gates.IAction; import buildcraft.api.gates.ITrigger; import buildcraft.api.gates.ITriggerParameter; @@ -27,6 +24,8 @@ import buildcraft.core.gui.GuiAdvancedInterface; import buildcraft.core.utils.StringUtil; import buildcraft.transport.Gate.GateKind; import buildcraft.transport.Pipe; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class GuiGateInterface extends GuiAdvancedInterface { diff --git a/common/buildcraft/transport/render/TileEntityPickupFX.java b/common/buildcraft/transport/render/TileEntityPickupFX.java index bacc8136..99132974 100644 --- a/common/buildcraft/transport/render/TileEntityPickupFX.java +++ b/common/buildcraft/transport/render/TileEntityPickupFX.java @@ -11,19 +11,21 @@ */ package buildcraft.transport.render; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.particle.EntityPickupFX; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; -import net.minecraft.world.World; -import org.lwjgl.opengl.GL11; - -import net.minecraft.client.particle.EntityFX; import net.minecraft.entity.item.EntityItem; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +import org.lwjgl.opengl.GL11; + import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class TileEntityPickupFX extends EntityFX diff --git a/common/buildcraft/transport/triggers/ActionEnergyPulser.java b/common/buildcraft/transport/triggers/ActionEnergyPulser.java index 5b8aca85..cac78ac1 100644 --- a/common/buildcraft/transport/triggers/ActionEnergyPulser.java +++ b/common/buildcraft/transport/triggers/ActionEnergyPulser.java @@ -1,12 +1,10 @@ package buildcraft.transport.triggers; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.util.Icon; -import buildcraft.BuildCraftTransport; -import buildcraft.core.DefaultProps; import buildcraft.core.triggers.ActionTriggerIconProvider; import buildcraft.core.triggers.BCAction; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ActionEnergyPulser extends BCAction { diff --git a/common/buildcraft/transport/triggers/ActionSignalOutput.java b/common/buildcraft/transport/triggers/ActionSignalOutput.java index 8fb7feeb..7aa68128 100644 --- a/common/buildcraft/transport/triggers/ActionSignalOutput.java +++ b/common/buildcraft/transport/triggers/ActionSignalOutput.java @@ -10,13 +10,11 @@ package buildcraft.transport.triggers; import net.minecraft.util.Icon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.BuildCraftTransport; import buildcraft.api.transport.IPipe; -import buildcraft.core.DefaultProps; import buildcraft.core.triggers.ActionTriggerIconProvider; import buildcraft.core.triggers.BCAction; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ActionSignalOutput extends BCAction { diff --git a/common/buildcraft/transport/triggers/TriggerPipeContents.java b/common/buildcraft/transport/triggers/TriggerPipeContents.java index fc562626..982e2c08 100644 --- a/common/buildcraft/transport/triggers/TriggerPipeContents.java +++ b/common/buildcraft/transport/triggers/TriggerPipeContents.java @@ -9,16 +9,12 @@ package buildcraft.transport.triggers; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; -import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; -import buildcraft.core.DefaultProps; import buildcraft.core.triggers.ActionTriggerIconProvider; import buildcraft.core.triggers.BCTrigger; import buildcraft.transport.EntityData; @@ -27,6 +23,8 @@ import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.PipeTransportLiquids; import buildcraft.transport.PipeTransportPower; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TriggerPipeContents extends BCTrigger implements ITriggerPipe { diff --git a/common/buildcraft/transport/triggers/TriggerPipeSignal.java b/common/buildcraft/transport/triggers/TriggerPipeSignal.java index 515cabfe..d8187e7b 100644 --- a/common/buildcraft/transport/triggers/TriggerPipeSignal.java +++ b/common/buildcraft/transport/triggers/TriggerPipeSignal.java @@ -9,17 +9,15 @@ package buildcraft.transport.triggers; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.util.Icon; -import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.transport.IPipe; -import buildcraft.core.DefaultProps; import buildcraft.core.triggers.ActionTriggerIconProvider; import buildcraft.core.triggers.BCTrigger; import buildcraft.transport.ITriggerPipe; import buildcraft.transport.Pipe; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TriggerPipeSignal extends BCTrigger implements ITriggerPipe { diff --git a/common/buildcraft/transport/triggers/TriggerRedstoneInput.java b/common/buildcraft/transport/triggers/TriggerRedstoneInput.java index 56352739..897f502a 100644 --- a/common/buildcraft/transport/triggers/TriggerRedstoneInput.java +++ b/common/buildcraft/transport/triggers/TriggerRedstoneInput.java @@ -10,15 +10,13 @@ package buildcraft.transport.triggers; import net.minecraft.util.Icon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; -import buildcraft.core.DefaultProps; import buildcraft.core.triggers.ActionTriggerIconProvider; import buildcraft.core.triggers.BCTrigger; import buildcraft.transport.ITriggerPipe; import buildcraft.transport.Pipe; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TriggerRedstoneInput extends BCTrigger implements ITriggerPipe { diff --git a/common/buildcraft/transport/utils/FacadeMatrix.java b/common/buildcraft/transport/utils/FacadeMatrix.java index d247f1ae..f94e5555 100644 --- a/common/buildcraft/transport/utils/FacadeMatrix.java +++ b/common/buildcraft/transport/utils/FacadeMatrix.java @@ -4,7 +4,6 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; public class FacadeMatrix extends ConnectionMatrix {