From 1d11beaa6b45c25168f69aa362bec1e6e808a400 Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Fri, 12 Jul 2013 14:21:44 -0700 Subject: [PATCH] More update work --- common/buildcraft/BuildCraftBuilders.java | 27 +- common/buildcraft/BuildCraftCore.java | 31 +- common/buildcraft/BuildCraftEnergy.java | 95 +++--- common/buildcraft/BuildCraftFactory.java | 29 +- common/buildcraft/BuildCraftSilicon.java | 8 +- common/buildcraft/BuildCraftTransport.java | 21 +- .../api/blueprints/BlueprintManager.java | 2 +- .../buildcraft/api/blueprints/BptBlock.java | 3 +- .../api/blueprints/BptBlockUtils.java | 1 - .../api/blueprints/BptSlotInfo.java | 1 - .../api/blueprints/IBptContext.java | 4 +- .../buildcraft/api/bptblocks/BptBlockBed.java | 7 +- .../api/bptblocks/BptBlockCustomStack.java | 5 +- .../api/bptblocks/BptBlockDelegate.java | 5 +- .../api/bptblocks/BptBlockDirt.java | 7 +- .../api/bptblocks/BptBlockDoor.java | 5 +- .../api/bptblocks/BptBlockFluid.java | 5 +- .../api/bptblocks/BptBlockIgnore.java | 5 +- .../api/bptblocks/BptBlockIgnoreMeta.java | 5 +- .../api/bptblocks/BptBlockInventory.java | 2 +- .../api/bptblocks/BptBlockLever.java | 5 +- .../api/bptblocks/BptBlockPumpkin.java | 5 +- .../bptblocks/BptBlockRedstoneRepeater.java | 7 +- .../bptblocks/BptBlockRotateInventory.java | 2 +- .../api/bptblocks/BptBlockRotateMeta.java | 5 +- .../api/bptblocks/BptBlockSign.java | 9 +- .../api/bptblocks/BptBlockStairs.java | 5 +- .../api/bptblocks/BptBlockWallSide.java | 5 +- common/buildcraft/api/core/IIconProvider.java | 4 +- .../buildcraft/api/filler/IFillerPattern.java | 6 +- .../api/fuels/IronEngineCoolant.java | 6 +- .../buildcraft/api/fuels/IronEngineFuel.java | 4 +- .../buildcraft/api/gates/ActionManager.java | 3 +- .../buildcraft/api/gates/IActionProvider.java | 1 - common/buildcraft/api/gates/ITrigger.java | 4 +- .../api/gates/ITriggerProvider.java | 3 +- .../buildcraft/api/power/IPowerReceptor.java | 2 +- common/buildcraft/api/power/PowerHandler.java | 2 +- .../api/recipes/AssemblyRecipe.java | 1 - .../api/recipes/RefineryRecipe.java | 6 +- .../api/transport/FacadeManager.java | 1 - .../buildcraft/api/transport/IPipedItem.java | 2 +- .../buildcraft/api/transport/PipeManager.java | 1 - .../buildcraft/builders/BlockArchitect.java | 18 +- .../builders/BlockBlueprintLibrary.java | 11 +- common/buildcraft/builders/BlockBuilder.java | 26 +- common/buildcraft/builders/BlockFiller.java | 17 +- common/buildcraft/builders/BlockMarker.java | 13 +- .../buildcraft/builders/BlockPathMarker.java | 7 +- .../buildcraft/builders/BptBlockFiller.java | 7 +- .../builders/BuilderProxyClient.java | 2 +- .../builders/ClientBuilderHook.java | 3 +- .../builders/EventHandlerBuilders.java | 4 +- common/buildcraft/builders/FillerFillAll.java | 6 +- .../builders/FillerFillPyramid.java | 6 +- .../buildcraft/builders/FillerFillStairs.java | 6 +- .../buildcraft/builders/FillerFillWalls.java | 6 +- .../buildcraft/builders/FillerFlattener.java | 6 +- common/buildcraft/builders/FillerHorizon.java | 6 +- common/buildcraft/builders/FillerPattern.java | 8 +- .../buildcraft/builders/FillerRegistry.java | 5 +- common/buildcraft/builders/FillerRemover.java | 6 +- common/buildcraft/builders/GuiHandler.java | 6 +- common/buildcraft/builders/IBuilderHook.java | 3 +- common/buildcraft/builders/ItemBptBase.java | 13 +- .../buildcraft/builders/ItemBptBluePrint.java | 4 +- .../buildcraft/builders/ItemBptTemplate.java | 4 +- common/buildcraft/builders/TileArchitect.java | 12 +- .../builders/TileBlueprintLibrary.java | 13 +- common/buildcraft/builders/TileBuilder.java | 21 +- common/buildcraft/builders/TileFiller.java | 12 +- common/buildcraft/builders/TileMarker.java | 4 +- .../buildcraft/builders/TilePathMarker.java | 13 +- .../gui/ContainerBlueprintLibrary.java | 4 +- .../builders/gui/ContainerBuilder.java | 4 +- .../builders/gui/ContainerFiller.java | 4 +- .../builders/gui/ContainerTemplate.java | 4 +- .../builders/gui/GuiBlueprintLibrary.java | 8 +- .../buildcraft/builders/gui/GuiBuilder.java | 11 +- common/buildcraft/builders/gui/GuiFiller.java | 6 +- .../buildcraft/builders/gui/GuiTemplate.java | 9 +- .../network/PacketHandlerBuilders.java | 13 +- .../builders/network/PacketLibraryAction.java | 3 +- common/buildcraft/core/BlockBuildCraft.java | 3 +- common/buildcraft/core/BlockSpring.java | 5 +- common/buildcraft/core/Box.java | 9 +- .../core/BuildCraftConfiguration.java | 1 - common/buildcraft/core/CommandBuildCraft.java | 3 +- common/buildcraft/core/CoreIconProvider.java | 4 +- .../core/CreativeTabBuildCraft.java | 2 +- common/buildcraft/core/DefaultProps.java | 4 - common/buildcraft/core/EntityBlock.java | 4 +- common/buildcraft/core/EntityEnergyLaser.java | 2 +- common/buildcraft/core/EntityLaser.java | 4 +- common/buildcraft/core/EntityPassiveItem.java | 11 +- common/buildcraft/core/EntityPowerLaser.java | 2 +- common/buildcraft/core/EntityRobot.java | 15 +- common/buildcraft/core/IBptContributor.java | 2 +- .../buildcraft/core/ItemBlockBuildCraft.java | 2 +- common/buildcraft/core/ItemBuildCraft.java | 6 +- .../buildcraft/core/ItemRedstoneChipset.java | 5 +- common/buildcraft/core/ItemSpring.java | 1 - common/buildcraft/core/ItemWrench.java | 2 +- common/buildcraft/core/SpringPopulate.java | 3 +- .../core/TickHandlerCoreClient.java | 5 +- common/buildcraft/core/TileBuffer.java | 2 +- common/buildcraft/core/TileBuildCraft.java | 9 +- common/buildcraft/core/Version.java | 5 +- .../buildcraft/core/blueprints/BptBase.java | 9 +- .../core/blueprints/BptBlueprint.java | 27 +- .../core/blueprints/BptBuilderBase.java | 4 +- .../core/blueprints/BptBuilderBlueprint.java | 9 +- .../core/blueprints/BptBuilderTemplate.java | 7 +- .../core/blueprints/BptContext.java | 4 +- .../buildcraft/core/blueprints/BptItem.java | 5 +- .../core/blueprints/BptPlayerIndex.java | 3 +- .../core/blueprints/BptRootIndex.java | 3 +- .../buildcraft/core/blueprints/BptSlot.java | 7 +- .../core/gui/BuildCraftContainer.java | 6 +- .../core/gui/GuiAdvancedInterface.java | 1 - common/buildcraft/core/gui/GuiBuildCraft.java | 25 +- .../core/gui/buttons/GuiBetterButton.java | 15 +- .../core/gui/buttons/GuiMultiButton.java | 8 +- .../buildcraft/core/gui/slots/SlotBase.java | 2 +- .../buildcraft/core/gui/tooltips/ToolTip.java | 3 +- .../core/inventory/ITransactor.java | 2 +- .../buildcraft/core/inventory/InvUtils.java | 6 +- .../core/inventory/InventoryConcatenator.java | 4 +- .../inventory/InventoryIteratorSided.java | 3 +- .../inventory/InventoryIteratorSimple.java | 3 +- .../core/inventory/InventoryWrapper.java | 2 +- .../core/inventory/InventoryWrapperForge.java | 2 +- .../inventory/InventoryWrapperSimple.java | 2 +- .../core/inventory/SimpleInventory.java | 3 +- .../buildcraft/core/inventory/Transactor.java | 4 +- .../core/inventory/TransactorRoundRobin.java | 2 +- .../core/inventory/TransactorSimple.java | 5 +- .../core/inventory/TransactorSpecial.java | 4 +- .../inventory/filters/ArrayStackFilter.java | 2 +- .../inventory/filters/CraftingFilter.java | 2 +- .../buildcraft/core/liquids/FluidUtils.java | 2 +- .../core/network/BuildCraftPacket.java | 3 +- .../buildcraft/core/network/ClassMapping.java | 5 +- .../core/network/PacketHandler.java | 5 +- common/buildcraft/core/network/PacketNBT.java | 1 - .../core/network/PacketSlotChange.java | 1 - .../core/network/TilePacketWrapper.java | 2 +- common/buildcraft/core/proxy/CoreProxy.java | 15 +- .../core/proxy/CoreProxyClient.java | 41 +-- .../buildcraft/core/render/FluidRenderer.java | 8 +- .../core/render/RenderEnergyLaser.java | 2 +- .../core/render/RenderEntityBlock.java | 44 ++- .../buildcraft/core/render/RenderLaser.java | 6 +- .../buildcraft/core/render/RenderRobot.java | 14 +- common/buildcraft/core/render/RenderVoid.java | 6 + .../core/render/RenderingEntityBlocks.java | 17 +- .../core/render/RenderingMarkers.java | 4 +- .../buildcraft/core/render/RenderingOil.java | 4 +- .../triggers/ActionTriggerIconProvider.java | 4 +- .../buildcraft/core/triggers/BCTrigger.java | 4 +- .../core/triggers/DefaultActionProvider.java | 9 +- .../core/triggers/DefaultTriggerProvider.java | 15 +- .../core/triggers/TriggerFluidContainer.java | 108 +++--- .../core/triggers/TriggerInventory.java | 6 +- .../core/triggers/TriggerMachine.java | 4 +- common/buildcraft/core/utils/BlockUtil.java | 11 +- .../buildcraft/core/utils/CraftingHelper.java | 1 - .../buildcraft/core/utils/Localization.java | 3 +- common/buildcraft/core/utils/Utils.java | 39 ++- common/buildcraft/energy/BlockEngine.java | 11 +- common/buildcraft/energy/BlockOilFlowing.java | 323 ------------------ common/buildcraft/energy/BlockOilStill.java | 81 ----- common/buildcraft/energy/BlockPollution.java | 4 +- common/buildcraft/energy/BptBlockEngine.java | 4 +- common/buildcraft/energy/GuiHandler.java | 6 +- common/buildcraft/energy/ItemBucketOil.java | 6 +- common/buildcraft/energy/ItemEngine.java | 2 +- .../buildcraft/energy/OilBucketHandler.java | 4 +- common/buildcraft/energy/TileEngine.java | 21 +- common/buildcraft/energy/TileEngineIron.java | 27 +- .../buildcraft/energy/TileEngineLegacy.java | 2 +- common/buildcraft/energy/TileEngineStone.java | 15 +- common/buildcraft/energy/TileEngineWood.java | 2 +- common/buildcraft/energy/TilePollution.java | 2 +- .../buildcraft/energy/TriggerEngineHeat.java | 4 +- .../energy/gui/ContainerEngine.java | 6 +- .../energy/gui/GuiCombustionEngine.java | 10 +- common/buildcraft/energy/gui/GuiEngine.java | 4 +- .../buildcraft/energy/gui/GuiSteamEngine.java | 6 +- .../energy/render/RenderEngine.java | 28 +- .../energy/worldgen/BiomeGenOilDesert.java | 1 - .../energy/worldgen/BiomeInitializer.java | 2 +- .../energy/worldgen/GenLayerAddOilDesert.java | 2 +- .../energy/worldgen/GenLayerAddOilOcean.java | 2 +- .../worldgen/GenLayerBiomeReplacer.java | 1 - .../energy/worldgen/OilPopulate.java | 31 +- .../factory/BlockAutoWorkbench.java | 17 +- common/buildcraft/factory/BlockFrame.java | 11 +- common/buildcraft/factory/BlockHopper.java | 17 +- .../buildcraft/factory/BlockMachineRoot.java | 4 +- .../buildcraft/factory/BlockMiningWell.java | 12 +- common/buildcraft/factory/BlockPlainPipe.java | 9 +- common/buildcraft/factory/BlockPump.java | 9 +- common/buildcraft/factory/BlockQuarry.java | 17 +- common/buildcraft/factory/BlockRefinery.java | 30 +- common/buildcraft/factory/BlockTank.java | 13 +- .../factory/BptBlockAutoWorkbench.java | 7 +- common/buildcraft/factory/BptBlockFrame.java | 5 +- .../buildcraft/factory/BptBlockRefinery.java | 2 +- .../factory/EntityMechanicalArm.java | 2 +- common/buildcraft/factory/FactoryProxy.java | 2 +- .../factory/FactoryProxyClient.java | 7 +- common/buildcraft/factory/GuiHandler.java | 6 +- .../buildcraft/factory/PumpDimensionList.java | 1 - .../buildcraft/factory/TileAutoWorkbench.java | 1 + common/buildcraft/factory/TileHopper.java | 10 +- common/buildcraft/factory/TileMiningWell.java | 11 +- common/buildcraft/factory/TilePump.java | 28 +- common/buildcraft/factory/TileQuarry.java | 31 +- common/buildcraft/factory/TileRefinery.java | 25 +- common/buildcraft/factory/TileTank.java | 83 ++--- .../factory/gui/ContainerAutoWorkbench.java | 16 +- .../factory/gui/ContainerHopper.java | 4 +- .../factory/gui/ContainerRefinery.java | 10 +- .../factory/gui/GuiAutoCrafting.java | 10 +- common/buildcraft/factory/gui/GuiHopper.java | 16 +- .../buildcraft/factory/gui/GuiRefinery.java | 17 +- .../factory/network/PacketHandlerFactory.java | 15 +- .../factory/render/RenderHopper.java | 18 +- .../factory/render/RenderRefinery.java | 20 +- .../buildcraft/factory/render/RenderTank.java | 8 +- common/buildcraft/silicon/BlockLaser.java | 7 +- .../buildcraft/silicon/BlockLaserTable.java | 13 +- common/buildcraft/silicon/GuiHandler.java | 6 +- .../silicon/SiliconRenderBlock.java | 6 +- .../silicon/TileAdvancedCraftingTable.java | 47 ++- .../buildcraft/silicon/TileAssemblyTable.java | 25 +- common/buildcraft/silicon/TileLaser.java | 9 +- .../gui/ContainerAdvancedCraftingTable.java | 8 +- .../silicon/gui/ContainerAssemblyTable.java | 6 +- .../silicon/gui/GuiAdvancedCraftingTable.java | 18 +- .../silicon/gui/GuiAssemblyTable.java | 22 +- .../silicon/network/PacketHandlerSilicon.java | 17 +- .../transport/BlockFilteredBuffer.java | 17 +- .../transport/BlockGenericPipe.java | 27 +- common/buildcraft/transport/EnergyPulser.java | 4 +- common/buildcraft/transport/EntityData.java | 5 +- .../buildcraft/transport/FallbackWrapper.java | 11 +- common/buildcraft/transport/Gate.java | 14 +- .../transport/GateIconProvider.java | 4 +- common/buildcraft/transport/GateVanilla.java | 161 +++++---- common/buildcraft/transport/GuiHandler.java | 6 +- .../transport/IPipeTransportItemsHook.java | 5 +- common/buildcraft/transport/ItemFacade.java | 21 +- common/buildcraft/transport/ItemGate.java | 11 +- common/buildcraft/transport/ItemPipe.java | 19 +- common/buildcraft/transport/ItemPlug.java | 8 +- common/buildcraft/transport/Pipe.java | 30 +- .../transport/PipeIconProvider.java | 4 +- .../buildcraft/transport/PipeRenderState.java | 9 +- .../buildcraft/transport/PipeTransport.java | 2 +- .../transport/PipeTransportFluids.java | 20 +- .../transport/PipeTransportItems.java | 37 +- .../transport/PipeTransportPower.java | 13 +- .../transport/PipeTriggerProvider.java | 7 +- .../transport/TileFilteredBuffer.java | 13 +- .../buildcraft/transport/TileGenericPipe.java | 34 +- .../transport/TransportProxyClient.java | 2 +- .../transport/WireIconProvider.java | 4 +- .../transport/blueprints/BptBlockPipe.java | 9 +- .../blueprints/BptItemPipeDiamond.java | 9 +- .../blueprints/BptItemPipeEmerald.java | 7 +- .../transport/blueprints/BptItemPipeIron.java | 7 +- .../blueprints/BptItemPipeWooden.java | 7 +- .../transport/gui/ContainerDiamondPipe.java | 6 +- .../transport/gui/ContainerEmeraldPipe.java | 6 +- .../gui/ContainerFilteredBuffer.java | 8 +- .../transport/gui/ContainerGateInterface.java | 24 +- .../transport/gui/GuiDiamondPipe.java | 13 +- .../transport/gui/GuiEmeraldPipe.java | 13 +- .../transport/gui/GuiFilteredBuffer.java | 14 +- .../transport/gui/GuiGateInterface.java | 24 +- .../transport/network/PacketFluidUpdate.java | 17 +- .../network/PacketHandlerTransport.java | 19 +- .../network/PacketPipeTransportContent.java | 11 +- .../network/PacketPipeTransportNBT.java | 3 +- .../transport/network/PacketPowerUpdate.java | 7 +- .../transport/network/PacketSimpleId.java | 3 +- .../network/PipeRenderStatePacket.java | 7 +- .../pipes/PipeFluidsCobblestone.java | 2 +- .../transport/pipes/PipeFluidsGold.java | 2 +- .../transport/pipes/PipeFluidsIron.java | 2 +- .../transport/pipes/PipeFluidsSandstone.java | 4 +- .../transport/pipes/PipeFluidsStone.java | 2 +- .../transport/pipes/PipeFluidsVoid.java | 4 +- .../transport/pipes/PipeFluidsWood.java | 12 +- .../transport/pipes/PipeItemsCobblestone.java | 2 +- .../transport/pipes/PipeItemsDiamond.java | 19 +- .../transport/pipes/PipeItemsEmerald.java | 23 +- .../transport/pipes/PipeItemsGold.java | 5 +- .../transport/pipes/PipeItemsIron.java | 2 +- .../transport/pipes/PipeItemsObsidian.java | 21 +- .../transport/pipes/PipeItemsQuartz.java | 5 +- .../transport/pipes/PipeItemsSandstone.java | 2 +- .../transport/pipes/PipeItemsStone.java | 5 +- .../transport/pipes/PipeItemsVoid.java | 4 +- .../transport/pipes/PipeItemsWood.java | 10 +- .../buildcraft/transport/pipes/PipeLogic.java | 4 +- .../transport/pipes/PipeLogicCobblestone.java | 4 +- .../transport/pipes/PipeLogicDiamond.java | 8 +- .../transport/pipes/PipeLogicIron.java | 8 +- .../transport/pipes/PipeLogicObsidian.java | 4 +- .../transport/pipes/PipeLogicQuartz.java | 4 +- .../transport/pipes/PipeLogicSandstone.java | 2 +- .../transport/pipes/PipeLogicStone.java | 4 +- .../transport/pipes/PipeLogicStripes.java | 4 +- .../transport/pipes/PipeLogicWood.java | 12 +- .../transport/pipes/PipePowerCobblestone.java | 2 +- .../transport/pipes/PipePowerDiamond.java | 2 +- .../transport/pipes/PipePowerGold.java | 2 +- .../transport/pipes/PipePowerQuartz.java | 2 +- .../transport/pipes/PipePowerStone.java | 2 +- .../transport/pipes/PipePowerWood.java | 4 +- .../pipes/PipeStructureCobblestone.java | 2 +- .../transport/render/FacadeItemRenderer.java | 10 +- .../transport/render/PipeItemRenderer.java | 66 ++-- .../transport/render/PipeWorldRenderer.java | 14 +- .../transport/render/PlugItemRenderer.java | 6 +- .../transport/render/RenderPipe.java | 53 ++- .../transport/render/TileEntityPickupFX.java | 9 +- .../TriggerFilteredBufferInventoryLevel.java | 8 +- .../triggers/TriggerPipeContents.java | 18 +- .../transport/utils/ConnectionMatrix.java | 1 - .../transport/utils/FacadeMatrix.java | 1 - .../transport/utils/TextureMatrix.java | 1 - .../transport/utils/WireMatrix.java | 3 +- 336 files changed, 1550 insertions(+), 2193 deletions(-) delete mode 100644 common/buildcraft/energy/BlockOilFlowing.java delete mode 100644 common/buildcraft/energy/BlockOilStill.java diff --git a/common/buildcraft/BuildCraftBuilders.java b/common/buildcraft/BuildCraftBuilders.java index 34982cb1..adc8c51d 100644 --- a/common/buildcraft/BuildCraftBuilders.java +++ b/common/buildcraft/BuildCraftBuilders.java @@ -7,20 +7,6 @@ */ package buildcraft; -import java.io.IOException; -import java.util.LinkedList; -import java.util.TreeMap; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.Configuration; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.Property; -import net.minecraftforge.event.ForgeSubscribe; import buildcraft.api.blueprints.BptBlock; import buildcraft.api.bptblocks.BptBlockBed; import buildcraft.api.bptblocks.BptBlockCustomStack; @@ -86,6 +72,19 @@ 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; +import java.io.IOException; +import java.util.LinkedList; +import java.util.TreeMap; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.Configuration; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.Property; +import net.minecraftforge.event.ForgeSubscribe; @Mod(name = "BuildCraft Builders", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Builders", dependencies = DefaultProps.DEPENDENCY_CORE) @NetworkMod(channels = {DefaultProps.NET_CHANNEL_NAME}, packetHandler = PacketHandlerBuilders.class, clientSideRequired = true, serverSideRequired = true) diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index 397ebf28..37e8a000 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -8,22 +8,6 @@ package buildcraft; -import java.io.File; -import java.util.TreeMap; -import java.util.logging.Logger; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockFluid; -import net.minecraft.entity.EntityList; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -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; @@ -75,6 +59,21 @@ 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 java.io.File; +import java.util.TreeMap; +import java.util.logging.Logger; +import net.minecraft.block.Block; +import net.minecraft.block.BlockFluid; +import net.minecraft.entity.EntityList; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +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; @Mod(name = "BuildCraft", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Core", dependencies = "required-after:Forge@[7.7.2.682,)") @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 657a683e..a9355548 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -7,24 +7,6 @@ */ package buildcraft; -import java.util.TreeMap; -import java.util.logging.Level; -import java.util.logging.Logger; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.Configuration; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.Property; -import net.minecraftforge.event.ForgeSubscribe; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; -import net.minecraftforge.fluids.FluidRegistry; import buildcraft.api.fuels.IronEngineCoolant; import buildcraft.api.fuels.IronEngineFuel; import buildcraft.api.recipes.RefineryRecipe; @@ -37,8 +19,6 @@ import buildcraft.core.network.PacketHandler; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.triggers.BCTrigger; import buildcraft.energy.BlockEngine; -import buildcraft.energy.BlockOilFlowing; -import buildcraft.energy.BlockOilStill; import buildcraft.energy.BptBlockEngine; import buildcraft.energy.EnergyProxy; import buildcraft.energy.GuiHandler; @@ -63,6 +43,24 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.TreeMap; +import java.util.logging.Level; +import java.util.logging.Logger; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.Configuration; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.Property; +import net.minecraftforge.event.ForgeSubscribe; +import net.minecraftforge.fluids.BlockFluidClassic; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; +import net.minecraftforge.fluids.FluidRegistry; @Mod(name = "BuildCraft Energy", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Energy", dependencies = DefaultProps.DEPENDENCY_CORE) @NetworkMod(channels = {DefaultProps.NET_CHANNEL_NAME}, packetHandler = PacketHandler.class, clientSideRequired = true, serverSideRequired = true) @@ -74,13 +72,13 @@ public class BuildCraftEnergy { public static BiomeGenOilDesert biomeOilDesert; public static BiomeGenOilOcean biomeOilOcean; public static BlockEngine engineBlock; + public static Fluid fluidOil; + public static Fluid fluidFuel; public static Block oilMoving; - public static Block oilStill; + public static Block blockOil; public static Item bucketOil; public static Item bucketFuel; public static Item fuel; - public static Fluid oilFluid; - public static Fluid fuelFluid; public static boolean canOilBurn; public static TreeMap saturationStored = new TreeMap(); public static BCTrigger triggerBlueEngineHeat = new TriggerEngineHeat(DefaultProps.TRIGGER_BLUE_ENGINE_HEAT, EnergyStage.BLUE); @@ -90,7 +88,7 @@ public class BuildCraftEnergy { @Instance("BuildCraft|Energy") public static BuildCraftEnergy instance; - @EventHandler + @EventHandler public void preInit(FMLPreInitializationEvent evt) { Property engineId = BuildCraftCore.mainConfiguration.getBlock("engine.id", DefaultProps.ENGINE_ID); Property oilStillId = BuildCraftCore.mainConfiguration.getBlock("oilStill.id", DefaultProps.OIL_STILL_ID); @@ -134,23 +132,28 @@ public class BuildCraftEnergy { LanguageRegistry.addName(new ItemStack(engineBlock, 1, 1), "Steam Engine"); LanguageRegistry.addName(new ItemStack(engineBlock, 1, 2), "Combustion Engine"); - oilStill = (new BlockOilStill(oilStillId.getInt(DefaultProps.OIL_STILL_ID), Material.water)).setUnlocalizedName("oil"); - CoreProxy.proxy.addName(oilStill.setUnlocalizedName("oilStill"), "Oil"); - CoreProxy.proxy.registerBlock(oilStill); - Property oilSpringsProp = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "oilSprings", true); - spawnOilSprings = oilSpringsProp.getBoolean(true); - BlockSpring.EnumSpring.OIL.canGen = spawnOilSprings; - BlockSpring.EnumSpring.OIL.liquidBlock = oilStill; - - oilMoving = (new BlockOilFlowing(oilMovingId.getInt(DefaultProps.OIL_MOVING_ID), Material.water)).setUnlocalizedName("oil"); - CoreProxy.proxy.addName(oilMoving.setUnlocalizedName("oilMoving"), "Oil"); - CoreProxy.proxy.registerBlock(oilMoving); - + // Oil and fuel - if (oilMoving.blockID + 1 != oilStill.blockID) { - throw new RuntimeException("Oil Still id must be Oil Moving id + 1"); + FluidRegistry.registerFluid(new Fluid("oil")); + fluidOil = FluidRegistry.getFluid("oil"); + FluidRegistry.registerFluid(new Fluid("fuel")); + fluidFuel = FluidRegistry.getFluid("fuel"); + + if (fluidOil.getBlockID() == -1) { + blockOil = new BlockFluidClassic(oilStillId.getInt(DefaultProps.OIL_STILL_ID), fluidOil, Material.water); + fluidOil.setBlockID(blockOil); + blockOil.setUnlocalizedName("blockOil"); + CoreProxy.proxy.addName(blockOil, "Oil"); + CoreProxy.proxy.registerBlock(blockOil); + Property oilSpringsProp = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "oilSprings", true); + spawnOilSprings = oilSpringsProp.getBoolean(true); + BlockSpring.EnumSpring.OIL.canGen = spawnOilSprings; + BlockSpring.EnumSpring.OIL.liquidBlock = blockOil; + } else { + blockOil = Block.blocksList[fluidOil.getBlockID()]; } + // TODO 1.6: Add Fuel Block fuel = new ItemBuildCraft(itemFuelId.getInt(DefaultProps.FUEL_ID)).setUnlocalizedName("fuel"); LanguageRegistry.addName(fuel, "Fuel"); @@ -163,12 +166,6 @@ public class BuildCraftEnergy { bucketFuel.setMaxStackSize(1); LanguageRegistry.addName(bucketFuel, "Fuel Bucket"); - oilFluid = new Fluid("oil"); - oilFluid.setBlockID(oilStill); - FluidRegistry.registerFluid(oilFluid); - fuelFluid = new Fluid("fuel"); - FluidRegistry.registerFluid(fuelFluid); - RefineryRecipe.registerRefineryRecipe(new RefineryRecipe(FluidRegistry.getFluid("oil"), null, FluidRegistry.getFluid("fuel"), 12, 1)); // Iron Engine Fuels @@ -181,12 +178,12 @@ public class BuildCraftEnergy { IronEngineCoolant.addCoolant(Block.ice.blockID, 0, FluidRegistry.getFluidStack("water", FluidContainerRegistry.BUCKET_VOLUME * 2)); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(FluidRegistry.getFluidStack("oil", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketOil), new ItemStack(Item.bucketEmpty))); - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(FluidRegistry.getFluidStack("fuel", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketFuel), new ItemStack(Item.bucketEmpty))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(FluidRegistry.getFluidStack("fuel", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketFuel), new ItemStack(Item.bucketEmpty))); MinecraftForge.EVENT_BUS.register(this); } - @EventHandler + @EventHandler public void init(FMLInitializationEvent evt) { NetworkRegistry.instance().registerGuiHandler(instance, new GuiHandler()); @@ -199,7 +196,7 @@ public class BuildCraftEnergy { EnergyProxy.proxy.registerTileEntities(); } - @EventHandler + @EventHandler public void postInit(FMLPostInitializationEvent evt) { if (BuildCraftCore.modifyWorld) { MinecraftForge.EVENT_BUS.register(OilPopulate.INSTANCE); @@ -211,8 +208,8 @@ public class BuildCraftEnergy { @SideOnly(Side.CLIENT) public void textureHook(TextureStitchEvent.Post event) { if (event.map.textureType == 0) { - FluidRegistry.getFluid("fuel").setIcons(fuel.getIconFromDamage(0)); - FluidRegistry.getFluid("oil").setIcons(oilStill.getBlockTextureFromSide(1)); + FluidRegistry.getFluid("fuel").setIcons(fuel.getIconFromDamage(0)); + FluidRegistry.getFluid("oil").setIcons(blockOil.getBlockTextureFromSide(1)); } } diff --git a/common/buildcraft/BuildCraftFactory.java b/common/buildcraft/BuildCraftFactory.java index b25ab827..36237f0b 100644 --- a/common/buildcraft/BuildCraftFactory.java +++ b/common/buildcraft/BuildCraftFactory.java @@ -8,20 +8,6 @@ package buildcraft; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.Configuration; -import net.minecraftforge.common.ForgeChunkManager; -import net.minecraftforge.common.ForgeChunkManager.Ticket; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.Property; -import net.minecraftforge.event.ForgeSubscribe; import buildcraft.core.DefaultProps; import buildcraft.core.Version; import buildcraft.core.proxy.CoreProxy; @@ -50,9 +36,7 @@ import buildcraft.factory.TileQuarry; import buildcraft.factory.TileRefinery; import buildcraft.factory.TileTank; import buildcraft.factory.network.PacketHandlerFactory; - import com.google.common.collect.Lists; - import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; @@ -63,6 +47,19 @@ import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.Configuration; +import net.minecraftforge.common.ForgeChunkManager; +import net.minecraftforge.common.ForgeChunkManager.Ticket; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.Property; +import net.minecraftforge.event.ForgeSubscribe; @Mod(name = "BuildCraft Factory", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Factory", dependencies = DefaultProps.DEPENDENCY_CORE) @NetworkMod(channels = { DefaultProps.NET_CHANNEL_NAME }, packetHandler = PacketHandlerFactory.class, clientSideRequired = true, serverSideRequired = true) diff --git a/common/buildcraft/BuildCraftSilicon.java b/common/buildcraft/BuildCraftSilicon.java index 4a26984f..a936e587 100644 --- a/common/buildcraft/BuildCraftSilicon.java +++ b/common/buildcraft/BuildCraftSilicon.java @@ -8,10 +8,6 @@ package buildcraft; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.Property; import buildcraft.api.bptblocks.BptBlockInventory; import buildcraft.api.bptblocks.BptBlockRotateMeta; import buildcraft.api.recipes.AssemblyRecipe; @@ -37,6 +33,10 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.Property; @Mod(name = "BuildCraft Silicon", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Silicon", dependencies = DefaultProps.DEPENDENCY_TRANSPORT) @NetworkMod(channels = { DefaultProps.NET_CHANNEL_NAME }, packetHandler = PacketHandlerSilicon.class, clientSideRequired = true, serverSideRequired = true) diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index 9a3a3135..bc18435e 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -7,16 +7,6 @@ */ package buildcraft; -import java.util.LinkedList; -import java.util.logging.Level; -import java.util.logging.Logger; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.common.Configuration; -import net.minecraftforge.common.Property; import buildcraft.api.core.IIconProvider; import buildcraft.api.gates.ActionManager; import buildcraft.api.recipes.AssemblyRecipe; @@ -82,11 +72,9 @@ import buildcraft.transport.triggers.TriggerFilteredBufferInventoryLevel; import buildcraft.transport.triggers.TriggerPipeContents; import buildcraft.transport.triggers.TriggerPipeContents.Kind; import buildcraft.transport.triggers.TriggerPipeSignal; - import com.google.common.base.Splitter; import com.google.common.collect.Iterables; import com.google.common.primitives.Ints; - import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.IMCCallback; import cpw.mods.fml.common.Mod.Init; @@ -102,6 +90,15 @@ 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 java.util.LinkedList; +import java.util.logging.Level; +import java.util.logging.Logger; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.Configuration; +import net.minecraftforge.common.Property; @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/blueprints/BlueprintManager.java b/common/buildcraft/api/blueprints/BlueprintManager.java index 9bab365b..c71b710e 100644 --- a/common/buildcraft/api/blueprints/BlueprintManager.java +++ b/common/buildcraft/api/blueprints/BlueprintManager.java @@ -1,9 +1,9 @@ package buildcraft.api.blueprints; +import buildcraft.api.core.BuildCraftAPI; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import buildcraft.api.core.BuildCraftAPI; @Deprecated public class BlueprintManager { diff --git a/common/buildcraft/api/blueprints/BptBlock.java b/common/buildcraft/api/blueprints/BptBlock.java index 3e281012..4f48d35e 100644 --- a/common/buildcraft/api/blueprints/BptBlock.java +++ b/common/buildcraft/api/blueprints/BptBlock.java @@ -9,15 +9,14 @@ package buildcraft.api.blueprints; +import buildcraft.api.core.BuildCraftAPI; import java.util.ArrayList; import java.util.LinkedList; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import buildcraft.api.core.BuildCraftAPI; /** * This class allow to specify specific behavior for blocks stored in blueprints: diff --git a/common/buildcraft/api/blueprints/BptBlockUtils.java b/common/buildcraft/api/blueprints/BptBlockUtils.java index a2d4ec19..a46d9b12 100644 --- a/common/buildcraft/api/blueprints/BptBlockUtils.java +++ b/common/buildcraft/api/blueprints/BptBlockUtils.java @@ -10,7 +10,6 @@ package buildcraft.api.blueprints; import java.util.LinkedList; - import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/common/buildcraft/api/blueprints/BptSlotInfo.java b/common/buildcraft/api/blueprints/BptSlotInfo.java index 32d5962f..799a3b4f 100644 --- a/common/buildcraft/api/blueprints/BptSlotInfo.java +++ b/common/buildcraft/api/blueprints/BptSlotInfo.java @@ -10,7 +10,6 @@ package buildcraft.api.blueprints; import java.util.LinkedList; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/common/buildcraft/api/blueprints/IBptContext.java b/common/buildcraft/api/blueprints/IBptContext.java index 4b8c6715..8498bfd3 100644 --- a/common/buildcraft/api/blueprints/IBptContext.java +++ b/common/buildcraft/api/blueprints/IBptContext.java @@ -9,10 +9,10 @@ package buildcraft.api.blueprints; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; import buildcraft.api.core.IBox; import buildcraft.api.core.Position; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; /** * This interface provide contextual information when building or initializing blueprint slots. diff --git a/common/buildcraft/api/bptblocks/BptBlockBed.java b/common/buildcraft/api/bptblocks/BptBlockBed.java index 904f1a9f..e2dae05c 100644 --- a/common/buildcraft/api/bptblocks/BptBlockBed.java +++ b/common/buildcraft/api/bptblocks/BptBlockBed.java @@ -9,13 +9,12 @@ package buildcraft.api.bptblocks; -import java.util.LinkedList; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; @Deprecated public class BptBlockBed extends BptBlock { diff --git a/common/buildcraft/api/bptblocks/BptBlockCustomStack.java b/common/buildcraft/api/bptblocks/BptBlockCustomStack.java index 959b7eba..79aef15c 100644 --- a/common/buildcraft/api/bptblocks/BptBlockCustomStack.java +++ b/common/buildcraft/api/bptblocks/BptBlockCustomStack.java @@ -9,12 +9,11 @@ package buildcraft.api.bptblocks; -import java.util.LinkedList; - -import net.minecraft.item.ItemStack; import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; @Deprecated public class BptBlockCustomStack extends BptBlock { diff --git a/common/buildcraft/api/bptblocks/BptBlockDelegate.java b/common/buildcraft/api/bptblocks/BptBlockDelegate.java index c6b5ad33..035dc556 100644 --- a/common/buildcraft/api/bptblocks/BptBlockDelegate.java +++ b/common/buildcraft/api/bptblocks/BptBlockDelegate.java @@ -9,13 +9,12 @@ package buildcraft.api.bptblocks; -import java.util.LinkedList; - -import net.minecraft.item.ItemStack; import buildcraft.api.blueprints.BlueprintManager; import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; @Deprecated public class BptBlockDelegate extends BptBlock { diff --git a/common/buildcraft/api/bptblocks/BptBlockDirt.java b/common/buildcraft/api/bptblocks/BptBlockDirt.java index 61643d64..365cbc45 100644 --- a/common/buildcraft/api/bptblocks/BptBlockDirt.java +++ b/common/buildcraft/api/bptblocks/BptBlockDirt.java @@ -9,13 +9,12 @@ package buildcraft.api.bptblocks; -import java.util.LinkedList; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; @Deprecated public class BptBlockDirt extends BptBlock { diff --git a/common/buildcraft/api/bptblocks/BptBlockDoor.java b/common/buildcraft/api/bptblocks/BptBlockDoor.java index ffd0bbef..196e83b3 100644 --- a/common/buildcraft/api/bptblocks/BptBlockDoor.java +++ b/common/buildcraft/api/bptblocks/BptBlockDoor.java @@ -9,12 +9,11 @@ package buildcraft.api.bptblocks; -import java.util.LinkedList; - -import net.minecraft.item.ItemStack; import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; @Deprecated public class BptBlockDoor extends BptBlock { diff --git a/common/buildcraft/api/bptblocks/BptBlockFluid.java b/common/buildcraft/api/bptblocks/BptBlockFluid.java index 8a420ee6..1769c394 100644 --- a/common/buildcraft/api/bptblocks/BptBlockFluid.java +++ b/common/buildcraft/api/bptblocks/BptBlockFluid.java @@ -9,12 +9,11 @@ package buildcraft.api.bptblocks; -import java.util.LinkedList; - -import net.minecraft.item.ItemStack; import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; @Deprecated public class BptBlockFluid extends BptBlock { diff --git a/common/buildcraft/api/bptblocks/BptBlockIgnore.java b/common/buildcraft/api/bptblocks/BptBlockIgnore.java index dd58463d..12a058bc 100644 --- a/common/buildcraft/api/bptblocks/BptBlockIgnore.java +++ b/common/buildcraft/api/bptblocks/BptBlockIgnore.java @@ -9,12 +9,11 @@ package buildcraft.api.bptblocks; -import java.util.LinkedList; - -import net.minecraft.item.ItemStack; import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; @Deprecated public class BptBlockIgnore extends BptBlock { diff --git a/common/buildcraft/api/bptblocks/BptBlockIgnoreMeta.java b/common/buildcraft/api/bptblocks/BptBlockIgnoreMeta.java index 0e490463..7f39f637 100644 --- a/common/buildcraft/api/bptblocks/BptBlockIgnoreMeta.java +++ b/common/buildcraft/api/bptblocks/BptBlockIgnoreMeta.java @@ -9,12 +9,11 @@ package buildcraft.api.bptblocks; -import java.util.LinkedList; - -import net.minecraft.item.ItemStack; import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; @Deprecated public class BptBlockIgnoreMeta extends BptBlock { diff --git a/common/buildcraft/api/bptblocks/BptBlockInventory.java b/common/buildcraft/api/bptblocks/BptBlockInventory.java index e4ebf709..0cebe58f 100644 --- a/common/buildcraft/api/bptblocks/BptBlockInventory.java +++ b/common/buildcraft/api/bptblocks/BptBlockInventory.java @@ -1,9 +1,9 @@ package buildcraft.api.bptblocks; -import net.minecraft.inventory.IInventory; import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +import net.minecraft.inventory.IInventory; @Deprecated public class BptBlockInventory extends BptBlock { diff --git a/common/buildcraft/api/bptblocks/BptBlockLever.java b/common/buildcraft/api/bptblocks/BptBlockLever.java index 0a1eab23..b9a8e1c4 100644 --- a/common/buildcraft/api/bptblocks/BptBlockLever.java +++ b/common/buildcraft/api/bptblocks/BptBlockLever.java @@ -9,11 +9,10 @@ package buildcraft.api.bptblocks; -import java.util.LinkedList; - -import net.minecraft.item.ItemStack; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; @Deprecated public class BptBlockLever extends BptBlockWallSide { diff --git a/common/buildcraft/api/bptblocks/BptBlockPumpkin.java b/common/buildcraft/api/bptblocks/BptBlockPumpkin.java index 43473f98..16049346 100644 --- a/common/buildcraft/api/bptblocks/BptBlockPumpkin.java +++ b/common/buildcraft/api/bptblocks/BptBlockPumpkin.java @@ -9,12 +9,11 @@ package buildcraft.api.bptblocks; -import java.util.LinkedList; - -import net.minecraft.item.ItemStack; import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; @Deprecated public class BptBlockPumpkin extends BptBlock { diff --git a/common/buildcraft/api/bptblocks/BptBlockRedstoneRepeater.java b/common/buildcraft/api/bptblocks/BptBlockRedstoneRepeater.java index 67ca97c3..8ac4f023 100644 --- a/common/buildcraft/api/bptblocks/BptBlockRedstoneRepeater.java +++ b/common/buildcraft/api/bptblocks/BptBlockRedstoneRepeater.java @@ -9,13 +9,12 @@ package buildcraft.api.bptblocks; -import java.util.LinkedList; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; @Deprecated public class BptBlockRedstoneRepeater extends BptBlock { diff --git a/common/buildcraft/api/bptblocks/BptBlockRotateInventory.java b/common/buildcraft/api/bptblocks/BptBlockRotateInventory.java index 319fcf7e..6fcc30a8 100644 --- a/common/buildcraft/api/bptblocks/BptBlockRotateInventory.java +++ b/common/buildcraft/api/bptblocks/BptBlockRotateInventory.java @@ -1,8 +1,8 @@ package buildcraft.api.bptblocks; -import net.minecraft.inventory.IInventory; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +import net.minecraft.inventory.IInventory; @Deprecated public class BptBlockRotateInventory extends BptBlockRotateMeta { diff --git a/common/buildcraft/api/bptblocks/BptBlockRotateMeta.java b/common/buildcraft/api/bptblocks/BptBlockRotateMeta.java index eb846df5..4352b660 100644 --- a/common/buildcraft/api/bptblocks/BptBlockRotateMeta.java +++ b/common/buildcraft/api/bptblocks/BptBlockRotateMeta.java @@ -9,12 +9,11 @@ package buildcraft.api.bptblocks; -import java.util.LinkedList; - -import net.minecraft.item.ItemStack; import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; @Deprecated public class BptBlockRotateMeta extends BptBlock { diff --git a/common/buildcraft/api/bptblocks/BptBlockSign.java b/common/buildcraft/api/bptblocks/BptBlockSign.java index 84a3996a..f7bd1338 100644 --- a/common/buildcraft/api/bptblocks/BptBlockSign.java +++ b/common/buildcraft/api/bptblocks/BptBlockSign.java @@ -9,15 +9,14 @@ package buildcraft.api.bptblocks; -import java.util.LinkedList; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import buildcraft.api.blueprints.BlockSignature; import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; @Deprecated public class BptBlockSign extends BptBlock { diff --git a/common/buildcraft/api/bptblocks/BptBlockStairs.java b/common/buildcraft/api/bptblocks/BptBlockStairs.java index 8ade4a4d..4dc061a4 100644 --- a/common/buildcraft/api/bptblocks/BptBlockStairs.java +++ b/common/buildcraft/api/bptblocks/BptBlockStairs.java @@ -9,12 +9,11 @@ package buildcraft.api.bptblocks; -import java.util.LinkedList; - -import net.minecraft.item.ItemStack; import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; @Deprecated public class BptBlockStairs extends BptBlock { diff --git a/common/buildcraft/api/bptblocks/BptBlockWallSide.java b/common/buildcraft/api/bptblocks/BptBlockWallSide.java index 8178d0f1..74ff3f0f 100644 --- a/common/buildcraft/api/bptblocks/BptBlockWallSide.java +++ b/common/buildcraft/api/bptblocks/BptBlockWallSide.java @@ -9,12 +9,11 @@ package buildcraft.api.bptblocks; -import java.util.LinkedList; - -import net.minecraft.item.ItemStack; import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; @Deprecated public class BptBlockWallSide extends BptBlock { diff --git a/common/buildcraft/api/core/IIconProvider.java b/common/buildcraft/api/core/IIconProvider.java index 04833918..666d32e3 100644 --- a/common/buildcraft/api/core/IIconProvider.java +++ b/common/buildcraft/api/core/IIconProvider.java @@ -1,9 +1,9 @@ package buildcraft.api.core; -import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.util.Icon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.util.Icon; public interface IIconProvider { diff --git a/common/buildcraft/api/filler/IFillerPattern.java b/common/buildcraft/api/filler/IFillerPattern.java index 71b1e411..dd5862bb 100644 --- a/common/buildcraft/api/filler/IFillerPattern.java +++ b/common/buildcraft/api/filler/IFillerPattern.java @@ -1,11 +1,11 @@ package buildcraft.api.filler; -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; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; public interface IFillerPattern { diff --git a/common/buildcraft/api/fuels/IronEngineCoolant.java b/common/buildcraft/api/fuels/IronEngineCoolant.java index 1da61668..b3e2f5bb 100644 --- a/common/buildcraft/api/fuels/IronEngineCoolant.java +++ b/common/buildcraft/api/fuels/IronEngineCoolant.java @@ -1,16 +1,14 @@ package buildcraft.api.fuels; +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; import java.util.HashMap; import java.util.Map; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; - public final class IronEngineCoolant { public static BiMap liquidCoolants = HashBiMap.create(); diff --git a/common/buildcraft/api/fuels/IronEngineFuel.java b/common/buildcraft/api/fuels/IronEngineFuel.java index 3f976a30..5b51bd6f 100644 --- a/common/buildcraft/api/fuels/IronEngineFuel.java +++ b/common/buildcraft/api/fuels/IronEngineFuel.java @@ -9,13 +9,11 @@ package buildcraft.api.fuels; +import com.google.common.collect.Maps; import java.util.Map; - import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import com.google.common.collect.Maps; - public class IronEngineFuel { public static Map fuels = Maps.newHashMap(); diff --git a/common/buildcraft/api/gates/ActionManager.java b/common/buildcraft/api/gates/ActionManager.java index 34a558ec..cc238113 100644 --- a/common/buildcraft/api/gates/ActionManager.java +++ b/common/buildcraft/api/gates/ActionManager.java @@ -1,10 +1,9 @@ package buildcraft.api.gates; +import buildcraft.api.transport.IPipe; import java.util.LinkedList; - import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; -import buildcraft.api.transport.IPipe; public class ActionManager { diff --git a/common/buildcraft/api/gates/IActionProvider.java b/common/buildcraft/api/gates/IActionProvider.java index ce737996..6c64b57e 100644 --- a/common/buildcraft/api/gates/IActionProvider.java +++ b/common/buildcraft/api/gates/IActionProvider.java @@ -10,7 +10,6 @@ package buildcraft.api.gates; import java.util.LinkedList; - import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; diff --git a/common/buildcraft/api/gates/ITrigger.java b/common/buildcraft/api/gates/ITrigger.java index 1517532b..205a0ba5 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.minecraftforge.common.ForgeDirection; import buildcraft.api.core.IIconProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; public interface ITrigger { diff --git a/common/buildcraft/api/gates/ITriggerProvider.java b/common/buildcraft/api/gates/ITriggerProvider.java index 81ddcd5d..fe2271e0 100644 --- a/common/buildcraft/api/gates/ITriggerProvider.java +++ b/common/buildcraft/api/gates/ITriggerProvider.java @@ -9,11 +9,10 @@ package buildcraft.api.gates; +import buildcraft.api.transport.IPipe; import java.util.LinkedList; - import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; -import buildcraft.api.transport.IPipe; public interface ITriggerProvider { diff --git a/common/buildcraft/api/power/IPowerReceptor.java b/common/buildcraft/api/power/IPowerReceptor.java index 77886ba7..6c9aae36 100644 --- a/common/buildcraft/api/power/IPowerReceptor.java +++ b/common/buildcraft/api/power/IPowerReceptor.java @@ -7,9 +7,9 @@ */ package buildcraft.api.power; +import buildcraft.api.power.PowerHandler.PowerReceiver; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import buildcraft.api.power.PowerHandler.PowerReceiver; /** * This interface should be implemented by any Tile Entity that wishes to be diff --git a/common/buildcraft/api/power/PowerHandler.java b/common/buildcraft/api/power/PowerHandler.java index f6eaef23..fde0902f 100644 --- a/common/buildcraft/api/power/PowerHandler.java +++ b/common/buildcraft/api/power/PowerHandler.java @@ -7,9 +7,9 @@ */ package buildcraft.api.power; +import buildcraft.api.core.SafeTimeTracker; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.ForgeDirection; -import buildcraft.api.core.SafeTimeTracker; public final class PowerHandler { diff --git a/common/buildcraft/api/recipes/AssemblyRecipe.java b/common/buildcraft/api/recipes/AssemblyRecipe.java index a56dad9b..573db282 100644 --- a/common/buildcraft/api/recipes/AssemblyRecipe.java +++ b/common/buildcraft/api/recipes/AssemblyRecipe.java @@ -1,7 +1,6 @@ package buildcraft.api.recipes; import java.util.LinkedList; - import net.minecraft.item.ItemStack; public class AssemblyRecipe { diff --git a/common/buildcraft/api/recipes/RefineryRecipe.java b/common/buildcraft/api/recipes/RefineryRecipe.java index 3cae4f14..452755a7 100644 --- a/common/buildcraft/api/recipes/RefineryRecipe.java +++ b/common/buildcraft/api/recipes/RefineryRecipe.java @@ -9,15 +9,13 @@ package buildcraft.api.recipes; +import com.google.common.base.Objects; +import com.google.common.collect.ComparisonChain; import java.util.Collections; import java.util.SortedSet; import java.util.TreeSet; - import net.minecraftforge.fluids.Fluid; -import com.google.common.base.Objects; -import com.google.common.collect.ComparisonChain; - public class RefineryRecipe implements Comparable { private static SortedSet recipes = new TreeSet(); diff --git a/common/buildcraft/api/transport/FacadeManager.java b/common/buildcraft/api/transport/FacadeManager.java index f5333921..28cbdd1a 100644 --- a/common/buildcraft/api/transport/FacadeManager.java +++ b/common/buildcraft/api/transport/FacadeManager.java @@ -1,7 +1,6 @@ package buildcraft.api.transport; import java.lang.reflect.Method; - import net.minecraft.item.ItemStack; /** diff --git a/common/buildcraft/api/transport/IPipedItem.java b/common/buildcraft/api/transport/IPipedItem.java index 5dc85792..cce264ca 100644 --- a/common/buildcraft/api/transport/IPipedItem.java +++ b/common/buildcraft/api/transport/IPipedItem.java @@ -1,12 +1,12 @@ package buildcraft.api.transport; +import buildcraft.api.core.Position; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import buildcraft.api.core.Position; public interface IPipedItem { diff --git a/common/buildcraft/api/transport/PipeManager.java b/common/buildcraft/api/transport/PipeManager.java index 0f13f013..c78c86e2 100644 --- a/common/buildcraft/api/transport/PipeManager.java +++ b/common/buildcraft/api/transport/PipeManager.java @@ -2,7 +2,6 @@ package buildcraft.api.transport; import java.util.ArrayList; import java.util.List; - import net.minecraft.world.World; public abstract class PipeManager { diff --git a/common/buildcraft/builders/BlockArchitect.java b/common/buildcraft/builders/BlockArchitect.java index 01ece6b8..06f9c3f4 100644 --- a/common/buildcraft/builders/BlockArchitect.java +++ b/common/buildcraft/builders/BlockArchitect.java @@ -9,12 +9,18 @@ package buildcraft.builders; +import buildcraft.BuildCraftBuilders; +import buildcraft.api.core.Position; +import buildcraft.api.tools.IToolWrench; +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; import java.util.ArrayList; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -24,14 +30,6 @@ import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import buildcraft.BuildCraftBuilders; -import buildcraft.api.core.Position; -import buildcraft.api.tools.IToolWrench; -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 4f944a84..7ccf77d0 100644 --- a/common/buildcraft/builders/BlockBlueprintLibrary.java +++ b/common/buildcraft/builders/BlockBlueprintLibrary.java @@ -9,8 +9,12 @@ package buildcraft.builders; +import buildcraft.BuildCraftBuilders; +import buildcraft.core.GuiIds; +import buildcraft.core.proxy.CoreProxy; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -20,11 +24,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; -import buildcraft.BuildCraftBuilders; -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 e7bbeb67..a0bbce63 100644 --- a/common/buildcraft/builders/BlockBuilder.java +++ b/common/buildcraft/builders/BlockBuilder.java @@ -9,20 +9,6 @@ package buildcraft.builders; -import java.util.ArrayList; - -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftBuilders; import buildcraft.api.core.Position; import buildcraft.api.tools.IToolWrench; @@ -31,6 +17,18 @@ import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; public class BlockBuilder extends BlockContainer { diff --git a/common/buildcraft/builders/BlockFiller.java b/common/buildcraft/builders/BlockFiller.java index bcb95ddf..0c223c17 100644 --- a/common/buildcraft/builders/BlockFiller.java +++ b/common/buildcraft/builders/BlockFiller.java @@ -9,8 +9,15 @@ package buildcraft.builders; +import buildcraft.BuildCraftBuilders; +import buildcraft.api.filler.IFillerPattern; +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; import java.util.ArrayList; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -20,14 +27,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import buildcraft.BuildCraftBuilders; -import buildcraft.api.filler.IFillerPattern; -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 BlockFiller extends BlockContainer { diff --git a/common/buildcraft/builders/BlockMarker.java b/common/buildcraft/builders/BlockMarker.java index 972ac14b..adfc49e7 100644 --- a/common/buildcraft/builders/BlockMarker.java +++ b/common/buildcraft/builders/BlockMarker.java @@ -7,8 +7,13 @@ */ package buildcraft.builders; +import buildcraft.BuildCraftBuilders; +import buildcraft.BuildCraftCore; +import buildcraft.core.CreativeTabBuildCraft; +import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -19,12 +24,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import buildcraft.BuildCraftBuilders; -import buildcraft.BuildCraftCore; -import buildcraft.core.CreativeTabBuildCraft; -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 23595389..7389ac49 100644 --- a/common/buildcraft/builders/BlockPathMarker.java +++ b/common/buildcraft/builders/BlockPathMarker.java @@ -9,17 +9,16 @@ package buildcraft.builders; +import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; - import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; 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/BptBlockFiller.java b/common/buildcraft/builders/BptBlockFiller.java index c3ae883f..4b645033 100644 --- a/common/buildcraft/builders/BptBlockFiller.java +++ b/common/buildcraft/builders/BptBlockFiller.java @@ -9,10 +9,6 @@ package buildcraft.builders; -import java.util.LinkedList; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import buildcraft.BuildCraftBuilders; import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptBlockUtils; @@ -21,6 +17,9 @@ import buildcraft.api.blueprints.IBptContext; import buildcraft.api.core.LaserKind; import buildcraft.api.core.Position; import buildcraft.core.Box; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; @Deprecated public class BptBlockFiller extends BptBlock { diff --git a/common/buildcraft/builders/BuilderProxyClient.java b/common/buildcraft/builders/BuilderProxyClient.java index 060eb8b8..c1f3cafc 100644 --- a/common/buildcraft/builders/BuilderProxyClient.java +++ b/common/buildcraft/builders/BuilderProxyClient.java @@ -1,7 +1,7 @@ package buildcraft.builders; -import net.minecraft.util.Icon; import buildcraft.BuildCraftBuilders; +import net.minecraft.util.Icon; public class BuilderProxyClient extends BuilderProxy { public static Icon fillerFillAllTexture; diff --git a/common/buildcraft/builders/ClientBuilderHook.java b/common/buildcraft/builders/ClientBuilderHook.java index b83814b8..d68e43b1 100644 --- a/common/buildcraft/builders/ClientBuilderHook.java +++ b/common/buildcraft/builders/ClientBuilderHook.java @@ -1,11 +1,10 @@ package buildcraft.builders; -import java.io.IOException; - import buildcraft.BuildCraftBuilders; import buildcraft.core.blueprints.BptPlayerIndex; import buildcraft.core.blueprints.BptRootIndex; import buildcraft.core.proxy.CoreProxy; +import java.io.IOException; public class ClientBuilderHook implements IBuilderHook { diff --git a/common/buildcraft/builders/EventHandlerBuilders.java b/common/buildcraft/builders/EventHandlerBuilders.java index b98f1426..be4ac781 100644 --- a/common/buildcraft/builders/EventHandlerBuilders.java +++ b/common/buildcraft/builders/EventHandlerBuilders.java @@ -8,10 +8,10 @@ package buildcraft.builders; -import net.minecraftforge.event.ForgeSubscribe; -import net.minecraftforge.event.world.WorldEvent; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; +import net.minecraftforge.event.ForgeSubscribe; +import net.minecraftforge.event.world.WorldEvent; public class EventHandlerBuilders { diff --git a/common/buildcraft/builders/FillerFillAll.java b/common/buildcraft/builders/FillerFillAll.java index b74c271a..884566d2 100644 --- a/common/buildcraft/builders/FillerFillAll.java +++ b/common/buildcraft/builders/FillerFillAll.java @@ -9,12 +9,12 @@ package buildcraft.builders; -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; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; public class FillerFillAll extends FillerPattern { diff --git a/common/buildcraft/builders/FillerFillPyramid.java b/common/buildcraft/builders/FillerFillPyramid.java index 293348a2..7450cdd1 100644 --- a/common/buildcraft/builders/FillerFillPyramid.java +++ b/common/buildcraft/builders/FillerFillPyramid.java @@ -9,12 +9,12 @@ package buildcraft.builders; -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; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; public class FillerFillPyramid extends FillerPattern { diff --git a/common/buildcraft/builders/FillerFillStairs.java b/common/buildcraft/builders/FillerFillStairs.java index dca31535..21aff72e 100644 --- a/common/buildcraft/builders/FillerFillStairs.java +++ b/common/buildcraft/builders/FillerFillStairs.java @@ -9,12 +9,12 @@ package buildcraft.builders; -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; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; public class FillerFillStairs extends FillerPattern { diff --git a/common/buildcraft/builders/FillerFillWalls.java b/common/buildcraft/builders/FillerFillWalls.java index f057e14a..06684e25 100644 --- a/common/buildcraft/builders/FillerFillWalls.java +++ b/common/buildcraft/builders/FillerFillWalls.java @@ -9,12 +9,12 @@ package buildcraft.builders; -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; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; public class FillerFillWalls extends FillerPattern { diff --git a/common/buildcraft/builders/FillerFlattener.java b/common/buildcraft/builders/FillerFlattener.java index 73c5be91..d5b0e00b 100644 --- a/common/buildcraft/builders/FillerFlattener.java +++ b/common/buildcraft/builders/FillerFlattener.java @@ -7,12 +7,12 @@ */ package buildcraft.builders; -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; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; public class FillerFlattener extends FillerPattern { diff --git a/common/buildcraft/builders/FillerHorizon.java b/common/buildcraft/builders/FillerHorizon.java index 3f51f948..512479bd 100644 --- a/common/buildcraft/builders/FillerHorizon.java +++ b/common/buildcraft/builders/FillerHorizon.java @@ -7,12 +7,12 @@ */ package buildcraft.builders; -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; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; public class FillerHorizon extends FillerPattern { diff --git a/common/buildcraft/builders/FillerPattern.java b/common/buildcraft/builders/FillerPattern.java index 260a909c..078532fb 100644 --- a/common/buildcraft/builders/FillerPattern.java +++ b/common/buildcraft/builders/FillerPattern.java @@ -7,10 +7,6 @@ */ package buildcraft.builders; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; -import net.minecraft.world.World; import buildcraft.BuildCraftBuilders; import buildcraft.api.core.IBox; import buildcraft.api.filler.IFillerPattern; @@ -18,6 +14,10 @@ import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.BlockUtil; 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 net.minecraft.world.World; public abstract class FillerPattern implements IFillerPattern { diff --git a/common/buildcraft/builders/FillerRegistry.java b/common/buildcraft/builders/FillerRegistry.java index ad15d3d6..c8325a2b 100644 --- a/common/buildcraft/builders/FillerRegistry.java +++ b/common/buildcraft/builders/FillerRegistry.java @@ -9,15 +9,14 @@ package buildcraft.builders; +import buildcraft.api.filler.IFillerPattern; +import buildcraft.api.filler.IFillerRegistry; import java.util.HashMap; import java.util.LinkedList; - import net.minecraft.block.Block; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import buildcraft.api.filler.IFillerPattern; -import buildcraft.api.filler.IFillerRegistry; public class FillerRegistry implements IFillerRegistry { diff --git a/common/buildcraft/builders/FillerRemover.java b/common/buildcraft/builders/FillerRemover.java index 226ab765..8caee5b8 100644 --- a/common/buildcraft/builders/FillerRemover.java +++ b/common/buildcraft/builders/FillerRemover.java @@ -9,12 +9,12 @@ package buildcraft.builders; -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; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; public class FillerRemover extends FillerPattern { diff --git a/common/buildcraft/builders/GuiHandler.java b/common/buildcraft/builders/GuiHandler.java index e5fe1534..7bd4a078 100644 --- a/common/buildcraft/builders/GuiHandler.java +++ b/common/buildcraft/builders/GuiHandler.java @@ -1,8 +1,5 @@ package buildcraft.builders; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import buildcraft.builders.gui.ContainerBlueprintLibrary; import buildcraft.builders.gui.ContainerBuilder; import buildcraft.builders.gui.ContainerFiller; @@ -13,6 +10,9 @@ import buildcraft.builders.gui.GuiFiller; import buildcraft.builders.gui.GuiTemplate; import buildcraft.core.GuiIds; import cpw.mods.fml.common.network.IGuiHandler; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class GuiHandler implements IGuiHandler { diff --git a/common/buildcraft/builders/IBuilderHook.java b/common/buildcraft/builders/IBuilderHook.java index 7fe9b727..4a7ae238 100644 --- a/common/buildcraft/builders/IBuilderHook.java +++ b/common/buildcraft/builders/IBuilderHook.java @@ -1,8 +1,7 @@ package buildcraft.builders; -import java.io.IOException; - import buildcraft.core.blueprints.BptRootIndex; +import java.io.IOException; public interface IBuilderHook { diff --git a/common/buildcraft/builders/ItemBptBase.java b/common/buildcraft/builders/ItemBptBase.java index 44509d71..4f623d20 100644 --- a/common/buildcraft/builders/ItemBptBase.java +++ b/common/buildcraft/builders/ItemBptBase.java @@ -9,18 +9,17 @@ package buildcraft.builders; -import java.util.List; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; -import net.minecraft.world.World; import buildcraft.BuildCraftBuilders; import buildcraft.core.CreativeTabBuildCraft; import buildcraft.core.ItemBuildCraft; import buildcraft.core.blueprints.BptBase; import buildcraft.core.proxy.CoreProxy; +import java.util.List; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.world.World; public abstract class ItemBptBase extends ItemBuildCraft { diff --git a/common/buildcraft/builders/ItemBptBluePrint.java b/common/buildcraft/builders/ItemBptBluePrint.java index 13de9643..aa50c903 100644 --- a/common/buildcraft/builders/ItemBptBluePrint.java +++ b/common/buildcraft/builders/ItemBptBluePrint.java @@ -9,10 +9,10 @@ package buildcraft.builders; -import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.util.Icon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.util.Icon; public class ItemBptBluePrint extends ItemBptBase { diff --git a/common/buildcraft/builders/ItemBptTemplate.java b/common/buildcraft/builders/ItemBptTemplate.java index fbf946a7..8f0557f6 100644 --- a/common/buildcraft/builders/ItemBptTemplate.java +++ b/common/buildcraft/builders/ItemBptTemplate.java @@ -1,9 +1,9 @@ package buildcraft.builders; -import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.util.Icon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.util.Icon; public class ItemBptTemplate extends ItemBptBase { private Icon usedTemplate; diff --git a/common/buildcraft/builders/TileArchitect.java b/common/buildcraft/builders/TileArchitect.java index fa2a92e4..260631ce 100644 --- a/common/buildcraft/builders/TileArchitect.java +++ b/common/buildcraft/builders/TileArchitect.java @@ -9,12 +9,6 @@ package buildcraft.builders; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftBuilders; import buildcraft.api.core.IAreaProvider; import buildcraft.api.core.LaserKind; @@ -28,6 +22,12 @@ import buildcraft.core.network.PacketUpdate; import buildcraft.core.network.TileNetworkData; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraftforge.common.ForgeDirection; public class TileArchitect extends TileBuildCraft implements IInventory { diff --git a/common/buildcraft/builders/TileBlueprintLibrary.java b/common/buildcraft/builders/TileBlueprintLibrary.java index d4805964..d5b87120 100644 --- a/common/buildcraft/builders/TileBlueprintLibrary.java +++ b/common/buildcraft/builders/TileBlueprintLibrary.java @@ -1,12 +1,5 @@ package buildcraft.builders; -import java.io.IOException; -import java.util.ArrayList; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import buildcraft.BuildCraftBuilders; import buildcraft.core.TileBuildCraft; import buildcraft.core.blueprints.BptBase; @@ -14,6 +7,12 @@ import buildcraft.core.blueprints.BptPlayerIndex; import buildcraft.core.network.TileNetworkData; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; +import java.io.IOException; +import java.util.ArrayList; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; public class TileBlueprintLibrary extends TileBuildCraft implements IInventory { public static final int COMMAND_NEXT = 1, COMMAND_PREV = 2, COMMAND_LOCK_UPDATE = 3, COMMAND_DELETE = 4; diff --git a/common/buildcraft/builders/TileBuilder.java b/common/buildcraft/builders/TileBuilder.java index 1bdc0a0d..9eb8eeab 100644 --- a/common/buildcraft/builders/TileBuilder.java +++ b/common/buildcraft/builders/TileBuilder.java @@ -7,17 +7,6 @@ */ package buildcraft.builders; -import java.util.Collection; -import java.util.Iterator; -import java.util.LinkedList; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftBuilders; import buildcraft.api.core.LaserKind; import buildcraft.api.core.Position; @@ -45,6 +34,16 @@ import buildcraft.core.network.PacketUpdate; import buildcraft.core.network.TileNetworkData; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedList; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraftforge.common.ForgeDirection; public class TileBuilder extends TileBuildCraft implements IBuilderInventory, IPowerReceptor, IMachine { diff --git a/common/buildcraft/builders/TileFiller.java b/common/buildcraft/builders/TileFiller.java index 6ea423f1..22526a41 100644 --- a/common/buildcraft/builders/TileFiller.java +++ b/common/buildcraft/builders/TileFiller.java @@ -7,12 +7,6 @@ */ package buildcraft.builders; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.api.core.IAreaProvider; import buildcraft.api.core.LaserKind; @@ -33,6 +27,12 @@ import buildcraft.core.proxy.CoreProxy; import buildcraft.core.triggers.ActionMachineControl; import buildcraft.core.triggers.ActionMachineControl.Mode; import buildcraft.core.utils.Utils; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.ForgeDirection; public class TileFiller extends TileBuildCraft implements ISidedInventory, IPowerReceptor, IMachine, IActionReceptor { diff --git a/common/buildcraft/builders/TileMarker.java b/common/buildcraft/builders/TileMarker.java index 41d92b05..fe952079 100644 --- a/common/buildcraft/builders/TileMarker.java +++ b/common/buildcraft/builders/TileMarker.java @@ -9,8 +9,6 @@ package buildcraft.builders; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import buildcraft.BuildCraftBuilders; import buildcraft.api.core.IAreaProvider; import buildcraft.api.core.LaserKind; @@ -21,6 +19,8 @@ import buildcraft.core.network.PacketUpdate; import buildcraft.core.network.TileNetworkData; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; public class TileMarker extends TileBuildCraft implements IAreaProvider { diff --git a/common/buildcraft/builders/TilePathMarker.java b/common/buildcraft/builders/TilePathMarker.java index 6548289b..72f61e2e 100644 --- a/common/buildcraft/builders/TilePathMarker.java +++ b/common/buildcraft/builders/TilePathMarker.java @@ -1,12 +1,5 @@ package buildcraft.builders; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.TreeSet; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import buildcraft.api.core.Position; import buildcraft.core.BlockIndex; import buildcraft.core.DefaultProps; @@ -15,6 +8,12 @@ import buildcraft.core.EntityPowerLaser; import buildcraft.core.network.PacketUpdate; import buildcraft.core.network.TileNetworkData; import buildcraft.core.proxy.CoreProxy; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.TreeSet; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class TilePathMarker extends TileMarker { diff --git a/common/buildcraft/builders/gui/ContainerBlueprintLibrary.java b/common/buildcraft/builders/gui/ContainerBlueprintLibrary.java index 59478181..e3ad35bc 100644 --- a/common/buildcraft/builders/gui/ContainerBlueprintLibrary.java +++ b/common/buildcraft/builders/gui/ContainerBlueprintLibrary.java @@ -9,12 +9,12 @@ package buildcraft.builders.gui; +import buildcraft.builders.TileBlueprintLibrary; +import buildcraft.core.gui.BuildCraftContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -import buildcraft.builders.TileBlueprintLibrary; -import buildcraft.core.gui.BuildCraftContainer; public class ContainerBlueprintLibrary extends BuildCraftContainer { diff --git a/common/buildcraft/builders/gui/ContainerBuilder.java b/common/buildcraft/builders/gui/ContainerBuilder.java index 74145592..3e9e1ac7 100644 --- a/common/buildcraft/builders/gui/ContainerBuilder.java +++ b/common/buildcraft/builders/gui/ContainerBuilder.java @@ -9,11 +9,11 @@ package buildcraft.builders.gui; +import buildcraft.builders.TileBuilder; +import buildcraft.core.gui.BuildCraftContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -import buildcraft.builders.TileBuilder; -import buildcraft.core.gui.BuildCraftContainer; public class ContainerBuilder extends BuildCraftContainer { diff --git a/common/buildcraft/builders/gui/ContainerFiller.java b/common/buildcraft/builders/gui/ContainerFiller.java index ec07d875..7c94d7f7 100644 --- a/common/buildcraft/builders/gui/ContainerFiller.java +++ b/common/buildcraft/builders/gui/ContainerFiller.java @@ -9,12 +9,12 @@ package buildcraft.builders.gui; +import buildcraft.core.gui.BuildCraftContainer; +import buildcraft.core.gui.slots.SlotLimited; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import buildcraft.core.gui.BuildCraftContainer; -import buildcraft.core.gui.slots.SlotLimited; public class ContainerFiller extends BuildCraftContainer { diff --git a/common/buildcraft/builders/gui/ContainerTemplate.java b/common/buildcraft/builders/gui/ContainerTemplate.java index 060fa920..9d813283 100644 --- a/common/buildcraft/builders/gui/ContainerTemplate.java +++ b/common/buildcraft/builders/gui/ContainerTemplate.java @@ -9,12 +9,12 @@ package buildcraft.builders.gui; +import buildcraft.builders.TileArchitect; +import buildcraft.core.gui.BuildCraftContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -import buildcraft.builders.TileArchitect; -import buildcraft.core.gui.BuildCraftContainer; public class ContainerTemplate extends BuildCraftContainer { diff --git a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java index 2613eda9..35cdd3f8 100644 --- a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java +++ b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java @@ -9,11 +9,6 @@ package buildcraft.builders.gui; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.EntityPlayer; - -import org.lwjgl.opengl.GL11; - import buildcraft.BuildCraftBuilders; import buildcraft.builders.TileBlueprintLibrary; import buildcraft.builders.network.PacketLibraryAction; @@ -24,6 +19,9 @@ import buildcraft.core.network.PacketIds; import buildcraft.core.network.PacketPayload; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.StringUtils; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.EntityPlayer; +import org.lwjgl.opengl.GL11; public class GuiBlueprintLibrary extends GuiBuildCraft { diff --git a/common/buildcraft/builders/gui/GuiBuilder.java b/common/buildcraft/builders/gui/GuiBuilder.java index f80fb91c..ced012dc 100644 --- a/common/buildcraft/builders/gui/GuiBuilder.java +++ b/common/buildcraft/builders/gui/GuiBuilder.java @@ -9,17 +9,14 @@ package buildcraft.builders.gui; -import java.util.Collection; - -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - import buildcraft.builders.TileBuilder; import buildcraft.core.DefaultProps; import buildcraft.core.gui.GuiAdvancedInterface; import buildcraft.core.utils.StringUtils; +import java.util.Collection; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import org.lwjgl.opengl.GL11; public class GuiBuilder extends GuiAdvancedInterface { diff --git a/common/buildcraft/builders/gui/GuiFiller.java b/common/buildcraft/builders/gui/GuiFiller.java index 1ca1d910..d57e3320 100644 --- a/common/buildcraft/builders/gui/GuiFiller.java +++ b/common/buildcraft/builders/gui/GuiFiller.java @@ -9,14 +9,12 @@ package buildcraft.builders.gui; -import net.minecraft.inventory.IInventory; - -import org.lwjgl.opengl.GL11; - import buildcraft.builders.TileFiller; import buildcraft.core.DefaultProps; import buildcraft.core.gui.GuiBuildCraft; import buildcraft.core.utils.StringUtils; +import net.minecraft.inventory.IInventory; +import org.lwjgl.opengl.GL11; public class GuiFiller extends GuiBuildCraft { diff --git a/common/buildcraft/builders/gui/GuiTemplate.java b/common/buildcraft/builders/gui/GuiTemplate.java index 559c648c..44923a8c 100644 --- a/common/buildcraft/builders/gui/GuiTemplate.java +++ b/common/buildcraft/builders/gui/GuiTemplate.java @@ -9,12 +9,6 @@ package buildcraft.builders.gui; -import java.util.Date; - -import net.minecraft.inventory.IInventory; - -import org.lwjgl.opengl.GL11; - import buildcraft.builders.TileArchitect; import buildcraft.core.DefaultProps; import buildcraft.core.gui.GuiBuildCraft; @@ -23,6 +17,9 @@ import buildcraft.core.network.PacketPayload; import buildcraft.core.network.PacketUpdate; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.StringUtils; +import java.util.Date; +import net.minecraft.inventory.IInventory; +import org.lwjgl.opengl.GL11; public class GuiTemplate extends GuiBuildCraft { diff --git a/common/buildcraft/builders/network/PacketHandlerBuilders.java b/common/buildcraft/builders/network/PacketHandlerBuilders.java index 8692c958..50ed17e9 100644 --- a/common/buildcraft/builders/network/PacketHandlerBuilders.java +++ b/common/buildcraft/builders/network/PacketHandlerBuilders.java @@ -1,18 +1,17 @@ package buildcraft.builders.network; -import java.io.ByteArrayInputStream; -import java.io.DataInputStream; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.network.INetworkManager; -import net.minecraft.network.packet.Packet250CustomPayload; -import net.minecraft.tileentity.TileEntity; import buildcraft.builders.TileArchitect; import buildcraft.builders.TileBlueprintLibrary; import buildcraft.core.network.PacketIds; import buildcraft.core.network.PacketUpdate; import cpw.mods.fml.common.network.IPacketHandler; import cpw.mods.fml.common.network.Player; +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.Packet250CustomPayload; +import net.minecraft.tileentity.TileEntity; public class PacketHandlerBuilders implements IPacketHandler { diff --git a/common/buildcraft/builders/network/PacketLibraryAction.java b/common/buildcraft/builders/network/PacketLibraryAction.java index 4e64e856..5aa18491 100644 --- a/common/buildcraft/builders/network/PacketLibraryAction.java +++ b/common/buildcraft/builders/network/PacketLibraryAction.java @@ -1,11 +1,10 @@ package buildcraft.builders.network; +import buildcraft.core.network.PacketCoordinates; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import buildcraft.core.network.PacketCoordinates; - public class PacketLibraryAction extends PacketCoordinates { public int actionId; diff --git a/common/buildcraft/core/BlockBuildCraft.java b/common/buildcraft/core/BlockBuildCraft.java index c0cb4705..74e84669 100644 --- a/common/buildcraft/core/BlockBuildCraft.java +++ b/common/buildcraft/core/BlockBuildCraft.java @@ -1,11 +1,10 @@ package buildcraft.core; +import buildcraft.core.utils.Utils; import java.util.Random; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.world.World; -import buildcraft.core.utils.Utils; public abstract class BlockBuildCraft extends BlockContainer { diff --git a/common/buildcraft/core/BlockSpring.java b/common/buildcraft/core/BlockSpring.java index d438a5ee..d4e2115a 100644 --- a/common/buildcraft/core/BlockSpring.java +++ b/common/buildcraft/core/BlockSpring.java @@ -1,16 +1,15 @@ package buildcraft.core; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.util.List; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; 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/Box.java b/common/buildcraft/core/Box.java index ccd92244..5369d735 100644 --- a/common/buildcraft/core/Box.java +++ b/common/buildcraft/core/Box.java @@ -9,11 +9,6 @@ package buildcraft.core; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import buildcraft.api.core.IAreaProvider; import buildcraft.api.core.IBox; import buildcraft.api.core.LaserKind; @@ -21,6 +16,10 @@ import buildcraft.api.core.Position; import buildcraft.core.network.TileNetworkData; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; public class Box implements IBox { diff --git a/common/buildcraft/core/BuildCraftConfiguration.java b/common/buildcraft/core/BuildCraftConfiguration.java index af53ef39..9f925e9f 100644 --- a/common/buildcraft/core/BuildCraftConfiguration.java +++ b/common/buildcraft/core/BuildCraftConfiguration.java @@ -10,7 +10,6 @@ package buildcraft.core; import java.io.File; - import net.minecraftforge.common.Configuration; import net.minecraftforge.common.Property; diff --git a/common/buildcraft/core/CommandBuildCraft.java b/common/buildcraft/core/CommandBuildCraft.java index b7102ca7..b9567c03 100644 --- a/common/buildcraft/core/CommandBuildCraft.java +++ b/common/buildcraft/core/CommandBuildCraft.java @@ -1,12 +1,11 @@ package buildcraft.core; +import buildcraft.core.proxy.CoreProxy; import java.util.List; - import net.minecraft.command.CommandBase; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.command.WrongUsageException; -import buildcraft.core.proxy.CoreProxy; public class CommandBuildCraft extends CommandBase { diff --git a/common/buildcraft/core/CoreIconProvider.java b/common/buildcraft/core/CoreIconProvider.java index 69de9650..7b288956 100644 --- a/common/buildcraft/core/CoreIconProvider.java +++ b/common/buildcraft/core/CoreIconProvider.java @@ -1,10 +1,10 @@ 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 net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.util.Icon; public class CoreIconProvider implements IIconProvider { diff --git a/common/buildcraft/core/CreativeTabBuildCraft.java b/common/buildcraft/core/CreativeTabBuildCraft.java index d0e81c30..dcb77115 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/DefaultProps.java b/common/buildcraft/core/DefaultProps.java index 9d6970a1..cff5190d 100644 --- a/common/buildcraft/core/DefaultProps.java +++ b/common/buildcraft/core/DefaultProps.java @@ -9,10 +9,6 @@ package buildcraft.core; -import net.minecraft.client.resources.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - public class DefaultProps { public static final String MOD = "BuildCraft"; diff --git a/common/buildcraft/core/EntityBlock.java b/common/buildcraft/core/EntityBlock.java index a52c0e78..6c833306 100644 --- a/common/buildcraft/core/EntityBlock.java +++ b/common/buildcraft/core/EntityBlock.java @@ -7,12 +7,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/EntityEnergyLaser.java b/common/buildcraft/core/EntityEnergyLaser.java index 92b5f68e..2ca5ee57 100644 --- a/common/buildcraft/core/EntityEnergyLaser.java +++ b/common/buildcraft/core/EntityEnergyLaser.java @@ -9,8 +9,8 @@ package buildcraft.core; -import net.minecraft.world.World; import buildcraft.api.core.Position; +import net.minecraft.world.World; public class EntityEnergyLaser extends EntityLaser { diff --git a/common/buildcraft/core/EntityLaser.java b/common/buildcraft/core/EntityLaser.java index 12cca57c..75c8f115 100644 --- a/common/buildcraft/core/EntityLaser.java +++ b/common/buildcraft/core/EntityLaser.java @@ -7,11 +7,11 @@ */ package buildcraft.core; +import buildcraft.api.core.Position; +import buildcraft.core.proxy.CoreProxy; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import buildcraft.api.core.Position; -import buildcraft.core.proxy.CoreProxy; public abstract class EntityLaser extends Entity { diff --git a/common/buildcraft/core/EntityPassiveItem.java b/common/buildcraft/core/EntityPassiveItem.java index e3854caf..fb159336 100644 --- a/common/buildcraft/core/EntityPassiveItem.java +++ b/common/buildcraft/core/EntityPassiveItem.java @@ -9,8 +9,12 @@ package buildcraft.core; +import buildcraft.BuildCraftCore; +import buildcraft.api.core.Position; +import buildcraft.api.transport.IPassiveItemContribution; +import buildcraft.api.transport.IPipedItem; +import buildcraft.core.proxy.CoreProxy; import java.util.TreeMap; - import net.minecraft.entity.item.EntityItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -20,11 +24,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import buildcraft.BuildCraftCore; -import buildcraft.api.core.Position; -import buildcraft.api.transport.IPassiveItemContribution; -import buildcraft.api.transport.IPipedItem; -import buildcraft.core.proxy.CoreProxy; public class EntityPassiveItem implements IPipedItem { diff --git a/common/buildcraft/core/EntityPowerLaser.java b/common/buildcraft/core/EntityPowerLaser.java index 91e1c63c..79eb3e1a 100644 --- a/common/buildcraft/core/EntityPowerLaser.java +++ b/common/buildcraft/core/EntityPowerLaser.java @@ -1,7 +1,7 @@ package buildcraft.core; -import net.minecraft.world.World; import buildcraft.api.core.Position; +import net.minecraft.world.World; public class EntityPowerLaser extends EntityLaser { private String texture; diff --git a/common/buildcraft/core/EntityRobot.java b/common/buildcraft/core/EntityRobot.java index 0d291710..15a29ec9 100644 --- a/common/buildcraft/core/EntityRobot.java +++ b/common/buildcraft/core/EntityRobot.java @@ -9,13 +9,6 @@ package buildcraft.core; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -import net.minecraft.entity.Entity; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import buildcraft.BuildCraftCore; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.core.Position; @@ -25,11 +18,15 @@ import buildcraft.core.blueprints.BptSlot; import buildcraft.core.blueprints.BptSlot.Mode; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.BlockUtil; - import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; - import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import net.minecraft.entity.Entity; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; public class EntityRobot extends Entity implements IEntityAdditionalSpawnData { diff --git a/common/buildcraft/core/IBptContributor.java b/common/buildcraft/core/IBptContributor.java index e7d6670d..2e008e4b 100644 --- a/common/buildcraft/core/IBptContributor.java +++ b/common/buildcraft/core/IBptContributor.java @@ -1,8 +1,8 @@ package buildcraft.core; -import net.minecraft.tileentity.TileEntity; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.core.blueprints.BptBase; +import net.minecraft.tileentity.TileEntity; public interface IBptContributor { diff --git a/common/buildcraft/core/ItemBlockBuildCraft.java b/common/buildcraft/core/ItemBlockBuildCraft.java index b589b9d9..31f5df78 100644 --- a/common/buildcraft/core/ItemBlockBuildCraft.java +++ b/common/buildcraft/core/ItemBlockBuildCraft.java @@ -1,8 +1,8 @@ package buildcraft.core; +import buildcraft.core.utils.StringUtils; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import buildcraft.core.utils.StringUtils; public class ItemBlockBuildCraft extends ItemBlock { diff --git a/common/buildcraft/core/ItemBuildCraft.java b/common/buildcraft/core/ItemBuildCraft.java index 4150d35f..42a8467b 100644 --- a/common/buildcraft/core/ItemBuildCraft.java +++ b/common/buildcraft/core/ItemBuildCraft.java @@ -9,12 +9,12 @@ package buildcraft.core; -import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import buildcraft.core.utils.StringUtils; 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; public class ItemBuildCraft extends Item { diff --git a/common/buildcraft/core/ItemRedstoneChipset.java b/common/buildcraft/core/ItemRedstoneChipset.java index 96db80e7..ff3bd7e5 100644 --- a/common/buildcraft/core/ItemRedstoneChipset.java +++ b/common/buildcraft/core/ItemRedstoneChipset.java @@ -1,13 +1,12 @@ package buildcraft.core; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.util.List; - 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/ItemSpring.java b/common/buildcraft/core/ItemSpring.java index 95013b06..53317134 100644 --- a/common/buildcraft/core/ItemSpring.java +++ b/common/buildcraft/core/ItemSpring.java @@ -10,7 +10,6 @@ package buildcraft.core; import java.util.Locale; - import net.minecraft.item.ItemStack; public class ItemSpring extends ItemBlockBuildCraft { diff --git a/common/buildcraft/core/ItemWrench.java b/common/buildcraft/core/ItemWrench.java index 4bb3cb7e..8dace6f9 100644 --- a/common/buildcraft/core/ItemWrench.java +++ b/common/buildcraft/core/ItemWrench.java @@ -1,11 +1,11 @@ package buildcraft.core; +import buildcraft.api.tools.IToolWrench; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import buildcraft.api.tools.IToolWrench; public class ItemWrench extends ItemBuildCraft implements IToolWrench { diff --git a/common/buildcraft/core/SpringPopulate.java b/common/buildcraft/core/SpringPopulate.java index 309692d3..b536409b 100644 --- a/common/buildcraft/core/SpringPopulate.java +++ b/common/buildcraft/core/SpringPopulate.java @@ -7,15 +7,14 @@ */ package buildcraft.core; +import buildcraft.BuildCraftCore; import java.util.Random; - 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/TickHandlerCoreClient.java b/common/buildcraft/core/TickHandlerCoreClient.java index 97b80506..bd99976c 100644 --- a/common/buildcraft/core/TickHandlerCoreClient.java +++ b/common/buildcraft/core/TickHandlerCoreClient.java @@ -1,11 +1,10 @@ package buildcraft.core; -import java.util.EnumSet; - -import net.minecraft.entity.player.EntityPlayer; import buildcraft.core.proxy.CoreProxy; import cpw.mods.fml.common.ITickHandler; import cpw.mods.fml.common.TickType; +import java.util.EnumSet; +import net.minecraft.entity.player.EntityPlayer; public class TickHandlerCoreClient implements ITickHandler { diff --git a/common/buildcraft/core/TileBuffer.java b/common/buildcraft/core/TileBuffer.java index 42f7aa38..cd5a78a8 100644 --- a/common/buildcraft/core/TileBuffer.java +++ b/common/buildcraft/core/TileBuffer.java @@ -7,11 +7,11 @@ */ package buildcraft.core; +import buildcraft.api.core.SafeTimeTracker; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import buildcraft.api.core.SafeTimeTracker; public final class TileBuffer { diff --git a/common/buildcraft/core/TileBuildCraft.java b/common/buildcraft/core/TileBuildCraft.java index e9153b98..092e6ccf 100644 --- a/common/buildcraft/core/TileBuildCraft.java +++ b/common/buildcraft/core/TileBuildCraft.java @@ -7,11 +7,6 @@ */ package buildcraft.core; -import java.util.HashMap; -import java.util.Map; - -import net.minecraft.network.packet.Packet; -import net.minecraft.tileentity.TileEntity; import buildcraft.api.power.IPowerReceptor; import buildcraft.core.network.ISynchronizedTile; import buildcraft.core.network.PacketPayload; @@ -20,6 +15,10 @@ import buildcraft.core.network.PacketUpdate; import buildcraft.core.network.TilePacketWrapper; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; +import java.util.HashMap; +import java.util.Map; +import net.minecraft.network.packet.Packet; +import net.minecraft.tileentity.TileEntity; public abstract class TileBuildCraft extends TileEntity implements ISynchronizedTile { diff --git a/common/buildcraft/core/Version.java b/common/buildcraft/core/Version.java index b6110953..35f75fd9 100644 --- a/common/buildcraft/core/Version.java +++ b/common/buildcraft/core/Version.java @@ -1,14 +1,13 @@ package buildcraft.core; +import buildcraft.BuildCraftCore; +import buildcraft.core.proxy.CoreProxy; import java.io.BufferedReader; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; import java.util.ArrayList; - import net.minecraftforge.common.Property; -import buildcraft.BuildCraftCore; -import buildcraft.core.proxy.CoreProxy; public class Version implements Runnable { diff --git a/common/buildcraft/core/blueprints/BptBase.java b/common/buildcraft/core/blueprints/BptBase.java index d2105a0f..22f09ff3 100644 --- a/common/buildcraft/core/blueprints/BptBase.java +++ b/common/buildcraft/core/blueprints/BptBase.java @@ -9,6 +9,10 @@ package buildcraft.core.blueprints; +import buildcraft.BuildCraftCore; +import buildcraft.core.Box; +import buildcraft.core.Version; +import buildcraft.core.proxy.CoreProxy; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; @@ -20,11 +24,6 @@ import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.io.UnsupportedEncodingException; -import buildcraft.BuildCraftCore; -import buildcraft.core.Box; -import buildcraft.core.Version; -import buildcraft.core.proxy.CoreProxy; - public abstract class BptBase { BptSlot contents[][][]; diff --git a/common/buildcraft/core/blueprints/BptBlueprint.java b/common/buildcraft/core/blueprints/BptBlueprint.java index ce08322b..e52aeeac 100644 --- a/common/buildcraft/core/blueprints/BptBlueprint.java +++ b/common/buildcraft/core/blueprints/BptBlueprint.java @@ -9,20 +9,6 @@ package buildcraft.core.blueprints; -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.IOException; -import java.io.StringReader; -import java.util.TreeSet; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; import buildcraft.BuildCraftCore; import buildcraft.api.blueprints.BlockSignature; import buildcraft.api.blueprints.BlueprintManager; @@ -31,6 +17,19 @@ import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; import buildcraft.api.blueprints.ItemSignature; import buildcraft.core.IBptContributor; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.IOException; +import java.io.StringReader; +import java.util.TreeSet; +import net.minecraft.block.Block; +import net.minecraft.block.BlockContainer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; public class BptBlueprint extends BptBase { diff --git a/common/buildcraft/core/blueprints/BptBuilderBase.java b/common/buildcraft/core/blueprints/BptBuilderBase.java index 874e53b0..c3be6bb0 100644 --- a/common/buildcraft/core/blueprints/BptBuilderBase.java +++ b/common/buildcraft/core/blueprints/BptBuilderBase.java @@ -9,11 +9,11 @@ package buildcraft.core.blueprints; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.World; import buildcraft.api.core.IAreaProvider; import buildcraft.core.Box; import buildcraft.core.IBuilderInventory; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; public abstract class BptBuilderBase implements IAreaProvider { diff --git a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java index e1ae8827..9b888f5a 100644 --- a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java +++ b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java @@ -9,21 +9,20 @@ package buildcraft.core.blueprints; +import buildcraft.BuildCraftCore; +import buildcraft.core.IBuilderInventory; +import buildcraft.core.blueprints.BptSlot.Mode; +import buildcraft.core.utils.BlockUtil; import java.util.Comparator; import java.util.LinkedList; import java.util.ListIterator; import java.util.TreeMap; import java.util.TreeSet; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.EnumGameType; import net.minecraft.world.World; -import buildcraft.BuildCraftCore; -import buildcraft.core.IBuilderInventory; -import buildcraft.core.blueprints.BptSlot.Mode; -import buildcraft.core.utils.BlockUtil; public class BptBuilderBlueprint extends BptBuilderBase { diff --git a/common/buildcraft/core/blueprints/BptBuilderTemplate.java b/common/buildcraft/core/blueprints/BptBuilderTemplate.java index 2f4d76f3..c1ba8cde 100644 --- a/common/buildcraft/core/blueprints/BptBuilderTemplate.java +++ b/common/buildcraft/core/blueprints/BptBuilderTemplate.java @@ -9,12 +9,11 @@ package buildcraft.core.blueprints; -import java.util.LinkedList; - -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; import buildcraft.core.IBuilderInventory; import buildcraft.core.blueprints.BptSlot.Mode; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class BptBuilderTemplate extends BptBuilderBase { diff --git a/common/buildcraft/core/blueprints/BptContext.java b/common/buildcraft/core/blueprints/BptContext.java index 45bdd3c6..ff74dfdd 100644 --- a/common/buildcraft/core/blueprints/BptContext.java +++ b/common/buildcraft/core/blueprints/BptContext.java @@ -9,12 +9,12 @@ package buildcraft.core.blueprints; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; import buildcraft.api.blueprints.IBptContext; import buildcraft.api.core.IBox; import buildcraft.api.core.Position; import buildcraft.core.Box; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class BptContext implements IBptContext { diff --git a/common/buildcraft/core/blueprints/BptItem.java b/common/buildcraft/core/blueprints/BptItem.java index f6fbf916..59329dc9 100644 --- a/common/buildcraft/core/blueprints/BptItem.java +++ b/common/buildcraft/core/blueprints/BptItem.java @@ -9,11 +9,10 @@ package buildcraft.core.blueprints; -import java.util.LinkedList; - -import net.minecraft.item.ItemStack; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; public class BptItem { diff --git a/common/buildcraft/core/blueprints/BptPlayerIndex.java b/common/buildcraft/core/blueprints/BptPlayerIndex.java index 3eccf675..dd38205c 100644 --- a/common/buildcraft/core/blueprints/BptPlayerIndex.java +++ b/common/buildcraft/core/blueprints/BptPlayerIndex.java @@ -1,5 +1,6 @@ package buildcraft.core.blueprints; +import buildcraft.core.proxy.CoreProxy; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; @@ -10,8 +11,6 @@ import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.util.TreeMap; -import buildcraft.core.proxy.CoreProxy; - public class BptPlayerIndex { private TreeMap bluePrintsFile = new TreeMap(); diff --git a/common/buildcraft/core/blueprints/BptRootIndex.java b/common/buildcraft/core/blueprints/BptRootIndex.java index dd30d145..275562ec 100644 --- a/common/buildcraft/core/blueprints/BptRootIndex.java +++ b/common/buildcraft/core/blueprints/BptRootIndex.java @@ -9,6 +9,7 @@ package buildcraft.core.blueprints; +import buildcraft.core.proxy.CoreProxy; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; @@ -19,8 +20,6 @@ import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.util.TreeMap; -import buildcraft.core.proxy.CoreProxy; - public class BptRootIndex { private TreeMap bluePrintsFile = new TreeMap(); diff --git a/common/buildcraft/core/blueprints/BptSlot.java b/common/buildcraft/core/blueprints/BptSlot.java index b402148a..f34f1a8a 100644 --- a/common/buildcraft/core/blueprints/BptSlot.java +++ b/common/buildcraft/core/blueprints/BptSlot.java @@ -1,12 +1,11 @@ package buildcraft.core.blueprints; -import java.util.LinkedList; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import buildcraft.api.blueprints.BlueprintManager; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; public class BptSlot extends BptSlotInfo { diff --git a/common/buildcraft/core/gui/BuildCraftContainer.java b/common/buildcraft/core/gui/BuildCraftContainer.java index a5250147..4984a77c 100644 --- a/common/buildcraft/core/gui/BuildCraftContainer.java +++ b/common/buildcraft/core/gui/BuildCraftContainer.java @@ -7,14 +7,14 @@ */ package buildcraft.core.gui; +import buildcraft.core.gui.slots.IPhantomSlot; +import buildcraft.core.gui.slots.SlotBase; +import buildcraft.core.inventory.StackHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import buildcraft.core.gui.slots.IPhantomSlot; -import buildcraft.core.gui.slots.SlotBase; -import buildcraft.core.inventory.StackHelper; public abstract class BuildCraftContainer extends Container { diff --git a/common/buildcraft/core/gui/GuiAdvancedInterface.java b/common/buildcraft/core/gui/GuiAdvancedInterface.java index 918beb35..52909de0 100644 --- a/common/buildcraft/core/gui/GuiAdvancedInterface.java +++ b/common/buildcraft/core/gui/GuiAdvancedInterface.java @@ -6,7 +6,6 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; - import org.lwjgl.opengl.GL11; public abstract class GuiAdvancedInterface extends GuiBuildCraft { diff --git a/common/buildcraft/core/gui/GuiBuildCraft.java b/common/buildcraft/core/gui/GuiBuildCraft.java index d8e76e39..86baf703 100644 --- a/common/buildcraft/core/gui/GuiBuildCraft.java +++ b/common/buildcraft/core/gui/GuiBuildCraft.java @@ -1,26 +1,25 @@ package buildcraft.core.gui; -import java.util.ArrayList; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; - -import org.lwjgl.opengl.GL11; - import buildcraft.core.DefaultProps; import buildcraft.core.gui.buttons.GuiBetterButton; import buildcraft.core.gui.slots.SlotBase; import buildcraft.core.gui.tooltips.ToolTip; import buildcraft.core.gui.tooltips.ToolTipLine; import buildcraft.core.utils.SessionVars; +import java.util.ArrayList; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; public abstract class GuiBuildCraft extends GuiContainer { + public static final ResourceLocation LEDGER_TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/ledger.png"); // / LEDGERS protected LedgerManager ledgerManager = new LedgerManager(this); @@ -210,7 +209,7 @@ public abstract class GuiBuildCraft extends GuiContainer { GL11.glColor4f(colorR, colorG, colorB, 1.0F); - mc.renderEngine.bindTexture(DefaultProps.TEXTURE_PATH_GUI + "/ledger.png"); + mc.renderEngine.func_110577_a(LEDGER_TEXTURE); drawTexturedModalRect(x, y, 0, 256 - currentHeight, 4, currentHeight); drawTexturedModalRect(x + 4, y, 256 - currentWidth + 4, 0, currentWidth - 4, 4); // Add in top left corner again diff --git a/common/buildcraft/core/gui/buttons/GuiBetterButton.java b/common/buildcraft/core/gui/buttons/GuiBetterButton.java index 56366a6f..7b24f659 100644 --- a/common/buildcraft/core/gui/buttons/GuiBetterButton.java +++ b/common/buildcraft/core/gui/buttons/GuiBetterButton.java @@ -1,15 +1,14 @@ package buildcraft.core.gui.buttons; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.resources.ResourceLocation; - -import org.lwjgl.opengl.GL11; - +import buildcraft.core.DefaultProps; import buildcraft.core.gui.tooltips.ToolTip; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; /** * @@ -18,7 +17,7 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiBetterButton extends GuiButton { - public static final ResourceLocation BUTTON_TEXTURES = new ResourceLocation("buildcraft","gfx/buildcraft/gui/buttons.png"); + public static final ResourceLocation BUTTON_TEXTURES = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/buttons.png"); protected final IButtonTextureSet texture; private ToolTip toolTip; diff --git a/common/buildcraft/core/gui/buttons/GuiMultiButton.java b/common/buildcraft/core/gui/buttons/GuiMultiButton.java index 9c0e0352..d5928ff2 100644 --- a/common/buildcraft/core/gui/buttons/GuiMultiButton.java +++ b/common/buildcraft/core/gui/buttons/GuiMultiButton.java @@ -1,12 +1,10 @@ package buildcraft.core.gui.buttons; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import org.lwjgl.opengl.GL11; /** * diff --git a/common/buildcraft/core/gui/slots/SlotBase.java b/common/buildcraft/core/gui/slots/SlotBase.java index 13dab528..27d7cbf8 100644 --- a/common/buildcraft/core/gui/slots/SlotBase.java +++ b/common/buildcraft/core/gui/slots/SlotBase.java @@ -7,9 +7,9 @@ */ package buildcraft.core.gui.slots; +import buildcraft.core.gui.tooltips.ToolTip; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -import buildcraft.core.gui.tooltips.ToolTip; /** * diff --git a/common/buildcraft/core/gui/tooltips/ToolTip.java b/common/buildcraft/core/gui/tooltips/ToolTip.java index 48c304df..48ab984d 100644 --- a/common/buildcraft/core/gui/tooltips/ToolTip.java +++ b/common/buildcraft/core/gui/tooltips/ToolTip.java @@ -1,10 +1,9 @@ package buildcraft.core.gui.tooltips; +import com.google.common.collect.ForwardingList; import java.util.ArrayList; import java.util.List; -import com.google.common.collect.ForwardingList; - /** * * @author CovertJaguar diff --git a/common/buildcraft/core/inventory/ITransactor.java b/common/buildcraft/core/inventory/ITransactor.java index 9d51a420..25363183 100644 --- a/common/buildcraft/core/inventory/ITransactor.java +++ b/common/buildcraft/core/inventory/ITransactor.java @@ -1,8 +1,8 @@ package buildcraft.core.inventory; +import buildcraft.core.inventory.filters.IStackFilter; import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeDirection; -import buildcraft.core.inventory.filters.IStackFilter; public interface ITransactor { diff --git a/common/buildcraft/core/inventory/InvUtils.java b/common/buildcraft/core/inventory/InvUtils.java index 5eb8b49e..af7b0db1 100644 --- a/common/buildcraft/core/inventory/InvUtils.java +++ b/common/buildcraft/core/inventory/InvUtils.java @@ -1,11 +1,11 @@ package buildcraft.core.inventory; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.ForgeDirection; import buildcraft.core.inventory.InventoryIterator.IInvSlot; import buildcraft.core.inventory.filters.ArrayStackFilter; import buildcraft.core.inventory.filters.IStackFilter; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.ForgeDirection; /** * diff --git a/common/buildcraft/core/inventory/InventoryConcatenator.java b/common/buildcraft/core/inventory/InventoryConcatenator.java index 87d0af5f..f2119dd9 100644 --- a/common/buildcraft/core/inventory/InventoryConcatenator.java +++ b/common/buildcraft/core/inventory/InventoryConcatenator.java @@ -97,7 +97,7 @@ public class InventoryConcatenator implements IInventory { } @Override - public boolean isStackValidForSlot(int slot, ItemStack stack) { - return invMap.get(slot).isStackValidForSlot(slotMap.get(slot), stack); + public boolean isItemValidForSlot(int slot, ItemStack stack) { + return invMap.get(slot).isItemValidForSlot(slotMap.get(slot), stack); } } diff --git a/common/buildcraft/core/inventory/InventoryIteratorSided.java b/common/buildcraft/core/inventory/InventoryIteratorSided.java index 349c1837..02db8127 100644 --- a/common/buildcraft/core/inventory/InventoryIteratorSided.java +++ b/common/buildcraft/core/inventory/InventoryIteratorSided.java @@ -1,11 +1,10 @@ package buildcraft.core.inventory; +import buildcraft.core.inventory.InventoryIterator.IInvSlot; import java.util.Iterator; - import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeDirection; -import buildcraft.core.inventory.InventoryIterator.IInvSlot; /** * @author CovertJaguar diff --git a/common/buildcraft/core/inventory/InventoryIteratorSimple.java b/common/buildcraft/core/inventory/InventoryIteratorSimple.java index fe64afd5..5d8c2428 100644 --- a/common/buildcraft/core/inventory/InventoryIteratorSimple.java +++ b/common/buildcraft/core/inventory/InventoryIteratorSimple.java @@ -1,10 +1,9 @@ package buildcraft.core.inventory; +import buildcraft.core.inventory.InventoryIterator.IInvSlot; import java.util.Iterator; - import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import buildcraft.core.inventory.InventoryIterator.IInvSlot; /** * @author CovertJaguar diff --git a/common/buildcraft/core/inventory/InventoryWrapper.java b/common/buildcraft/core/inventory/InventoryWrapper.java index 3ee9078d..38b5d479 100644 --- a/common/buildcraft/core/inventory/InventoryWrapper.java +++ b/common/buildcraft/core/inventory/InventoryWrapper.java @@ -1,10 +1,10 @@ package buildcraft.core.inventory; +import buildcraft.core.utils.Utils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; -import buildcraft.core.utils.Utils; public abstract class InventoryWrapper implements ISidedInventory { diff --git a/common/buildcraft/core/inventory/InventoryWrapperForge.java b/common/buildcraft/core/inventory/InventoryWrapperForge.java index 5fea0219..91f2ba8c 100644 --- a/common/buildcraft/core/inventory/InventoryWrapperForge.java +++ b/common/buildcraft/core/inventory/InventoryWrapperForge.java @@ -1,8 +1,8 @@ package buildcraft.core.inventory; +import buildcraft.core.utils.Utils; import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeDirection; -import buildcraft.core.utils.Utils; public class InventoryWrapperForge extends InventoryWrapper { diff --git a/common/buildcraft/core/inventory/InventoryWrapperSimple.java b/common/buildcraft/core/inventory/InventoryWrapperSimple.java index d6ea5cd8..2da6af71 100644 --- a/common/buildcraft/core/inventory/InventoryWrapperSimple.java +++ b/common/buildcraft/core/inventory/InventoryWrapperSimple.java @@ -1,8 +1,8 @@ package buildcraft.core.inventory; +import buildcraft.core.utils.Utils; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import buildcraft.core.utils.Utils; public class InventoryWrapperSimple extends InventoryWrapper { diff --git a/common/buildcraft/core/inventory/SimpleInventory.java b/common/buildcraft/core/inventory/SimpleInventory.java index ed6aa520..244c2869 100644 --- a/common/buildcraft/core/inventory/SimpleInventory.java +++ b/common/buildcraft/core/inventory/SimpleInventory.java @@ -7,15 +7,14 @@ */ package buildcraft.core.inventory; +import buildcraft.core.utils.INBTTagable; import java.util.LinkedList; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; -import buildcraft.core.utils.INBTTagable; public class SimpleInventory implements IInventory, INBTTagable { diff --git a/common/buildcraft/core/inventory/Transactor.java b/common/buildcraft/core/inventory/Transactor.java index c4b47fc2..fd2df49e 100644 --- a/common/buildcraft/core/inventory/Transactor.java +++ b/common/buildcraft/core/inventory/Transactor.java @@ -1,11 +1,11 @@ package buildcraft.core.inventory; +import buildcraft.api.inventory.ISpecialInventory; +import buildcraft.core.utils.Utils; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeDirection; -import buildcraft.api.inventory.ISpecialInventory; -import buildcraft.core.utils.Utils; public abstract class Transactor implements ITransactor { diff --git a/common/buildcraft/core/inventory/TransactorRoundRobin.java b/common/buildcraft/core/inventory/TransactorRoundRobin.java index 94daa531..89c21ecd 100644 --- a/common/buildcraft/core/inventory/TransactorRoundRobin.java +++ b/common/buildcraft/core/inventory/TransactorRoundRobin.java @@ -1,9 +1,9 @@ package buildcraft.core.inventory; +import buildcraft.core.inventory.InventoryIterator.IInvSlot; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeDirection; -import buildcraft.core.inventory.InventoryIterator.IInvSlot; public class TransactorRoundRobin extends TransactorSimple { diff --git a/common/buildcraft/core/inventory/TransactorSimple.java b/common/buildcraft/core/inventory/TransactorSimple.java index 32cba531..4f8a5b4d 100644 --- a/common/buildcraft/core/inventory/TransactorSimple.java +++ b/common/buildcraft/core/inventory/TransactorSimple.java @@ -1,13 +1,12 @@ package buildcraft.core.inventory; +import buildcraft.core.inventory.InventoryIterator.IInvSlot; +import buildcraft.core.inventory.filters.IStackFilter; import java.util.ArrayList; import java.util.List; - import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeDirection; -import buildcraft.core.inventory.InventoryIterator.IInvSlot; -import buildcraft.core.inventory.filters.IStackFilter; public class TransactorSimple extends Transactor { diff --git a/common/buildcraft/core/inventory/TransactorSpecial.java b/common/buildcraft/core/inventory/TransactorSpecial.java index 0db7891c..bd1c7f03 100644 --- a/common/buildcraft/core/inventory/TransactorSpecial.java +++ b/common/buildcraft/core/inventory/TransactorSpecial.java @@ -1,9 +1,9 @@ package buildcraft.core.inventory; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.ForgeDirection; import buildcraft.api.inventory.ISpecialInventory; import buildcraft.core.inventory.filters.IStackFilter; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.ForgeDirection; public class TransactorSpecial extends Transactor { diff --git a/common/buildcraft/core/inventory/filters/ArrayStackFilter.java b/common/buildcraft/core/inventory/filters/ArrayStackFilter.java index f6c5dce6..41fa0f76 100644 --- a/common/buildcraft/core/inventory/filters/ArrayStackFilter.java +++ b/common/buildcraft/core/inventory/filters/ArrayStackFilter.java @@ -1,7 +1,7 @@ package buildcraft.core.inventory.filters; -import net.minecraft.item.ItemStack; import buildcraft.core.inventory.StackHelper; +import net.minecraft.item.ItemStack; /** * Returns true if the stack matches any one one of the filter stacks. diff --git a/common/buildcraft/core/inventory/filters/CraftingFilter.java b/common/buildcraft/core/inventory/filters/CraftingFilter.java index d1d1cf5e..b2dc1558 100644 --- a/common/buildcraft/core/inventory/filters/CraftingFilter.java +++ b/common/buildcraft/core/inventory/filters/CraftingFilter.java @@ -1,7 +1,7 @@ package buildcraft.core.inventory.filters; -import net.minecraft.item.ItemStack; import buildcraft.core.inventory.StackHelper; +import net.minecraft.item.ItemStack; /** * Returns true if the stack matches any one one of the filter stacks. diff --git a/common/buildcraft/core/liquids/FluidUtils.java b/common/buildcraft/core/liquids/FluidUtils.java index c417990e..1903ff2c 100644 --- a/common/buildcraft/core/liquids/FluidUtils.java +++ b/common/buildcraft/core/liquids/FluidUtils.java @@ -1,12 +1,12 @@ package buildcraft.core.liquids; +import buildcraft.core.utils.Utils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; -import buildcraft.core.utils.Utils; /** * diff --git a/common/buildcraft/core/network/BuildCraftPacket.java b/common/buildcraft/core/network/BuildCraftPacket.java index 8624833b..e1712054 100644 --- a/common/buildcraft/core/network/BuildCraftPacket.java +++ b/common/buildcraft/core/network/BuildCraftPacket.java @@ -1,13 +1,12 @@ package buildcraft.core.network; +import buildcraft.core.DefaultProps; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; - import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.Packet250CustomPayload; -import buildcraft.core.DefaultProps; public abstract class BuildCraftPacket { diff --git a/common/buildcraft/core/network/ClassMapping.java b/common/buildcraft/core/network/ClassMapping.java index a18030b7..5e1899ed 100644 --- a/common/buildcraft/core/network/ClassMapping.java +++ b/common/buildcraft/core/network/ClassMapping.java @@ -9,14 +9,13 @@ package buildcraft.core.network; +import buildcraft.BuildCraftCore; +import buildcraft.core.ByteBuffer; import java.lang.reflect.Field; import java.lang.reflect.Type; import java.util.LinkedList; import java.util.TreeMap; -import buildcraft.BuildCraftCore; -import buildcraft.core.ByteBuffer; - public class ClassMapping { public static class Reporter { diff --git a/common/buildcraft/core/network/PacketHandler.java b/common/buildcraft/core/network/PacketHandler.java index a9d5a21d..8e291c9e 100644 --- a/common/buildcraft/core/network/PacketHandler.java +++ b/common/buildcraft/core/network/PacketHandler.java @@ -1,15 +1,14 @@ package buildcraft.core.network; +import cpw.mods.fml.common.network.IPacketHandler; +import cpw.mods.fml.common.network.Player; import java.io.ByteArrayInputStream; import java.io.DataInputStream; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import cpw.mods.fml.common.network.IPacketHandler; -import cpw.mods.fml.common.network.Player; public class PacketHandler implements IPacketHandler { diff --git a/common/buildcraft/core/network/PacketNBT.java b/common/buildcraft/core/network/PacketNBT.java index 4fb6f9a2..0cf5a19a 100644 --- a/common/buildcraft/core/network/PacketNBT.java +++ b/common/buildcraft/core/network/PacketNBT.java @@ -3,7 +3,6 @@ package buildcraft.core.network; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; - import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; diff --git a/common/buildcraft/core/network/PacketSlotChange.java b/common/buildcraft/core/network/PacketSlotChange.java index 4fbf36a9..43aa772b 100644 --- a/common/buildcraft/core/network/PacketSlotChange.java +++ b/common/buildcraft/core/network/PacketSlotChange.java @@ -3,7 +3,6 @@ package buildcraft.core.network; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompressedStreamTools; diff --git a/common/buildcraft/core/network/TilePacketWrapper.java b/common/buildcraft/core/network/TilePacketWrapper.java index 4a51421b..5e8349b2 100644 --- a/common/buildcraft/core/network/TilePacketWrapper.java +++ b/common/buildcraft/core/network/TilePacketWrapper.java @@ -9,9 +9,9 @@ package buildcraft.core.network; -import net.minecraft.tileentity.TileEntity; import buildcraft.core.ByteBuffer; import buildcraft.core.network.ClassMapping.Indexes; +import net.minecraft.tileentity.TileEntity; public class TilePacketWrapper { diff --git a/common/buildcraft/core/proxy/CoreProxy.java b/common/buildcraft/core/proxy/CoreProxy.java index b6c29b82..ffde5076 100644 --- a/common/buildcraft/core/proxy/CoreProxy.java +++ b/common/buildcraft/core/proxy/CoreProxy.java @@ -7,10 +7,16 @@ */ package buildcraft.core.proxy; +import buildcraft.api.core.LaserKind; +import buildcraft.core.EntityBlock; +import buildcraft.core.ItemBlockBuildCraft; +import buildcraft.core.network.BuildCraftPacket; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.registry.GameRegistry; import java.io.File; import java.util.List; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -28,13 +34,6 @@ import net.minecraft.util.ChatMessageComponent; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; import net.minecraftforge.oredict.ShapedOreRecipe; -import buildcraft.api.core.LaserKind; -import buildcraft.core.EntityBlock; -import buildcraft.core.ItemBlockBuildCraft; -import buildcraft.core.network.BuildCraftPacket; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.registry.GameRegistry; public class CoreProxy { diff --git a/common/buildcraft/core/proxy/CoreProxyClient.java b/common/buildcraft/core/proxy/CoreProxyClient.java index 76eb95b3..11f333c7 100644 --- a/common/buildcraft/core/proxy/CoreProxyClient.java +++ b/common/buildcraft/core/proxy/CoreProxyClient.java @@ -9,24 +9,6 @@ package buildcraft.core.proxy; -import java.io.File; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.WorldClient; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.network.packet.Packet; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatMessageComponent; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.StringTranslate; -import net.minecraft.world.World; import buildcraft.BuildCraftCore; import buildcraft.api.core.LaserKind; import buildcraft.core.EntityBlock; @@ -44,14 +26,33 @@ import buildcraft.transport.render.TileEntityPickupFX; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; +import java.io.File; +import java.util.List; +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.WorldClient; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.network.packet.Packet; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatMessageComponent; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.StringTranslate; +import net.minecraft.world.World; public class CoreProxyClient extends CoreProxy { /* INSTANCES */ + @Override public Object getClient() { return FMLClientHandler.instance().getClient(); } + @Override public World getClientWorld() { return FMLClientHandler.instance().getClient().theWorld; } @@ -68,6 +69,7 @@ public class CoreProxyClient extends CoreProxy { /* WRAPPER */ @SuppressWarnings("rawtypes") + @Override public void feedSubBlocks(int id, CreativeTabs tab, List itemList) { if (Block.blocksList[id] == null) return; @@ -120,7 +122,7 @@ public class CoreProxyClient extends CoreProxy { @Override public void initializeEntityRendering() { - RenderingRegistry.registerEntityRenderingHandler(EntityBlock.class, new RenderEntityBlock()); + RenderingRegistry.registerEntityRenderingHandler(EntityBlock.class, RenderEntityBlock.INSTANCE); RenderingRegistry.registerEntityRenderingHandler(EntityPowerLaser.class, new RenderLaser()); RenderingRegistry.registerEntityRenderingHandler(EntityEnergyLaser.class, new RenderEnergyLaser()); RenderingRegistry.registerEntityRenderingHandler(EntityRobot.class, new RenderRobot()); @@ -133,6 +135,7 @@ public class CoreProxyClient extends CoreProxy { } /* FILE SYSTEM */ + @Override public File getBuildCraftBase() { return Minecraft.getMinecraftDir(); } diff --git a/common/buildcraft/core/render/FluidRenderer.java b/common/buildcraft/core/render/FluidRenderer.java index b9ad6962..6d4bd6a1 100644 --- a/common/buildcraft/core/render/FluidRenderer.java +++ b/common/buildcraft/core/render/FluidRenderer.java @@ -7,22 +7,20 @@ */ package buildcraft.core.render; +import buildcraft.core.render.RenderEntityBlock.BlockInterface; import java.util.HashMap; import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; - import org.lwjgl.opengl.GL11; -import buildcraft.core.render.RenderEntityBlock.BlockInterface; - /** * * @author CovertJaguar @@ -87,7 +85,7 @@ public class FluidRenderer { return icon; } - public static String getFluidSheet(FluidStack liquid) { + public static ResourceLocation getFluidSheet(FluidStack liquid) { if (liquid == null || liquid.itemID <= 0) { return "/terrain.png"; } diff --git a/common/buildcraft/core/render/RenderEnergyLaser.java b/common/buildcraft/core/render/RenderEnergyLaser.java index 1799ed25..7c3027dc 100644 --- a/common/buildcraft/core/render/RenderEnergyLaser.java +++ b/common/buildcraft/core/render/RenderEnergyLaser.java @@ -9,9 +9,9 @@ package buildcraft.core.render; -import net.minecraft.client.model.ModelRenderer; import buildcraft.core.EntityEnergyLaser; import buildcraft.core.EntityLaser; +import net.minecraft.client.model.ModelRenderer; public class RenderEnergyLaser extends RenderLaser { diff --git a/common/buildcraft/core/render/RenderEntityBlock.java b/common/buildcraft/core/render/RenderEntityBlock.java index 707af543..6c967381 100644 --- a/common/buildcraft/core/render/RenderEntityBlock.java +++ b/common/buildcraft/core/render/RenderEntityBlock.java @@ -1,33 +1,33 @@ /** - * Copyright (c) SpaceToad, 2011 - * http://www.mod-buildcraft.com + * Copyright (c) SpaceToad, 2011 http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in + * BuildCraft is distributed under the terms of the Minecraft Mod Public License + * 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ - package buildcraft.core.render; +import buildcraft.core.EntityBlock; import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.util.Icon; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import org.lwjgl.opengl.GL11; -import buildcraft.core.EntityBlock; - public class RenderEntityBlock extends Render { + + public static RenderEntityBlock INSTANCE = new RenderEntityBlock(); + + @Override + protected ResourceLocation func_110775_a(Entity entity) { + throw new UnsupportedOperationException("Not supported yet."); + } - private static RenderBlocks renderBlocks = new RenderBlocks(); - static { - } public static class BlockInterface { public double minX; @@ -36,9 +36,7 @@ public class RenderEntityBlock extends Render { public double maxX; public double maxY; public double maxZ; - public Block baseBlock = Block.sand; - public Icon texture = null; public Icon getBlockTextureFromSide(int i) { @@ -53,7 +51,7 @@ public class RenderEntityBlock extends Render { } } - public RenderEntityBlock() { + private RenderEntityBlock() { } @Override @@ -110,19 +108,19 @@ public class RenderEntityBlock extends Render { } } - public static void renderBlock(BlockInterface block, IBlockAccess blockAccess, int i, int j, int k, boolean doLight, boolean doTessellating) { + public void renderBlock(BlockInterface block, IBlockAccess blockAccess, int i, int j, int k, boolean doLight, boolean doTessellating) { float f = 0.5F; float f1 = 1.0F; float f2 = 0.8F; float f3 = 0.6F; - renderBlocks.renderMaxX = block.maxX; - renderBlocks.renderMinX = block.minX; - renderBlocks.renderMaxY = block.maxY; - renderBlocks.renderMinY = block.minY; - renderBlocks.renderMaxZ = block.maxZ; - renderBlocks.renderMinZ = block.minZ; - renderBlocks.enableAO = false; + renderBlocks.renderMaxX = block.maxX; + renderBlocks.renderMinX = block.minX; + renderBlocks.renderMaxY = block.maxY; + renderBlocks.renderMinY = block.minY; + renderBlocks.renderMaxZ = block.maxZ; + renderBlocks.renderMinZ = block.minZ; + renderBlocks.enableAO = false; Tessellator tessellator = Tessellator.instance; diff --git a/common/buildcraft/core/render/RenderLaser.java b/common/buildcraft/core/render/RenderLaser.java index 45b6d38c..abf274fa 100644 --- a/common/buildcraft/core/render/RenderLaser.java +++ b/common/buildcraft/core/render/RenderLaser.java @@ -1,15 +1,13 @@ package buildcraft.core.render; +import buildcraft.api.core.Position; +import buildcraft.core.EntityLaser; 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 org.lwjgl.opengl.GL11; -import buildcraft.api.core.Position; -import buildcraft.core.EntityLaser; - public class RenderLaser extends Render { protected ModelBase model = new ModelBase() { diff --git a/common/buildcraft/core/render/RenderRobot.java b/common/buildcraft/core/render/RenderRobot.java index f2ea96c7..1aae2e11 100644 --- a/common/buildcraft/core/render/RenderRobot.java +++ b/common/buildcraft/core/render/RenderRobot.java @@ -1,17 +1,17 @@ package buildcraft.core.render; +import buildcraft.core.DefaultProps; +import buildcraft.core.EntityRobot; 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.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import buildcraft.core.DefaultProps; -import buildcraft.core.EntityRobot; - public class RenderRobot extends Render { + public static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/robot.png"); protected ModelBase model = new ModelBase() { }; private ModelRenderer box; @@ -35,7 +35,7 @@ public class RenderRobot extends Render { GL11.glDisable(2896 /* GL_LIGHTING */); GL11.glTranslated(x, y, z); - renderManager.renderEngine.bindTexture(DefaultProps.TEXTURE_PATH_ENTITIES + "/robot.png"); + renderManager.renderEngine.func_110577_a(TEXTURE); float factor = (float) (1.0 / 16.0); @@ -46,4 +46,8 @@ public class RenderRobot extends Render { } + @Override + protected ResourceLocation func_110775_a(Entity entity) { + return TEXTURE; + } } diff --git a/common/buildcraft/core/render/RenderVoid.java b/common/buildcraft/core/render/RenderVoid.java index f55d62db..155e23b7 100644 --- a/common/buildcraft/core/render/RenderVoid.java +++ b/common/buildcraft/core/render/RenderVoid.java @@ -11,6 +11,7 @@ package buildcraft.core.render; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; +import net.minecraft.util.ResourceLocation; public class RenderVoid extends Render { @@ -20,4 +21,9 @@ public class RenderVoid extends Render { } + @Override + protected ResourceLocation func_110775_a(Entity entity) { + throw new UnsupportedOperationException("Not supported yet."); + } + } diff --git a/common/buildcraft/core/render/RenderingEntityBlocks.java b/common/buildcraft/core/render/RenderingEntityBlocks.java index 27dd87dd..783aad58 100644 --- a/common/buildcraft/core/render/RenderingEntityBlocks.java +++ b/common/buildcraft/core/render/RenderingEntityBlocks.java @@ -1,19 +1,16 @@ package buildcraft.core.render; -import java.util.HashMap; - -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.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - import buildcraft.BuildCraftCore; import buildcraft.core.IInventoryRenderer; import buildcraft.core.utils.Utils; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import java.util.HashMap; +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.world.IBlockAccess; +import org.lwjgl.opengl.GL11; public class RenderingEntityBlocks implements ISimpleBlockRenderingHandler { public static class EntityRenderIndex { diff --git a/common/buildcraft/core/render/RenderingMarkers.java b/common/buildcraft/core/render/RenderingMarkers.java index 70135266..5b92c7ba 100644 --- a/common/buildcraft/core/render/RenderingMarkers.java +++ b/common/buildcraft/core/render/RenderingMarkers.java @@ -1,12 +1,12 @@ package buildcraft.core.render; +import buildcraft.BuildCraftCore; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; -import buildcraft.BuildCraftCore; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderingMarkers implements ISimpleBlockRenderingHandler { diff --git a/common/buildcraft/core/render/RenderingOil.java b/common/buildcraft/core/render/RenderingOil.java index 296b70b5..0d771be7 100644 --- a/common/buildcraft/core/render/RenderingOil.java +++ b/common/buildcraft/core/render/RenderingOil.java @@ -1,10 +1,10 @@ package buildcraft.core.render; +import buildcraft.BuildCraftCore; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; -import buildcraft.BuildCraftCore; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderingOil implements ISimpleBlockRenderingHandler { diff --git a/common/buildcraft/core/triggers/ActionTriggerIconProvider.java b/common/buildcraft/core/triggers/ActionTriggerIconProvider.java index 3887d35e..6426ed51 100644 --- a/common/buildcraft/core/triggers/ActionTriggerIconProvider.java +++ b/common/buildcraft/core/triggers/ActionTriggerIconProvider.java @@ -1,10 +1,10 @@ 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 net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.util.Icon; public class ActionTriggerIconProvider implements IIconProvider { diff --git a/common/buildcraft/core/triggers/BCTrigger.java b/common/buildcraft/core/triggers/BCTrigger.java index 8882a990..424d14c7 100644 --- a/common/buildcraft/core/triggers/BCTrigger.java +++ b/common/buildcraft/core/triggers/BCTrigger.java @@ -9,8 +9,6 @@ package buildcraft.core.triggers; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.api.core.IIconProvider; import buildcraft.api.gates.ActionManager; @@ -19,6 +17,8 @@ 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.minecraftforge.common.ForgeDirection; /** * 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/DefaultActionProvider.java b/common/buildcraft/core/triggers/DefaultActionProvider.java index 01f16922..3eea5f3c 100644 --- a/common/buildcraft/core/triggers/DefaultActionProvider.java +++ b/common/buildcraft/core/triggers/DefaultActionProvider.java @@ -1,15 +1,14 @@ package buildcraft.core.triggers; -import java.util.LinkedList; -import java.util.logging.Level; - -import net.minecraft.block.Block; -import net.minecraft.tileentity.TileEntity; import buildcraft.BuildCraftCore; import buildcraft.api.gates.IAction; import buildcraft.api.gates.IActionProvider; import buildcraft.core.IMachine; import cpw.mods.fml.common.FMLLog; +import java.util.LinkedList; +import java.util.logging.Level; +import net.minecraft.block.Block; +import net.minecraft.tileentity.TileEntity; public class DefaultActionProvider implements IActionProvider { diff --git a/common/buildcraft/core/triggers/DefaultTriggerProvider.java b/common/buildcraft/core/triggers/DefaultTriggerProvider.java index 6f4b9186..48c5e643 100644 --- a/common/buildcraft/core/triggers/DefaultTriggerProvider.java +++ b/common/buildcraft/core/triggers/DefaultTriggerProvider.java @@ -1,19 +1,18 @@ package buildcraft.core.triggers; -import java.util.LinkedList; - -import net.minecraft.block.Block; -import net.minecraft.inventory.IInventory; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; import buildcraft.BuildCraftCore; import buildcraft.api.gates.IOverrideDefaultTriggers; import buildcraft.api.gates.ITrigger; import buildcraft.api.gates.ITriggerProvider; import buildcraft.api.transport.IPipe; import buildcraft.core.IMachine; +import java.util.LinkedList; +import net.minecraft.block.Block; +import net.minecraft.inventory.IInventory; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; public class DefaultTriggerProvider implements ITriggerProvider { diff --git a/common/buildcraft/core/triggers/TriggerFluidContainer.java b/common/buildcraft/core/triggers/TriggerFluidContainer.java index 498ad0de..7b5a993f 100644 --- a/common/buildcraft/core/triggers/TriggerFluidContainer.java +++ b/common/buildcraft/core/triggers/TriggerFluidContainer.java @@ -1,29 +1,26 @@ /** - * Copyright (c) SpaceToad, 2011 - * http://www.mod-buildcraft.com + * Copyright (c) SpaceToad, 2011 http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in + * BuildCraft is distributed under the terms of the Minecraft Mod Public License + * 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ - package buildcraft.core.triggers; +import buildcraft.api.gates.ITriggerParameter; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import net.minecraftforge.fluids.IFluidTank; -import buildcraft.api.gates.ITriggerParameter; public class TriggerFluidContainer extends BCTrigger { public enum State { + Empty, Contains, Space, Full }; - public State state; public TriggerFluidContainer(int id, State state) { @@ -42,14 +39,14 @@ public class TriggerFluidContainer extends BCTrigger { @Override public String getDescription() { switch (state) { - case Empty: - return "Tank Empty"; - case Contains: - return "Fluid in Tank"; - case Space: - return "Space for Fluid"; - default: - return "Tank Full"; + case Empty: + return "Tank Empty"; + case Contains: + return "Fluid in Tank"; + case Space: + return "Space for Fluid"; + default: + return "Tank Full"; } } @@ -73,47 +70,36 @@ public class TriggerFluidContainer extends BCTrigger { return false; switch (state) { - case Empty: - for (FluidTankInfo c : liquids) { - if (searchedFluid != null) { - FluidStack drained = c.drain(1, false); - if (drained != null && searchedFluid.isFluidEqual(drained)) + case Empty: + for (FluidTankInfo c : liquids) { + if (c.fluid != null && c.fluid.amount > 0 && (searchedFluid == null || searchedFluid.isFluidEqual(c.fluid))) return false; - } else if (c.getFluid() != null && c.getFluid().amount > 0) - return false; - } - - return true; - case Contains: - for (IFluidTank c : liquids) { - if (c.getFluid() != null && c.getFluid().amount != 0) { - if (searchedFluid == null || searchedFluid.isFluidEqual(c.getFluid())) + } + return true; + case Contains: + for (FluidTankInfo c : liquids) { + if (c.fluid != null && c.fluid.amount > 0 && (searchedFluid == null || searchedFluid.isFluidEqual(c.fluid))) return true; } - } - - return false; - - case Space: - for (IFluidTank c : liquids) { - if (searchedFluid != null) { - if (c.fill(searchedFluid, false) > 0) - return true; - } else if (c.getFluid() == null || c.getFluid().amount < c.getCapacity()) - return true; - } - - return false; - case Full: - for (IFluidTank c : liquids) { - if (searchedFluid != null) { - if (c.fill(searchedFluid, false) > 0) - return false; - } else if (c.getFluid() == null || c.getFluid().amount < c.getCapacity()) + return false; + case Space: + if (searchedFluid == null) { + for (FluidTankInfo c : liquids) { + if (c.fluid == null || c.fluid.amount < c.capacity) + return true; + } return false; - } - - return true; + } + return container.fill(side, searchedFluid, false) > 0; + case Full: + if (searchedFluid == null) { + for (FluidTankInfo c : liquids) { + if (c.fluid == null || c.fluid.amount < c.capacity) + return false; + } + return true; + } + return container.fill(side, searchedFluid, false) <= 0; } } @@ -123,14 +109,14 @@ public class TriggerFluidContainer extends BCTrigger { @Override public int getIconIndex() { switch (state) { - case Empty: - return ActionTriggerIconProvider.Trigger_FluidContainer_Empty; - case Contains: - return ActionTriggerIconProvider.Trigger_FluidContainer_Contains; - case Space: - return ActionTriggerIconProvider.Trigger_FluidContainer_Space; - default: - return ActionTriggerIconProvider.Trigger_FluidContainer_Full; + case Empty: + return ActionTriggerIconProvider.Trigger_FluidContainer_Empty; + case Contains: + return ActionTriggerIconProvider.Trigger_FluidContainer_Contains; + case Space: + return ActionTriggerIconProvider.Trigger_FluidContainer_Space; + default: + return ActionTriggerIconProvider.Trigger_FluidContainer_Full; } } } diff --git a/common/buildcraft/core/triggers/TriggerInventory.java b/common/buildcraft/core/triggers/TriggerInventory.java index a07ed244..b1de1004 100644 --- a/common/buildcraft/core/triggers/TriggerInventory.java +++ b/common/buildcraft/core/triggers/TriggerInventory.java @@ -9,14 +9,14 @@ package buildcraft.core.triggers; +import buildcraft.api.gates.ITriggerParameter; +import buildcraft.api.inventory.ISpecialInventory; +import buildcraft.core.inventory.InventoryWrapper; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; -import buildcraft.api.gates.ITriggerParameter; -import buildcraft.api.inventory.ISpecialInventory; -import buildcraft.core.inventory.InventoryWrapper; public class TriggerInventory extends BCTrigger { diff --git a/common/buildcraft/core/triggers/TriggerMachine.java b/common/buildcraft/core/triggers/TriggerMachine.java index 098cd3e5..9f4ff236 100644 --- a/common/buildcraft/core/triggers/TriggerMachine.java +++ b/common/buildcraft/core/triggers/TriggerMachine.java @@ -9,10 +9,10 @@ package buildcraft.core.triggers; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; import buildcraft.api.gates.ITriggerParameter; import buildcraft.core.IMachine; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; public class TriggerMachine extends BCTrigger { diff --git a/common/buildcraft/core/utils/BlockUtil.java b/common/buildcraft/core/utils/BlockUtil.java index cf93e9a5..f82bc6a2 100644 --- a/common/buildcraft/core/utils/BlockUtil.java +++ b/common/buildcraft/core/utils/BlockUtil.java @@ -8,8 +8,11 @@ package buildcraft.core.utils; +import buildcraft.BuildCraftCore; +import buildcraft.BuildCraftEnergy; +import buildcraft.api.core.BuildCraftAPI; +import cpw.mods.fml.common.FMLCommonHandler; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -19,10 +22,6 @@ import net.minecraft.network.packet.Packet60Explosion; import net.minecraft.world.ChunkPosition; import net.minecraft.world.Explosion; 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 { @@ -79,7 +78,7 @@ public class BlockUtil { if (block.getBlockHardness(world, x, y, z) < 0) return false; - if (blockID == BuildCraftEnergy.oilMoving.blockID || blockID == BuildCraftEnergy.oilStill.blockID) + if (blockID == BuildCraftEnergy.oilMoving.blockID || blockID == BuildCraftEnergy.blockOil.blockID) return false; if (blockID == Block.lavaStill.blockID || blockID == Block.lavaMoving.blockID) diff --git a/common/buildcraft/core/utils/CraftingHelper.java b/common/buildcraft/core/utils/CraftingHelper.java index 19d6306d..2ba52696 100644 --- a/common/buildcraft/core/utils/CraftingHelper.java +++ b/common/buildcraft/core/utils/CraftingHelper.java @@ -2,7 +2,6 @@ package buildcraft.core.utils; import java.util.ArrayList; import java.util.List; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/core/utils/Localization.java b/common/buildcraft/core/utils/Localization.java index d57e2a6a..34fc65c8 100644 --- a/common/buildcraft/core/utils/Localization.java +++ b/common/buildcraft/core/utils/Localization.java @@ -1,12 +1,11 @@ package buildcraft.core.utils; +import buildcraft.core.proxy.CoreProxy; import java.io.IOException; import java.io.InputStream; import java.util.LinkedList; import java.util.Properties; -import buildcraft.core.proxy.CoreProxy; - /** * Simple mod localization class. * diff --git a/common/buildcraft/core/utils/Utils.java b/common/buildcraft/core/utils/Utils.java index b9d77799..805de51f 100644 --- a/common/buildcraft/core/utils/Utils.java +++ b/common/buildcraft/core/utils/Utils.java @@ -7,26 +7,6 @@ */ package buildcraft.core.utils; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.InventoryLargeChest; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagString; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityChest; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.api.core.IAreaProvider; import buildcraft.api.core.LaserKind; @@ -46,6 +26,25 @@ import buildcraft.core.network.ISynchronizedTile; import buildcraft.core.network.PacketUpdate; import buildcraft.core.proxy.CoreProxy; import buildcraft.energy.TileEngine; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Random; +import net.minecraft.block.Block; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.InventoryLargeChest; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.NBTTagString; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityChest; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; public class Utils { diff --git a/common/buildcraft/energy/BlockEngine.java b/common/buildcraft/energy/BlockEngine.java index 061f9199..7b76c692 100644 --- a/common/buildcraft/energy/BlockEngine.java +++ b/common/buildcraft/energy/BlockEngine.java @@ -7,9 +7,13 @@ */ package buildcraft.energy; +import buildcraft.BuildCraftCore; +import buildcraft.core.CreativeTabBuildCraft; +import buildcraft.core.IItemPipe; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.util.List; import java.util.Random; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -20,11 +24,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import buildcraft.BuildCraftCore; -import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.IItemPipe; -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 deleted file mode 100644 index 4022fe41..00000000 --- a/common/buildcraft/energy/BlockOilFlowing.java +++ /dev/null @@ -1,323 +0,0 @@ -/** - * Copyright (c) SpaceToad, 2011 http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public License - * 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt - */ -package buildcraft.energy; - -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockFlowing; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.util.Icon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; -import buildcraft.BuildCraftCore; -import buildcraft.BuildCraftEnergy; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class BlockOilFlowing extends BlockFlowing implements IFluid { - - int numAdjacentSources = 0; - boolean isOptimalFlowDirection[] = new boolean[4]; - int flowCost[] = new int[4]; - - public BlockOilFlowing(int i, Material material) { - super(i, material); - - setHardness(100F); - setLightOpacity(3); - } - - @Override - public int getRenderType() { - return BuildCraftCore.oilModel; - } - - private void updateFlow(World par1World, int par2, int par3, int par4) { - int l = par1World.getBlockMetadata(par2, par3, par4); - par1World.setBlock(par2, par3, par4, this.blockID + 1, l, 2); - } - - /** - * How many world ticks before ticking - */ - @Override - public int tickRate(World par1World) { - return 20; - } - - @Override - public void updateTick(World world, int x, int y, int z, Random random) { - int oldDecay = this.getFlowDecay(world, x, y, z); - byte viscosity = 2; - int flowDecay; - - if (oldDecay > 0) { - this.numAdjacentSources = 0; - int minFlowDecay = this.getSmallestFlowDecay(world, x - 1, y, z, -100); - minFlowDecay = this.getSmallestFlowDecay(world, x + 1, y, z, minFlowDecay); - minFlowDecay = this.getSmallestFlowDecay(world, x, y, z - 1, minFlowDecay); - minFlowDecay = this.getSmallestFlowDecay(world, x, y, z + 1, minFlowDecay); - flowDecay = minFlowDecay + viscosity; - - if (flowDecay >= 8 || minFlowDecay < 0) { - flowDecay = -1; - } - - int decayAbove = getFlowDecay(world, x, y + 1, z); - if (decayAbove >= 0) { - if (decayAbove >= 8) { - flowDecay = decayAbove; - } else { - flowDecay = decayAbove + 8; - } - } - - boolean update = true; - if (oldDecay < 8 && flowDecay < 8 && flowDecay > oldDecay && random.nextDouble() < 0.2) { - flowDecay = oldDecay; - update = false; - } - - if (flowDecay == oldDecay) { - if (update) { - this.updateFlow(world, x, y, z); - } - } else { - oldDecay = flowDecay; - - if (flowDecay < 0) { - world.setBlockToAir(x, y, z); - } else { - world.setBlockMetadataWithNotify(x, y, z, flowDecay, 2); - world.scheduleBlockUpdate(x, y, z, this.blockID, this.tickRate(world)); - world.notifyBlocksOfNeighborChange(x, y, z, this.blockID); - } - } - } else { - this.updateFlow(world, x, y, z); - } - - if (this.liquidCanDisplaceBlock(world, x, y - 1, z)) { - if (oldDecay >= 8) { - this.flowIntoBlock(world, x, y - 1, z, oldDecay); - } else { - this.flowIntoBlock(world, x, y - 1, z, oldDecay + 8); - } - } else if (oldDecay >= 0 && (oldDecay == 0 || this.blockBlocksFlow(world, x, y - 1, z))) { - boolean[] flowDirection = this.getOptimalFlowDirections(world, x, y, z); - flowDecay = oldDecay + viscosity; - - if (oldDecay >= 8) { - flowDecay = 1; - } - - if (flowDecay >= 8) { - return; - } - - if (flowDirection[0]) { - this.flowIntoBlock(world, x - 1, y, z, flowDecay); - } - - if (flowDirection[1]) { - this.flowIntoBlock(world, x + 1, y, z, flowDecay); - } - - if (flowDirection[2]) { - this.flowIntoBlock(world, x, y, z - 1, flowDecay); - } - - if (flowDirection[3]) { - this.flowIntoBlock(world, x, y, z + 1, flowDecay); - } - } - } - - private void flowIntoBlock(World world, int i, int j, int k, int l) { - if (liquidCanDisplaceBlock(world, i, j, k)) { - int blockId = world.getBlockId(i, j, k); - if (blockId > 0) { - Block.blocksList[blockId].dropBlockAsItem(world, i, j, k, world.getBlockMetadata(i, j, k), 0); - } - world.setBlock(i, j, k, blockID, l, 3); - } - } - - private int calculateFlowCost(World world, int i, int j, int k, int l, int i1) { - int j1 = 1000; - for (int k1 = 0; k1 < 4; k1++) { - if (k1 == 0 && i1 == 1 || k1 == 1 && i1 == 0 || k1 == 2 && i1 == 3 || k1 == 3 && i1 == 2) { - continue; - } - int l1 = i; - int i2 = j; - int j2 = k; - if (k1 == 0) { - l1--; - } - if (k1 == 1) { - l1++; - } - if (k1 == 2) { - j2--; - } - if (k1 == 3) { - j2++; - } - if (blockBlocksFlow(world, l1, i2, j2) || world.getBlockMaterial(l1, i2, j2) == blockMaterial && world.getBlockMetadata(l1, i2, j2) == 0) { - continue; - } - if (!blockBlocksFlow(world, l1, i2 - 1, j2)) { - return l; - } - if (l >= 4) { - continue; - } - int k2 = calculateFlowCost(world, l1, i2, j2, l + 1, k1); - if (k2 < j1) { - j1 = k2; - } - } - - return j1; - } - - private boolean[] getOptimalFlowDirections(World world, int i, int j, int k) { - for (int l = 0; l < 4; l++) { - flowCost[l] = 1000; - int j1 = i; - int i2 = j; - int j2 = k; - if (l == 0) { - j1--; - } - if (l == 1) { - j1++; - } - if (l == 2) { - j2--; - } - if (l == 3) { - j2++; - } - if (blockBlocksFlow(world, j1, i2, j2) || world.getBlockMaterial(j1, i2, j2) == blockMaterial && world.getBlockMetadata(j1, i2, j2) == 0) { - continue; - } - if (!blockBlocksFlow(world, j1, i2 - 1, j2)) { - flowCost[l] = 0; - } else { - flowCost[l] = calculateFlowCost(world, j1, i2, j2, 1, l); - } - } - - int i1 = flowCost[0]; - for (int k1 = 1; k1 < 4; k1++) { - if (flowCost[k1] < i1) { - i1 = flowCost[k1]; - } - } - - for (int l1 = 0; l1 < 4; l1++) { - isOptimalFlowDirection[l1] = flowCost[l1] == i1; - } - - return isOptimalFlowDirection; - } - - private boolean blockBlocksFlow(World par1World, int par2, int par3, int par4) { - int l = par1World.getBlockId(par2, par3, par4); - - if (l != Block.doorWood.blockID && l != Block.doorIron.blockID && l != Block.signPost.blockID && l != Block.ladder.blockID && l != Block.reed.blockID) { - if (l == 0) { - return false; - } else { - Material material = Block.blocksList[l].blockMaterial; - return material == Material.portal ? true : material.blocksMovement(); - } - } else { - return true; - } - } - - @Override - protected int getSmallestFlowDecay(World par1World, int par2, int par3, int par4, int par5) { - int i1 = this.getFlowDecay(par1World, par2, par3, par4); - - if (i1 < 0) { - return par5; - } else { - if (i1 == 0) { - ++this.numAdjacentSources; - } - - if (i1 >= 8) { - i1 = 0; - } - - return par5 >= 0 && i1 >= par5 ? par5 : i1; - } - } - - private boolean liquidCanDisplaceBlock(World world, int i, int j, int k) { - Material material = world.getBlockMaterial(i, j, k); - if (material == blockMaterial) { - return false; - } else { - return !blockBlocksFlow(world, i, j, k); - } - } - - @Override - public int stillFluidId() { - return BuildCraftEnergy.oilStill.blockID; - } - - @Override - public boolean isMetaSensitive() { - return false; - } - - @Override - public int stillFluidMeta() { - return 0; - } - - @Override - public boolean isBlockReplaceable(World world, int i, int j, int k) { - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister iconRegister) { - this.theIcon = new Icon[]{iconRegister.registerIcon("buildcraft:oil"), iconRegister.registerIcon("buildcraft:oil_flow")}; - } - - @Override - public int getFireSpreadSpeed(World world, int x, int y, int z, int metadata, ForgeDirection face) { - return BuildCraftEnergy.canOilBurn ? 300 : 0; - } - - @Override - public int getFlammability(IBlockAccess world, int x, int y, int z, int metadata, ForgeDirection face) { - return 0; - } - - @Override - public boolean isFlammable(IBlockAccess world, int x, int y, int z, int metadata, ForgeDirection face) { - return BuildCraftEnergy.canOilBurn; - } - - @Override - public boolean isFireSource(World world, int x, int y, int z, int metadata, ForgeDirection side) { - return BuildCraftEnergy.canOilBurn; - } -} diff --git a/common/buildcraft/energy/BlockOilStill.java b/common/buildcraft/energy/BlockOilStill.java deleted file mode 100644 index 1f766e7c..00000000 --- a/common/buildcraft/energy/BlockOilStill.java +++ /dev/null @@ -1,81 +0,0 @@ -/** - * Copyright (c) SpaceToad, 2011 http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public License - * 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt - */ -package buildcraft.energy; - -import net.minecraft.block.BlockStationary; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.util.Icon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; -import buildcraft.BuildCraftCore; -import buildcraft.BuildCraftEnergy; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class BlockOilStill extends BlockStationary implements IFluid { - - public BlockOilStill(int i, Material material) { - super(i, material); - - setHardness(100F); - setLightOpacity(3); - } - - @Override - public int getRenderType() { - return BuildCraftCore.oilModel; - } - - @Override - public int stillFluidId() { - return BuildCraftEnergy.oilStill.blockID; - } - - @Override - public boolean isMetaSensitive() { - return false; - } - - @Override - public int stillFluidMeta() { - return 0; - } - - @Override - public boolean isBlockReplaceable(World world, int i, int j, int k) { - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister iconRegister) { - this.theIcon = new Icon[]{iconRegister.registerIcon("buildcraft:oil"), iconRegister.registerIcon("buildcraft:oil_flow")}; - } - - @Override - public int getFireSpreadSpeed(World world, int x, int y, int z, int metadata, ForgeDirection face) { - return BuildCraftEnergy.canOilBurn ? 300 : 0; - } - - @Override - public int getFlammability(IBlockAccess world, int x, int y, int z, int metadata, ForgeDirection face) { - return 0; - } - - @Override - public boolean isFlammable(IBlockAccess world, int x, int y, int z, int metadata, ForgeDirection face) { - return BuildCraftEnergy.canOilBurn; - } - - @Override - public boolean isFireSource(World world, int x, int y, int z, int metadata, ForgeDirection side) { - return BuildCraftEnergy.canOilBurn; - } -} diff --git a/common/buildcraft/energy/BlockPollution.java b/common/buildcraft/energy/BlockPollution.java index 5b3887c4..ae50a074 100644 --- a/common/buildcraft/energy/BlockPollution.java +++ b/common/buildcraft/energy/BlockPollution.java @@ -9,13 +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.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockPollution extends BlockContainer { diff --git a/common/buildcraft/energy/BptBlockEngine.java b/common/buildcraft/energy/BptBlockEngine.java index 51701faa..554aaf30 100644 --- a/common/buildcraft/energy/BptBlockEngine.java +++ b/common/buildcraft/energy/BptBlockEngine.java @@ -9,13 +9,13 @@ package buildcraft.energy; -import net.minecraft.block.Block; -import net.minecraftforge.common.ForgeDirection; import buildcraft.api.blueprints.BlockSignature; import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; import buildcraft.core.Version; +import net.minecraft.block.Block; +import net.minecraftforge.common.ForgeDirection; @Deprecated public class BptBlockEngine extends BptBlock { diff --git a/common/buildcraft/energy/GuiHandler.java b/common/buildcraft/energy/GuiHandler.java index 3f2666de..b5a6616e 100644 --- a/common/buildcraft/energy/GuiHandler.java +++ b/common/buildcraft/energy/GuiHandler.java @@ -1,13 +1,13 @@ package buildcraft.energy; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import buildcraft.core.GuiIds; import buildcraft.energy.gui.ContainerEngine; import buildcraft.energy.gui.GuiCombustionEngine; import buildcraft.energy.gui.GuiSteamEngine; import cpw.mods.fml.common.network.IGuiHandler; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class GuiHandler implements IGuiHandler { diff --git a/common/buildcraft/energy/ItemBucketOil.java b/common/buildcraft/energy/ItemBucketOil.java index 4ea5f328..84eaf5b1 100644 --- a/common/buildcraft/energy/ItemBucketOil.java +++ b/common/buildcraft/energy/ItemBucketOil.java @@ -9,14 +9,14 @@ package buildcraft.energy; -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.utils.StringUtils; 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; public class ItemBucketOil extends ItemBucket { diff --git a/common/buildcraft/energy/ItemEngine.java b/common/buildcraft/energy/ItemEngine.java index 5f738be8..a32bbe73 100644 --- a/common/buildcraft/energy/ItemEngine.java +++ b/common/buildcraft/energy/ItemEngine.java @@ -9,8 +9,8 @@ package buildcraft.energy; -import net.minecraft.item.ItemStack; import buildcraft.core.ItemBlockBuildCraft; +import net.minecraft.item.ItemStack; public class ItemEngine extends ItemBlockBuildCraft { diff --git a/common/buildcraft/energy/OilBucketHandler.java b/common/buildcraft/energy/OilBucketHandler.java index 4cd9c400..f53fa3cf 100644 --- a/common/buildcraft/energy/OilBucketHandler.java +++ b/common/buildcraft/energy/OilBucketHandler.java @@ -9,13 +9,13 @@ package buildcraft.energy; +import buildcraft.BuildCraftEnergy; import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.event.Event.Result; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.entity.player.FillBucketEvent; -import buildcraft.BuildCraftEnergy; public class OilBucketHandler { @@ -35,7 +35,7 @@ public class OilBucketHandler { int blockID = world.getBlockId(pos.blockX, pos.blockY, pos.blockZ); - if ((blockID == BuildCraftEnergy.oilStill.blockID || blockID == BuildCraftEnergy.oilMoving.blockID) + if ((blockID == BuildCraftEnergy.blockOil.blockID || blockID == BuildCraftEnergy.oilMoving.blockID) && world.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ) == 0) { world.setBlock(pos.blockX, pos.blockY, pos.blockZ, 0); diff --git a/common/buildcraft/energy/TileEngine.java b/common/buildcraft/energy/TileEngine.java index 60cc28f7..e68c55b0 100644 --- a/common/buildcraft/energy/TileEngine.java +++ b/common/buildcraft/energy/TileEngine.java @@ -7,17 +7,6 @@ */ package buildcraft.energy; -import java.util.LinkedList; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagFloat; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftEnergy; import buildcraft.api.core.Position; import buildcraft.api.gates.IOverrideDefaultTriggers; @@ -35,6 +24,16 @@ import buildcraft.core.network.TileNetworkData; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; import buildcraft.energy.gui.ContainerEngine; +import java.util.LinkedList; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagFloat; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; public abstract class TileEngine extends TileBuildCraft implements IPowerReceptor, IPowerEmitter, IInventory, IOverrideDefaultTriggers, IPipeConnection { diff --git a/common/buildcraft/energy/TileEngineIron.java b/common/buildcraft/energy/TileEngineIron.java index 30e03a67..01680a17 100644 --- a/common/buildcraft/energy/TileEngineIron.java +++ b/common/buildcraft/energy/TileEngineIron.java @@ -7,20 +7,6 @@ */ package buildcraft.energy; -import java.util.LinkedList; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ICrafting; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; -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.BuildCraftEnergy; import buildcraft.api.fuels.IronEngineCoolant; @@ -34,6 +20,19 @@ import buildcraft.core.liquids.FluidUtils; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; import buildcraft.energy.gui.ContainerEngine; +import java.util.LinkedList; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ICrafting; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; public class TileEngineIron extends TileEngine implements IFluidHandler { diff --git a/common/buildcraft/energy/TileEngineLegacy.java b/common/buildcraft/energy/TileEngineLegacy.java index dc910459..7882e768 100644 --- a/common/buildcraft/energy/TileEngineLegacy.java +++ b/common/buildcraft/energy/TileEngineLegacy.java @@ -7,9 +7,9 @@ */ package buildcraft.energy; +import buildcraft.core.DefaultProps; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import buildcraft.core.DefaultProps; /** * This class is just intended to update pre 4.0 engines to the design. diff --git a/common/buildcraft/energy/TileEngineStone.java b/common/buildcraft/energy/TileEngineStone.java index 976a7023..f2a574e9 100644 --- a/common/buildcraft/energy/TileEngineStone.java +++ b/common/buildcraft/energy/TileEngineStone.java @@ -7,14 +7,6 @@ */ package buildcraft.energy; -import java.util.LinkedList; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ICrafting; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftEnergy; import buildcraft.api.gates.ITrigger; @@ -23,6 +15,13 @@ import buildcraft.core.GuiIds; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; import buildcraft.energy.gui.ContainerEngine; +import java.util.LinkedList; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ICrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraftforge.common.ForgeDirection; public class TileEngineStone extends TileEngine { diff --git a/common/buildcraft/energy/TileEngineWood.java b/common/buildcraft/energy/TileEngineWood.java index 773ac6e7..6638aee9 100644 --- a/common/buildcraft/energy/TileEngineWood.java +++ b/common/buildcraft/energy/TileEngineWood.java @@ -7,9 +7,9 @@ */ package buildcraft.energy; -import net.minecraftforge.common.ForgeDirection; import buildcraft.core.DefaultProps; import buildcraft.core.proxy.CoreProxy; +import net.minecraftforge.common.ForgeDirection; public class TileEngineWood extends TileEngine { diff --git a/common/buildcraft/energy/TilePollution.java b/common/buildcraft/energy/TilePollution.java index dfeedc01..ac0f3dfe 100644 --- a/common/buildcraft/energy/TilePollution.java +++ b/common/buildcraft/energy/TilePollution.java @@ -9,10 +9,10 @@ package buildcraft.energy; -import net.minecraft.tileentity.TileEntity; import buildcraft.BuildCraftEnergy; import buildcraft.api.core.SafeTimeTracker; import buildcraft.core.BlockIndex; +import net.minecraft.tileentity.TileEntity; public class TilePollution extends TileEntity { diff --git a/common/buildcraft/energy/TriggerEngineHeat.java b/common/buildcraft/energy/TriggerEngineHeat.java index a094a049..24064741 100644 --- a/common/buildcraft/energy/TriggerEngineHeat.java +++ b/common/buildcraft/energy/TriggerEngineHeat.java @@ -7,13 +7,13 @@ */ package buildcraft.energy; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; import buildcraft.api.gates.ITriggerParameter; import buildcraft.core.triggers.ActionTriggerIconProvider; import buildcraft.core.triggers.BCTrigger; import buildcraft.core.utils.StringUtils; import buildcraft.energy.TileEngine.EnergyStage; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; public class TriggerEngineHeat extends BCTrigger { diff --git a/common/buildcraft/energy/gui/ContainerEngine.java b/common/buildcraft/energy/gui/ContainerEngine.java index cb26bb22..9c90557d 100644 --- a/common/buildcraft/energy/gui/ContainerEngine.java +++ b/common/buildcraft/energy/gui/ContainerEngine.java @@ -7,13 +7,13 @@ */ package buildcraft.energy.gui; +import buildcraft.core.gui.BuildCraftContainer; +import buildcraft.energy.TileEngine; +import buildcraft.energy.TileEngineStone; 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.TileEngine; -import buildcraft.energy.TileEngineStone; public class ContainerEngine extends BuildCraftContainer { diff --git a/common/buildcraft/energy/gui/GuiCombustionEngine.java b/common/buildcraft/energy/gui/GuiCombustionEngine.java index 5000ea1d..d14c4ce3 100644 --- a/common/buildcraft/energy/gui/GuiCombustionEngine.java +++ b/common/buildcraft/energy/gui/GuiCombustionEngine.java @@ -9,19 +9,17 @@ package buildcraft.energy.gui; +import buildcraft.core.DefaultProps; +import buildcraft.core.utils.StringUtils; +import buildcraft.energy.TileEngine; +import buildcraft.energy.TileEngineIron; import net.minecraft.block.Block; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.Item; import net.minecraft.util.Icon; import net.minecraftforge.fluids.FluidStack; - import org.lwjgl.opengl.GL11; -import buildcraft.core.DefaultProps; -import buildcraft.core.utils.StringUtils; -import buildcraft.energy.TileEngine; -import buildcraft.energy.TileEngineIron; - public class GuiCombustionEngine extends GuiEngine { public GuiCombustionEngine(InventoryPlayer inventoryplayer, TileEngine tileEngine) { diff --git a/common/buildcraft/energy/gui/GuiEngine.java b/common/buildcraft/energy/gui/GuiEngine.java index feb11673..06cd19f6 100644 --- a/common/buildcraft/energy/gui/GuiEngine.java +++ b/common/buildcraft/energy/gui/GuiEngine.java @@ -1,13 +1,13 @@ package buildcraft.energy.gui; -import net.minecraft.client.Minecraft; -import net.minecraft.inventory.IInventory; import buildcraft.BuildCraftCore; import buildcraft.core.CoreIconProvider; import buildcraft.core.gui.BuildCraftContainer; import buildcraft.core.gui.GuiBuildCraft; import buildcraft.core.utils.StringUtils; import buildcraft.energy.TileEngine; +import net.minecraft.client.Minecraft; +import net.minecraft.inventory.IInventory; public abstract class GuiEngine extends GuiBuildCraft { diff --git a/common/buildcraft/energy/gui/GuiSteamEngine.java b/common/buildcraft/energy/gui/GuiSteamEngine.java index 4627e641..289cad7a 100644 --- a/common/buildcraft/energy/gui/GuiSteamEngine.java +++ b/common/buildcraft/energy/gui/GuiSteamEngine.java @@ -9,13 +9,11 @@ package buildcraft.energy.gui; -import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import buildcraft.core.DefaultProps; import buildcraft.core.utils.StringUtils; import buildcraft.energy.TileEngine; +import net.minecraft.entity.player.InventoryPlayer; +import org.lwjgl.opengl.GL11; public class GuiSteamEngine extends GuiEngine { diff --git a/common/buildcraft/energy/render/RenderEngine.java b/common/buildcraft/energy/render/RenderEngine.java index f17bfd7a..c6fc7e5a 100644 --- a/common/buildcraft/energy/render/RenderEngine.java +++ b/common/buildcraft/energy/render/RenderEngine.java @@ -7,27 +7,25 @@ */ package buildcraft.energy.render; -import static net.minecraftforge.common.ForgeDirection.DOWN; -import static net.minecraftforge.common.ForgeDirection.EAST; -import static net.minecraftforge.common.ForgeDirection.NORTH; -import static net.minecraftforge.common.ForgeDirection.SOUTH; -import static net.minecraftforge.common.ForgeDirection.UP; -import static net.minecraftforge.common.ForgeDirection.WEST; -import net.minecraft.client.model.ModelBase; -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.common.ForgeDirection; - -import org.lwjgl.opengl.GL11; - import buildcraft.BuildCraftCore; import buildcraft.BuildCraftCore.RenderMode; import buildcraft.core.DefaultProps; import buildcraft.core.IInventoryRenderer; import buildcraft.energy.TileEngine; import buildcraft.energy.TileEngine.EnergyStage; +import net.minecraft.client.model.ModelBase; +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.common.ForgeDirection; +import static net.minecraftforge.common.ForgeDirection.DOWN; +import static net.minecraftforge.common.ForgeDirection.EAST; +import static net.minecraftforge.common.ForgeDirection.NORTH; +import static net.minecraftforge.common.ForgeDirection.SOUTH; +import static net.minecraftforge.common.ForgeDirection.UP; +import static net.minecraftforge.common.ForgeDirection.WEST; +import org.lwjgl.opengl.GL11; public class RenderEngine extends TileEntitySpecialRenderer implements IInventoryRenderer { diff --git a/common/buildcraft/energy/worldgen/BiomeGenOilDesert.java b/common/buildcraft/energy/worldgen/BiomeGenOilDesert.java index 06b25406..2591c4ce 100644 --- a/common/buildcraft/energy/worldgen/BiomeGenOilDesert.java +++ b/common/buildcraft/energy/worldgen/BiomeGenOilDesert.java @@ -1,7 +1,6 @@ package buildcraft.energy.worldgen; import java.util.Random; - import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenDesert; import net.minecraftforge.common.BiomeDictionary; diff --git a/common/buildcraft/energy/worldgen/BiomeInitializer.java b/common/buildcraft/energy/worldgen/BiomeInitializer.java index a51f2320..bd6e630b 100644 --- a/common/buildcraft/energy/worldgen/BiomeInitializer.java +++ b/common/buildcraft/energy/worldgen/BiomeInitializer.java @@ -1,8 +1,8 @@ package buildcraft.energy.worldgen; +import buildcraft.BuildCraftEnergy; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.terraingen.WorldTypeEvent; -import buildcraft.BuildCraftEnergy; /** * diff --git a/common/buildcraft/energy/worldgen/GenLayerAddOilDesert.java b/common/buildcraft/energy/worldgen/GenLayerAddOilDesert.java index 090d2c75..5e2bc8dd 100644 --- a/common/buildcraft/energy/worldgen/GenLayerAddOilDesert.java +++ b/common/buildcraft/energy/worldgen/GenLayerAddOilDesert.java @@ -1,8 +1,8 @@ package buildcraft.energy.worldgen; +import buildcraft.BuildCraftEnergy; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.layer.GenLayer; -import buildcraft.BuildCraftEnergy; /** * diff --git a/common/buildcraft/energy/worldgen/GenLayerAddOilOcean.java b/common/buildcraft/energy/worldgen/GenLayerAddOilOcean.java index 6ca60461..cf0a1be7 100644 --- a/common/buildcraft/energy/worldgen/GenLayerAddOilOcean.java +++ b/common/buildcraft/energy/worldgen/GenLayerAddOilOcean.java @@ -1,8 +1,8 @@ package buildcraft.energy.worldgen; +import buildcraft.BuildCraftEnergy; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.layer.GenLayer; -import buildcraft.BuildCraftEnergy; /** * diff --git a/common/buildcraft/energy/worldgen/GenLayerBiomeReplacer.java b/common/buildcraft/energy/worldgen/GenLayerBiomeReplacer.java index fae3731a..934cd971 100644 --- a/common/buildcraft/energy/worldgen/GenLayerBiomeReplacer.java +++ b/common/buildcraft/energy/worldgen/GenLayerBiomeReplacer.java @@ -1,7 +1,6 @@ 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/energy/worldgen/OilPopulate.java b/common/buildcraft/energy/worldgen/OilPopulate.java index fe0b9bd1..4de89eac 100644 --- a/common/buildcraft/energy/worldgen/OilPopulate.java +++ b/common/buildcraft/energy/worldgen/OilPopulate.java @@ -7,15 +7,12 @@ */ package buildcraft.energy.worldgen; -import static net.minecraftforge.common.BiomeDictionary.Type.DESERT; -import static net.minecraftforge.common.BiomeDictionary.Type.FOREST; -import static net.minecraftforge.common.BiomeDictionary.Type.FROZEN; -import static net.minecraftforge.common.BiomeDictionary.Type.WASTELAND; +import buildcraft.BuildCraftCore; +import buildcraft.BuildCraftEnergy; import java.util.HashSet; import java.util.Random; import java.util.Set; - import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockFluid; @@ -24,14 +21,16 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.BiomeDictionary; +import static net.minecraftforge.common.BiomeDictionary.Type.DESERT; +import static net.minecraftforge.common.BiomeDictionary.Type.FOREST; +import static net.minecraftforge.common.BiomeDictionary.Type.FROZEN; +import static net.minecraftforge.common.BiomeDictionary.Type.WASTELAND; import net.minecraftforge.common.EnumHelper; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.terraingen.PopulateChunkEvent; import net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType; import net.minecraftforge.event.terraingen.TerrainGen; -import buildcraft.BuildCraftCore; -import buildcraft.BuildCraftEnergy; public class OilPopulate { @@ -149,7 +148,7 @@ public class OilPopulate { int distance = poolX * poolX + poolY * poolY + poolZ * poolZ; if (distance <= radiusSq) { - world.setBlock(poolX + wellX, poolY + wellY, poolZ + wellZ, BuildCraftEnergy.oilStill.blockID, 0, distance == radiusSq ? 3 : 2); + world.setBlock(poolX + wellX, poolY + wellY, poolZ + wellZ, BuildCraftEnergy.blockOil.blockID, 0, distance == radiusSq ? 3 : 2); } } } @@ -181,15 +180,15 @@ public class OilPopulate { } } for (int y = baseY + 1; y <= maxHeight; ++y) { - world.setBlock(wellX, y, wellZ, BuildCraftEnergy.oilStill.blockID); + world.setBlock(wellX, y, wellZ, BuildCraftEnergy.blockOil.blockID); } if (type == GenType.LARGE) { for (int y = wellY; y <= maxHeight - wellHeight / 2; ++y) { - world.setBlock(wellX + 1, y, wellZ, BuildCraftEnergy.oilStill.blockID); - world.setBlock(wellX - 1, y, wellZ, BuildCraftEnergy.oilStill.blockID); - world.setBlock(wellX, y, wellZ + 1, BuildCraftEnergy.oilStill.blockID); - world.setBlock(wellX, y, wellZ - 1, BuildCraftEnergy.oilStill.blockID); + world.setBlock(wellX + 1, y, wellZ, BuildCraftEnergy.blockOil.blockID); + world.setBlock(wellX - 1, y, wellZ, BuildCraftEnergy.blockOil.blockID); + world.setBlock(wellX, y, wellZ + 1, BuildCraftEnergy.blockOil.blockID); + world.setBlock(wellX, y, wellZ - 1, BuildCraftEnergy.blockOil.blockID); } } @@ -263,7 +262,7 @@ public class OilPopulate { private boolean isOil(World world, int x, int y, int z) { int blockId = world.getBlockId(x, y, z); - return (blockId == BuildCraftEnergy.oilStill.blockID || blockId == BuildCraftEnergy.oilMoving.blockID); + return (blockId == BuildCraftEnergy.blockOil.blockID || blockId == BuildCraftEnergy.oilMoving.blockID); } private boolean isReplaceableForLake(World world, BiomeGenBase biome, int x, int y, int z) { @@ -318,7 +317,7 @@ public class OilPopulate { return; } if (isOilOrWater(world, x, y, z) || world.isBlockSolidOnSide(x, y - 1, z, ForgeDirection.UP)) { - world.setBlock(x, y, z, BuildCraftEnergy.oilStill.blockID, 0, update); + world.setBlock(x, y, z, BuildCraftEnergy.blockOil.blockID, 0, update); } else { return; } @@ -330,7 +329,7 @@ public class OilPopulate { if (isOilOrWater(world, x, y - d, z) || !world.isBlockSolidOnSide(x, y - d - 1, z, ForgeDirection.UP)) { return; } - world.setBlock(x, y - d, z, BuildCraftEnergy.oilStill.blockID, 0, 2); + world.setBlock(x, y - d, z, BuildCraftEnergy.blockOil.blockID, 0, 2); } } } diff --git a/common/buildcraft/factory/BlockAutoWorkbench.java b/common/buildcraft/factory/BlockAutoWorkbench.java index 9e6bcc4b..83a7b4a4 100644 --- a/common/buildcraft/factory/BlockAutoWorkbench.java +++ b/common/buildcraft/factory/BlockAutoWorkbench.java @@ -9,15 +9,6 @@ package buildcraft.factory; -import java.util.ArrayList; - -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.BuildCraftFactory; import buildcraft.core.BlockBuildCraft; import buildcraft.core.GuiIds; @@ -25,6 +16,14 @@ import buildcraft.core.IItemPipe; import buildcraft.core.proxy.CoreProxy; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +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; public class BlockAutoWorkbench extends BlockBuildCraft { diff --git a/common/buildcraft/factory/BlockFrame.java b/common/buildcraft/factory/BlockFrame.java index 911a4b95..a6a155db 100644 --- a/common/buildcraft/factory/BlockFrame.java +++ b/common/buildcraft/factory/BlockFrame.java @@ -9,10 +9,14 @@ package buildcraft.factory; +import buildcraft.BuildCraftCore; +import buildcraft.core.IFramePipeConnection; +import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -23,11 +27,6 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import buildcraft.BuildCraftCore; -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 cc5dd2da..d46484b6 100644 --- a/common/buildcraft/factory/BlockHopper.java +++ b/common/buildcraft/factory/BlockHopper.java @@ -1,14 +1,5 @@ package buildcraft.factory; -import java.util.ArrayList; - -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; import buildcraft.core.BlockBuildCraft; @@ -17,6 +8,14 @@ import buildcraft.core.IItemPipe; import buildcraft.core.proxy.CoreProxy; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +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; public class BlockHopper extends BlockBuildCraft { diff --git a/common/buildcraft/factory/BlockMachineRoot.java b/common/buildcraft/factory/BlockMachineRoot.java index f2769d3f..843301e7 100644 --- a/common/buildcraft/factory/BlockMachineRoot.java +++ b/common/buildcraft/factory/BlockMachineRoot.java @@ -9,12 +9,12 @@ package buildcraft.factory; +import buildcraft.core.CreativeTabBuildCraft; +import buildcraft.core.IMachine; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; -import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.IMachine; public abstract class BlockMachineRoot extends BlockContainer { diff --git a/common/buildcraft/factory/BlockMiningWell.java b/common/buildcraft/factory/BlockMiningWell.java index a0499abe..85712ae5 100644 --- a/common/buildcraft/factory/BlockMiningWell.java +++ b/common/buildcraft/factory/BlockMiningWell.java @@ -9,22 +9,20 @@ package buildcraft.factory; +import buildcraft.BuildCraftFactory; +import buildcraft.api.core.Position; +import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import buildcraft.BuildCraftFactory; -import buildcraft.api.core.Position; -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 4ceaf997..13a0f444 100644 --- a/common/buildcraft/factory/BlockPlainPipe.java +++ b/common/buildcraft/factory/BlockPlainPipe.java @@ -9,18 +9,17 @@ package buildcraft.factory; +import buildcraft.core.IFramePipeConnection; +import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.Random; - 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.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 930146a9..5036a4f2 100644 --- a/common/buildcraft/factory/BlockPump.java +++ b/common/buildcraft/factory/BlockPump.java @@ -9,8 +9,11 @@ package buildcraft.factory; +import buildcraft.core.CreativeTabBuildCraft; +import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -18,10 +21,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; -import buildcraft.core.CreativeTabBuildCraft; -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 547eb030..ecee8fbd 100644 --- a/common/buildcraft/factory/BlockQuarry.java +++ b/common/buildcraft/factory/BlockQuarry.java @@ -9,8 +9,15 @@ package buildcraft.factory; +import buildcraft.BuildCraftFactory; +import buildcraft.api.core.Position; +import buildcraft.api.tools.IToolWrench; +import buildcraft.core.Box; +import buildcraft.core.proxy.CoreProxy; +import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.EntityLivingBase; @@ -21,14 +28,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import buildcraft.BuildCraftFactory; -import buildcraft.api.core.Position; -import buildcraft.api.tools.IToolWrench; -import buildcraft.core.Box; -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 a17e059d..a95790cc 100644 --- a/common/buildcraft/factory/BlockRefinery.java +++ b/common/buildcraft/factory/BlockRefinery.java @@ -7,22 +7,6 @@ */ package buildcraft.factory; -import java.util.ArrayList; - -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftFactory; import buildcraft.api.core.Position; @@ -33,6 +17,20 @@ import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; public class BlockRefinery extends BlockContainer { diff --git a/common/buildcraft/factory/BlockTank.java b/common/buildcraft/factory/BlockTank.java index adbf13b8..2362bbf6 100644 --- a/common/buildcraft/factory/BlockTank.java +++ b/common/buildcraft/factory/BlockTank.java @@ -9,8 +9,12 @@ package buildcraft.factory; +import buildcraft.BuildCraftCore; +import buildcraft.core.CreativeTabBuildCraft; +import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -23,11 +27,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; -import buildcraft.BuildCraftCore; -import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.utils.Utils; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockTank extends BlockContainer { @@ -110,7 +109,7 @@ public class BlockTank extends BlockContainer { // Handle empty containers } else { - FluidStack available = tank.getTanks(ForgeDirection.UNKNOWN)[0].getFluid(); + FluidStack available = tank.getTankInfo(ForgeDirection.UNKNOWN)[0].fluid; if (available != null) { ItemStack filled = FluidContainerRegistry.fillFluidContainer(available, current); diff --git a/common/buildcraft/factory/BptBlockAutoWorkbench.java b/common/buildcraft/factory/BptBlockAutoWorkbench.java index 5fad3b8c..4d43674c 100644 --- a/common/buildcraft/factory/BptBlockAutoWorkbench.java +++ b/common/buildcraft/factory/BptBlockAutoWorkbench.java @@ -9,14 +9,13 @@ package buildcraft.factory; -import java.util.LinkedList; - -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptBlockUtils; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; @Deprecated public class BptBlockAutoWorkbench extends BptBlock { diff --git a/common/buildcraft/factory/BptBlockFrame.java b/common/buildcraft/factory/BptBlockFrame.java index fd860e13..6f8c0e15 100644 --- a/common/buildcraft/factory/BptBlockFrame.java +++ b/common/buildcraft/factory/BptBlockFrame.java @@ -9,12 +9,11 @@ package buildcraft.factory; -import java.util.LinkedList; - -import net.minecraft.item.ItemStack; import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; @Deprecated public class BptBlockFrame extends BptBlock { diff --git a/common/buildcraft/factory/BptBlockRefinery.java b/common/buildcraft/factory/BptBlockRefinery.java index f4d6a094..8651abe6 100644 --- a/common/buildcraft/factory/BptBlockRefinery.java +++ b/common/buildcraft/factory/BptBlockRefinery.java @@ -8,10 +8,10 @@ package buildcraft.factory; -import net.minecraftforge.common.ForgeDirection; import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +import net.minecraftforge.common.ForgeDirection; @Deprecated public class BptBlockRefinery extends BptBlock { diff --git a/common/buildcraft/factory/EntityMechanicalArm.java b/common/buildcraft/factory/EntityMechanicalArm.java index 6137e288..682373cf 100644 --- a/common/buildcraft/factory/EntityMechanicalArm.java +++ b/common/buildcraft/factory/EntityMechanicalArm.java @@ -9,11 +9,11 @@ package buildcraft.factory; +import buildcraft.core.EntityBlock; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import buildcraft.core.EntityBlock; public class EntityMechanicalArm extends Entity { EntityBlock xArm, yArm, zArm, head; diff --git a/common/buildcraft/factory/FactoryProxy.java b/common/buildcraft/factory/FactoryProxy.java index 47d097be..f150464b 100644 --- a/common/buildcraft/factory/FactoryProxy.java +++ b/common/buildcraft/factory/FactoryProxy.java @@ -1,8 +1,8 @@ package buildcraft.factory; -import net.minecraft.world.World; import buildcraft.core.EntityBlock; import cpw.mods.fml.common.SidedProxy; +import net.minecraft.world.World; public class FactoryProxy { @SidedProxy(clientSide = "buildcraft.factory.FactoryProxyClient", serverSide = "buildcraft.factory.FactoryProxy") diff --git a/common/buildcraft/factory/FactoryProxyClient.java b/common/buildcraft/factory/FactoryProxyClient.java index 276a6e5e..daebdc08 100644 --- a/common/buildcraft/factory/FactoryProxyClient.java +++ b/common/buildcraft/factory/FactoryProxyClient.java @@ -1,9 +1,5 @@ package buildcraft.factory; -import java.lang.reflect.Method; - -import net.minecraft.util.Icon; -import net.minecraft.world.World; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftFactory; import buildcraft.core.EntityBlock; @@ -16,6 +12,9 @@ import buildcraft.factory.render.RenderRefinery; import buildcraft.factory.render.RenderTank; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; +import java.lang.reflect.Method; +import net.minecraft.util.Icon; +import net.minecraft.world.World; public class FactoryProxyClient extends FactoryProxy { public static Icon pumpTexture; diff --git a/common/buildcraft/factory/GuiHandler.java b/common/buildcraft/factory/GuiHandler.java index 2101e32c..ae8be321 100644 --- a/common/buildcraft/factory/GuiHandler.java +++ b/common/buildcraft/factory/GuiHandler.java @@ -1,8 +1,5 @@ package buildcraft.factory; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import buildcraft.core.GuiIds; import buildcraft.factory.gui.ContainerAutoWorkbench; import buildcraft.factory.gui.ContainerHopper; @@ -11,6 +8,9 @@ import buildcraft.factory.gui.GuiAutoCrafting; import buildcraft.factory.gui.GuiHopper; import buildcraft.factory.gui.GuiRefinery; import cpw.mods.fml.common.network.IGuiHandler; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class GuiHandler implements IGuiHandler { diff --git a/common/buildcraft/factory/PumpDimensionList.java b/common/buildcraft/factory/PumpDimensionList.java index 69bafaa7..f293776d 100644 --- a/common/buildcraft/factory/PumpDimensionList.java +++ b/common/buildcraft/factory/PumpDimensionList.java @@ -3,7 +3,6 @@ package buildcraft.factory; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; - import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; diff --git a/common/buildcraft/factory/TileAutoWorkbench.java b/common/buildcraft/factory/TileAutoWorkbench.java index ffa0e385..bb06e664 100644 --- a/common/buildcraft/factory/TileAutoWorkbench.java +++ b/common/buildcraft/factory/TileAutoWorkbench.java @@ -26,6 +26,7 @@ import net.minecraft.inventory.SlotCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ChatMessageComponent; import net.minecraft.util.ChunkCoordinates; import net.minecraftforge.common.ForgeDirection; diff --git a/common/buildcraft/factory/TileHopper.java b/common/buildcraft/factory/TileHopper.java index 3816e6c8..74cec761 100644 --- a/common/buildcraft/factory/TileHopper.java +++ b/common/buildcraft/factory/TileHopper.java @@ -1,16 +1,16 @@ package buildcraft.factory; +import buildcraft.core.TileBuildCraft; +import buildcraft.core.inventory.ITransactor; +import buildcraft.core.inventory.SimpleInventory; +import buildcraft.core.inventory.Transactor; +import buildcraft.core.proxy.CoreProxy; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; 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.SimpleInventory; -import buildcraft.core.inventory.Transactor; -import buildcraft.core.proxy.CoreProxy; public class TileHopper extends TileBuildCraft implements IInventory { diff --git a/common/buildcraft/factory/TileMiningWell.java b/common/buildcraft/factory/TileMiningWell.java index 3645db56..d19f5013 100644 --- a/common/buildcraft/factory/TileMiningWell.java +++ b/common/buildcraft/factory/TileMiningWell.java @@ -7,12 +7,6 @@ */ package buildcraft.factory; -import java.util.List; - -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftFactory; import buildcraft.api.gates.IAction; @@ -25,6 +19,11 @@ import buildcraft.core.IMachine; import buildcraft.core.TileBuildCraft; import buildcraft.core.utils.BlockUtil; import buildcraft.core.utils.Utils; +import java.util.List; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; public class TileMiningWell extends TileBuildCraft implements IMachine, IPowerReceptor, IPipeConnection { diff --git a/common/buildcraft/factory/TilePump.java b/common/buildcraft/factory/TilePump.java index df3af502..c0b4d2e3 100644 --- a/common/buildcraft/factory/TilePump.java +++ b/common/buildcraft/factory/TilePump.java @@ -7,20 +7,6 @@ */ package buildcraft.factory; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.Set; -import java.util.TreeMap; -import java.util.TreeSet; - -import net.minecraft.block.Block; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fluids.IFluidTank; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftFactory; import buildcraft.api.core.Position; @@ -37,6 +23,20 @@ import buildcraft.core.network.PacketPayload; import buildcraft.core.network.PacketUpdate; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.Set; +import java.util.TreeMap; +import java.util.TreeSet; +import net.minecraft.block.Block; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.IFluidTank; +import net.minecraftforge.liquids.ITankContainer; public class TilePump extends TileBuildCraft implements IMachine, IPowerReceptor, ITankContainer { diff --git a/common/buildcraft/factory/TileQuarry.java b/common/buildcraft/factory/TileQuarry.java index 194651ec..6bcc6b07 100755 --- a/common/buildcraft/factory/TileQuarry.java +++ b/common/buildcraft/factory/TileQuarry.java @@ -7,21 +7,6 @@ */ package buildcraft.factory; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; - -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.packet.Packet3Chat; -import net.minecraft.util.AxisAlignedBB; -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.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftFactory; import buildcraft.api.core.IAreaProvider; @@ -45,12 +30,24 @@ import buildcraft.core.network.TileNetworkData; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.BlockUtil; import buildcraft.core.utils.Utils; - import com.google.common.collect.Lists; import com.google.common.collect.Sets; - import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.network.Player; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.packet.Packet3Chat; +import net.minecraft.util.AxisAlignedBB; +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.ForgeDirection; public class TileQuarry extends TileBuildCraft implements IMachine, IPowerReceptor, IPipeConnection, IBuilderInventory { diff --git a/common/buildcraft/factory/TileRefinery.java b/common/buildcraft/factory/TileRefinery.java index 83172bd5..8868ea3d 100644 --- a/common/buildcraft/factory/TileRefinery.java +++ b/common/buildcraft/factory/TileRefinery.java @@ -7,19 +7,6 @@ */ package buildcraft.factory; -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.ForgeDirection; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fluids.IFluidHandler; -import net.minecraftforge.fluids.IFluidTank; import buildcraft.BuildCraftCore; import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.gates.IAction; @@ -33,6 +20,18 @@ import buildcraft.core.TileBuildCraft; import buildcraft.core.network.PacketPayload; import buildcraft.core.network.PacketUpdate; import buildcraft.core.proxy.CoreProxy; +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.ForgeDirection; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.IFluidTank; public class TileRefinery extends TileBuildCraft implements IFluidHandler, IPowerReceptor, IInventory, IMachine { diff --git a/common/buildcraft/factory/TileTank.java b/common/buildcraft/factory/TileTank.java index eb2cfc64..4c44121f 100644 --- a/common/buildcraft/factory/TileTank.java +++ b/common/buildcraft/factory/TileTank.java @@ -7,23 +7,24 @@ */ package buildcraft.factory; -import static net.minecraftforge.common.ForgeDirection.DOWN; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fluids.IFluidTank; import buildcraft.BuildCraftCore; -import buildcraft.BuildCraftFactory; import buildcraft.api.core.SafeTimeTracker; import buildcraft.core.TileBuildCraft; import buildcraft.core.network.PacketPayload; import buildcraft.core.network.PacketUpdate; import buildcraft.core.proxy.CoreProxy; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; -public class TileTank extends TileBuildCraft implements ITankContainer { +public class TileTank extends TileBuildCraft implements IFluidHandler { public final FluidTank tank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 16); public boolean hasUpdate = false; @@ -50,15 +51,13 @@ public class TileTank extends TileBuildCraft implements ITankContainer { /* NETWORK */ @Override public PacketPayload getPacketPayload() { - PacketPayload payload = new PacketPayload(3, 0, 0); + PacketPayload payload = new PacketPayload(2, 0, 0); if (tank.getFluid() != null) { - payload.intPayload[0] = tank.getFluid().itemID; - payload.intPayload[1] = tank.getFluid().itemMeta; - payload.intPayload[2] = tank.getFluid().amount; + payload.intPayload[0] = tank.getFluid().getFluid().getID(); + payload.intPayload[1] = tank.getFluid().amount; } else { payload.intPayload[0] = 0; payload.intPayload[1] = 0; - payload.intPayload[2] = 0; } return payload; } @@ -66,7 +65,7 @@ public class TileTank extends TileBuildCraft implements ITankContainer { @Override public void handleUpdatePacket(PacketUpdate packet) { if (packet.payload.intPayload[0] > 0) { - FluidStack liquid = new FluidStack(packet.payload.intPayload[0], packet.payload.intPayload[2], packet.payload.intPayload[1]); + FluidStack liquid = new FluidStack(FluidRegistry.getFluid(packet.payload.intPayload[0]), packet.payload.intPayload[2]); tank.setFluid(liquid); } else { tank.setFluid(null); @@ -77,24 +76,13 @@ public class TileTank extends TileBuildCraft implements ITankContainer { @Override public void readFromNBT(NBTTagCompound data) { super.readFromNBT(data); - - if (data.hasKey("stored") && data.hasKey("liquidId")) { - FluidStack liquid = new FluidStack(data.getInteger("liquidId"), data.getInteger("stored"), 0); - tank.setFluid(liquid); - } else { - FluidStack liquid = FluidStack.loadFluidStackFromNBT(data.getCompoundTag("tank")); - if (liquid != null) { - tank.setFluid(liquid); - } - } + tank.readFromNBT(data); } @Override public void writeToNBT(NBTTagCompound data) { super.writeToNBT(data); - if (tank.containsValidFluid()) { - data.setTag("tank", tank.getFluid().writeToNBT(new NBTTagCompound())); - } + tank.writeToNBT(data); } /* HELPER FUNCTIONS */ @@ -169,12 +157,7 @@ public class TileTank extends TileBuildCraft implements ITankContainer { /* ITANKCONTAINER */ @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - return fill(0, resource, doFill); - } - - @Override - public int fill(int tankIndex, FluidStack resource, boolean doFill) { - if (tankIndex != 0 || resource == null) { + if (resource == null) { return 0; } @@ -202,18 +185,20 @@ public class TileTank extends TileBuildCraft implements ITankContainer { @Override public FluidStack drain(ForgeDirection from, int maxEmpty, boolean doDrain) { - return drain(0, maxEmpty, doDrain); - } - - @Override - public FluidStack drain(int tankIndex, int maxEmpty, boolean doDrain) { TileTank bottom = getBottomTank(); bottom.hasUpdate = true; return bottom.tank.drain(maxEmpty, doDrain); } @Override - public IFluidTank[] getTanks(ForgeDirection direction) { + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + if (resource != null && !resource.isFluidEqual(tank.getFluid())) + return null; + return drain(from, resource.amount, doDrain); + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection direction) { FluidTank compositeTank = new FluidTank(tank.getCapacity()); TileTank tile = getBottomTank(); @@ -223,7 +208,7 @@ public class TileTank extends TileBuildCraft implements ITankContainer { if (tile != null && tile.tank.getFluid() != null) { compositeTank.setFluid(tile.tank.getFluid().copy()); } else { - return new IFluidTank[]{compositeTank}; + return new FluidTankInfo[]{compositeTank.getInfo()}; } tile = getTankAbove(tile); @@ -244,14 +229,16 @@ public class TileTank extends TileBuildCraft implements ITankContainer { } compositeTank.setCapacity(capacity); - return new IFluidTank[]{compositeTank}; + return new FluidTankInfo[]{compositeTank.getInfo()}; } @Override - public IFluidTank getTank(ForgeDirection direction, FluidStack type) { - if (direction == DOWN && worldObj != null && worldObj.getBlockId(xCoord, yCoord - 1, zCoord) != BuildCraftFactory.tankBlock.blockID) { - return tank; - } - return null; + public boolean canFill(ForgeDirection from, Fluid fluid) { + return true; + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return false; } } diff --git a/common/buildcraft/factory/gui/ContainerAutoWorkbench.java b/common/buildcraft/factory/gui/ContainerAutoWorkbench.java index 8538d4f1..11804d59 100644 --- a/common/buildcraft/factory/gui/ContainerAutoWorkbench.java +++ b/common/buildcraft/factory/gui/ContainerAutoWorkbench.java @@ -7,14 +7,6 @@ */ package buildcraft.factory.gui; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.InventoryCraftResult; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; import buildcraft.core.gui.BuildCraftContainer; import buildcraft.core.gui.slots.SlotOutput; import buildcraft.core.gui.slots.SlotUntouchable; @@ -23,6 +15,14 @@ import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.Utils; import buildcraft.factory.TileAutoWorkbench; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.InventoryCraftResult; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; public class ContainerAutoWorkbench extends BuildCraftContainer { diff --git a/common/buildcraft/factory/gui/ContainerHopper.java b/common/buildcraft/factory/gui/ContainerHopper.java index 75697c56..701761ee 100644 --- a/common/buildcraft/factory/gui/ContainerHopper.java +++ b/common/buildcraft/factory/gui/ContainerHopper.java @@ -1,11 +1,11 @@ package buildcraft.factory.gui; +import buildcraft.core.gui.BuildCraftContainer; +import buildcraft.factory.TileHopper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -import buildcraft.core.gui.BuildCraftContainer; -import buildcraft.factory.TileHopper; public class ContainerHopper extends BuildCraftContainer { diff --git a/common/buildcraft/factory/gui/ContainerRefinery.java b/common/buildcraft/factory/gui/ContainerRefinery.java index 8986f597..403871f6 100644 --- a/common/buildcraft/factory/gui/ContainerRefinery.java +++ b/common/buildcraft/factory/gui/ContainerRefinery.java @@ -8,17 +8,17 @@ */ package buildcraft.factory.gui; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; import buildcraft.core.gui.BuildCraftContainer; import buildcraft.core.network.PacketIds; import buildcraft.core.network.PacketPayload; import buildcraft.core.network.PacketUpdate; import buildcraft.core.proxy.CoreProxy; import buildcraft.factory.TileRefinery; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; public class ContainerRefinery extends BuildCraftContainer { diff --git a/common/buildcraft/factory/gui/GuiAutoCrafting.java b/common/buildcraft/factory/gui/GuiAutoCrafting.java index b0294ff2..8aa44f89 100644 --- a/common/buildcraft/factory/gui/GuiAutoCrafting.java +++ b/common/buildcraft/factory/gui/GuiAutoCrafting.java @@ -7,16 +7,14 @@ */ package buildcraft.factory.gui; -import net.minecraft.client.resources.ResourceLocation; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.world.World; - -import org.lwjgl.opengl.GL11; - import buildcraft.core.DefaultProps; import buildcraft.core.gui.GuiBuildCraft; import buildcraft.core.utils.StringUtils; import buildcraft.factory.TileAutoWorkbench; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; +import org.lwjgl.opengl.GL11; public class GuiAutoCrafting extends GuiBuildCraft { diff --git a/common/buildcraft/factory/gui/GuiHopper.java b/common/buildcraft/factory/gui/GuiHopper.java index 00659245..5ab38dc3 100644 --- a/common/buildcraft/factory/gui/GuiHopper.java +++ b/common/buildcraft/factory/gui/GuiHopper.java @@ -1,15 +1,16 @@ package buildcraft.factory.gui; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import buildcraft.core.DefaultProps; import buildcraft.factory.TileHopper; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; public class GuiHopper extends GuiContainer { + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/hopper_gui.png"); + public GuiHopper(InventoryPlayer inventory, TileHopper tile) { super(new ContainerHopper(inventory, tile)); // TODO Auto-generated constructor stub @@ -17,8 +18,8 @@ public class GuiHopper extends GuiContainer { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(DefaultProps.TEXTURE_PATH_GUI + "/hopper_gui.png"); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.renderEngine.func_110577_a(TEXTURE); int j = (width - xSize) / 2; int k = (height - ySize) / 2; drawTexturedModalRect(j, k, 0, 0, xSize, ySize); @@ -28,5 +29,4 @@ public class GuiHopper extends GuiContainer { protected void drawGuiContainerForegroundLayer(int par1, int par2) { super.drawGuiContainerForegroundLayer(par1, par2); } - } diff --git a/common/buildcraft/factory/gui/GuiRefinery.java b/common/buildcraft/factory/gui/GuiRefinery.java index 6f25d73c..5b278e3f 100644 --- a/common/buildcraft/factory/gui/GuiRefinery.java +++ b/common/buildcraft/factory/gui/GuiRefinery.java @@ -9,21 +9,21 @@ package buildcraft.factory.gui; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - import buildcraft.api.recipes.RefineryRecipe; import buildcraft.core.DefaultProps; import buildcraft.core.gui.GuiAdvancedInterface; import buildcraft.core.utils.StringUtils; import buildcraft.factory.TileRefinery; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; +import org.lwjgl.opengl.GL11; public class GuiRefinery extends GuiAdvancedInterface { + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/refinery_filter.png"); ContainerRefinery container; public GuiRefinery(InventoryPlayer inventory, TileRefinery refinery) { @@ -55,7 +55,7 @@ public class GuiRefinery extends GuiAdvancedInterface { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(DefaultProps.TEXTURE_PATH_GUI + "/refinery_filter.png"); + mc.renderEngine.func_110577_a(TEXTURE); int j = (width - xSize) / 2; int k = (height - ySize) / 2; drawTexturedModalRect(j, k, 0, 0, xSize, ySize); @@ -100,6 +100,7 @@ public class GuiRefinery extends GuiAdvancedInterface { FluidStack liquid0 = null; FluidStack liquid1 = null; + // TODO 1.6: Replace these with Phantom slots? -CovertJaguar if (filter0 != null) { liquid0 = new FluidStack(filter0.itemID, FluidContainerRegistry.BUCKET_VOLUME, filter0.getItemDamage()); } diff --git a/common/buildcraft/factory/network/PacketHandlerFactory.java b/common/buildcraft/factory/network/PacketHandlerFactory.java index c4d6240b..692ce104 100644 --- a/common/buildcraft/factory/network/PacketHandlerFactory.java +++ b/common/buildcraft/factory/network/PacketHandlerFactory.java @@ -1,18 +1,17 @@ package buildcraft.factory.network; -import java.io.ByteArrayInputStream; -import java.io.DataInputStream; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.network.INetworkManager; -import net.minecraft.network.packet.Packet250CustomPayload; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import buildcraft.core.network.PacketIds; import buildcraft.core.network.PacketUpdate; import buildcraft.factory.TileRefinery; import cpw.mods.fml.common.network.IPacketHandler; import cpw.mods.fml.common.network.Player; +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.Packet250CustomPayload; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class PacketHandlerFactory implements IPacketHandler { diff --git a/common/buildcraft/factory/render/RenderHopper.java b/common/buildcraft/factory/render/RenderHopper.java index 0b855d2a..9f600b76 100644 --- a/common/buildcraft/factory/render/RenderHopper.java +++ b/common/buildcraft/factory/render/RenderHopper.java @@ -1,24 +1,24 @@ package buildcraft.factory.render; +import buildcraft.BuildCraftCore; +import buildcraft.BuildCraftCore.RenderMode; +import buildcraft.core.DefaultProps; +import buildcraft.core.IInventoryRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; 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.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import buildcraft.BuildCraftCore; -import buildcraft.BuildCraftCore.RenderMode; -import buildcraft.core.DefaultProps; -import buildcraft.core.IInventoryRenderer; - public class RenderHopper extends TileEntitySpecialRenderer implements IInventoryRenderer { + private static final ResourceLocation HOPPER_TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_BLOCKS + "/hopper.png"); + private static final ResourceLocation HOPPER_MIDDLE_TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_BLOCKS + "/hopper_middle.png"); private ModelBase model = new ModelBase() { }; - private final ModelRenderer top; private final ModelFrustum middle; private final ModelRenderer bottom; @@ -56,10 +56,10 @@ public class RenderHopper extends TileEntitySpecialRenderer implements IInventor GL11.glDisable(GL11.GL_LIGHTING); GL11.glTranslated(x, y, z); - bindTextureByName(DefaultProps.TEXTURE_PATH_BLOCKS + "/hopper.png"); + func_110628_a(HOPPER_TEXTURE); top.render((float) (1.0 / 16.0)); bottom.render((float) (1.0 / 16.0)); - bindTextureByName(DefaultProps.TEXTURE_PATH_BLOCKS + "/hopper_middle.png"); + func_110628_a(HOPPER_MIDDLE_TEXTURE); middle.render(Tessellator.instance, 1F / 16F); GL11.glEnable(GL11.GL_LIGHTING); diff --git a/common/buildcraft/factory/render/RenderRefinery.java b/common/buildcraft/factory/render/RenderRefinery.java index 81cbfa02..863f089b 100644 --- a/common/buildcraft/factory/render/RenderRefinery.java +++ b/common/buildcraft/factory/render/RenderRefinery.java @@ -7,22 +7,22 @@ */ package buildcraft.factory.render; +import buildcraft.core.DefaultProps; +import buildcraft.core.IInventoryRenderer; +import buildcraft.core.render.FluidRenderer; +import buildcraft.factory.TileRefinery; import net.minecraft.client.model.ModelBase; 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.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; - import org.lwjgl.opengl.GL11; -import buildcraft.core.DefaultProps; -import buildcraft.core.IInventoryRenderer; -import buildcraft.core.render.FluidRenderer; -import buildcraft.factory.TileRefinery; - public class RenderRefinery extends TileEntitySpecialRenderer implements IInventoryRenderer { + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_BLOCKS + "/refinery.png"); private static final float pixel = (float) (1.0 / 16.0); private final ModelRenderer tank; private final ModelRenderer magnet[] = new ModelRenderer[4]; @@ -125,7 +125,7 @@ public class RenderRefinery extends TileEntitySpecialRenderer implements IInvent GL11.glRotatef(angle, 0, 1, 0); - bindTextureByName(DefaultProps.TEXTURE_PATH_BLOCKS + "/refinery.png"); + func_110628_a(TEXTURE); GL11.glPushMatrix(); GL11.glTranslatef(-0.5F, -0.5F, -0.5F); @@ -181,7 +181,7 @@ public class RenderRefinery extends TileEntitySpecialRenderer implements IInvent int[] list1 = FluidRenderer.getFluidDisplayLists(liquid1, tile.worldObj, false); if (list1 != null) { - bindTextureByName(FluidRenderer.getFluidSheet(liquid1)); + func_110628_a(FluidRenderer.getFluidSheet(liquid1)); GL11.glCallList(list1[(int) ((float) liquid1.amount / (float) TileRefinery.LIQUID_PER_SLOT * (FluidRenderer.DISPLAY_STAGES - 1))]); } } @@ -192,7 +192,7 @@ public class RenderRefinery extends TileEntitySpecialRenderer implements IInvent if (list2 != null) { GL11.glPushMatrix(); GL11.glTranslatef(0, 0, 1); - bindTextureByName(FluidRenderer.getFluidSheet(liquid2)); + func_110628_a(FluidRenderer.getFluidSheet(liquid2)); GL11.glCallList(list2[(int) ((float) liquid2.amount / (float) TileRefinery.LIQUID_PER_SLOT * (FluidRenderer.DISPLAY_STAGES - 1))]); GL11.glPopMatrix(); } @@ -205,7 +205,7 @@ public class RenderRefinery extends TileEntitySpecialRenderer implements IInvent if (list3 != null) { GL11.glPushMatrix(); GL11.glTranslatef(1, 0, 0.5F); - bindTextureByName(FluidRenderer.getFluidSheet(liquidResult)); + func_110628_a(FluidRenderer.getFluidSheet(liquidResult)); GL11.glCallList(list3[(int) ((float) liquidResult.amount / (float) TileRefinery.LIQUID_PER_SLOT * (FluidRenderer.DISPLAY_STAGES - 1))]); GL11.glPopMatrix(); } diff --git a/common/buildcraft/factory/render/RenderTank.java b/common/buildcraft/factory/render/RenderTank.java index a7c21991..38bc65bb 100644 --- a/common/buildcraft/factory/render/RenderTank.java +++ b/common/buildcraft/factory/render/RenderTank.java @@ -7,15 +7,13 @@ */ package buildcraft.factory.render; +import buildcraft.core.render.FluidRenderer; +import buildcraft.factory.TileTank; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidStack; - import org.lwjgl.opengl.GL11; -import buildcraft.core.render.FluidRenderer; -import buildcraft.factory.TileTank; - public class RenderTank extends TileEntitySpecialRenderer { @Override @@ -40,7 +38,7 @@ public class RenderTank extends TileEntitySpecialRenderer { GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - bindTextureByName(FluidRenderer.getFluidSheet(liquid)); + func_110628_a(FluidRenderer.getFluidSheet(liquid)); GL11.glTranslatef((float) x + 0.125F, (float) y, (float) z + 0.125F); GL11.glScalef(0.75F, 0.999F, 0.75F); diff --git a/common/buildcraft/silicon/BlockLaser.java b/common/buildcraft/silicon/BlockLaser.java index 36aa5c7e..0d9acc62 100644 --- a/common/buildcraft/silicon/BlockLaser.java +++ b/common/buildcraft/silicon/BlockLaser.java @@ -9,8 +9,10 @@ package buildcraft.silicon; +import buildcraft.core.CreativeTabBuildCraft; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -19,9 +21,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import buildcraft.core.CreativeTabBuildCraft; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockLaser extends BlockContainer { diff --git a/common/buildcraft/silicon/BlockLaserTable.java b/common/buildcraft/silicon/BlockLaserTable.java index 92d525e7..2ae0d3b0 100644 --- a/common/buildcraft/silicon/BlockLaserTable.java +++ b/common/buildcraft/silicon/BlockLaserTable.java @@ -1,7 +1,12 @@ package buildcraft.silicon; +import buildcraft.BuildCraftSilicon; +import buildcraft.core.CreativeTabBuildCraft; +import buildcraft.core.proxy.CoreProxy; +import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.util.List; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -11,12 +16,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; -import buildcraft.BuildCraftSilicon; -import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.proxy.CoreProxy; -import buildcraft.core.utils.Utils; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockLaserTable extends BlockContainer { diff --git a/common/buildcraft/silicon/GuiHandler.java b/common/buildcraft/silicon/GuiHandler.java index 3ef11692..7c9eb060 100644 --- a/common/buildcraft/silicon/GuiHandler.java +++ b/common/buildcraft/silicon/GuiHandler.java @@ -1,13 +1,13 @@ package buildcraft.silicon; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import buildcraft.silicon.gui.ContainerAdvancedCraftingTable; import buildcraft.silicon.gui.ContainerAssemblyTable; import buildcraft.silicon.gui.GuiAdvancedCraftingTable; import buildcraft.silicon.gui.GuiAssemblyTable; import cpw.mods.fml.common.network.IGuiHandler; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class GuiHandler implements IGuiHandler { diff --git a/common/buildcraft/silicon/SiliconRenderBlock.java b/common/buildcraft/silicon/SiliconRenderBlock.java index 53fc3ea6..0732e9e6 100644 --- a/common/buildcraft/silicon/SiliconRenderBlock.java +++ b/common/buildcraft/silicon/SiliconRenderBlock.java @@ -9,17 +9,15 @@ package buildcraft.silicon; +import buildcraft.core.utils.Utils; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.ForgeDirection; - import org.lwjgl.opengl.GL11; -import buildcraft.core.utils.Utils; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; - public class SiliconRenderBlock implements ISimpleBlockRenderingHandler { @Override public int getRenderId() { diff --git a/common/buildcraft/silicon/TileAdvancedCraftingTable.java b/common/buildcraft/silicon/TileAdvancedCraftingTable.java index 13bd6522..52f4cc0c 100644 --- a/common/buildcraft/silicon/TileAdvancedCraftingTable.java +++ b/common/buildcraft/silicon/TileAdvancedCraftingTable.java @@ -1,29 +1,5 @@ package buildcraft.silicon; -import static net.minecraftforge.common.ForgeDirection.DOWN; -import static net.minecraftforge.common.ForgeDirection.EAST; -import static net.minecraftforge.common.ForgeDirection.NORTH; -import static net.minecraftforge.common.ForgeDirection.SOUTH; -import static net.minecraftforge.common.ForgeDirection.WEST; - -import java.util.EnumSet; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -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.IRecipe; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatMessageComponent; -import net.minecraft.util.ChunkCoordinates; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.api.gates.IAction; import buildcraft.api.gates.IActionReceptor; @@ -45,8 +21,29 @@ import buildcraft.core.proxy.CoreProxy; import buildcraft.core.triggers.ActionMachineControl; import buildcraft.core.utils.CraftingHelper; import buildcraft.core.utils.Utils; - import com.google.common.collect.Lists; +import java.util.EnumSet; +import java.util.List; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; +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.IRecipe; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatMessageComponent; +import net.minecraft.util.ChunkCoordinates; +import net.minecraftforge.common.ForgeDirection; +import static net.minecraftforge.common.ForgeDirection.DOWN; +import static net.minecraftforge.common.ForgeDirection.EAST; +import static net.minecraftforge.common.ForgeDirection.NORTH; +import static net.minecraftforge.common.ForgeDirection.SOUTH; +import static net.minecraftforge.common.ForgeDirection.WEST; public class TileAdvancedCraftingTable extends TileEntity implements IInventory, ILaserTarget, IMachine, IActionReceptor, ISidedInventory { diff --git a/common/buildcraft/silicon/TileAssemblyTable.java b/common/buildcraft/silicon/TileAssemblyTable.java index b3970c7d..6daca467 100644 --- a/common/buildcraft/silicon/TileAssemblyTable.java +++ b/common/buildcraft/silicon/TileAssemblyTable.java @@ -1,18 +1,5 @@ package buildcraft.silicon; -import java.util.LinkedHashSet; -import java.util.LinkedList; - -import net.minecraft.entity.item.EntityItem; -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.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; import buildcraft.api.gates.IAction; import buildcraft.api.recipes.AssemblyRecipe; import buildcraft.api.transport.IPipeConnection; @@ -24,6 +11,18 @@ import buildcraft.core.network.PacketNBT; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; import cpw.mods.fml.common.FMLCommonHandler; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import net.minecraft.entity.item.EntityItem; +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.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; public class TileAssemblyTable extends TileEntity implements IMachine, IInventory, IPipeConnection, ILaserTarget { diff --git a/common/buildcraft/silicon/TileLaser.java b/common/buildcraft/silicon/TileLaser.java index 929111e5..0e1e416e 100644 --- a/common/buildcraft/silicon/TileLaser.java +++ b/common/buildcraft/silicon/TileLaser.java @@ -7,11 +7,6 @@ */ package buildcraft.silicon; -import java.util.LinkedList; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.api.core.Position; import buildcraft.api.core.SafeTimeTracker; @@ -27,6 +22,10 @@ import buildcraft.core.IMachine; import buildcraft.core.TileBuildCraft; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.triggers.ActionMachineControl; +import java.util.LinkedList; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; public class TileLaser extends TileBuildCraft implements IPowerReceptor, IActionReceptor, IMachine { diff --git a/common/buildcraft/silicon/gui/ContainerAdvancedCraftingTable.java b/common/buildcraft/silicon/gui/ContainerAdvancedCraftingTable.java index 4ea8f0b5..db312d76 100644 --- a/common/buildcraft/silicon/gui/ContainerAdvancedCraftingTable.java +++ b/common/buildcraft/silicon/gui/ContainerAdvancedCraftingTable.java @@ -1,14 +1,14 @@ package buildcraft.silicon.gui; -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.SlotOutput; import buildcraft.core.gui.slots.SlotPhantom; import buildcraft.core.gui.slots.SlotUntouchable; import buildcraft.silicon.TileAdvancedCraftingTable; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.Slot; public class ContainerAdvancedCraftingTable extends BuildCraftContainer { diff --git a/common/buildcraft/silicon/gui/ContainerAssemblyTable.java b/common/buildcraft/silicon/gui/ContainerAssemblyTable.java index e802057d..61c60eb6 100644 --- a/common/buildcraft/silicon/gui/ContainerAssemblyTable.java +++ b/common/buildcraft/silicon/gui/ContainerAssemblyTable.java @@ -9,13 +9,13 @@ package buildcraft.silicon.gui; +import buildcraft.core.gui.BuildCraftContainer; +import buildcraft.silicon.TileAssemblyTable; +import buildcraft.silicon.TileAssemblyTable.SelectionMessage; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -import buildcraft.core.gui.BuildCraftContainer; -import buildcraft.silicon.TileAssemblyTable; -import buildcraft.silicon.TileAssemblyTable.SelectionMessage; public class ContainerAssemblyTable extends BuildCraftContainer { IInventory playerIInventory; diff --git a/common/buildcraft/silicon/gui/GuiAdvancedCraftingTable.java b/common/buildcraft/silicon/gui/GuiAdvancedCraftingTable.java index e9023c5c..2b188f88 100644 --- a/common/buildcraft/silicon/gui/GuiAdvancedCraftingTable.java +++ b/common/buildcraft/silicon/gui/GuiAdvancedCraftingTable.java @@ -1,22 +1,22 @@ package buildcraft.silicon.gui; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.resources.ResourceLocation; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IInventory; - -import org.lwjgl.opengl.GL11; - import buildcraft.BuildCraftCore; import buildcraft.core.CoreIconProvider; import buildcraft.core.DefaultProps; import buildcraft.core.gui.GuiBuildCraft; import buildcraft.core.utils.StringUtils; import buildcraft.silicon.TileAdvancedCraftingTable; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; public class GuiAdvancedCraftingTable extends GuiBuildCraft { - public static final ResourceLocation gui = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/assembly_advancedworkbench.png"); + + public static final ResourceLocation gui = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/assembly_advancedworkbench.png"); + class AssemblyWorkbenchLedger extends Ledger { int headerColour = 0xe1c92f; diff --git a/common/buildcraft/silicon/gui/GuiAssemblyTable.java b/common/buildcraft/silicon/gui/GuiAssemblyTable.java index 2200c0fa..48108ccf 100644 --- a/common/buildcraft/silicon/gui/GuiAssemblyTable.java +++ b/common/buildcraft/silicon/gui/GuiAssemblyTable.java @@ -9,17 +9,6 @@ package buildcraft.silicon.gui; -import java.util.Iterator; -import java.util.LinkedList; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.resources.ResourceLocation; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - import buildcraft.BuildCraftCore; import buildcraft.api.recipes.AssemblyRecipe; import buildcraft.core.CoreIconProvider; @@ -32,9 +21,16 @@ import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.StringUtils; import buildcraft.silicon.TileAssemblyTable; import buildcraft.silicon.TileAssemblyTable.SelectionMessage; +import java.util.Iterator; +import java.util.LinkedList; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; public class GuiAssemblyTable extends GuiAdvancedInterface { - public static final ResourceLocation gui = new ResourceLocation("buildcraft",DefaultProps.TEXTURE_PATH_GUI + "/assembly_table.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft",DefaultProps.TEXTURE_PATH_GUI + "/assembly_table.png"); TileAssemblyTable assemblyTable; class AssemblyLedger extends Ledger { @@ -145,7 +141,7 @@ public class GuiAssemblyTable extends GuiAdvancedInterface { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.func_110577_a(gui); + mc.renderEngine.func_110577_a(TEXTURE); int cornerX = (width - xSize) / 2; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); diff --git a/common/buildcraft/silicon/network/PacketHandlerSilicon.java b/common/buildcraft/silicon/network/PacketHandlerSilicon.java index 3124a3a3..6faa57db 100644 --- a/common/buildcraft/silicon/network/PacketHandlerSilicon.java +++ b/common/buildcraft/silicon/network/PacketHandlerSilicon.java @@ -1,14 +1,5 @@ package buildcraft.silicon.network; -import java.io.ByteArrayInputStream; -import java.io.DataInputStream; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.network.INetworkManager; -import net.minecraft.network.packet.Packet250CustomPayload; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import buildcraft.core.network.PacketCoordinates; import buildcraft.core.network.PacketIds; import buildcraft.core.network.PacketNBT; @@ -19,6 +10,14 @@ import buildcraft.silicon.TileAssemblyTable.SelectionMessage; import buildcraft.silicon.gui.ContainerAssemblyTable; import cpw.mods.fml.common.network.IPacketHandler; import cpw.mods.fml.common.network.Player; +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.Packet250CustomPayload; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class PacketHandlerSilicon implements IPacketHandler { diff --git a/common/buildcraft/transport/BlockFilteredBuffer.java b/common/buildcraft/transport/BlockFilteredBuffer.java index 48b3d733..9e1188c5 100644 --- a/common/buildcraft/transport/BlockFilteredBuffer.java +++ b/common/buildcraft/transport/BlockFilteredBuffer.java @@ -7,15 +7,6 @@ */ package buildcraft.transport; -import java.util.ArrayList; - -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.BuildCraftTransport; import buildcraft.core.BlockBuildCraft; import buildcraft.core.GuiIds; @@ -23,6 +14,14 @@ import buildcraft.core.IItemPipe; import buildcraft.core.proxy.CoreProxy; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +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; /** * diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 915c7a1c..36400a3f 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -7,22 +7,31 @@ */ package buildcraft.transport; +import buildcraft.BuildCraftCore; +import buildcraft.BuildCraftTransport; +import buildcraft.api.tools.IToolWrench; +import buildcraft.api.transport.IPipe; +import buildcraft.api.transport.ISolidSideTile; +import buildcraft.core.BlockIndex; +import buildcraft.core.proxy.CoreProxy; +import buildcraft.core.utils.Utils; +import buildcraft.transport.render.PipeWorldRenderer; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; -import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.particle.EntityDiggingFX; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -36,18 +45,6 @@ import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import buildcraft.BuildCraftCore; -import buildcraft.BuildCraftTransport; -import buildcraft.api.tools.IToolWrench; -import buildcraft.api.transport.IPipe; -import buildcraft.api.transport.ISolidSideTile; -import buildcraft.core.BlockIndex; -import buildcraft.core.proxy.CoreProxy; -import buildcraft.core.utils.Utils; -import buildcraft.transport.render.PipeWorldRenderer; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockGenericPipe extends BlockContainer { diff --git a/common/buildcraft/transport/EnergyPulser.java b/common/buildcraft/transport/EnergyPulser.java index 82587b2b..a43b3fe0 100644 --- a/common/buildcraft/transport/EnergyPulser.java +++ b/common/buildcraft/transport/EnergyPulser.java @@ -1,9 +1,9 @@ package buildcraft.transport; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.ForgeDirection; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerHandler.Type; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.ForgeDirection; public class EnergyPulser { diff --git a/common/buildcraft/transport/EntityData.java b/common/buildcraft/transport/EntityData.java index 1d1a804b..ef8c9959 100644 --- a/common/buildcraft/transport/EntityData.java +++ b/common/buildcraft/transport/EntityData.java @@ -1,9 +1,8 @@ package buildcraft.transport; -import java.util.EnumSet; - -import net.minecraftforge.common.ForgeDirection; import buildcraft.api.transport.IPipedItem; +import java.util.EnumSet; +import net.minecraftforge.common.ForgeDirection; public class EntityData { diff --git a/common/buildcraft/transport/FallbackWrapper.java b/common/buildcraft/transport/FallbackWrapper.java index a48667f2..d7c6ceb5 100644 --- a/common/buildcraft/transport/FallbackWrapper.java +++ b/common/buildcraft/transport/FallbackWrapper.java @@ -1,18 +1,15 @@ package buildcraft.transport; -import java.lang.reflect.Method; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; -import net.minecraftforge.common.ForgeDirection; import buildcraft.api.core.IIconProvider; import buildcraft.api.gates.ITrigger; import buildcraft.api.gates.ITriggerParameter; - import com.google.common.base.Throwables; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.lang.reflect.Method; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraftforge.common.ForgeDirection; public class FallbackWrapper implements ITrigger { diff --git a/common/buildcraft/transport/Gate.java b/common/buildcraft/transport/Gate.java index 8b347bee..cd0d2696 100644 --- a/common/buildcraft/transport/Gate.java +++ b/common/buildcraft/transport/Gate.java @@ -1,15 +1,15 @@ package buildcraft.transport; -import java.util.LinkedList; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import buildcraft.BuildCraftTransport; import buildcraft.api.gates.IAction; import buildcraft.api.gates.ITrigger; import buildcraft.core.network.PacketPayload; +import java.util.LinkedList; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; public abstract class Gate { @@ -98,7 +98,7 @@ public abstract class Gate { // / TEXTURES public abstract int getTextureIconIndex(boolean isSignalActive); - public abstract String getGuiFile(); + public abstract ResourceLocation getGuiFile(); public static boolean isGateItem(ItemStack stack) { return stack.itemID == BuildCraftTransport.pipeGate.itemID || stack.itemID == BuildCraftTransport.pipeGateAutarchic.itemID; diff --git a/common/buildcraft/transport/GateIconProvider.java b/common/buildcraft/transport/GateIconProvider.java index c3e72580..4c26259e 100644 --- a/common/buildcraft/transport/GateIconProvider.java +++ b/common/buildcraft/transport/GateIconProvider.java @@ -1,10 +1,10 @@ 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 net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.util.Icon; public class GateIconProvider implements IIconProvider { diff --git a/common/buildcraft/transport/GateVanilla.java b/common/buildcraft/transport/GateVanilla.java index 4bc1104e..9ef95b39 100644 --- a/common/buildcraft/transport/GateVanilla.java +++ b/common/buildcraft/transport/GateVanilla.java @@ -1,12 +1,5 @@ package buildcraft.transport; -import java.util.LinkedList; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import buildcraft.BuildCraftTransport; import buildcraft.api.gates.IAction; import buildcraft.api.gates.ITrigger; @@ -20,6 +13,13 @@ import buildcraft.core.utils.Utils; import buildcraft.transport.pipes.PipePowerWood; import buildcraft.transport.triggers.ActionEnergyPulser; import buildcraft.transport.triggers.ActionSingleEnergyPulse; +import java.util.LinkedList; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; public class GateVanilla extends Gate { @@ -86,22 +86,22 @@ public class GateVanilla extends Gate { @Override public String getName() { switch (kind) { - case Single: - return StringUtils.localize("item.pipeGate.0"); - case AND_2: - return StringUtils.localize("item.pipeGate.1"); - case AND_3: - return StringUtils.localize("item.pipeGate.3"); - case AND_4: - return StringUtils.localize("item.pipeGate.5"); - case OR_2: - return StringUtils.localize("item.pipeGate.2"); - case OR_3: - return StringUtils.localize("item.pipeGate.4"); - case OR_4: - return StringUtils.localize("item.pipeGate.6"); - default: - return ""; + case Single: + return StringUtils.localize("item.pipeGate.0"); + case AND_2: + return StringUtils.localize("item.pipeGate.1"); + case AND_3: + return StringUtils.localize("item.pipeGate.3"); + case AND_4: + return StringUtils.localize("item.pipeGate.5"); + case OR_2: + return StringUtils.localize("item.pipeGate.2"); + case OR_3: + return StringUtils.localize("item.pipeGate.4"); + case OR_4: + return StringUtils.localize("item.pipeGate.6"); + default: + return ""; } } @@ -146,28 +146,28 @@ public class GateVanilla extends Gate { int gateDamage = 0; switch (kind) { - case Single: - gateDamage = 0; - break; - case AND_2: - gateDamage = 1; - break; - case OR_2: - gateDamage = 2; - break; - case AND_3: - gateDamage = 3; - break; - case OR_3: - gateDamage = 4; - break; - case AND_4: - gateDamage = 5; - break; - case OR_4: - default: - gateDamage = 6; - break; + case Single: + gateDamage = 0; + break; + case AND_2: + gateDamage = 1; + break; + case OR_2: + gateDamage = 2; + break; + case AND_3: + gateDamage = 3; + break; + case OR_3: + gateDamage = 4; + break; + case AND_4: + gateDamage = 5; + break; + case OR_4: + default: + gateDamage = 6; + break; } Item gateItem; @@ -265,44 +265,63 @@ public class GateVanilla extends Gate { if (hasPulser() && pulser.isActive()) { isGateActive = true; } - - if (!hasPulser()){ - switch (kind){ - case None: return 0; - case Single: return isGateActive ? GateIconProvider.Gate_Lit : GateIconProvider.Gate_Dark; - case AND_2: return isGateActive ? GateIconProvider.Gate_Iron_And_Lit : GateIconProvider.Gate_Iron_And_Dark; - case OR_2: return isGateActive ? GateIconProvider.Gate_Iron_Or_Lit : GateIconProvider.Gate_Iron_Or_Dark; - case AND_3: return isGateActive ? GateIconProvider.Gate_Gold_And_Lit : GateIconProvider.Gate_Gold_And_Dark; - case OR_3: return isGateActive ? GateIconProvider.Gate_Gold_Or_Lit : GateIconProvider.Gate_Gold_Or_Dark; - case AND_4: return isGateActive ? GateIconProvider.Gate_Diamond_And_Lit : GateIconProvider.Gate_Diamond_And_Dark; - case OR_4: return isGateActive ? GateIconProvider.Gate_Diamond_Or_Lit : GateIconProvider.Gate_Diamond_Or_Dark; + + if (!hasPulser()) { + switch (kind) { + case None: + return 0; + case Single: + return isGateActive ? GateIconProvider.Gate_Lit : GateIconProvider.Gate_Dark; + case AND_2: + return isGateActive ? GateIconProvider.Gate_Iron_And_Lit : GateIconProvider.Gate_Iron_And_Dark; + case OR_2: + return isGateActive ? GateIconProvider.Gate_Iron_Or_Lit : GateIconProvider.Gate_Iron_Or_Dark; + case AND_3: + return isGateActive ? GateIconProvider.Gate_Gold_And_Lit : GateIconProvider.Gate_Gold_And_Dark; + case OR_3: + return isGateActive ? GateIconProvider.Gate_Gold_Or_Lit : GateIconProvider.Gate_Gold_Or_Dark; + case AND_4: + return isGateActive ? GateIconProvider.Gate_Diamond_And_Lit : GateIconProvider.Gate_Diamond_And_Dark; + case OR_4: + return isGateActive ? GateIconProvider.Gate_Diamond_Or_Lit : GateIconProvider.Gate_Diamond_Or_Dark; } } else { - switch (kind){ - case None: return 0; - case Single: return isGateActive ? GateIconProvider.Gate_Autarchic_Lit : GateIconProvider.Gate_Autarchic_Dark; - case AND_2: return isGateActive ? GateIconProvider.Gate_Autarchic_Iron_And_Lit : GateIconProvider.Gate_Autarchic_Iron_And_Dark; - case OR_2: return isGateActive ? GateIconProvider.Gate_Autarchic_Iron_Or_Lit : GateIconProvider.Gate_Autarchic_Iron_Or_Dark; - case AND_3: return isGateActive ? GateIconProvider.Gate_Autarchic_Gold_And_Lit : GateIconProvider.Gate_Autarchic_Gold_And_Dark; - case OR_3: return isGateActive ? GateIconProvider.Gate_Autarchic_Gold_Or_Lit : GateIconProvider.Gate_Autarchic_Gold_Or_Dark; - case AND_4: return isGateActive ? GateIconProvider.Gate_Autarchic_Diamond_And_Lit : GateIconProvider.Gate_Autarchic_Diamond_And_Dark; - case OR_4: return isGateActive ? GateIconProvider.Gate_Autarchic_Diamond_Or_Lit : GateIconProvider.Gate_Autarchic_Diamond_Or_Dark; + switch (kind) { + case None: + return 0; + case Single: + return isGateActive ? GateIconProvider.Gate_Autarchic_Lit : GateIconProvider.Gate_Autarchic_Dark; + case AND_2: + return isGateActive ? GateIconProvider.Gate_Autarchic_Iron_And_Lit : GateIconProvider.Gate_Autarchic_Iron_And_Dark; + case OR_2: + return isGateActive ? GateIconProvider.Gate_Autarchic_Iron_Or_Lit : GateIconProvider.Gate_Autarchic_Iron_Or_Dark; + case AND_3: + return isGateActive ? GateIconProvider.Gate_Autarchic_Gold_And_Lit : GateIconProvider.Gate_Autarchic_Gold_And_Dark; + case OR_3: + return isGateActive ? GateIconProvider.Gate_Autarchic_Gold_Or_Lit : GateIconProvider.Gate_Autarchic_Gold_Or_Dark; + case AND_4: + return isGateActive ? GateIconProvider.Gate_Autarchic_Diamond_And_Lit : GateIconProvider.Gate_Autarchic_Diamond_And_Dark; + case OR_4: + return isGateActive ? GateIconProvider.Gate_Autarchic_Diamond_Or_Lit : GateIconProvider.Gate_Autarchic_Diamond_Or_Dark; } } return 0; } + private static final ResourceLocation TEXTURE1 = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/gate_interface_1.png"); + private static final ResourceLocation TEXTURE2 = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/gate_interface_2.png"); + private static final ResourceLocation TEXTURE3 = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/gate_interface_3.png"); + private static final ResourceLocation TEXTURE4 = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/gate_interface_4.png"); @Override - public String getGuiFile() { + public ResourceLocation getGuiFile() { if (kind == GateKind.Single) - return DefaultProps.TEXTURE_PATH_GUI + "/gate_interface_1.png"; + return TEXTURE1; else if (kind == GateKind.AND_2 || kind == GateKind.OR_2) - return DefaultProps.TEXTURE_PATH_GUI + "/gate_interface_2.png"; + return TEXTURE2; else if (kind == GateKind.AND_3 || kind == GateKind.OR_3) - return DefaultProps.TEXTURE_PATH_GUI + "/gate_interface_3.png"; + return TEXTURE3; else - return DefaultProps.TEXTURE_PATH_GUI + "/gate_interface_4.png"; + return TEXTURE4; } - } diff --git a/common/buildcraft/transport/GuiHandler.java b/common/buildcraft/transport/GuiHandler.java index c6a1ab8f..e3fe31dc 100644 --- a/common/buildcraft/transport/GuiHandler.java +++ b/common/buildcraft/transport/GuiHandler.java @@ -1,9 +1,6 @@ package buildcraft.transport; import buildcraft.BuildCraftCore; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import buildcraft.core.GuiIds; import buildcraft.transport.gui.ContainerDiamondPipe; import buildcraft.transport.gui.ContainerEmeraldPipe; @@ -17,6 +14,9 @@ import buildcraft.transport.pipes.PipeItemsEmerald; import buildcraft.transport.pipes.PipeLogicDiamond; import cpw.mods.fml.common.network.IGuiHandler; import java.util.logging.Level; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class GuiHandler implements IGuiHandler { diff --git a/common/buildcraft/transport/IPipeTransportItemsHook.java b/common/buildcraft/transport/IPipeTransportItemsHook.java index e8a93a5c..c1666d60 100644 --- a/common/buildcraft/transport/IPipeTransportItemsHook.java +++ b/common/buildcraft/transport/IPipeTransportItemsHook.java @@ -9,11 +9,10 @@ package buildcraft.transport; -import java.util.LinkedList; - -import net.minecraftforge.common.ForgeDirection; import buildcraft.api.core.Position; import buildcraft.api.transport.IPipedItem; +import java.util.LinkedList; +import net.minecraftforge.common.ForgeDirection; public interface IPipeTransportItemsHook { diff --git a/common/buildcraft/transport/ItemFacade.java b/common/buildcraft/transport/ItemFacade.java index 0f1546fb..a7bc5011 100644 --- a/common/buildcraft/transport/ItemFacade.java +++ b/common/buildcraft/transport/ItemFacade.java @@ -1,11 +1,19 @@ package buildcraft.transport; +import buildcraft.BuildCraftTransport; +import buildcraft.api.recipes.AssemblyRecipe; +import buildcraft.core.CreativeTabBuildCraft; +import buildcraft.core.ItemBuildCraft; +import buildcraft.core.proxy.CoreProxy; +import com.google.common.base.Strings; +import com.google.common.collect.Sets; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.LinkedList; import java.util.List; import java.util.Set; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -18,17 +26,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import buildcraft.BuildCraftTransport; -import buildcraft.api.recipes.AssemblyRecipe; -import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.ItemBuildCraft; -import buildcraft.core.proxy.CoreProxy; - -import com.google.common.base.Strings; -import com.google.common.collect.Sets; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemFacade extends ItemBuildCraft { diff --git a/common/buildcraft/transport/ItemGate.java b/common/buildcraft/transport/ItemGate.java index bc9d6756..2cdce7bf 100644 --- a/common/buildcraft/transport/ItemGate.java +++ b/common/buildcraft/transport/ItemGate.java @@ -1,11 +1,5 @@ package buildcraft.transport; -import java.util.List; - -import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; import buildcraft.api.core.IIconProvider; import buildcraft.api.gates.ActionManager; import buildcraft.api.gates.IAction; @@ -14,6 +8,11 @@ import buildcraft.core.CreativeTabBuildCraft; import buildcraft.core.ItemBuildCraft; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; public class ItemGate extends ItemBuildCraft { diff --git a/common/buildcraft/transport/ItemPipe.java b/common/buildcraft/transport/ItemPipe.java index 09877570..9eafad8b 100644 --- a/common/buildcraft/transport/ItemPipe.java +++ b/common/buildcraft/transport/ItemPipe.java @@ -7,15 +7,6 @@ */ package buildcraft.transport; -import java.util.List; -import java.util.logging.Level; - -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; @@ -24,6 +15,14 @@ import buildcraft.core.IItemPipe; import buildcraft.core.ItemBuildCraft; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; +import java.util.logging.Level; +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; public class ItemPipe extends ItemBuildCraft implements IItemPipe { @@ -69,7 +68,7 @@ public class ItemPipe extends ItemBuildCraft implements IItemPipe { if (itemstack.stackSize == 0) return false; - if (entityplayer.canCurrentToolHarvestBlock(i, j, k) && world.canPlaceEntityOnSide(blockID, i, j, k, false, side, entityplayer, itemstack)) { + if (world.canPlaceEntityOnSide(blockID, i, j, k, false, side, entityplayer, itemstack)) { Pipe pipe = BlockGenericPipe.createPipe(itemID); if (pipe == null) { diff --git a/common/buildcraft/transport/ItemPlug.java b/common/buildcraft/transport/ItemPlug.java index dc34df8e..f819d006 100644 --- a/common/buildcraft/transport/ItemPlug.java +++ b/common/buildcraft/transport/ItemPlug.java @@ -1,15 +1,15 @@ package buildcraft.transport; +import buildcraft.core.CreativeTabBuildCraft; +import buildcraft.core.ItemBuildCraft; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; 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.world.World; import net.minecraftforge.common.ForgeDirection; -import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.ItemBuildCraft; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemPlug extends ItemBuildCraft { diff --git a/common/buildcraft/transport/Pipe.java b/common/buildcraft/transport/Pipe.java index 83210c5c..511692c2 100644 --- a/common/buildcraft/transport/Pipe.java +++ b/common/buildcraft/transport/Pipe.java @@ -9,21 +9,6 @@ package buildcraft.transport; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.Map; -import java.util.Random; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; @@ -42,12 +27,23 @@ import buildcraft.core.utils.Utils; import buildcraft.transport.Gate.GateConditional; import buildcraft.transport.pipes.PipeLogic; import buildcraft.transport.triggers.ActionSignalOutput; - import com.google.common.collect.HashMultiset; import com.google.common.collect.Multiset; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.Map; +import java.util.Random; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; public abstract class Pipe implements IPipe, IDropControlInventory { diff --git a/common/buildcraft/transport/PipeIconProvider.java b/common/buildcraft/transport/PipeIconProvider.java index f1ce0179..f43802e2 100644 --- a/common/buildcraft/transport/PipeIconProvider.java +++ b/common/buildcraft/transport/PipeIconProvider.java @@ -1,10 +1,10 @@ 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 net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.util.Icon; public class PipeIconProvider implements IIconProvider { diff --git a/common/buildcraft/transport/PipeRenderState.java b/common/buildcraft/transport/PipeRenderState.java index b47bb11b..7448d50c 100644 --- a/common/buildcraft/transport/PipeRenderState.java +++ b/common/buildcraft/transport/PipeRenderState.java @@ -1,10 +1,5 @@ package buildcraft.transport; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -import net.minecraft.util.Icon; import buildcraft.core.network.IClientState; import buildcraft.transport.utils.ConnectionMatrix; import buildcraft.transport.utils.FacadeMatrix; @@ -12,6 +7,10 @@ import buildcraft.transport.utils.TextureMatrix; import buildcraft.transport.utils.WireMatrix; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import net.minecraft.util.Icon; public class PipeRenderState implements IClientState { diff --git a/common/buildcraft/transport/PipeTransport.java b/common/buildcraft/transport/PipeTransport.java index fb4ac051..8894fd40 100644 --- a/common/buildcraft/transport/PipeTransport.java +++ b/common/buildcraft/transport/PipeTransport.java @@ -9,11 +9,11 @@ package buildcraft.transport; +import buildcraft.api.transport.IPipedItem; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import buildcraft.api.transport.IPipedItem; public abstract class PipeTransport { diff --git a/common/buildcraft/transport/PipeTransportFluids.java b/common/buildcraft/transport/PipeTransportFluids.java index b58bbb44..2fe4323a 100644 --- a/common/buildcraft/transport/PipeTransportFluids.java +++ b/common/buildcraft/transport/PipeTransportFluids.java @@ -9,8 +9,16 @@ package buildcraft.transport; +import buildcraft.BuildCraftCore; +import buildcraft.api.core.SafeTimeTracker; +import buildcraft.api.gates.ITrigger; +import buildcraft.api.transport.IPipeEntry; +import buildcraft.core.DefaultProps; +import buildcraft.core.IMachine; +import buildcraft.core.proxy.CoreProxy; +import buildcraft.core.utils.Utils; +import buildcraft.transport.network.PacketFluidUpdate; import java.util.BitSet; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; @@ -22,16 +30,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import net.minecraftforge.fluids.IFluidTank; -import buildcraft.BuildCraftCore; -import buildcraft.api.core.SafeTimeTracker; -import buildcraft.api.gates.ITrigger; -import buildcraft.api.transport.IPipeEntry; -import buildcraft.core.DefaultProps; -import buildcraft.core.IMachine; -import buildcraft.core.proxy.CoreProxy; -import buildcraft.core.utils.Utils; -import buildcraft.transport.network.PacketFluidUpdate; public class PipeTransportFluids extends PipeTransport implements IFluidHandler { diff --git a/common/buildcraft/transport/PipeTransportItems.java b/common/buildcraft/transport/PipeTransportItems.java index f54ae9ce..9c843ea8 100644 --- a/common/buildcraft/transport/PipeTransportItems.java +++ b/common/buildcraft/transport/PipeTransportItems.java @@ -10,25 +10,6 @@ package buildcraft.transport; import buildcraft.BuildCraftCore; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -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.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.network.packet.Packet; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.Position; import buildcraft.api.gates.ITrigger; @@ -48,7 +29,25 @@ import buildcraft.transport.network.PacketPipeTransportNBT; import buildcraft.transport.network.PacketSimpleId; import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.network.Player; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.logging.Level; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.network.packet.Packet; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; public class PipeTransportItems extends PipeTransport { diff --git a/common/buildcraft/transport/PipeTransportPower.java b/common/buildcraft/transport/PipeTransportPower.java index 3a4da35a..93cd7564 100644 --- a/common/buildcraft/transport/PipeTransportPower.java +++ b/common/buildcraft/transport/PipeTransportPower.java @@ -7,13 +7,6 @@ */ package buildcraft.transport; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.gates.ITrigger; @@ -31,6 +24,12 @@ import buildcraft.transport.pipes.PipePowerGold; import buildcraft.transport.pipes.PipePowerQuartz; import buildcraft.transport.pipes.PipePowerStone; import buildcraft.transport.pipes.PipePowerWood; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; public class PipeTransportPower extends PipeTransport { diff --git a/common/buildcraft/transport/PipeTriggerProvider.java b/common/buildcraft/transport/PipeTriggerProvider.java index 6f2c0b1e..d81f3896 100644 --- a/common/buildcraft/transport/PipeTriggerProvider.java +++ b/common/buildcraft/transport/PipeTriggerProvider.java @@ -1,15 +1,14 @@ package buildcraft.transport; -import java.util.LinkedList; - -import net.minecraft.block.Block; -import net.minecraft.tileentity.TileEntity; import buildcraft.BuildCraftTransport; import buildcraft.api.gates.IOverrideDefaultTriggers; import buildcraft.api.gates.ITrigger; import buildcraft.api.gates.ITriggerProvider; import buildcraft.api.transport.IPipe; import buildcraft.transport.pipes.PipePowerWood; +import java.util.LinkedList; +import net.minecraft.block.Block; +import net.minecraft.tileentity.TileEntity; public class PipeTriggerProvider implements ITriggerProvider { diff --git a/common/buildcraft/transport/TileFilteredBuffer.java b/common/buildcraft/transport/TileFilteredBuffer.java index c464a5da..dbb8c0b5 100644 --- a/common/buildcraft/transport/TileFilteredBuffer.java +++ b/common/buildcraft/transport/TileFilteredBuffer.java @@ -1,17 +1,16 @@ package buildcraft.transport; -import java.util.LinkedList; - -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 buildcraft.BuildCraftTransport; import buildcraft.api.gates.IOverrideDefaultTriggers; import buildcraft.api.gates.ITrigger; import buildcraft.core.TileBuildCraft; import buildcraft.core.inventory.SimpleInventory; +import java.util.LinkedList; +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; public class TileFilteredBuffer extends TileBuildCraft implements IInventory, IOverrideDefaultTriggers { diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index 650935ab..6cce71c3 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -7,24 +7,6 @@ */ package buildcraft.transport; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.LinkedList; -import java.util.logging.Level; - -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.world.World; -import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; -import net.minecraftforge.fluids.IFluidTank; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; @@ -54,6 +36,22 @@ import buildcraft.transport.Gate.GateKind; import buildcraft.transport.network.PipeRenderStatePacket; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.LinkedList; +import java.util.logging.Level; +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.world.World; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; public class TileGenericPipe extends TileEntity implements IPowerReceptor, IFluidHandler, IPipeEntry, IPipeTile, IOverrideDefaultTriggers, ITileBufferHolder, IPipeConnection, IDropControlInventory, IPipeRenderState, ISyncedTile, ISolidSideTile { diff --git a/common/buildcraft/transport/TransportProxyClient.java b/common/buildcraft/transport/TransportProxyClient.java index 0436ef06..cc3f44e7 100644 --- a/common/buildcraft/transport/TransportProxyClient.java +++ b/common/buildcraft/transport/TransportProxyClient.java @@ -1,6 +1,5 @@ package buildcraft.transport; -import net.minecraftforge.client.MinecraftForgeClient; import buildcraft.BuildCraftTransport; import buildcraft.transport.render.FacadeItemRenderer; import buildcraft.transport.render.PipeItemRenderer; @@ -9,6 +8,7 @@ import buildcraft.transport.render.PlugItemRenderer; import buildcraft.transport.render.RenderPipe; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; +import net.minecraftforge.client.MinecraftForgeClient; public class TransportProxyClient extends TransportProxy { public final static PipeItemRenderer pipeItemRenderer = new PipeItemRenderer(); diff --git a/common/buildcraft/transport/WireIconProvider.java b/common/buildcraft/transport/WireIconProvider.java index a7d5c7c4..9e65ad41 100644 --- a/common/buildcraft/transport/WireIconProvider.java +++ b/common/buildcraft/transport/WireIconProvider.java @@ -1,10 +1,10 @@ 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 net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.util.Icon; public class WireIconProvider implements IIconProvider { diff --git a/common/buildcraft/transport/blueprints/BptBlockPipe.java b/common/buildcraft/transport/blueprints/BptBlockPipe.java index 4c9ff027..5f5d9486 100644 --- a/common/buildcraft/transport/blueprints/BptBlockPipe.java +++ b/common/buildcraft/transport/blueprints/BptBlockPipe.java @@ -9,11 +9,6 @@ package buildcraft.transport.blueprints; -import java.util.LinkedList; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftTransport; import buildcraft.api.blueprints.BlockSignature; @@ -26,6 +21,10 @@ import buildcraft.core.Version; import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.GateVanilla; import buildcraft.transport.Pipe; +import java.util.LinkedList; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; @Deprecated public class BptBlockPipe extends BptBlock { diff --git a/common/buildcraft/transport/blueprints/BptItemPipeDiamond.java b/common/buildcraft/transport/blueprints/BptItemPipeDiamond.java index 6898abb3..88b23ae7 100644 --- a/common/buildcraft/transport/blueprints/BptItemPipeDiamond.java +++ b/common/buildcraft/transport/blueprints/BptItemPipeDiamond.java @@ -9,15 +9,14 @@ package buildcraft.transport.blueprints; -import java.util.LinkedList; - -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.ForgeDirection; import buildcraft.api.blueprints.BptBlockUtils; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; import buildcraft.core.blueprints.BptItem; +import java.util.LinkedList; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.ForgeDirection; public class BptItemPipeDiamond extends BptItem { diff --git a/common/buildcraft/transport/blueprints/BptItemPipeEmerald.java b/common/buildcraft/transport/blueprints/BptItemPipeEmerald.java index f6cf20ff..f1d4cd6e 100644 --- a/common/buildcraft/transport/blueprints/BptItemPipeEmerald.java +++ b/common/buildcraft/transport/blueprints/BptItemPipeEmerald.java @@ -9,14 +9,13 @@ package buildcraft.transport.blueprints; -import java.util.LinkedList; - -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; import buildcraft.api.blueprints.BptBlockUtils; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; import buildcraft.core.blueprints.BptItem; +import java.util.LinkedList; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; public class BptItemPipeEmerald extends BptItem { diff --git a/common/buildcraft/transport/blueprints/BptItemPipeIron.java b/common/buildcraft/transport/blueprints/BptItemPipeIron.java index 3a7ceb62..5f5539d1 100644 --- a/common/buildcraft/transport/blueprints/BptItemPipeIron.java +++ b/common/buildcraft/transport/blueprints/BptItemPipeIron.java @@ -9,13 +9,12 @@ package buildcraft.transport.blueprints; -import java.util.LinkedList; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.ForgeDirection; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; import buildcraft.core.blueprints.BptItem; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.ForgeDirection; public class BptItemPipeIron extends BptItem { diff --git a/common/buildcraft/transport/blueprints/BptItemPipeWooden.java b/common/buildcraft/transport/blueprints/BptItemPipeWooden.java index 6fb4d146..66ef7240 100644 --- a/common/buildcraft/transport/blueprints/BptItemPipeWooden.java +++ b/common/buildcraft/transport/blueprints/BptItemPipeWooden.java @@ -9,13 +9,12 @@ package buildcraft.transport.blueprints; -import java.util.LinkedList; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.ForgeDirection; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; import buildcraft.core.blueprints.BptItem; +import java.util.LinkedList; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.ForgeDirection; public class BptItemPipeWooden extends BptItem { diff --git a/common/buildcraft/transport/gui/ContainerDiamondPipe.java b/common/buildcraft/transport/gui/ContainerDiamondPipe.java index 6bb5270d..670b4410 100644 --- a/common/buildcraft/transport/gui/ContainerDiamondPipe.java +++ b/common/buildcraft/transport/gui/ContainerDiamondPipe.java @@ -7,12 +7,12 @@ */ 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.PipeLogicDiamond; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; public class ContainerDiamondPipe extends BuildCraftContainer { diff --git a/common/buildcraft/transport/gui/ContainerEmeraldPipe.java b/common/buildcraft/transport/gui/ContainerEmeraldPipe.java index 0f8a2a2d..6e892abf 100644 --- a/common/buildcraft/transport/gui/ContainerEmeraldPipe.java +++ b/common/buildcraft/transport/gui/ContainerEmeraldPipe.java @@ -7,12 +7,12 @@ */ 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.PipeItemsEmerald; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; public class ContainerEmeraldPipe extends BuildCraftContainer { diff --git a/common/buildcraft/transport/gui/ContainerFilteredBuffer.java b/common/buildcraft/transport/gui/ContainerFilteredBuffer.java index 07758c25..4e9cb88f 100644 --- a/common/buildcraft/transport/gui/ContainerFilteredBuffer.java +++ b/common/buildcraft/transport/gui/ContainerFilteredBuffer.java @@ -7,14 +7,14 @@ */ package buildcraft.transport.gui; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; import buildcraft.core.gui.BuildCraftContainer; import buildcraft.core.gui.slots.SlotPhantom; import buildcraft.core.gui.slots.SlotValidated; import buildcraft.transport.TileFilteredBuffer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; /** * diff --git a/common/buildcraft/transport/gui/ContainerGateInterface.java b/common/buildcraft/transport/gui/ContainerGateInterface.java index 21f97a8b..7564c4ff 100644 --- a/common/buildcraft/transport/gui/ContainerGateInterface.java +++ b/common/buildcraft/transport/gui/ContainerGateInterface.java @@ -9,17 +9,6 @@ package buildcraft.transport.gui; -import java.util.Iterator; -import java.util.LinkedList; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; import buildcraft.api.core.Position; import buildcraft.api.gates.ActionManager; import buildcraft.api.gates.IAction; @@ -34,6 +23,17 @@ import buildcraft.core.network.PacketPayload; import buildcraft.core.network.PacketUpdate; import buildcraft.core.proxy.CoreProxy; import buildcraft.transport.Pipe; +import java.util.Iterator; +import java.util.LinkedList; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.ForgeDirection; public class ContainerGateInterface extends BuildCraftContainer { @@ -459,7 +459,7 @@ public class ContainerGateInterface extends BuildCraftContainer { } /** GATE INFORMATION **/ - public String getGateGuiFile() { + public ResourceLocation getGateGuiFile() { return pipe.gate.getGuiFile(); } diff --git a/common/buildcraft/transport/gui/GuiDiamondPipe.java b/common/buildcraft/transport/gui/GuiDiamondPipe.java index 3822a545..bde7def0 100644 --- a/common/buildcraft/transport/gui/GuiDiamondPipe.java +++ b/common/buildcraft/transport/gui/GuiDiamondPipe.java @@ -7,18 +7,17 @@ */ package buildcraft.transport.gui; -import net.minecraft.client.resources.ResourceLocation; -import net.minecraft.inventory.IInventory; - -import org.lwjgl.opengl.GL11; - import buildcraft.core.DefaultProps; import buildcraft.core.gui.GuiBuildCraft; import buildcraft.core.utils.StringUtils; import buildcraft.transport.pipes.PipeLogicDiamond; +import net.minecraft.inventory.IInventory; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; public class GuiDiamondPipe extends GuiBuildCraft { - public static final ResourceLocation gui = new ResourceLocation("buildcraft",DefaultProps.TEXTURE_PATH_GUI + "/filter.png"); + + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/filter.png"); IInventory playerInventory; IInventory filterInventory; @@ -39,7 +38,7 @@ public class GuiDiamondPipe extends GuiBuildCraft { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.func_110577_a(gui); + mc.renderEngine.func_110577_a(TEXTURE); int j = (width - xSize) / 2; int k = (height - ySize) / 2; drawTexturedModalRect(j, k, 0, 0, xSize, ySize); diff --git a/common/buildcraft/transport/gui/GuiEmeraldPipe.java b/common/buildcraft/transport/gui/GuiEmeraldPipe.java index c7a9589c..affc563f 100644 --- a/common/buildcraft/transport/gui/GuiEmeraldPipe.java +++ b/common/buildcraft/transport/gui/GuiEmeraldPipe.java @@ -7,18 +7,17 @@ */ package buildcraft.transport.gui; -import net.minecraft.client.resources.ResourceLocation; -import net.minecraft.inventory.IInventory; - -import org.lwjgl.opengl.GL11; - import buildcraft.core.DefaultProps; import buildcraft.core.gui.GuiBuildCraft; import buildcraft.core.utils.StringUtils; import buildcraft.transport.pipes.PipeItemsEmerald; +import net.minecraft.inventory.IInventory; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; public class GuiEmeraldPipe extends GuiBuildCraft { - public static final ResourceLocation gui = new ResourceLocation("buildcraft",DefaultProps.TEXTURE_PATH_GUI + "/filter_2.png"); + + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/filter_2.png"); IInventory playerInventory; IInventory filterInventory; @@ -40,7 +39,7 @@ public class GuiEmeraldPipe extends GuiBuildCraft { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.func_110577_a(gui); + mc.renderEngine.func_110577_a(TEXTURE); int j = (width - xSize) / 2; int k = (height - ySize) / 2; drawTexturedModalRect(j, k, 0, 0, xSize, ySize); diff --git a/common/buildcraft/transport/gui/GuiFilteredBuffer.java b/common/buildcraft/transport/gui/GuiFilteredBuffer.java index 94b0b07b..617dce39 100644 --- a/common/buildcraft/transport/gui/GuiFilteredBuffer.java +++ b/common/buildcraft/transport/gui/GuiFilteredBuffer.java @@ -7,15 +7,14 @@ */ package buildcraft.transport.gui; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IInventory; - -import org.lwjgl.opengl.GL11; - import buildcraft.core.DefaultProps; import buildcraft.core.utils.StringUtils; import buildcraft.transport.TileFilteredBuffer; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; /** * @@ -23,6 +22,7 @@ import buildcraft.transport.TileFilteredBuffer; */ public class GuiFilteredBuffer extends GuiContainer { + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/filteredBuffer_gui.png"); IInventory playerInventory; TileFilteredBuffer filteredBuffer; @@ -39,7 +39,7 @@ public class GuiFilteredBuffer extends GuiContainer { protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(DefaultProps.TEXTURE_PATH_GUI + "/filteredBuffer_gui.png"); + mc.renderEngine.func_110577_a(TEXTURE); int cornerX = (width - xSize) / 2; int cornerY = (height - ySize) / 2; diff --git a/common/buildcraft/transport/gui/GuiGateInterface.java b/common/buildcraft/transport/gui/GuiGateInterface.java index c13e3d8d..90b5d68d 100644 --- a/common/buildcraft/transport/gui/GuiGateInterface.java +++ b/common/buildcraft/transport/gui/GuiGateInterface.java @@ -9,14 +9,6 @@ package buildcraft.transport.gui; -import java.util.Iterator; - -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; - -import org.lwjgl.opengl.GL11; - import buildcraft.api.gates.IAction; import buildcraft.api.gates.ITrigger; import buildcraft.api.gates.ITriggerParameter; @@ -27,6 +19,12 @@ import buildcraft.transport.Gate.GateKind; import buildcraft.transport.Pipe; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.Iterator; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; public class GuiGateInterface extends GuiAdvancedInterface { @@ -243,10 +241,10 @@ public class GuiGateInterface extends GuiAdvancedInterface { _container.synchronize(); - String texture = _container.getGateGuiFile(); + ResourceLocation texture = _container.getGateGuiFile(); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(texture); + mc.renderEngine.func_110577_a(texture); int cornerX = (width - xSize) / 2; int cornerY = (height - ySize) / 2; @@ -262,18 +260,18 @@ public class GuiGateInterface extends GuiAdvancedInterface { if (_container.getGateOrdinal() >= GateKind.AND_3.ordinal()) { if (_container.triggerState[triggerTracker++]) { - mc.renderEngine.bindTexture(texture); + mc.renderEngine.func_110577_a(texture); drawTexturedModalRect(cornerX + slot.x + 35, cornerY + slot.y + 6, 176, 18, 18, 4); } if (trigger == null || !trigger.hasParameter()) { - mc.renderEngine.bindTexture(texture); + mc.renderEngine.func_110577_a(texture); drawTexturedModalRect(cornerX + slot.x + 17, cornerY + slot.y - 1, 176, 0, 18, 18); } } else if (_container.triggerState[triggerTracker++]) { - mc.renderEngine.bindTexture(texture); + mc.renderEngine.func_110577_a(texture); drawTexturedModalRect(cornerX + slot.x + 17, cornerY + slot.y + 6, 176, 18, 18, 4); } diff --git a/common/buildcraft/transport/network/PacketFluidUpdate.java b/common/buildcraft/transport/network/PacketFluidUpdate.java index 4e030b71..a2dd745b 100644 --- a/common/buildcraft/transport/network/PacketFluidUpdate.java +++ b/common/buildcraft/transport/network/PacketFluidUpdate.java @@ -1,19 +1,18 @@ package buildcraft.transport.network; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.BitSet; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; import buildcraft.core.network.PacketCoordinates; import buildcraft.core.network.PacketIds; import buildcraft.core.proxy.CoreProxy; import buildcraft.transport.PipeTransportFluids; import buildcraft.transport.TileGenericPipe; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.BitSet; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.FluidStack; public class PacketFluidUpdate extends PacketCoordinates { diff --git a/common/buildcraft/transport/network/PacketHandlerTransport.java b/common/buildcraft/transport/network/PacketHandlerTransport.java index 0cc7c010..e6b35076 100644 --- a/common/buildcraft/transport/network/PacketHandlerTransport.java +++ b/common/buildcraft/transport/network/PacketHandlerTransport.java @@ -1,15 +1,5 @@ package buildcraft.transport.network; -import java.io.ByteArrayInputStream; -import java.io.DataInputStream; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.Container; -import net.minecraft.network.INetworkManager; -import net.minecraft.network.packet.Packet250CustomPayload; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import buildcraft.core.network.PacketCoordinates; import buildcraft.core.network.PacketIds; import buildcraft.core.network.PacketSlotChange; @@ -22,6 +12,15 @@ import buildcraft.transport.pipes.PipeItemsEmerald; import buildcraft.transport.pipes.PipeLogicDiamond; import cpw.mods.fml.common.network.IPacketHandler; import cpw.mods.fml.common.network.Player; +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.inventory.Container; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.Packet250CustomPayload; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class PacketHandlerTransport implements IPacketHandler { diff --git a/common/buildcraft/transport/network/PacketPipeTransportContent.java b/common/buildcraft/transport/network/PacketPipeTransportContent.java index 0c587782..39bba5df 100644 --- a/common/buildcraft/transport/network/PacketPipeTransportContent.java +++ b/common/buildcraft/transport/network/PacketPipeTransportContent.java @@ -1,14 +1,13 @@ package buildcraft.transport.network; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -import net.minecraft.util.MathHelper; -import net.minecraftforge.common.ForgeDirection; import buildcraft.core.network.BuildCraftPacket; import buildcraft.core.network.PacketIds; import buildcraft.transport.EntityData; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import net.minecraft.util.MathHelper; +import net.minecraftforge.common.ForgeDirection; public class PacketPipeTransportContent extends BuildCraftPacket { diff --git a/common/buildcraft/transport/network/PacketPipeTransportNBT.java b/common/buildcraft/transport/network/PacketPipeTransportNBT.java index 05abc2b0..4c24db40 100644 --- a/common/buildcraft/transport/network/PacketPipeTransportNBT.java +++ b/common/buildcraft/transport/network/PacketPipeTransportNBT.java @@ -1,12 +1,11 @@ package buildcraft.transport.network; +import buildcraft.core.network.PacketCoordinates; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; - import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; -import buildcraft.core.network.PacketCoordinates; public class PacketPipeTransportNBT extends PacketCoordinates { diff --git a/common/buildcraft/transport/network/PacketPowerUpdate.java b/common/buildcraft/transport/network/PacketPowerUpdate.java index 5bc5c94f..64f86e35 100644 --- a/common/buildcraft/transport/network/PacketPowerUpdate.java +++ b/common/buildcraft/transport/network/PacketPowerUpdate.java @@ -1,11 +1,10 @@ package buildcraft.transport.network; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - import buildcraft.core.network.PacketCoordinates; import buildcraft.core.network.PacketIds; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; public class PacketPowerUpdate extends PacketCoordinates { diff --git a/common/buildcraft/transport/network/PacketSimpleId.java b/common/buildcraft/transport/network/PacketSimpleId.java index ad39d4fd..7f7a2fdd 100644 --- a/common/buildcraft/transport/network/PacketSimpleId.java +++ b/common/buildcraft/transport/network/PacketSimpleId.java @@ -1,11 +1,10 @@ package buildcraft.transport.network; +import buildcraft.core.network.PacketCoordinates; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import buildcraft.core.network.PacketCoordinates; - public class PacketSimpleId extends PacketCoordinates { public int entityId; diff --git a/common/buildcraft/transport/network/PipeRenderStatePacket.java b/common/buildcraft/transport/network/PipeRenderStatePacket.java index 7317ad7d..ffe4b691 100644 --- a/common/buildcraft/transport/network/PipeRenderStatePacket.java +++ b/common/buildcraft/transport/network/PipeRenderStatePacket.java @@ -1,12 +1,11 @@ package buildcraft.transport.network; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - import buildcraft.core.network.PacketCoordinates; import buildcraft.core.network.PacketIds; import buildcraft.transport.PipeRenderState; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; public class PipeRenderStatePacket extends PacketCoordinates { diff --git a/common/buildcraft/transport/pipes/PipeFluidsCobblestone.java b/common/buildcraft/transport/pipes/PipeFluidsCobblestone.java index 33a70fb5..d2acb38e 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeFluidsCobblestone.java @@ -8,7 +8,6 @@ package buildcraft.transport.pipes; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; @@ -16,6 +15,7 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportFluids; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.common.ForgeDirection; public class PipeFluidsCobblestone extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipeFluidsGold.java b/common/buildcraft/transport/pipes/PipeFluidsGold.java index e4f2c027..f62f1027 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsGold.java +++ b/common/buildcraft/transport/pipes/PipeFluidsGold.java @@ -8,7 +8,6 @@ package buildcraft.transport.pipes; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; @@ -16,6 +15,7 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportFluids; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.common.ForgeDirection; public class PipeFluidsGold extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipeFluidsIron.java b/common/buildcraft/transport/pipes/PipeFluidsIron.java index 4da48aff..342c730d 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsIron.java +++ b/common/buildcraft/transport/pipes/PipeFluidsIron.java @@ -8,7 +8,6 @@ package buildcraft.transport.pipes; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; @@ -16,6 +15,7 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportFluids; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.common.ForgeDirection; public class PipeFluidsIron extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipeFluidsSandstone.java b/common/buildcraft/transport/pipes/PipeFluidsSandstone.java index 568feb6d..24661641 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsSandstone.java +++ b/common/buildcraft/transport/pipes/PipeFluidsSandstone.java @@ -9,8 +9,6 @@ package buildcraft.transport.pipes; -import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.IPipeTransportFluidsHook; @@ -20,6 +18,8 @@ import buildcraft.transport.PipeTransportFluids; import buildcraft.transport.TileGenericPipe; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.FluidStack; public class PipeFluidsSandstone extends Pipe implements IPipeTransportFluidsHook { public PipeFluidsSandstone(int itemID) { diff --git a/common/buildcraft/transport/pipes/PipeFluidsStone.java b/common/buildcraft/transport/pipes/PipeFluidsStone.java index 5e18e19e..d3deb0fe 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsStone.java +++ b/common/buildcraft/transport/pipes/PipeFluidsStone.java @@ -8,7 +8,6 @@ package buildcraft.transport.pipes; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; @@ -16,6 +15,7 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportFluids; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.common.ForgeDirection; public class PipeFluidsStone extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipeFluidsVoid.java b/common/buildcraft/transport/pipes/PipeFluidsVoid.java index dbdd5d38..985f0936 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsVoid.java +++ b/common/buildcraft/transport/pipes/PipeFluidsVoid.java @@ -9,8 +9,6 @@ package buildcraft.transport.pipes; -import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.IPipeTransportFluidsHook; @@ -19,6 +17,8 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportFluids; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.FluidStack; public class PipeFluidsVoid extends Pipe implements IPipeTransportFluidsHook { diff --git a/common/buildcraft/transport/pipes/PipeFluidsWood.java b/common/buildcraft/transport/pipes/PipeFluidsWood.java index 42c113d8..315c7e65 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsWood.java +++ b/common/buildcraft/transport/pipes/PipeFluidsWood.java @@ -8,12 +8,6 @@ package buildcraft.transport.pipes; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidHandler; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; @@ -28,6 +22,12 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportFluids; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidHandler; public class PipeFluidsWood extends Pipe implements IPowerReceptor { diff --git a/common/buildcraft/transport/pipes/PipeItemsCobblestone.java b/common/buildcraft/transport/pipes/PipeItemsCobblestone.java index 5c8dca15..4ea3c8d3 100644 --- a/common/buildcraft/transport/pipes/PipeItemsCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeItemsCobblestone.java @@ -8,7 +8,6 @@ package buildcraft.transport.pipes; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; @@ -16,6 +15,7 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.common.ForgeDirection; public class PipeItemsCobblestone extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipeItemsDiamond.java b/common/buildcraft/transport/pipes/PipeItemsDiamond.java index c3bc5fa8..01a177ab 100644 --- a/common/buildcraft/transport/pipes/PipeItemsDiamond.java +++ b/common/buildcraft/transport/pipes/PipeItemsDiamond.java @@ -8,16 +8,6 @@ package buildcraft.transport.pipes; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.LinkedList; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; @@ -29,6 +19,15 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.LinkedList; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.ForgeDirection; public class PipeItemsDiamond extends Pipe implements IPipeTransportItemsHook, IClientState { diff --git a/common/buildcraft/transport/pipes/PipeItemsEmerald.java b/common/buildcraft/transport/pipes/PipeItemsEmerald.java index a1c9dc7a..9d4e9403 100644 --- a/common/buildcraft/transport/pipes/PipeItemsEmerald.java +++ b/common/buildcraft/transport/pipes/PipeItemsEmerald.java @@ -7,18 +7,6 @@ */ package buildcraft.transport.pipes; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.inventory.ISelectiveInventory; import buildcraft.api.inventory.ISpecialInventory; @@ -30,6 +18,17 @@ import buildcraft.core.utils.Utils; import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; public class PipeItemsEmerald extends PipeItemsWood implements IClientState { diff --git a/common/buildcraft/transport/pipes/PipeItemsGold.java b/common/buildcraft/transport/pipes/PipeItemsGold.java index 7e89fb09..19a573e4 100644 --- a/common/buildcraft/transport/pipes/PipeItemsGold.java +++ b/common/buildcraft/transport/pipes/PipeItemsGold.java @@ -8,9 +8,6 @@ package buildcraft.transport.pipes; -import java.util.LinkedList; - -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; @@ -22,6 +19,8 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.LinkedList; +import net.minecraftforge.common.ForgeDirection; public class PipeItemsGold extends Pipe implements IPipeTransportItemsHook { diff --git a/common/buildcraft/transport/pipes/PipeItemsIron.java b/common/buildcraft/transport/pipes/PipeItemsIron.java index 949b1e3b..f501edfe 100644 --- a/common/buildcraft/transport/pipes/PipeItemsIron.java +++ b/common/buildcraft/transport/pipes/PipeItemsIron.java @@ -8,7 +8,6 @@ package buildcraft.transport.pipes; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; @@ -16,6 +15,7 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.common.ForgeDirection; public class PipeItemsIron extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipeItemsObsidian.java b/common/buildcraft/transport/pipes/PipeItemsObsidian.java index aa2a9164..41cdc245 100644 --- a/common/buildcraft/transport/pipes/PipeItemsObsidian.java +++ b/common/buildcraft/transport/pipes/PipeItemsObsidian.java @@ -8,17 +8,6 @@ package buildcraft.transport.pipes; -import java.util.List; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.item.EntityMinecartChest; -import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; @@ -35,6 +24,16 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.item.EntityMinecartChest; +import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; +import net.minecraftforge.common.ForgeDirection; public class PipeItemsObsidian extends Pipe implements IPowerReceptor { diff --git a/common/buildcraft/transport/pipes/PipeItemsQuartz.java b/common/buildcraft/transport/pipes/PipeItemsQuartz.java index 8a4fe7b9..0f77492c 100644 --- a/common/buildcraft/transport/pipes/PipeItemsQuartz.java +++ b/common/buildcraft/transport/pipes/PipeItemsQuartz.java @@ -7,9 +7,6 @@ */ package buildcraft.transport.pipes; -import java.util.LinkedList; - -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; @@ -21,6 +18,8 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.LinkedList; +import net.minecraftforge.common.ForgeDirection; public class PipeItemsQuartz extends Pipe implements IPipeTransportItemsHook { diff --git a/common/buildcraft/transport/pipes/PipeItemsSandstone.java b/common/buildcraft/transport/pipes/PipeItemsSandstone.java index 84c2d63e..0d241dab 100644 --- a/common/buildcraft/transport/pipes/PipeItemsSandstone.java +++ b/common/buildcraft/transport/pipes/PipeItemsSandstone.java @@ -9,7 +9,6 @@ package buildcraft.transport.pipes; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; @@ -17,6 +16,7 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.common.ForgeDirection; public class PipeItemsSandstone extends Pipe { public PipeItemsSandstone(int itemID) { diff --git a/common/buildcraft/transport/pipes/PipeItemsStone.java b/common/buildcraft/transport/pipes/PipeItemsStone.java index 86029578..6b5b778f 100644 --- a/common/buildcraft/transport/pipes/PipeItemsStone.java +++ b/common/buildcraft/transport/pipes/PipeItemsStone.java @@ -8,9 +8,6 @@ package buildcraft.transport.pipes; -import java.util.LinkedList; - -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; @@ -22,6 +19,8 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.LinkedList; +import net.minecraftforge.common.ForgeDirection; public class PipeItemsStone extends Pipe implements IPipeTransportItemsHook { diff --git a/common/buildcraft/transport/pipes/PipeItemsVoid.java b/common/buildcraft/transport/pipes/PipeItemsVoid.java index 90271b02..f17da1ee 100644 --- a/common/buildcraft/transport/pipes/PipeItemsVoid.java +++ b/common/buildcraft/transport/pipes/PipeItemsVoid.java @@ -9,8 +9,6 @@ package buildcraft.transport.pipes; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.EntityData; @@ -20,6 +18,8 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; public class PipeItemsVoid extends Pipe implements IItemTravelingHook { diff --git a/common/buildcraft/transport/pipes/PipeItemsWood.java b/common/buildcraft/transport/pipes/PipeItemsWood.java index 93515f67..b6e69cbe 100644 --- a/common/buildcraft/transport/pipes/PipeItemsWood.java +++ b/common/buildcraft/transport/pipes/PipeItemsWood.java @@ -7,11 +7,6 @@ */ package buildcraft.transport.pipes; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; @@ -30,6 +25,11 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; public class PipeItemsWood extends Pipe implements IPowerReceptor { diff --git a/common/buildcraft/transport/pipes/PipeLogic.java b/common/buildcraft/transport/pipes/PipeLogic.java index 16b32c05..83f40079 100644 --- a/common/buildcraft/transport/pipes/PipeLogic.java +++ b/common/buildcraft/transport/pipes/PipeLogic.java @@ -9,13 +9,13 @@ package buildcraft.transport.pipes; +import buildcraft.core.IDropControlInventory; +import buildcraft.transport.TileGenericPipe; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import buildcraft.core.IDropControlInventory; -import buildcraft.transport.TileGenericPipe; public class PipeLogic implements IDropControlInventory { diff --git a/common/buildcraft/transport/pipes/PipeLogicCobblestone.java b/common/buildcraft/transport/pipes/PipeLogicCobblestone.java index a75d1a65..b9f2595a 100644 --- a/common/buildcraft/transport/pipes/PipeLogicCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeLogicCobblestone.java @@ -7,10 +7,10 @@ */ package buildcraft.transport.pipes; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; import buildcraft.transport.Pipe; import buildcraft.transport.TileGenericPipe; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; public class PipeLogicCobblestone extends PipeLogic { diff --git a/common/buildcraft/transport/pipes/PipeLogicDiamond.java b/common/buildcraft/transport/pipes/PipeLogicDiamond.java index 52f6e51d..d21caf23 100644 --- a/common/buildcraft/transport/pipes/PipeLogicDiamond.java +++ b/common/buildcraft/transport/pipes/PipeLogicDiamond.java @@ -7,15 +7,15 @@ */ package buildcraft.transport.pipes; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.nbt.NBTTagCompound; import buildcraft.BuildCraftTransport; import buildcraft.core.GuiIds; import buildcraft.core.inventory.SimpleInventory; import buildcraft.core.proxy.CoreProxy; import buildcraft.transport.BlockGenericPipe; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.nbt.NBTTagCompound; public class PipeLogicDiamond extends PipeLogic { diff --git a/common/buildcraft/transport/pipes/PipeLogicIron.java b/common/buildcraft/transport/pipes/PipeLogicIron.java index 6d95ceec..428a7bc2 100644 --- a/common/buildcraft/transport/pipes/PipeLogicIron.java +++ b/common/buildcraft/transport/pipes/PipeLogicIron.java @@ -9,16 +9,16 @@ package buildcraft.transport.pipes; +import buildcraft.api.tools.IToolWrench; +import buildcraft.api.transport.IPipeEntry; +import buildcraft.transport.Pipe; +import buildcraft.transport.TileGenericPipe; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; -import buildcraft.api.tools.IToolWrench; -import buildcraft.api.transport.IPipeEntry; -import buildcraft.transport.Pipe; -import buildcraft.transport.TileGenericPipe; public class PipeLogicIron extends PipeLogic { diff --git a/common/buildcraft/transport/pipes/PipeLogicObsidian.java b/common/buildcraft/transport/pipes/PipeLogicObsidian.java index 8cb8dffb..dd9ecec4 100644 --- a/common/buildcraft/transport/pipes/PipeLogicObsidian.java +++ b/common/buildcraft/transport/pipes/PipeLogicObsidian.java @@ -9,10 +9,10 @@ package buildcraft.transport.pipes; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; import buildcraft.transport.Pipe; import buildcraft.transport.TileGenericPipe; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; public class PipeLogicObsidian extends PipeLogic { diff --git a/common/buildcraft/transport/pipes/PipeLogicQuartz.java b/common/buildcraft/transport/pipes/PipeLogicQuartz.java index 39c390f8..253e1edc 100644 --- a/common/buildcraft/transport/pipes/PipeLogicQuartz.java +++ b/common/buildcraft/transport/pipes/PipeLogicQuartz.java @@ -9,10 +9,10 @@ package buildcraft.transport.pipes; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; import buildcraft.transport.Pipe; import buildcraft.transport.TileGenericPipe; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; public class PipeLogicQuartz extends PipeLogic { diff --git a/common/buildcraft/transport/pipes/PipeLogicSandstone.java b/common/buildcraft/transport/pipes/PipeLogicSandstone.java index 41be61a4..e44d944a 100644 --- a/common/buildcraft/transport/pipes/PipeLogicSandstone.java +++ b/common/buildcraft/transport/pipes/PipeLogicSandstone.java @@ -9,9 +9,9 @@ package buildcraft.transport.pipes; +import buildcraft.transport.TileGenericPipe; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; -import buildcraft.transport.TileGenericPipe; public class PipeLogicSandstone extends PipeLogic { @Override diff --git a/common/buildcraft/transport/pipes/PipeLogicStone.java b/common/buildcraft/transport/pipes/PipeLogicStone.java index 86497506..b03dd0bd 100644 --- a/common/buildcraft/transport/pipes/PipeLogicStone.java +++ b/common/buildcraft/transport/pipes/PipeLogicStone.java @@ -9,10 +9,10 @@ package buildcraft.transport.pipes; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; import buildcraft.transport.Pipe; import buildcraft.transport.TileGenericPipe; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; public class PipeLogicStone extends PipeLogic { diff --git a/common/buildcraft/transport/pipes/PipeLogicStripes.java b/common/buildcraft/transport/pipes/PipeLogicStripes.java index a810e731..69b3063c 100644 --- a/common/buildcraft/transport/pipes/PipeLogicStripes.java +++ b/common/buildcraft/transport/pipes/PipeLogicStripes.java @@ -9,10 +9,10 @@ package buildcraft.transport.pipes; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; import buildcraft.transport.Pipe; import buildcraft.transport.TileGenericPipe; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; public class PipeLogicStripes extends PipeLogic { diff --git a/common/buildcraft/transport/pipes/PipeLogicWood.java b/common/buildcraft/transport/pipes/PipeLogicWood.java index 16bc4e44..13ca3143 100644 --- a/common/buildcraft/transport/pipes/PipeLogicWood.java +++ b/common/buildcraft/transport/pipes/PipeLogicWood.java @@ -9,18 +9,18 @@ package buildcraft.transport.pipes; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.IFluidHandler; import buildcraft.api.tools.IToolWrench; import buildcraft.api.transport.PipeManager; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; import buildcraft.transport.Pipe; import buildcraft.transport.TileGenericPipe; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.IFluidHandler; public class PipeLogicWood extends PipeLogic { diff --git a/common/buildcraft/transport/pipes/PipePowerCobblestone.java b/common/buildcraft/transport/pipes/PipePowerCobblestone.java index b8ed7ab3..b4b9b2f4 100644 --- a/common/buildcraft/transport/pipes/PipePowerCobblestone.java +++ b/common/buildcraft/transport/pipes/PipePowerCobblestone.java @@ -7,7 +7,6 @@ */ package buildcraft.transport.pipes; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; @@ -15,6 +14,7 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportPower; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.common.ForgeDirection; public class PipePowerCobblestone extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipePowerDiamond.java b/common/buildcraft/transport/pipes/PipePowerDiamond.java index 54f8103b..42513a38 100644 --- a/common/buildcraft/transport/pipes/PipePowerDiamond.java +++ b/common/buildcraft/transport/pipes/PipePowerDiamond.java @@ -7,7 +7,6 @@ */ package buildcraft.transport.pipes; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; @@ -15,6 +14,7 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportPower; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.common.ForgeDirection; public class PipePowerDiamond extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipePowerGold.java b/common/buildcraft/transport/pipes/PipePowerGold.java index 920b55ab..8b6e4e87 100644 --- a/common/buildcraft/transport/pipes/PipePowerGold.java +++ b/common/buildcraft/transport/pipes/PipePowerGold.java @@ -7,7 +7,6 @@ */ package buildcraft.transport.pipes; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; @@ -15,6 +14,7 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportPower; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.common.ForgeDirection; public class PipePowerGold extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipePowerQuartz.java b/common/buildcraft/transport/pipes/PipePowerQuartz.java index c80678aa..59904ab6 100644 --- a/common/buildcraft/transport/pipes/PipePowerQuartz.java +++ b/common/buildcraft/transport/pipes/PipePowerQuartz.java @@ -7,7 +7,6 @@ */ package buildcraft.transport.pipes; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; @@ -15,6 +14,7 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportPower; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.common.ForgeDirection; public class PipePowerQuartz extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipePowerStone.java b/common/buildcraft/transport/pipes/PipePowerStone.java index 8d2236c8..8d04228a 100644 --- a/common/buildcraft/transport/pipes/PipePowerStone.java +++ b/common/buildcraft/transport/pipes/PipePowerStone.java @@ -7,7 +7,6 @@ */ package buildcraft.transport.pipes; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; @@ -15,6 +14,7 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportPower; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.common.ForgeDirection; public class PipePowerStone extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipePowerWood.java b/common/buildcraft/transport/pipes/PipePowerWood.java index a9bdbbba..fe49a1f3 100644 --- a/common/buildcraft/transport/pipes/PipePowerWood.java +++ b/common/buildcraft/transport/pipes/PipePowerWood.java @@ -7,8 +7,6 @@ */ package buildcraft.transport.pipes; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.power.IPowerReceptor; @@ -20,6 +18,8 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportPower; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.ForgeDirection; public class PipePowerWood extends Pipe implements IPowerReceptor { diff --git a/common/buildcraft/transport/pipes/PipeStructureCobblestone.java b/common/buildcraft/transport/pipes/PipeStructureCobblestone.java index f5e6b4f6..62261c93 100644 --- a/common/buildcraft/transport/pipes/PipeStructureCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeStructureCobblestone.java @@ -1,6 +1,5 @@ package buildcraft.transport.pipes; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; @@ -8,6 +7,7 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportStructure; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.common.ForgeDirection; public class PipeStructureCobblestone extends Pipe { diff --git a/common/buildcraft/transport/render/FacadeItemRenderer.java b/common/buildcraft/transport/render/FacadeItemRenderer.java index 02d443f0..56e98d1d 100644 --- a/common/buildcraft/transport/render/FacadeItemRenderer.java +++ b/common/buildcraft/transport/render/FacadeItemRenderer.java @@ -1,5 +1,9 @@ package buildcraft.transport.render; +import buildcraft.BuildCraftTransport; +import buildcraft.core.utils.Utils; +import buildcraft.transport.ItemFacade; +import buildcraft.transport.PipeIconProvider; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -7,14 +11,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraftforge.client.IItemRenderer; - import org.lwjgl.opengl.GL11; -import buildcraft.BuildCraftTransport; -import buildcraft.core.utils.Utils; -import buildcraft.transport.ItemFacade; -import buildcraft.transport.PipeIconProvider; - public class FacadeItemRenderer implements IItemRenderer { private void renderFacadeItem(RenderBlocks render, ItemStack item, float translateX, float translateY, float translateZ) { diff --git a/common/buildcraft/transport/render/PipeItemRenderer.java b/common/buildcraft/transport/render/PipeItemRenderer.java index 50fae0a8..fcc31b68 100644 --- a/common/buildcraft/transport/render/PipeItemRenderer.java +++ b/common/buildcraft/transport/render/PipeItemRenderer.java @@ -1,19 +1,18 @@ package buildcraft.transport.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.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; -import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; - import buildcraft.BuildCraftTransport; import buildcraft.core.utils.Utils; import buildcraft.transport.ItemPipe; +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.texture.TextureMap; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraftforge.client.IItemRenderer; +import org.lwjgl.opengl.GL11; public class PipeItemRenderer implements IItemRenderer { @@ -25,7 +24,8 @@ public class PipeItemRenderer implements IItemRenderer { Block block = BuildCraftTransport.genericPipeBlock; Icon icon = ((ItemPipe) Item.itemsList[item.itemID]).getIconFromDamage(0); - if (icon == null) icon = Minecraft.getMinecraft().renderEngine.getMissingIcon(0); + if (icon == null) + icon = ((TextureMap) Minecraft.getMinecraft().func_110434_K().func_110581_b(TextureMap.field_110575_b)).func_110572_b("missingno"); block.setBlockBounds(Utils.pipeMinPos, 0.0F, Utils.pipeMinPos, Utils.pipeMaxPos, 1.0F, Utils.pipeMaxPos); block.setBlockBoundsForItemRender(); @@ -60,19 +60,20 @@ public class PipeItemRenderer implements IItemRenderer { block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); } - /** IItemRenderer implementation **/ - + /** + * IItemRenderer implementation * + */ @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { switch (type) { - case ENTITY: - return true; - case EQUIPPED: - return true; - case INVENTORY: - return true; - default: - return false; + case ENTITY: + return true; + case EQUIPPED: + return true; + case INVENTORY: + return true; + default: + return false; } } @@ -84,17 +85,16 @@ public class PipeItemRenderer implements IItemRenderer { @Override public void renderItem(ItemRenderType type, ItemStack item, Object... data) { switch (type) { - case ENTITY: - renderPipeItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); - break; - case EQUIPPED: - renderPipeItem((RenderBlocks) data[0], item, -0.4f, 0.50f, 0.35f); - break; - case INVENTORY: - renderPipeItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); - break; - default: + case ENTITY: + renderPipeItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + break; + case EQUIPPED: + renderPipeItem((RenderBlocks) data[0], item, -0.4f, 0.50f, 0.35f); + break; + case INVENTORY: + renderPipeItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + break; + default: } } - } diff --git a/common/buildcraft/transport/render/PipeWorldRenderer.java b/common/buildcraft/transport/render/PipeWorldRenderer.java index 8654959b..a658850f 100644 --- a/common/buildcraft/transport/render/PipeWorldRenderer.java +++ b/common/buildcraft/transport/render/PipeWorldRenderer.java @@ -1,12 +1,5 @@ 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.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.transport.IPipe; @@ -18,6 +11,13 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeRenderState; import buildcraft.transport.TransportProxy; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.ForgeDirection; public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { diff --git a/common/buildcraft/transport/render/PlugItemRenderer.java b/common/buildcraft/transport/render/PlugItemRenderer.java index c50f768d..d30a9f40 100644 --- a/common/buildcraft/transport/render/PlugItemRenderer.java +++ b/common/buildcraft/transport/render/PlugItemRenderer.java @@ -1,17 +1,15 @@ package buildcraft.transport.render; +import buildcraft.BuildCraftTransport; +import buildcraft.transport.PipeIconProvider; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraftforge.client.IItemRenderer; - import org.lwjgl.opengl.GL11; -import buildcraft.BuildCraftTransport; -import buildcraft.transport.PipeIconProvider; - public class PlugItemRenderer implements IItemRenderer{ private void renderPlugItem(RenderBlocks render, ItemStack item, float translateX, float translateY, float translateZ) { diff --git a/common/buildcraft/transport/render/RenderPipe.java b/common/buildcraft/transport/render/RenderPipe.java index 0d57ca0e..f04acc0c 100644 --- a/common/buildcraft/transport/render/RenderPipe.java +++ b/common/buildcraft/transport/render/RenderPipe.java @@ -9,34 +9,10 @@ package buildcraft.transport.render; -import java.util.HashMap; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.GLAllocation; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - -import com.google.common.collect.Maps; - import buildcraft.BuildCraftCore; import buildcraft.BuildCraftCore.RenderMode; import buildcraft.BuildCraftTransport; import buildcraft.api.transport.IPipedItem; -import buildcraft.core.render.FluidRenderer; import buildcraft.core.render.RenderEntityBlock; import buildcraft.core.render.RenderEntityBlock.BlockInterface; import buildcraft.core.utils.Utils; @@ -47,6 +23,23 @@ import buildcraft.transport.PipeTransportFluids; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.PipeTransportPower; import buildcraft.transport.TileGenericPipe; +import com.google.common.collect.Maps; +import java.util.HashMap; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.GLAllocation; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import org.lwjgl.opengl.GL11; public class RenderPipe extends TileEntitySpecialRenderer { @@ -127,7 +120,7 @@ public class RenderPipe extends TileEntitySpecialRenderer { block.minY = Utils.pipeMinPos + 0.01F; block.maxY = block.minY + (size - 0.02F) * ratio; - RenderEntityBlock.renderBlock(block, world, 0, 0, 0, false, true); + RenderEntityBlock.INSTANCE.renderBlock(block, world, 0, 0, 0, false, true); GL11.glEndList(); @@ -145,7 +138,7 @@ public class RenderPipe extends TileEntitySpecialRenderer { block.minZ = 0.5 - (size / 2 - 0.01) * ratio; block.maxZ = 0.5 + (size / 2 - 0.01) * ratio; - RenderEntityBlock.renderBlock(block, world, 0, 0, 0, false, true); + RenderEntityBlock.INSTANCE.renderBlock(block, world, 0, 0, 0, false, true); GL11.glEndList(); @@ -163,7 +156,7 @@ public class RenderPipe extends TileEntitySpecialRenderer { block.minY = Utils.pipeMinPos + 0.01; block.maxY = block.minY + (size - 0.02F) * ratio; - RenderEntityBlock.renderBlock(block, world, 0, 0, 0, false, true); + RenderEntityBlock.INSTANCE.renderBlock(block, world, 0, 0, 0, false, true); GL11.glEndList(); @@ -181,7 +174,7 @@ public class RenderPipe extends TileEntitySpecialRenderer { block.minZ = 0.5 - (size / 2 - 0.02) * ratio; block.maxZ = 0.5 + (size / 2 - 0.02) * ratio; - RenderEntityBlock.renderBlock(block, world, 0, 0, 0, false, true); + RenderEntityBlock.INSTANCE.renderBlock(block, world, 0, 0, 0, false, true); GL11.glEndList(); @@ -220,7 +213,7 @@ public class RenderPipe extends TileEntitySpecialRenderer { block.minX = 0; block.maxX = 0.5 + (minSize / 2F) + unit * s; - RenderEntityBlock.renderBlock(block, world, 0, 0, 0, false, true); + RenderEntityBlock.INSTANCE.renderBlock(block, world, 0, 0, 0, false, true); GL11.glEndList(); } @@ -246,7 +239,7 @@ public class RenderPipe extends TileEntitySpecialRenderer { block.minX = 0; block.maxX = 0.5 + (minSize / 2F) + unit * s; - RenderEntityBlock.renderBlock(block, world, 0, 0, 0, false, true); + RenderEntityBlock.INSTANCE.renderBlock(block, world, 0, 0, 0, false, true); GL11.glEndList(); } diff --git a/common/buildcraft/transport/render/TileEntityPickupFX.java b/common/buildcraft/transport/render/TileEntityPickupFX.java index a891d059..3a525cbd 100644 --- a/common/buildcraft/transport/render/TileEntityPickupFX.java +++ b/common/buildcraft/transport/render/TileEntityPickupFX.java @@ -11,8 +11,10 @@ */ package buildcraft.transport.render; +import buildcraft.core.utils.Utils; +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; @@ -20,12 +22,7 @@ import net.minecraft.entity.Entity; 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; //import net.minecraft.client.particle.EntityPickupFX; @SideOnly(Side.CLIENT) diff --git a/common/buildcraft/transport/triggers/TriggerFilteredBufferInventoryLevel.java b/common/buildcraft/transport/triggers/TriggerFilteredBufferInventoryLevel.java index 55b6908f..65258fdb 100644 --- a/common/buildcraft/transport/triggers/TriggerFilteredBufferInventoryLevel.java +++ b/common/buildcraft/transport/triggers/TriggerFilteredBufferInventoryLevel.java @@ -9,14 +9,14 @@ package buildcraft.transport.triggers; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; import buildcraft.api.gates.ITriggerParameter; import buildcraft.core.triggers.ActionTriggerIconProvider; import buildcraft.core.triggers.BCTrigger; import buildcraft.transport.TileFilteredBuffer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.ForgeDirection; public class TriggerFilteredBufferInventoryLevel extends BCTrigger { diff --git a/common/buildcraft/transport/triggers/TriggerPipeContents.java b/common/buildcraft/transport/triggers/TriggerPipeContents.java index 40c1c306..b52616da 100644 --- a/common/buildcraft/transport/triggers/TriggerPipeContents.java +++ b/common/buildcraft/transport/triggers/TriggerPipeContents.java @@ -7,10 +7,6 @@ */ package buildcraft.transport.triggers; -import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidTank; import buildcraft.api.gates.ITriggerParameter; import buildcraft.core.triggers.ActionTriggerIconProvider; import buildcraft.core.triggers.BCTrigger; @@ -22,6 +18,10 @@ import buildcraft.transport.PipeTransportFluids; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.PipeTransportPower; import buildcraft.transport.pipes.PipePowerWood; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; public class TriggerPipeContents extends BCTrigger implements ITriggerPipe { @@ -94,16 +94,16 @@ public class TriggerPipeContents extends BCTrigger implements ITriggerPipe { } if (kind == Kind.Empty) { - for (IFluidTank b : transportFluids.getTanks(ForgeDirection.UNKNOWN)) { - if (b.getFluid() != null && b.getFluid().amount != 0) + for (FluidTankInfo b : transportFluids.getTankInfo(ForgeDirection.UNKNOWN)) { + if (b.fluid != null && b.fluid.amount != 0) return false; } return true; } else { - for (IFluidTank b : transportFluids.getTanks(ForgeDirection.UNKNOWN)) { - if (b.getFluid() != null && b.getFluid().amount != 0) - if (searchedFluid == null || searchedFluid.isFluidEqual(b.getFluid())) + for (FluidTankInfo b : transportFluids.getTankInfo(ForgeDirection.UNKNOWN)) { + if (b.fluid != null && b.fluid.amount != 0) + if (searchedFluid == null || searchedFluid.isFluidEqual(b.fluid)) return true; } diff --git a/common/buildcraft/transport/utils/ConnectionMatrix.java b/common/buildcraft/transport/utils/ConnectionMatrix.java index 7a9e8811..778e7ba7 100644 --- a/common/buildcraft/transport/utils/ConnectionMatrix.java +++ b/common/buildcraft/transport/utils/ConnectionMatrix.java @@ -4,7 +4,6 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.util.BitSet; - import net.minecraftforge.common.ForgeDirection; public class ConnectionMatrix { diff --git a/common/buildcraft/transport/utils/FacadeMatrix.java b/common/buildcraft/transport/utils/FacadeMatrix.java index 2181b4c1..c14426b0 100644 --- a/common/buildcraft/transport/utils/FacadeMatrix.java +++ b/common/buildcraft/transport/utils/FacadeMatrix.java @@ -3,7 +3,6 @@ package buildcraft.transport.utils; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; - import net.minecraftforge.common.ForgeDirection; public class FacadeMatrix { diff --git a/common/buildcraft/transport/utils/TextureMatrix.java b/common/buildcraft/transport/utils/TextureMatrix.java index 7f1b79d1..599c9b15 100644 --- a/common/buildcraft/transport/utils/TextureMatrix.java +++ b/common/buildcraft/transport/utils/TextureMatrix.java @@ -3,7 +3,6 @@ package buildcraft.transport.utils; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; - import net.minecraftforge.common.ForgeDirection; public class TextureMatrix { diff --git a/common/buildcraft/transport/utils/WireMatrix.java b/common/buildcraft/transport/utils/WireMatrix.java index f8dbc0ec..b5cbdf01 100644 --- a/common/buildcraft/transport/utils/WireMatrix.java +++ b/common/buildcraft/transport/utils/WireMatrix.java @@ -1,12 +1,11 @@ package buildcraft.transport.utils; +import buildcraft.api.transport.IPipe; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.util.BitSet; - import net.minecraftforge.common.ForgeDirection; -import buildcraft.api.transport.IPipe; public class WireMatrix {