From fab95e89005ea442e290d7ede31bafa72f27bb5a Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Wed, 3 Sep 2014 19:00:03 +0100 Subject: [PATCH] Re-organise imports. I went for what seemed like a good level of organisation: Java __________ Mekanism __________ Minecraft Forge FML __________ Netty LWJGL __________ Other APIs __________ Static Imports. --- src/main/java/mekanism/api/Coord4D.java | 4 ++-- src/main/java/mekanism/api/MekanismAPI.java | 2 +- .../java/mekanism/api/gas/GasNetwork.java | 1 + .../mekanism/api/gas/GasTransmission.java | 2 +- .../mekanism/api/gas/IGasTransmitter.java | 1 + .../mekanism/api/recipe/AdvancedInput.java | 2 +- .../api/recipe/PressurizedReactants.java | 2 +- .../mekanism/api/recipe/RecipeHelper.java | 1 + .../api/transmitters/DynamicNetwork.java | 1 + .../api/transmitters/IGridTransmitter.java | 1 - .../api/transmitters/TransmissionType.java | 1 + .../mekanism/client/CapeBufferDownload.java | 1 + .../client/ClientConnectionHandler.java | 1 + .../mekanism/client/ClientPlayerTracker.java | 1 + .../java/mekanism/client/ClientProxy.java | 1 + .../mekanism/client/ClientTickHandler.java | 1 + .../java/mekanism/client/HolidayManager.java | 1 + .../java/mekanism/client/MekKeyHandler.java | 12 ----------- .../java/mekanism/client/MekanismClient.java | 4 +--- .../mekanism/client/MekanismKeyHandler.java | 6 +++--- .../mekanism/client/ThreadClientUpdate.java | 1 + .../client/ThreadMultiblockSparkle.java | 1 + .../mekanism/client/entity/EntityLaser.java | 2 +- .../gui/GuiAdvancedElectricMachine.java | 8 ++++---- .../client/gui/GuiAmbientAccumulator.java | 2 +- .../java/mekanism/client/gui/GuiBucketIO.java | 4 +++- .../mekanism/client/gui/GuiChanceMachine.java | 6 +++--- .../client/gui/GuiChemicalCrystallizer.java | 8 ++++---- .../gui/GuiChemicalDissolutionChamber.java | 8 ++++---- .../client/gui/GuiChemicalInfuser.java | 8 ++++---- .../gui/GuiChemicalInjectionChamber.java | 1 + .../client/gui/GuiChemicalOxidizer.java | 8 ++++---- .../client/gui/GuiChemicalWasher.java | 8 ++++---- .../java/mekanism/client/gui/GuiCombiner.java | 1 + .../mekanism/client/gui/GuiConfiguration.java | 6 +++--- .../client/gui/GuiConfigurationTab.java | 4 +++- .../client/gui/GuiContainerEditMode.java | 2 ++ .../java/mekanism/client/gui/GuiCredits.java | 1 + .../java/mekanism/client/gui/GuiCrusher.java | 1 + .../mekanism/client/gui/GuiDictionary.java | 9 +++------ .../mekanism/client/gui/GuiDigitalMiner.java | 6 +++--- .../client/gui/GuiDigitalMinerConfig.java | 6 +++--- .../mekanism/client/gui/GuiDynamicTank.java | 6 +++--- .../mekanism/client/gui/GuiElectricChest.java | 6 +++--- .../client/gui/GuiElectricMachine.java | 6 +++--- .../mekanism/client/gui/GuiElectricPump.java | 6 +++--- .../client/gui/GuiElectrolyticSeparator.java | 8 ++++---- .../java/mekanism/client/gui/GuiElement.java | 4 +++- .../client/gui/GuiEnergizedSmelter.java | 1 + .../mekanism/client/gui/GuiEnergyCube.java | 8 ++++---- .../mekanism/client/gui/GuiEnergyGauge.java | 4 +++- .../mekanism/client/gui/GuiEnergyInfo.java | 4 +++- .../client/gui/GuiEnrichmentChamber.java | 1 + .../client/gui/GuiEntangledBlock.java | 11 ++-------- .../java/mekanism/client/gui/GuiFactory.java | 8 ++++---- .../mekanism/client/gui/GuiFluidGauge.java | 1 + .../client/gui/GuiFluidicPlenisher.java | 6 +++--- .../java/mekanism/client/gui/GuiGasGauge.java | 1 + .../java/mekanism/client/gui/GuiGasTank.java | 6 +++--- .../java/mekanism/client/gui/GuiGauge.java | 4 +++- .../client/gui/GuiLaserAmplifier.java | 5 ++--- .../client/gui/GuiLogisticalSorter.java | 6 +++--- .../mekanism/client/gui/GuiMFilterSelect.java | 6 +++--- .../client/gui/GuiMItemStackFilter.java | 9 +++------ .../client/gui/GuiMMaterialFilter.java | 6 +++--- .../mekanism/client/gui/GuiMModIDFilter.java | 6 +++--- .../client/gui/GuiMOreDictFilter.java | 8 +++----- .../java/mekanism/client/gui/GuiMekanism.java | 1 + .../client/gui/GuiMetallurgicInfuser.java | 6 +++--- .../client/gui/GuiOsmiumCompressor.java | 1 + src/main/java/mekanism/client/gui/GuiPRC.java | 6 +++--- .../mekanism/client/gui/GuiPasswordEnter.java | 6 +++--- .../client/gui/GuiPasswordModify.java | 6 +++--- .../mekanism/client/gui/GuiPortableTank.java | 6 +++--- .../client/gui/GuiPortableTeleporter.java | 6 +++--- .../java/mekanism/client/gui/GuiPowerBar.java | 4 +++- .../client/gui/GuiPrecisionSawmill.java | 1 + .../java/mekanism/client/gui/GuiProgress.java | 4 +++- .../client/gui/GuiPurificationChamber.java | 1 + .../mekanism/client/gui/GuiRecipeType.java | 4 +++- .../client/gui/GuiRedstoneControl.java | 4 +++- .../mekanism/client/gui/GuiRobitCrafting.java | 6 +++--- .../client/gui/GuiRobitInventory.java | 6 +++--- .../mekanism/client/gui/GuiRobitMain.java | 6 +++--- .../mekanism/client/gui/GuiRobitRepair.java | 7 ++++--- .../mekanism/client/gui/GuiRobitSmelting.java | 1 + .../client/gui/GuiRotaryCondensentrator.java | 6 +++--- .../client/gui/GuiSalinationController.java | 12 +++-------- .../mekanism/client/gui/GuiScrollList.java | 5 +++-- .../mekanism/client/gui/GuiSeismicReader.java | 6 +++--- .../client/gui/GuiSeismicVibrator.java | 6 +++--- .../java/mekanism/client/gui/GuiSlot.java | 4 +++- .../mekanism/client/gui/GuiSortingTab.java | 4 +++- .../mekanism/client/gui/GuiTFilterSelect.java | 6 +++--- .../client/gui/GuiTItemStackFilter.java | 6 +++--- .../client/gui/GuiTMaterialFilter.java | 6 +++--- .../mekanism/client/gui/GuiTModIDFilter.java | 6 +++--- .../client/gui/GuiTOreDictFilter.java | 6 +++--- .../mekanism/client/gui/GuiTeleporter.java | 6 +++--- .../client/gui/GuiUpgradeManagement.java | 6 +++--- .../mekanism/client/gui/GuiUpgradeTab.java | 3 ++- .../client/model/ModelArmoredJetpack.java | 1 + .../client/model/ModelAtomicDisassembler.java | 1 + .../mekanism/client/model/ModelBalloon.java | 6 +++--- .../model/ModelChemicalCrystallizer.java | 1 + .../ModelChemicalDissolutionChamber.java | 1 + .../client/model/ModelChemicalInfuser.java | 6 +++--- .../client/model/ModelChemicalOxidizer.java | 6 +++--- .../client/model/ModelChemicalWasher.java | 1 + .../client/model/ModelDigitalMiner.java | 1 + .../client/model/ModelEnergyCube.java | 1 + .../client/model/ModelFlamethrower.java | 1 - .../mekanism/client/model/ModelGasMask.java | 6 +++--- .../mekanism/client/model/ModelJetpack.java | 6 +++--- .../mekanism/client/model/ModelLaser.java | 1 - .../client/model/ModelLogisticalSorter.java | 1 + .../client/model/ModelPortableTank.java | 1 + .../mekanism/client/model/ModelRobit.java | 6 +++--- .../client/model/ModelSeismicVibrator.java | 4 ++-- .../nei/AdvancedMachineRecipeHandler.java | 12 +++++------ .../client/nei/BaseRecipeHandler.java | 10 ++++++---- .../nei/ChanceMachineRecipeHandler.java | 11 +++++----- .../ChemicalCrystallizerRecipeHandler.java | 10 +++++----- ...emicalDissolutionChamberRecipeHandler.java | 12 +++++------ .../nei/ChemicalInfuserRecipeHandler.java | 12 +++++------ ...ChemicalInjectionChamberRecipeHandler.java | 3 ++- .../nei/ChemicalOxidizerRecipeHandler.java | 11 +++++----- .../nei/ChemicalWasherRecipeHandler.java | 10 +++++----- .../client/nei/CombinerRecipeHandler.java | 3 ++- .../client/nei/CrusherRecipeHandler.java | 3 --- .../ElectrolyticSeparatorRecipeHandler.java | 13 ++++++------ .../client/nei/ElementBoundHandler.java | 2 ++ .../client/nei/MachineRecipeHandler.java | 9 +++++---- .../client/nei/MekanismRecipeHandler.java | 2 ++ .../client/nei/MekanismSlotClickHandler.java | 2 ++ .../nei/MetallurgicInfuserRecipeHandler.java | 9 +++++---- .../client/nei/NEIMekanismConfig.java | 1 + .../nei/OsmiumCompressorRecipeHandler.java | 3 ++- .../mekanism/client/nei/PRCRecipeHandler.java | 12 +++++------ .../nei/PurificationChamberRecipeHandler.java | 3 ++- .../RotaryCondensentratorRecipeHandler.java | 12 +++++------ .../SalinationControllerRecipeHandler.java | 9 +++++---- src/main/java/mekanism/client/render/CTM.java | 2 -- .../client/render/MekanismRenderer.java | 8 ++++---- .../client/render/MinerVisualRenderer.java | 2 +- .../client/render/ModelCustomArmor.java | 6 +++--- .../client/render/RenderGlowPanel.java | 2 ++ .../client/render/RenderPartTransmitter.java | 5 +++-- .../client/render/RenderTickHandler.java | 1 + .../render/block/BasicRenderingHandler.java | 5 ++--- .../render/block/CTMRenderingHandler.java | 3 --- .../render/block/MachineRenderingHandler.java | 6 +++--- .../client/render/block/RenderBlocksCTM.java | 3 --- .../client/render/block/TextureSubmap.java | 2 +- .../client/render/entity/RenderBalloon.java | 6 +++--- .../client/render/entity/RenderFlame.java | 6 +++--- .../entity/RenderObsidianTNTPrimed.java | 6 +++--- .../client/render/entity/RenderRobit.java | 1 + .../render/item/ItemRenderingHandler.java | 7 +++---- .../client/render/tileentity/RenderBin.java | 6 +++--- .../render/tileentity/RenderChargepad.java | 6 +++--- .../RenderChemicalCrystallizer.java | 6 +++--- .../RenderChemicalDissolutionChamber.java | 6 +++--- .../tileentity/RenderChemicalInfuser.java | 1 + .../tileentity/RenderChemicalOxidizer.java | 1 + .../tileentity/RenderChemicalWasher.java | 1 + .../tileentity/RenderConfigurableMachine.java | 6 +++--- .../render/tileentity/RenderDigitalMiner.java | 6 +++--- .../render/tileentity/RenderDynamicTank.java | 9 ++++----- .../tileentity/RenderElectricChest.java | 6 +++--- .../render/tileentity/RenderElectricPump.java | 6 +++--- .../RenderElectrolyticSeparator.java | 6 +++--- .../render/tileentity/RenderEnergyCube.java | 6 +++--- .../tileentity/RenderFluidicPlenisher.java | 6 +++--- .../render/tileentity/RenderGasTank.java | 6 +++--- .../client/render/tileentity/RenderLaser.java | 6 +++--- .../tileentity/RenderLaserAmplifier.java | 6 +++--- .../tileentity/RenderLogisticalSorter.java | 6 +++--- .../tileentity/RenderMetallurgicInfuser.java | 6 +++--- .../render/tileentity/RenderObsidianTNT.java | 6 +++--- .../render/tileentity/RenderPortableTank.java | 6 +++--- .../RenderPressurizedReactionChamber.java | 6 +++--- .../RenderRotaryCondensentrator.java | 6 +++--- .../RenderSalinationController.java | 7 +++---- .../tileentity/RenderSeismicVibrator.java | 6 +++--- .../render/tileentity/RenderTeleporter.java | 1 + .../java/mekanism/client/sound/Sound.java | 5 ++--- .../mekanism/client/sound/SoundHandler.java | 2 +- .../mekanism/client/voice/VoiceClient.java | 5 +++-- .../mekanism/client/voice/VoiceInput.java | 11 +++++----- .../mekanism/client/voice/VoiceOutput.java | 9 +++++---- .../mekanism/common/BoxBlacklistParser.java | 1 + .../java/mekanism/common/CommandMekanism.java | 1 + .../common/CommonPlayerTickHandler.java | 1 + .../mekanism/common/CommonPlayerTracker.java | 1 + .../java/mekanism/common/CommonProxy.java | 1 + .../common/CommonWorldTickHandler.java | 4 +--- .../java/mekanism/common/EnergyNetwork.java | 11 +++++----- .../java/mekanism/common/FluidNetwork.java | 1 + .../java/mekanism/common/FuelHandler.java | 5 +++-- .../mekanism/common/InventoryNetwork.java | 1 + .../java/mekanism/common/ItemAttacher.java | 1 + src/main/java/mekanism/common/Mekanism.java | 14 ++++++------- .../java/mekanism/common/MekanismBlocks.java | 7 +++++-- .../java/mekanism/common/MekanismItems.java | 1 - .../java/mekanism/common/OreDictCache.java | 1 + .../java/mekanism/common/PacketHandler.java | 6 +++--- .../java/mekanism/common/RobitAIFollow.java | 1 + .../java/mekanism/common/RobitAIPickup.java | 1 + src/main/java/mekanism/common/Tier.java | 1 + src/main/java/mekanism/common/Upgrade.java | 1 + .../java/mekanism/common/asm/LoadingHook.java | 3 ++- .../common/base/IAdvancedBoundingBlock.java | 8 +++++--- .../java/mekanism/common/base/IBlockCTM.java | 1 - .../java/mekanism/common/base/IEjector.java | 1 + .../mekanism/common/base/IEnergyCube.java | 2 +- .../java/mekanism/common/base/IFactory.java | 5 +++-- .../common/base/ILogisticalTransporter.java | 1 + .../java/mekanism/common/base/IModule.java | 4 ++-- .../mekanism/common/base/ITileComponent.java | 4 ++-- .../mekanism/common/base/ITileNetwork.java | 4 ++-- .../mekanism/common/base/IUpgradeItem.java | 1 + .../mekanism/common/block/BlockBasic.java | 3 ++- .../mekanism/common/block/BlockBounding.java | 1 + .../common/block/BlockCardboardBox.java | 1 + .../common/block/BlockEnergyCube.java | 8 +++++--- .../mekanism/common/block/BlockGasTank.java | 3 ++- .../mekanism/common/block/BlockMachine.java | 6 ++++-- .../common/block/BlockObsidianTNT.java | 1 + .../java/mekanism/common/block/BlockOre.java | 1 + .../common/block/BlockPlasticFence.java | 10 +++++----- .../common/content/boiler/BoilerCache.java | 2 +- .../common/content/matrix/MatrixCache.java | 1 + .../matrix/SynchronizedMatrixData.java | 1 + .../content/miner/MItemStackFilter.java | 5 +++-- .../common/content/miner/MMaterialFilter.java | 5 +++-- .../common/content/miner/MModIDFilter.java | 5 +++-- .../common/content/miner/MOreDictFilter.java | 5 +++-- .../common/content/miner/MinerFilter.java | 5 +++-- .../content/miner/ThreadMinerSearch.java | 1 + .../common/content/tank/DynamicFluidTank.java | 1 + .../content/tank/SynchronizedTankData.java | 1 + .../common/content/tank/TankCache.java | 1 + .../content/tank/TankUpdateProtocol.java | 3 +-- .../teleportation/SharedInventory.java | 2 -- .../teleportation/SharedInventoryManager.java | 1 - .../common/content/transporter/Finder.java | 3 ++- .../content/transporter/PathfinderCache.java | 2 +- .../content/transporter/TItemStackFilter.java | 5 +++-- .../content/transporter/TMaterialFilter.java | 5 +++-- .../content/transporter/TModIDFilter.java | 5 +++-- .../content/transporter/TOreDictFilter.java | 5 +++-- .../transporter/TransporterFilter.java | 5 +++-- .../transporter/TransporterManager.java | 2 ++ .../transporter/TransporterPathfinder.java | 3 +-- .../content/transporter/TransporterStack.java | 5 +++-- .../common/content/turbine/TurbineCache.java | 1 + .../mekanism/common/entity/EntityBalloon.java | 5 +++-- .../mekanism/common/entity/EntityFlame.java | 7 ++++--- .../mekanism/common/entity/EntityRobit.java | 11 +++++----- .../common/integration/IC2ItemManager.java | 4 ++-- .../common/integration/MekanismHooks.java | 2 ++ .../common/integration/OreDictManager.java | 7 ++++--- .../common/inventory/InventoryBin.java | 1 + .../inventory/InventoryElectricChest.java | 1 + .../ContainerAdvancedElectricMachine.java | 1 + .../container/ContainerChanceMachine.java | 1 + .../ContainerChemicalCrystallizer.java | 1 + .../ContainerChemicalDissolutionChamber.java | 1 + .../container/ContainerChemicalInfuser.java | 1 + .../container/ContainerChemicalOxidizer.java | 1 + .../container/ContainerChemicalWasher.java | 1 + .../container/ContainerDigitalMiner.java | 1 + .../container/ContainerDynamicTank.java | 1 + .../container/ContainerElectricChest.java | 4 +++- .../container/ContainerElectricMachine.java | 1 + .../container/ContainerElectricPump.java | 1 + .../ContainerElectrolyticSeparator.java | 1 + .../container/ContainerEnergyCube.java | 3 ++- .../inventory/container/ContainerFactory.java | 1 + .../inventory/container/ContainerFilter.java | 1 + .../container/ContainerFluidicPlenisher.java | 1 + .../inventory/container/ContainerGasTank.java | 1 + .../container/ContainerLaserAmplifier.java | 7 +------ .../ContainerMetallurgicInfuser.java | 1 + .../inventory/container/ContainerNull.java | 1 + .../inventory/container/ContainerPRC.java | 1 + .../container/ContainerPortableTank.java | 1 + .../container/ContainerRobitInventory.java | 1 + .../container/ContainerRobitMain.java | 1 + .../container/ContainerRobitSmelting.java | 1 + .../ContainerRotaryCondensentrator.java | 1 + .../ContainerSalinationController.java | 1 + .../container/ContainerSeismicVibrator.java | 1 + .../container/ContainerTeleporter.java | 1 + .../container/ContainerUpgradeManagement.java | 1 + .../inventory/slot/SlotElectricChest.java | 1 + .../common/inventory/slot/SlotEnergy.java | 1 + .../inventory/slot/SlotMachineUpgrade.java | 1 + .../inventory/slot/SlotStorageTank.java | 1 + .../common/item/ItemAtomicDisassembler.java | 1 + .../mekanism/common/item/ItemBalloon.java | 1 + .../mekanism/common/item/ItemBlockBasic.java | 1 + .../common/item/ItemBlockCardboardBox.java | 1 + .../common/item/ItemBlockEnergyCube.java | 14 ++++++------- .../common/item/ItemBlockGasTank.java | 1 + .../common/item/ItemBlockMachine.java | 20 +++++++++---------- .../mekanism/common/item/ItemBlockOre.java | 6 +++--- .../common/item/ItemBlockPlastic.java | 1 + .../java/mekanism/common/item/ItemClump.java | 1 + .../common/item/ItemConfigurator.java | 4 +++- .../common/item/ItemControlCircuit.java | 1 + .../mekanism/common/item/ItemCrystal.java | 1 + .../mekanism/common/item/ItemDictionary.java | 1 + .../mekanism/common/item/ItemDirtyDust.java | 1 + .../java/mekanism/common/item/ItemDust.java | 1 + .../mekanism/common/item/ItemElectricBow.java | 1 + .../mekanism/common/item/ItemEnergized.java | 6 +++--- .../mekanism/common/item/ItemFilterCard.java | 1 + .../common/item/ItemFlamethrower.java | 1 + .../mekanism/common/item/ItemFreeRunners.java | 11 +++++----- .../mekanism/common/item/ItemGasMask.java | 2 +- .../java/mekanism/common/item/ItemHDPE.java | 1 + .../java/mekanism/common/item/ItemIngot.java | 1 + .../mekanism/common/item/ItemJetpack.java | 1 + .../mekanism/common/item/ItemMekanism.java | 1 + .../common/item/ItemNetworkReader.java | 1 + .../common/item/ItemPortableTeleporter.java | 1 + .../java/mekanism/common/item/ItemProxy.java | 1 - .../java/mekanism/common/item/ItemRobit.java | 1 + .../mekanism/common/item/ItemScubaTank.java | 1 + .../common/item/ItemSeismicReader.java | 1 + .../java/mekanism/common/item/ItemShard.java | 1 + .../mekanism/common/item/ItemUpgrade.java | 10 +++++----- .../common/item/ItemWalkieTalkie.java | 1 + .../common/multiblock/MultiblockCache.java | 1 + .../common/multiblock/MultiblockManager.java | 1 + .../common/multiblock/SynchronizedData.java | 1 + .../common/multiblock/UpdateProtocol.java | 1 + .../common/multipart/ItemGlowPanel.java | 7 ++++--- .../common/multipart/ItemPartTransmitter.java | 5 +++-- .../common/multipart/MultipartMekanism.java | 7 +++++-- .../multipart/PartDiversionTransporter.java | 5 +++-- .../common/multipart/PartGlowPanel.java | 5 +++-- .../multipart/PartLogisticalTransporter.java | 12 ++++++----- .../common/multipart/PartMechanicalPipe.java | 4 +++- .../common/multipart/PartPressurizedTube.java | 5 +++-- .../common/multipart/PartSidedPipe.java | 12 +++++------ .../common/multipart/PartTransmitter.java | 2 ++ .../common/multipart/PartUniversalCable.java | 15 +++++++------- .../multipart/PlasticMicroMaterial.java | 1 + .../common/multipart/TransmitterType.java | 1 + .../common/network/PacketBoxBlacklist.java | 7 ++++--- .../common/network/PacketConfigSync.java | 4 +++- .../network/PacketConfigurationUpdate.java | 5 +++-- .../network/PacketConfiguratorState.java | 4 +++- .../network/PacketContainerEditMode.java | 4 +++- .../common/network/PacketDataRequest.java | 5 +++-- .../common/network/PacketDigitUpdate.java | 4 +++- .../common/network/PacketDigitalMinerGui.java | 5 +++-- .../common/network/PacketEditFilter.java | 5 +++-- .../network/PacketElectricBowState.java | 4 +++- .../common/network/PacketElectricChest.java | 5 +++-- .../network/PacketFlamethrowerActive.java | 7 +++---- .../common/network/PacketJetpackData.java | 4 +++- .../mekanism/common/network/PacketKey.java | 4 +++- .../network/PacketLogisticalSorterGui.java | 4 +++- .../common/network/PacketNewFilter.java | 5 +++-- .../network/PacketPortableTankState.java | 4 +++- .../network/PacketPortableTeleport.java | 4 +++- .../common/network/PacketPortalFX.java | 5 +++-- .../common/network/PacketRedstoneControl.java | 4 +++- .../common/network/PacketRemoveUpgrade.java | 6 +++--- .../mekanism/common/network/PacketRobit.java | 4 +++- .../common/network/PacketScubaTankData.java | 4 +++- .../common/network/PacketSimpleGui.java | 4 +++- .../common/network/PacketStatusUpdate.java | 4 +++- .../common/network/PacketTileEntity.java | 5 +++-- .../network/PacketTransmitterUpdate.java | 4 +++- .../network/PacketWalkieTalkieState.java | 4 +++- .../mekanism/common/recipe/BinRecipe.java | 1 + .../common/recipe/MekanismRecipe.java | 1 + .../mekanism/common/recipe/RecipeHandler.java | 11 +++++----- .../tile/TileEntityAdvancedBoundingBlock.java | 10 ++++++---- .../TileEntityAdvancedElectricMachine.java | 10 ++++++---- .../tile/TileEntityAmbientAccumulator.java | 1 - .../common/tile/TileEntityBasicBlock.java | 8 +++++--- .../common/tile/TileEntityBasicMachine.java | 6 +++--- .../mekanism/common/tile/TileEntityBin.java | 8 +++++--- .../common/tile/TileEntityBoundingBlock.java | 5 +++-- .../common/tile/TileEntityCardboardBox.java | 1 + .../common/tile/TileEntityChanceMachine.java | 4 +++- .../common/tile/TileEntityChargepad.java | 14 ++++++------- .../tile/TileEntityChemicalCrystallizer.java | 9 ++++----- .../TileEntityChemicalDissolutionChamber.java | 9 ++++----- .../tile/TileEntityChemicalInfuser.java | 9 ++++----- .../TileEntityChemicalInjectionChamber.java | 1 + .../tile/TileEntityChemicalOxidizer.java | 9 ++++----- .../common/tile/TileEntityChemicalWasher.java | 9 ++++----- .../common/tile/TileEntityCombiner.java | 1 + .../common/tile/TileEntityContainerBlock.java | 1 + .../common/tile/TileEntityDigitalMiner.java | 6 ++++-- .../common/tile/TileEntityDynamicTank.java | 5 +++-- .../common/tile/TileEntityDynamicValve.java | 1 + .../common/tile/TileEntityElectricBlock.java | 20 ++++++++++--------- .../common/tile/TileEntityElectricChest.java | 5 +++-- .../tile/TileEntityElectricMachine.java | 2 ++ .../common/tile/TileEntityElectricPump.java | 7 +++---- .../tile/TileEntityElectrolyticSeparator.java | 10 ++++++---- .../tile/TileEntityEnergizedSmelter.java | 1 + .../common/tile/TileEntityEnergyCube.java | 6 ++++-- .../common/tile/TileEntityEntangledBlock.java | 2 ++ .../common/tile/TileEntityFactory.java | 14 ++++++------- .../tile/TileEntityFluidicPlenisher.java | 5 +++-- .../common/tile/TileEntityGasTank.java | 5 +++-- .../mekanism/common/tile/TileEntityLaser.java | 5 +++-- .../tile/TileEntityLogisticalSorter.java | 7 ++++--- .../tile/TileEntityMetallurgicInfuser.java | 10 +++++----- .../common/tile/TileEntityMultiblock.java | 6 +++--- .../tile/TileEntityNoisyElectricBlock.java | 2 -- .../tile/TileEntityOsmiumCompressor.java | 1 + .../mekanism/common/tile/TileEntityPRC.java | 10 ++++++---- .../common/tile/TileEntityPortableTank.java | 7 ++++--- .../tile/TileEntityPurificationChamber.java | 1 + .../tile/TileEntityRotaryCondensentrator.java | 5 +++-- .../tile/TileEntitySalinationBlock.java | 2 +- .../tile/TileEntitySalinationController.java | 5 +++-- .../tile/TileEntitySalinationValve.java | 2 +- .../tile/TileEntitySeismicVibrator.java | 5 +++-- .../common/tile/TileEntityTeleporter.java | 6 ++++-- .../tile/component/TileComponentEjector.java | 5 +++-- .../tile/component/TileComponentUpgrade.java | 5 +++-- .../java/mekanism/common/util/CableUtils.java | 11 +++++----- .../mekanism/common/util/ChargeUtils.java | 7 ++++--- .../mekanism/common/util/InventoryUtils.java | 1 + .../mekanism/common/util/MekanismUtils.java | 7 ++++--- .../java/mekanism/common/util/MinerUtils.java | 1 + .../java/mekanism/common/util/PipeUtils.java | 1 + .../common/util/TransporterUtils.java | 4 +++- .../common/voice/VoiceConnection.java | 1 + .../client/BlockRenderingHandler.java | 8 ++++---- .../client/GeneratorsClientProxy.java | 6 +++--- .../client/gui/GeneratorsGuiFactory.java | 2 -- .../client/gui/GuiBioGenerator.java | 6 +++--- .../generators/client/gui/GuiFuelTab.java | 5 ++--- .../client/gui/GuiGasGenerator.java | 8 ++++---- .../client/gui/GuiGeneratorsConfig.java | 1 - .../client/gui/GuiHeatGenerator.java | 6 +++--- .../generators/client/gui/GuiHeatTab.java | 5 ++--- .../client/gui/GuiNeutronCapture.java | 1 + .../client/gui/GuiReactorController.java | 1 + .../generators/client/gui/GuiReactorFuel.java | 6 ++---- .../generators/client/gui/GuiReactorHeat.java | 3 ++- .../client/gui/GuiReactorStats.java | 6 +++--- .../client/gui/GuiSolarGenerator.java | 6 +++--- .../generators/client/gui/GuiStatTab.java | 5 ++--- .../generators/client/gui/GuiWindTurbine.java | 6 +++--- .../model/ModelAdvancedSolarGenerator.java | 1 + .../render/RenderAdvancedSolarGenerator.java | 6 +++--- .../client/render/RenderBioGenerator.java | 6 +++--- .../client/render/RenderGasGenerator.java | 6 +++--- .../client/render/RenderHeatGenerator.java | 6 +++--- .../client/render/RenderReactor.java | 8 ++------ .../client/render/RenderSolarGenerator.java | 1 + .../client/render/RenderWindTurbine.java | 1 + .../generators/common/FusionReactor.java | 6 +++--- .../common/GeneratorsCommonProxy.java | 4 ++-- .../common/GeneratorsPacketHandler.java | 4 ++-- .../generators/common/MekanismGenerators.java | 8 +++++--- .../common/block/BlockGenerator.java | 8 +++++--- .../generators/common/block/BlockReactor.java | 6 +++--- .../container/ContainerBioGenerator.java | 1 + .../container/ContainerGasGenerator.java | 1 + .../container/ContainerHeatGenerator.java | 1 + .../container/ContainerNeutronCapture.java | 1 - .../container/ContainerReactorController.java | 1 + .../container/ContainerSolarGenerator.java | 1 + .../container/ContainerWindTurbine.java | 1 + .../common/item/ItemBlockGenerator.java | 14 ++++++------- .../common/item/ItemBlockReactor.java | 1 + .../common/network/PacketGeneratorsGui.java | 5 +++-- .../TileEntityAdvancedSolarGenerator.java | 1 + .../common/tile/TileEntityBioGenerator.java | 5 +++-- .../common/tile/TileEntityGasGenerator.java | 8 +++++--- .../common/tile/TileEntityGenerator.java | 7 ++++--- .../common/tile/TileEntityHeatGenerator.java | 6 ++++-- .../common/tile/TileEntitySolarGenerator.java | 7 ++++--- .../common/tile/TileEntityWindTurbine.java | 3 ++- .../tile/reactor/TileEntityReactorBlock.java | 1 + .../reactor/TileEntityReactorController.java | 3 ++- .../TileEntityReactorLaserFocusMatrix.java | 1 - .../tile/reactor/TileEntityReactorPort.java | 2 -- .../tools/client/gui/ToolsGuiFactory.java | 1 - .../mekanism/tools/common/MekanismTools.java | 5 +++-- .../tools/item/ItemMekanismArmor.java | 2 +- .../mekanism/tools/item/ItemMekanismHoe.java | 3 ++- .../tools/item/ItemMekanismPaxel.java | 1 - .../tools/item/ItemMekanismSword.java | 1 + .../mekanism/tools/item/ItemMekanismTool.java | 3 ++- 499 files changed, 1188 insertions(+), 919 deletions(-) diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index e7faff4b7..1de730622 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -1,7 +1,5 @@ package mekanism.api; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import net.minecraft.block.Block; @@ -17,6 +15,8 @@ import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import io.netty.buffer.ByteBuf; + /** * Coord4D - an integer-based way to keep track of and perform operations on blocks in a Minecraft-based environment. This also takes * in account the dimension the coordinate is in. diff --git a/src/main/java/mekanism/api/MekanismAPI.java b/src/main/java/mekanism/api/MekanismAPI.java index ceb7e7a98..9f8c87a68 100644 --- a/src/main/java/mekanism/api/MekanismAPI.java +++ b/src/main/java/mekanism/api/MekanismAPI.java @@ -7,8 +7,8 @@ import mekanism.api.util.BlockInfo; import net.minecraft.block.Block; import net.minecraft.item.Item; -import cpw.mods.fml.common.eventhandler.Event; import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.common.eventhandler.Event; public class MekanismAPI { diff --git a/src/main/java/mekanism/api/gas/GasNetwork.java b/src/main/java/mekanism/api/gas/GasNetwork.java index f1b7941a1..90ed973ac 100644 --- a/src/main/java/mekanism/api/gas/GasNetwork.java +++ b/src/main/java/mekanism/api/gas/GasNetwork.java @@ -16,6 +16,7 @@ import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.ITransmitterNetwork; import mekanism.api.transmitters.TransmissionType; import mekanism.api.util.ListUtils; + import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/mekanism/api/gas/GasTransmission.java b/src/main/java/mekanism/api/gas/GasTransmission.java index c90914116..7c4c2a54a 100644 --- a/src/main/java/mekanism/api/gas/GasTransmission.java +++ b/src/main/java/mekanism/api/gas/GasTransmission.java @@ -1,8 +1,8 @@ package mekanism.api.gas; import mekanism.api.Coord4D; -import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; + import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/mekanism/api/gas/IGasTransmitter.java b/src/main/java/mekanism/api/gas/IGasTransmitter.java index 63eb02fd1..8be999c01 100644 --- a/src/main/java/mekanism/api/gas/IGasTransmitter.java +++ b/src/main/java/mekanism/api/gas/IGasTransmitter.java @@ -1,6 +1,7 @@ package mekanism.api.gas; import mekanism.api.transmitters.IGridTransmitter; + import net.minecraft.tileentity.TileEntity; public interface IGasTransmitter extends IGridTransmitter diff --git a/src/main/java/mekanism/api/recipe/AdvancedInput.java b/src/main/java/mekanism/api/recipe/AdvancedInput.java index 0edb63253..240b76e45 100644 --- a/src/main/java/mekanism/api/recipe/AdvancedInput.java +++ b/src/main/java/mekanism/api/recipe/AdvancedInput.java @@ -1,7 +1,7 @@ package mekanism.api.recipe; -import mekanism.api.util.StackUtils; import mekanism.api.gas.Gas; +import mekanism.api.util.StackUtils; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/api/recipe/PressurizedReactants.java b/src/main/java/mekanism/api/recipe/PressurizedReactants.java index 16e83c195..a34f95643 100644 --- a/src/main/java/mekanism/api/recipe/PressurizedReactants.java +++ b/src/main/java/mekanism/api/recipe/PressurizedReactants.java @@ -1,8 +1,8 @@ package mekanism.api.recipe; -import mekanism.api.util.StackUtils; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; +import mekanism.api.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/mekanism/api/recipe/RecipeHelper.java b/src/main/java/mekanism/api/recipe/RecipeHelper.java index 4b7af406d..f40aa746b 100644 --- a/src/main/java/mekanism/api/recipe/RecipeHelper.java +++ b/src/main/java/mekanism/api/recipe/RecipeHelper.java @@ -4,6 +4,7 @@ import java.lang.reflect.Method; import mekanism.api.gas.GasStack; import mekanism.api.infuse.InfusionInput; + import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java index 3eab40418..3d8f909d3 100644 --- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java +++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java @@ -14,6 +14,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.IClientTicker; import mekanism.api.Range4D; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/mekanism/api/transmitters/IGridTransmitter.java b/src/main/java/mekanism/api/transmitters/IGridTransmitter.java index ea222d8e6..2caf73d5e 100644 --- a/src/main/java/mekanism/api/transmitters/IGridTransmitter.java +++ b/src/main/java/mekanism/api/transmitters/IGridTransmitter.java @@ -1,6 +1,5 @@ package mekanism.api.transmitters; -import mekanism.api.Coord4D; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/mekanism/api/transmitters/TransmissionType.java b/src/main/java/mekanism/api/transmitters/TransmissionType.java index dae45979e..e9df5085e 100644 --- a/src/main/java/mekanism/api/transmitters/TransmissionType.java +++ b/src/main/java/mekanism/api/transmitters/TransmissionType.java @@ -1,6 +1,7 @@ package mekanism.api.transmitters; import mekanism.api.gas.IGasTransmitter; + import net.minecraft.tileentity.TileEntity; public enum TransmissionType diff --git a/src/main/java/mekanism/client/CapeBufferDownload.java b/src/main/java/mekanism/client/CapeBufferDownload.java index ca686de0e..cf7fecab7 100644 --- a/src/main/java/mekanism/client/CapeBufferDownload.java +++ b/src/main/java/mekanism/client/CapeBufferDownload.java @@ -4,6 +4,7 @@ import java.lang.reflect.Method; import mekanism.common.ObfuscatedNames; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.renderer.IImageBuffer; import net.minecraft.client.renderer.ThreadDownloadImageData; diff --git a/src/main/java/mekanism/client/ClientConnectionHandler.java b/src/main/java/mekanism/client/ClientConnectionHandler.java index 2289e0d58..c8d4164b2 100644 --- a/src/main/java/mekanism/client/ClientConnectionHandler.java +++ b/src/main/java/mekanism/client/ClientConnectionHandler.java @@ -5,6 +5,7 @@ import java.net.InetSocketAddress; import mekanism.api.MekanismConfig.general; import mekanism.client.voice.VoiceClient; import mekanism.common.Mekanism; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.FMLNetworkEvent.ClientConnectedToServerEvent; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/ClientPlayerTracker.java b/src/main/java/mekanism/client/ClientPlayerTracker.java index 67e36a2e4..c39d4dc9b 100644 --- a/src/main/java/mekanism/client/ClientPlayerTracker.java +++ b/src/main/java/mekanism/client/ClientPlayerTracker.java @@ -1,6 +1,7 @@ package mekanism.client; import mekanism.common.Mekanism; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerChangedDimensionEvent; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index e42131a5d..e4231dad6 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -149,6 +149,7 @@ import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySalinationController; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntityTeleporter; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.entity.RenderSkeleton; diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index c5d535cc2..2ded76657 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -26,6 +26,7 @@ import mekanism.common.network.PacketJetpackData.JetpackPacket; import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage; import mekanism.common.network.PacketScubaTankData.ScubaTankPacket; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/client/HolidayManager.java b/src/main/java/mekanism/client/HolidayManager.java index 90eee8775..b6896860b 100644 --- a/src/main/java/mekanism/client/HolidayManager.java +++ b/src/main/java/mekanism/client/HolidayManager.java @@ -7,6 +7,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.client; import mekanism.common.Mekanism; + import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ChatComponentText; diff --git a/src/main/java/mekanism/client/MekKeyHandler.java b/src/main/java/mekanism/client/MekKeyHandler.java index 4d7ade018..fbd3ac4b3 100644 --- a/src/main/java/mekanism/client/MekKeyHandler.java +++ b/src/main/java/mekanism/client/MekKeyHandler.java @@ -1,19 +1,7 @@ package mekanism.client; -import java.util.EnumSet; - -import mekanism.common.Mekanism; - import net.minecraft.client.settings.KeyBinding; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.input.Mouse; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.Type; -import cpw.mods.fml.relauncher.Side; public abstract class MekKeyHandler { diff --git a/src/main/java/mekanism/client/MekanismClient.java b/src/main/java/mekanism/client/MekanismClient.java index d65262fbd..9db702caa 100644 --- a/src/main/java/mekanism/client/MekanismClient.java +++ b/src/main/java/mekanism/client/MekanismClient.java @@ -3,15 +3,13 @@ package mekanism.client; import mekanism.api.MekanismAPI; import mekanism.api.MekanismAPI.BoxBlacklistEvent; import mekanism.api.MekanismConfig.general; -import mekanism.client.sound.SoundHandler; import mekanism.client.voice.VoiceClient; import mekanism.common.Mekanism; import mekanism.common.network.PacketKey.KeyMessage; + import net.minecraft.client.Minecraft; import net.minecraft.client.settings.KeyBinding; import net.minecraftforge.common.MinecraftForge; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class MekanismClient extends Mekanism { diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index 95a33e27d..ffb3b771f 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -22,14 +22,12 @@ import mekanism.common.network.PacketScubaTankData.ScubaTankPacket; import mekanism.common.network.PacketWalkieTalkieState.WalkieTalkieStateMessage; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.settings.KeyBinding; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentText; - -import org.lwjgl.input.Keyboard; - import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.common.FMLCommonHandler; @@ -39,6 +37,8 @@ import cpw.mods.fml.common.gameevent.TickEvent.Type; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.input.Keyboard; + @SideOnly(Side.CLIENT) public class MekanismKeyHandler extends MekKeyHandler { diff --git a/src/main/java/mekanism/client/ThreadClientUpdate.java b/src/main/java/mekanism/client/ThreadClientUpdate.java index 5fd364ccb..a6ee1b172 100644 --- a/src/main/java/mekanism/client/ThreadClientUpdate.java +++ b/src/main/java/mekanism/client/ThreadClientUpdate.java @@ -14,6 +14,7 @@ import mekanism.client.gui.GuiCredits; import mekanism.common.Mekanism; import mekanism.common.Version; import mekanism.common.base.IModule; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/ThreadMultiblockSparkle.java b/src/main/java/mekanism/client/ThreadMultiblockSparkle.java index c21208a6a..b35aadeba 100644 --- a/src/main/java/mekanism/client/ThreadMultiblockSparkle.java +++ b/src/main/java/mekanism/client/ThreadMultiblockSparkle.java @@ -8,6 +8,7 @@ import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.common.multiblock.MultiblockManager; import mekanism.common.tile.TileEntityMultiblock; + import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/mekanism/client/entity/EntityLaser.java b/src/main/java/mekanism/client/entity/EntityLaser.java index 95f462bca..e87f55695 100644 --- a/src/main/java/mekanism/client/entity/EntityLaser.java +++ b/src/main/java/mekanism/client/entity/EntityLaser.java @@ -10,9 +10,9 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java index b4a807b62..a6c070a0b 100644 --- a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -2,8 +2,8 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.util.ListUtils; import mekanism.api.gas.GasStack; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.GuiProgress.ProgressBar; @@ -13,13 +13,13 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.inventory.container.ContainerAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiAdvancedElectricMachine extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java b/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java index 5004ddf46..8093c2fda 100644 --- a/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java +++ b/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java @@ -5,11 +5,11 @@ import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.GuiGauge.Type; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.tile.TileEntityAmbientAccumulator; -import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.EntityPlayer; + import org.lwjgl.opengl.GL11; public class GuiAmbientAccumulator extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiBucketIO.java b/src/main/java/mekanism/client/gui/GuiBucketIO.java index 7c6c00222..aa047f665 100644 --- a/src/main/java/mekanism/client/gui/GuiBucketIO.java +++ b/src/main/java/mekanism/client/gui/GuiBucketIO.java @@ -1,12 +1,14 @@ package mekanism.client.gui; -import codechicken.lib.vec.Rectangle4i; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.vec.Rectangle4i; + @SideOnly(Side.CLIENT) public class GuiBucketIO extends GuiElement { diff --git a/src/main/java/mekanism/client/gui/GuiChanceMachine.java b/src/main/java/mekanism/client/gui/GuiChanceMachine.java index f42e49722..194905de8 100644 --- a/src/main/java/mekanism/client/gui/GuiChanceMachine.java +++ b/src/main/java/mekanism/client/gui/GuiChanceMachine.java @@ -11,13 +11,13 @@ import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerChanceMachine; import mekanism.common.tile.TileEntityChanceMachine; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiChanceMachine extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java index 21d9dc2d6..a53f654c1 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java @@ -4,10 +4,10 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.util.ListUtils; import mekanism.api.gas.Gas; import mekanism.api.gas.GasTank; import mekanism.api.gas.OreGas; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.GuiProgress.IProgressInfoHandler; @@ -21,16 +21,16 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityChemicalCrystallizer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiChemicalCrystallizer extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java index dfae39bf2..fb397192c 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java @@ -2,8 +2,8 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.util.ListUtils; import mekanism.api.gas.GasTank; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.GuiProgress.IProgressInfoHandler; @@ -14,13 +14,13 @@ import mekanism.common.inventory.container.ContainerChemicalDissolutionChamber; import mekanism.common.tile.TileEntityChemicalDissolutionChamber; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiChemicalDissolutionChamber extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java index 5dabed8d3..850ca7fcf 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.util.ListUtils; import mekanism.api.gas.GasTank; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.GuiProgress.IProgressInfoHandler; @@ -19,13 +19,13 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiChemicalInfuser extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java b/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java index 127274263..336519fcc 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityAdvancedElectricMachine; + import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java index 235b92780..085763a96 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java @@ -2,8 +2,8 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.util.ListUtils; import mekanism.api.gas.GasTank; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.GuiProgress.IProgressInfoHandler; @@ -14,13 +14,13 @@ import mekanism.common.inventory.container.ContainerChemicalOxidizer; import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiChemicalOxidizer extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java index 22ee9e60c..9e2731031 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.util.ListUtils; import mekanism.api.gas.GasTank; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; @@ -21,14 +21,14 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityChemicalWasher; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiChemicalWasher extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiCombiner.java b/src/main/java/mekanism/client/gui/GuiCombiner.java index fb6af5eb4..3dba41e96 100644 --- a/src/main/java/mekanism/client/gui/GuiCombiner.java +++ b/src/main/java/mekanism/client/gui/GuiCombiner.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityAdvancedElectricMachine; + import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiConfiguration.java b/src/main/java/mekanism/client/gui/GuiConfiguration.java index 337fd528a..100e477c9 100644 --- a/src/main/java/mekanism/client/gui/GuiConfiguration.java +++ b/src/main/java/mekanism/client/gui/GuiConfiguration.java @@ -18,17 +18,17 @@ import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiConfiguration extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiConfigurationTab.java b/src/main/java/mekanism/client/gui/GuiConfigurationTab.java index 270851f2c..08a7efbee 100644 --- a/src/main/java/mekanism/client/gui/GuiConfigurationTab.java +++ b/src/main/java/mekanism/client/gui/GuiConfigurationTab.java @@ -6,12 +6,14 @@ import mekanism.common.Mekanism; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.vec.Rectangle4i; + @SideOnly(Side.CLIENT) public class GuiConfigurationTab extends GuiElement { diff --git a/src/main/java/mekanism/client/gui/GuiContainerEditMode.java b/src/main/java/mekanism/client/gui/GuiContainerEditMode.java index b1571d024..805558bd9 100644 --- a/src/main/java/mekanism/client/gui/GuiContainerEditMode.java +++ b/src/main/java/mekanism/client/gui/GuiContainerEditMode.java @@ -8,8 +8,10 @@ import mekanism.common.network.PacketContainerEditMode.ContainerEditModeMessage; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; + import codechicken.lib.vec.Rectangle4i; public class GuiContainerEditMode extends GuiElement diff --git a/src/main/java/mekanism/client/gui/GuiCredits.java b/src/main/java/mekanism/client/gui/GuiCredits.java index dc1089694..81a20ac89 100644 --- a/src/main/java/mekanism/client/gui/GuiCredits.java +++ b/src/main/java/mekanism/client/gui/GuiCredits.java @@ -6,6 +6,7 @@ import mekanism.common.Mekanism; import mekanism.common.Version; import mekanism.common.base.IModule; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/gui/GuiCrusher.java b/src/main/java/mekanism/client/gui/GuiCrusher.java index 4e04ab99d..a7f330323 100644 --- a/src/main/java/mekanism/client/gui/GuiCrusher.java +++ b/src/main/java/mekanism/client/gui/GuiCrusher.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityElectricMachine; + import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiDictionary.java b/src/main/java/mekanism/client/gui/GuiDictionary.java index a078382c9..2bc672fe3 100644 --- a/src/main/java/mekanism/client/gui/GuiDictionary.java +++ b/src/main/java/mekanism/client/gui/GuiDictionary.java @@ -1,22 +1,19 @@ package mekanism.client.gui; -import java.util.ArrayList; -import java.util.List; - import mekanism.client.sound.SoundHandler; import mekanism.common.inventory.container.ContainerDictionary; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiDictionary extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index 8d0cf56ae..17381378a 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -20,15 +20,15 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiDigitalMiner extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index 04f0c1394..95759909b 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -25,17 +25,17 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiDigitalMinerConfig extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiDynamicTank.java b/src/main/java/mekanism/client/gui/GuiDynamicTank.java index 68e09d035..0e5d47845 100644 --- a/src/main/java/mekanism/client/gui/GuiDynamicTank.java +++ b/src/main/java/mekanism/client/gui/GuiDynamicTank.java @@ -7,14 +7,14 @@ import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiDynamicTank extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiElectricChest.java b/src/main/java/mekanism/client/gui/GuiElectricChest.java index 2da089b45..0bafd37fa 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricChest.java +++ b/src/main/java/mekanism/client/gui/GuiElectricChest.java @@ -12,17 +12,17 @@ import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiElectricChest extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiElectricMachine.java b/src/main/java/mekanism/client/gui/GuiElectricMachine.java index 6717ae8c1..471d2241a 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiElectricMachine.java @@ -11,13 +11,13 @@ import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerElectricMachine; import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiElectricMachine extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiElectricPump.java b/src/main/java/mekanism/client/gui/GuiElectricPump.java index 4071f263d..67fcab8ff 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricPump.java +++ b/src/main/java/mekanism/client/gui/GuiElectricPump.java @@ -8,15 +8,15 @@ import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiElectricPump extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java index 351bcd74d..f42aab5d7 100755 --- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -5,8 +5,8 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; -import mekanism.api.util.ListUtils; import mekanism.api.gas.GasTank; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; @@ -21,14 +21,14 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiElectrolyticSeparator extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiElement.java b/src/main/java/mekanism/client/gui/GuiElement.java index ea439f1e3..627e74001 100644 --- a/src/main/java/mekanism/client/gui/GuiElement.java +++ b/src/main/java/mekanism/client/gui/GuiElement.java @@ -4,14 +4,16 @@ import java.util.List; import mekanism.common.ObfuscatedNames; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.vec.Rectangle4i; + @SideOnly(Side.CLIENT) public abstract class GuiElement { diff --git a/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java b/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java index 70f0a7bb4..67b68591a 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java +++ b/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityElectricMachine; + import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiEnergyCube.java b/src/main/java/mekanism/client/gui/GuiEnergyCube.java index bf17db6d9..c6aeb260d 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergyCube.java +++ b/src/main/java/mekanism/client/gui/GuiEnergyCube.java @@ -2,8 +2,8 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.util.ListUtils; import mekanism.api.energy.IStrictEnergyStorage; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiEnergyGauge.IEnergyInfoHandler; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiSlot.SlotOverlay; @@ -12,13 +12,13 @@ import mekanism.common.inventory.container.ContainerEnergyCube; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiEnergyCube extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiEnergyGauge.java b/src/main/java/mekanism/client/gui/GuiEnergyGauge.java index 995f1d9ca..e361e79c7 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergyGauge.java +++ b/src/main/java/mekanism/client/gui/GuiEnergyGauge.java @@ -1,12 +1,14 @@ package mekanism.client.gui; -import codechicken.lib.vec.Rectangle4i; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.client.render.MekanismRenderer; import mekanism.common.util.MekanismUtils; + import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; + public class GuiEnergyGauge extends GuiGauge { IEnergyInfoHandler infoHandler; diff --git a/src/main/java/mekanism/client/gui/GuiEnergyInfo.java b/src/main/java/mekanism/client/gui/GuiEnergyInfo.java index 25be7860f..5feb2a503 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergyInfo.java +++ b/src/main/java/mekanism/client/gui/GuiEnergyInfo.java @@ -2,13 +2,15 @@ package mekanism.client.gui; import java.util.List; -import codechicken.lib.vec.Rectangle4i; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.vec.Rectangle4i; + @SideOnly(Side.CLIENT) public class GuiEnergyInfo extends GuiElement { diff --git a/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java b/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java index 3807bc145..acc4aeb06 100644 --- a/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java +++ b/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityElectricMachine; + import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiEntangledBlock.java b/src/main/java/mekanism/client/gui/GuiEntangledBlock.java index 0b2043e7b..ce51d18ef 100644 --- a/src/main/java/mekanism/client/gui/GuiEntangledBlock.java +++ b/src/main/java/mekanism/client/gui/GuiEntangledBlock.java @@ -3,28 +3,21 @@ package mekanism.client.gui; import java.util.ArrayList; import mekanism.api.Coord4D; -import mekanism.client.gui.GuiGauge.Type; -import mekanism.client.gui.GuiNumberGauge.INumberInfoHandler; -import mekanism.client.render.MekanismRenderer; import mekanism.common.Mekanism; -import mekanism.common.inventory.container.ContainerLaserAmplifier; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityEntangledBlock; -import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiEntangledBlock extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index 380249e07..e7b0bf965 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -2,8 +2,8 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.util.ListUtils; import mekanism.api.gas.GasStack; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.render.MekanismRenderer; import mekanism.common.Tier.FactoryTier; @@ -11,13 +11,13 @@ import mekanism.common.base.IFactory.RecipeType; import mekanism.common.inventory.container.ContainerFactory; import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiFactory extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiFluidGauge.java b/src/main/java/mekanism/client/gui/GuiFluidGauge.java index 4fbe26165..c651faa1c 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidGauge.java +++ b/src/main/java/mekanism/client/gui/GuiFluidGauge.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java index aba8a6f07..accfcb071 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java +++ b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java @@ -8,15 +8,15 @@ import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiFluidicPlenisher extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiGasGauge.java b/src/main/java/mekanism/client/gui/GuiGasGauge.java index 0ed50aba1..7903eb1ac 100644 --- a/src/main/java/mekanism/client/gui/GuiGasGauge.java +++ b/src/main/java/mekanism/client/gui/GuiGasGauge.java @@ -3,6 +3,7 @@ package mekanism.client.gui; import mekanism.api.gas.Gas; import mekanism.api.gas.GasTank; import mekanism.common.util.MekanismUtils; + import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index 30f368837..609c4cb71 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -10,13 +10,13 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiGasTank extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiGauge.java b/src/main/java/mekanism/client/gui/GuiGauge.java index 00c334c10..59f8bc6b9 100644 --- a/src/main/java/mekanism/client/gui/GuiGauge.java +++ b/src/main/java/mekanism/client/gui/GuiGauge.java @@ -1,12 +1,14 @@ package mekanism.client.gui; -import codechicken.lib.vec.Rectangle4i; import mekanism.client.render.MekanismRenderer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; + public abstract class GuiGauge extends GuiElement { protected int xLocation; diff --git a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java index 7c6df202d..c7533e2cb 100644 --- a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java +++ b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java @@ -16,13 +16,12 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiLaserAmplifier extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index 40b377867..e33a865c8 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -25,17 +25,17 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiLogisticalSorter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java index bf349d764..5e43be218 100644 --- a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java @@ -9,14 +9,14 @@ import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiMFilterSelect extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java index c50fc0d62..27222f60a 100644 --- a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java @@ -1,7 +1,5 @@ package mekanism.client.gui; -import java.util.ArrayList; - import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.sound.SoundHandler; @@ -12,24 +10,23 @@ import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage; import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; import mekanism.common.network.PacketEditFilter.EditFilterMessage; import mekanism.common.network.PacketNewFilter.NewFilterMessage; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.block.Block; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiMItemStackFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java index 83973ed82..0e3cc652b 100644 --- a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java @@ -14,19 +14,19 @@ import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.block.Block; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiMMaterialFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java index 21373d8a3..74ed4f43e 100644 --- a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java @@ -17,6 +17,7 @@ import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.block.Block; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; @@ -24,13 +25,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiMModIDFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java index 878bdd375..e21032e33 100644 --- a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java @@ -1,6 +1,5 @@ package mekanism.client.gui; -import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; @@ -18,6 +17,7 @@ import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.block.Block; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; @@ -25,14 +25,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiMOreDictFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiMekanism.java b/src/main/java/mekanism/client/gui/GuiMekanism.java index 784d48b78..94924ca15 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanism.java +++ b/src/main/java/mekanism/client/gui/GuiMekanism.java @@ -9,6 +9,7 @@ import mekanism.common.SideData; import mekanism.common.base.IInvConfiguration; import mekanism.common.item.ItemConfigurator; import mekanism.common.tile.TileEntityContainerBlock; + import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index de67e4922..840b04318 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -17,13 +17,13 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiMetallurgicInfuser extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java b/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java index add0d4f92..fdd5abced 100644 --- a/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java +++ b/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityAdvancedElectricMachine; + import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiPRC.java b/src/main/java/mekanism/client/gui/GuiPRC.java index 8708e7754..8478262e0 100644 --- a/src/main/java/mekanism/client/gui/GuiPRC.java +++ b/src/main/java/mekanism/client/gui/GuiPRC.java @@ -11,14 +11,14 @@ import mekanism.common.inventory.container.ContainerPRC; import mekanism.common.tile.TileEntityPRC; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiPRC extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java b/src/main/java/mekanism/client/gui/GuiPasswordEnter.java index 1fa9d4471..d34c97a52 100644 --- a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java +++ b/src/main/java/mekanism/client/gui/GuiPasswordEnter.java @@ -11,17 +11,17 @@ import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiPasswordEnter extends GuiScreen { diff --git a/src/main/java/mekanism/client/gui/GuiPasswordModify.java b/src/main/java/mekanism/client/gui/GuiPasswordModify.java index 4c2d9f9c7..d0116b7f2 100644 --- a/src/main/java/mekanism/client/gui/GuiPasswordModify.java +++ b/src/main/java/mekanism/client/gui/GuiPasswordModify.java @@ -9,17 +9,17 @@ import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiPasswordModify extends GuiScreen { diff --git a/src/main/java/mekanism/client/gui/GuiPortableTank.java b/src/main/java/mekanism/client/gui/GuiPortableTank.java index 6e04888d1..ea33cc6ab 100644 --- a/src/main/java/mekanism/client/gui/GuiPortableTank.java +++ b/src/main/java/mekanism/client/gui/GuiPortableTank.java @@ -7,14 +7,14 @@ import mekanism.common.inventory.container.ContainerPortableTank; import mekanism.common.tile.TileEntityPortableTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiPortableTank extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiPortableTeleporter.java b/src/main/java/mekanism/client/gui/GuiPortableTeleporter.java index cce00aacb..18022df21 100644 --- a/src/main/java/mekanism/client/gui/GuiPortableTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiPortableTeleporter.java @@ -7,16 +7,16 @@ import mekanism.common.network.PacketDigitUpdate.DigitUpdateMessage; import mekanism.common.network.PacketPortableTeleport.PortableTeleportMessage; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiPortableTeleporter extends GuiScreen { diff --git a/src/main/java/mekanism/client/gui/GuiPowerBar.java b/src/main/java/mekanism/client/gui/GuiPowerBar.java index ca141b653..3a9917bf7 100644 --- a/src/main/java/mekanism/client/gui/GuiPowerBar.java +++ b/src/main/java/mekanism/client/gui/GuiPowerBar.java @@ -1,13 +1,15 @@ package mekanism.client.gui; -import codechicken.lib.vec.Rectangle4i; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.vec.Rectangle4i; + @SideOnly(Side.CLIENT) public class GuiPowerBar extends GuiElement { diff --git a/src/main/java/mekanism/client/gui/GuiPrecisionSawmill.java b/src/main/java/mekanism/client/gui/GuiPrecisionSawmill.java index 0f3cdcff8..01f10ca94 100644 --- a/src/main/java/mekanism/client/gui/GuiPrecisionSawmill.java +++ b/src/main/java/mekanism/client/gui/GuiPrecisionSawmill.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityChanceMachine; + import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiProgress.java b/src/main/java/mekanism/client/gui/GuiProgress.java index eafa1468a..9b01e183e 100644 --- a/src/main/java/mekanism/client/gui/GuiProgress.java +++ b/src/main/java/mekanism/client/gui/GuiProgress.java @@ -1,12 +1,14 @@ package mekanism.client.gui; -import codechicken.lib.vec.Rectangle4i; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.vec.Rectangle4i; + @SideOnly(Side.CLIENT) public class GuiProgress extends GuiElement { diff --git a/src/main/java/mekanism/client/gui/GuiPurificationChamber.java b/src/main/java/mekanism/client/gui/GuiPurificationChamber.java index 337aa4e05..0b4ad0774 100644 --- a/src/main/java/mekanism/client/gui/GuiPurificationChamber.java +++ b/src/main/java/mekanism/client/gui/GuiPurificationChamber.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityAdvancedElectricMachine; + import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiRecipeType.java b/src/main/java/mekanism/client/gui/GuiRecipeType.java index ed124ea20..79fc0fad1 100644 --- a/src/main/java/mekanism/client/gui/GuiRecipeType.java +++ b/src/main/java/mekanism/client/gui/GuiRecipeType.java @@ -1,11 +1,13 @@ package mekanism.client.gui; -import codechicken.lib.vec.Rectangle4i; import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; + public class GuiRecipeType extends GuiElement { TileEntityFactory tileEntity; diff --git a/src/main/java/mekanism/client/gui/GuiRedstoneControl.java b/src/main/java/mekanism/client/gui/GuiRedstoneControl.java index b726f4471..796e2a447 100644 --- a/src/main/java/mekanism/client/gui/GuiRedstoneControl.java +++ b/src/main/java/mekanism/client/gui/GuiRedstoneControl.java @@ -1,6 +1,5 @@ package mekanism.client.gui; -import codechicken.lib.vec.Rectangle4i; import mekanism.api.Coord4D; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -9,9 +8,12 @@ import mekanism.common.base.IRedstoneControl.RedstoneControl; import mekanism.common.network.PacketRedstoneControl.RedstoneControlMessage; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; + public class GuiRedstoneControl extends GuiElement { TileEntity tileEntity; diff --git a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java index bef30bcd5..dfd496b80 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java @@ -7,14 +7,14 @@ import mekanism.common.network.PacketRobit.RobitMessage; import mekanism.common.network.PacketRobit.RobitPacketType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.world.World; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiRobitCrafting extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiRobitInventory.java b/src/main/java/mekanism/client/gui/GuiRobitInventory.java index 0c58f63a4..bbd9782c7 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitInventory.java +++ b/src/main/java/mekanism/client/gui/GuiRobitInventory.java @@ -8,13 +8,13 @@ import mekanism.common.network.PacketRobit.RobitMessage; import mekanism.common.network.PacketRobit.RobitPacketType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiRobitInventory extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiRobitMain.java b/src/main/java/mekanism/client/gui/GuiRobitMain.java index abe05ea3d..7d359b0ac 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitMain.java +++ b/src/main/java/mekanism/client/gui/GuiRobitMain.java @@ -8,16 +8,16 @@ import mekanism.common.network.PacketRobit.RobitMessage; import mekanism.common.network.PacketRobit.RobitPacketType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiRobitMain extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiRobitRepair.java b/src/main/java/mekanism/client/gui/GuiRobitRepair.java index a7456eade..9f7ec77e0 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitRepair.java +++ b/src/main/java/mekanism/client/gui/GuiRobitRepair.java @@ -9,6 +9,7 @@ import mekanism.common.network.PacketRobit.RobitMessage; import mekanism.common.network.PacketRobit.RobitPacketType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -18,13 +19,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.play.client.C17PacketCustomPayload; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; -import org.apache.commons.io.Charsets; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import org.apache.commons.io.Charsets; @SideOnly(Side.CLIENT) public class GuiRobitRepair extends GuiMekanism implements ICrafting diff --git a/src/main/java/mekanism/client/gui/GuiRobitSmelting.java b/src/main/java/mekanism/client/gui/GuiRobitSmelting.java index 8ed95f2d1..272e97e31 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitSmelting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitSmelting.java @@ -8,6 +8,7 @@ import mekanism.common.network.PacketRobit.RobitMessage; import mekanism.common.network.PacketRobit.RobitPacketType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index e2765b5e7..67dd40d38 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -17,14 +17,14 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiRotaryCondensentrator extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiSalinationController.java b/src/main/java/mekanism/client/gui/GuiSalinationController.java index 584a931c5..6022d8415 100644 --- a/src/main/java/mekanism/client/gui/GuiSalinationController.java +++ b/src/main/java/mekanism/client/gui/GuiSalinationController.java @@ -1,26 +1,20 @@ package mekanism.client.gui; -import java.util.ArrayList; - -import mekanism.api.Coord4D; import mekanism.api.gas.GasStack; import mekanism.client.render.MekanismRenderer; -import mekanism.client.sound.SoundHandler; -import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerSalinationController; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntitySalinationController; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiSalinationController extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiScrollList.java b/src/main/java/mekanism/client/gui/GuiScrollList.java index e629ea4b4..279b3692f 100644 --- a/src/main/java/mekanism/client/gui/GuiScrollList.java +++ b/src/main/java/mekanism/client/gui/GuiScrollList.java @@ -5,13 +5,14 @@ import java.util.List; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import codechicken.lib.vec.Rectangle4i; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiScrollList extends GuiElement diff --git a/src/main/java/mekanism/client/gui/GuiSeismicReader.java b/src/main/java/mekanism/client/gui/GuiSeismicReader.java index 9a6bf2036..b9537e905 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicReader.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicReader.java @@ -7,6 +7,7 @@ import mekanism.api.Coord4D; import mekanism.common.item.ItemSeismicReader; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; @@ -15,13 +16,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.IFluidBlock; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiSeismicReader extends GuiScreen { diff --git a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java index 9f124d4b2..fe2f6c580 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java @@ -6,13 +6,13 @@ import mekanism.common.inventory.container.ContainerSeismicVibrator; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiSeismicVibrator extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiSlot.java b/src/main/java/mekanism/client/gui/GuiSlot.java index c17a4f5a6..a01dce7e0 100644 --- a/src/main/java/mekanism/client/gui/GuiSlot.java +++ b/src/main/java/mekanism/client/gui/GuiSlot.java @@ -1,10 +1,12 @@ package mekanism.client.gui; -import codechicken.lib.vec.Rectangle4i; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; + public class GuiSlot extends GuiElement { protected int xLocation; diff --git a/src/main/java/mekanism/client/gui/GuiSortingTab.java b/src/main/java/mekanism/client/gui/GuiSortingTab.java index 95cf17a2e..d3b3c581c 100644 --- a/src/main/java/mekanism/client/gui/GuiSortingTab.java +++ b/src/main/java/mekanism/client/gui/GuiSortingTab.java @@ -2,7 +2,6 @@ package mekanism.client.gui; import java.util.ArrayList; -import codechicken.lib.vec.Rectangle4i; import mekanism.api.Coord4D; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -10,10 +9,13 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.vec.Rectangle4i; + @SideOnly(Side.CLIENT) public class GuiSortingTab extends GuiElement { diff --git a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java index 9a44aab09..c381fd089 100644 --- a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java @@ -9,14 +9,14 @@ import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiTFilterSelect extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java index 381f2517c..d9d39044e 100644 --- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java @@ -15,18 +15,18 @@ import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.TransporterUtils; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiTItemStackFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java index 71c7a22e4..c935a59bf 100644 --- a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java @@ -15,20 +15,20 @@ import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.TransporterUtils; + import net.minecraft.block.Block; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiTMaterialFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java index 1186d17bf..a83806b6a 100644 --- a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java @@ -18,18 +18,18 @@ import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.TransporterUtils; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiTModIDFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java index 31ec00ec4..f75acef85 100644 --- a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java @@ -18,18 +18,18 @@ import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.TransporterUtils; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiTOreDictFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index af99eeebf..74cd515cc 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -12,13 +12,13 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiTeleporter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java index 2010acf06..4730e8a8b 100644 --- a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java +++ b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java @@ -14,14 +14,14 @@ import mekanism.common.network.PacketRemoveUpgrade.RemoveUpgradeMessage; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiUpgradeManagement extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiUpgradeTab.java b/src/main/java/mekanism/client/gui/GuiUpgradeTab.java index 605fe0d23..4b3002d35 100644 --- a/src/main/java/mekanism/client/gui/GuiUpgradeTab.java +++ b/src/main/java/mekanism/client/gui/GuiUpgradeTab.java @@ -3,12 +3,13 @@ package mekanism.client.gui; import mekanism.api.Coord4D; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.base.IUpgradeTile; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; + import codechicken.lib.vec.Rectangle4i; public class GuiUpgradeTab extends GuiElement diff --git a/src/main/java/mekanism/client/model/ModelArmoredJetpack.java b/src/main/java/mekanism/client/model/ModelArmoredJetpack.java index 55083bec4..12d500cc2 100644 --- a/src/main/java/mekanism/client/model/ModelArmoredJetpack.java +++ b/src/main/java/mekanism/client/model/ModelArmoredJetpack.java @@ -1,6 +1,7 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java b/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java index c312595f5..a9ba4be4b 100644 --- a/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java +++ b/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java @@ -1,6 +1,7 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/mekanism/client/model/ModelBalloon.java b/src/main/java/mekanism/client/model/ModelBalloon.java index dab4fb017..d1a16c4ef 100644 --- a/src/main/java/mekanism/client/model/ModelBalloon.java +++ b/src/main/java/mekanism/client/model/ModelBalloon.java @@ -1,14 +1,14 @@ package mekanism.client.model; import mekanism.api.EnumColor; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelBalloon extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java b/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java index 18cc82b80..fc6e4c91d 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java @@ -1,6 +1,7 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java b/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java index 470ae4726..9d21c26e9 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java @@ -1,6 +1,7 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java index b7e2b8329..28cd2dd62 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java +++ b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java @@ -1,14 +1,14 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelChemicalInfuser extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java index 9519791fd..f6dc605ab 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java +++ b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java @@ -1,14 +1,14 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelChemicalOxidizer extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelChemicalWasher.java b/src/main/java/mekanism/client/model/ModelChemicalWasher.java index 434e29a32..82f2251e1 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalWasher.java +++ b/src/main/java/mekanism/client/model/ModelChemicalWasher.java @@ -1,6 +1,7 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelDigitalMiner.java b/src/main/java/mekanism/client/model/ModelDigitalMiner.java index b54698b10..8c20ea876 100644 --- a/src/main/java/mekanism/client/model/ModelDigitalMiner.java +++ b/src/main/java/mekanism/client/model/ModelDigitalMiner.java @@ -1,6 +1,7 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelEnergyCube.java b/src/main/java/mekanism/client/model/ModelEnergyCube.java index bccffea10..33382ee42 100644 --- a/src/main/java/mekanism/client/model/ModelEnergyCube.java +++ b/src/main/java/mekanism/client/model/ModelEnergyCube.java @@ -1,6 +1,7 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelFlamethrower.java b/src/main/java/mekanism/client/model/ModelFlamethrower.java index e882a69c8..c6e72f986 100644 --- a/src/main/java/mekanism/client/model/ModelFlamethrower.java +++ b/src/main/java/mekanism/client/model/ModelFlamethrower.java @@ -2,7 +2,6 @@ package mekanism.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/model/ModelGasMask.java b/src/main/java/mekanism/client/model/ModelGasMask.java index 469a43070..bcdbe9725 100644 --- a/src/main/java/mekanism/client/model/ModelGasMask.java +++ b/src/main/java/mekanism/client/model/ModelGasMask.java @@ -1,14 +1,14 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelGasMask extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelJetpack.java b/src/main/java/mekanism/client/model/ModelJetpack.java index 19d31a719..d5f5a0122 100644 --- a/src/main/java/mekanism/client/model/ModelJetpack.java +++ b/src/main/java/mekanism/client/model/ModelJetpack.java @@ -1,14 +1,14 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelJetpack extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelLaser.java b/src/main/java/mekanism/client/model/ModelLaser.java index 8e5226712..079f869b6 100644 --- a/src/main/java/mekanism/client/model/ModelLaser.java +++ b/src/main/java/mekanism/client/model/ModelLaser.java @@ -2,7 +2,6 @@ package mekanism.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; public class ModelLaser extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelLogisticalSorter.java b/src/main/java/mekanism/client/model/ModelLogisticalSorter.java index fc065cd10..8979bda3c 100644 --- a/src/main/java/mekanism/client/model/ModelLogisticalSorter.java +++ b/src/main/java/mekanism/client/model/ModelLogisticalSorter.java @@ -1,6 +1,7 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelPortableTank.java b/src/main/java/mekanism/client/model/ModelPortableTank.java index 3bdcb45af..297e199fc 100644 --- a/src/main/java/mekanism/client/model/ModelPortableTank.java +++ b/src/main/java/mekanism/client/model/ModelPortableTank.java @@ -1,6 +1,7 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelRobit.java b/src/main/java/mekanism/client/model/ModelRobit.java index 6796e0798..d6a3a1eb5 100644 --- a/src/main/java/mekanism/client/model/ModelRobit.java +++ b/src/main/java/mekanism/client/model/ModelRobit.java @@ -1,15 +1,15 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelRobit extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelSeismicVibrator.java b/src/main/java/mekanism/client/model/ModelSeismicVibrator.java index 612042609..e27dd6bf5 100644 --- a/src/main/java/mekanism/client/model/ModelSeismicVibrator.java +++ b/src/main/java/mekanism/client/model/ModelSeismicVibrator.java @@ -1,12 +1,12 @@ package mekanism.client.model; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelSeismicVibrator extends ModelBase { diff --git a/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java b/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java index 376bc5406..11750ba02 100644 --- a/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java @@ -1,18 +1,14 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import mekanism.api.recipe.AdvancedInput; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; +import mekanism.api.recipe.AdvancedInput; import mekanism.client.gui.GuiElement; import mekanism.client.gui.GuiPowerBar; import mekanism.client.gui.GuiPowerBar.IPowerInfoHandler; @@ -25,6 +21,7 @@ import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.ObfuscatedNames; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; @@ -37,6 +34,9 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public abstract class AdvancedMachineRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/BaseRecipeHandler.java b/src/main/java/mekanism/client/nei/BaseRecipeHandler.java index 7382cf7b3..64ad74355 100644 --- a/src/main/java/mekanism/client/nei/BaseRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/BaseRecipeHandler.java @@ -1,9 +1,5 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; -import static codechicken.lib.gui.GuiDraw.gui; - import java.util.HashSet; import java.util.List; import java.util.Set; @@ -12,13 +8,19 @@ import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiElement; import mekanism.client.gui.IGuiWrapper; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.gui.FontRenderer; import net.minecraft.util.IIcon; import net.minecraftforge.fluids.FluidStack; + import codechicken.nei.recipe.GuiCraftingRecipe; import codechicken.nei.recipe.GuiUsageRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; +import static codechicken.lib.gui.GuiDraw.gui; + public abstract class BaseRecipeHandler extends TemplateRecipeHandler implements IGuiWrapper { public BaseRecipeHandler() diff --git a/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java b/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java index 6a1d65218..483fcff28 100644 --- a/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java @@ -1,10 +1,6 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawString; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Rectangle; +import java.awt.*; import java.util.Map; import java.util.Map.Entry; import java.util.Set; @@ -21,6 +17,7 @@ import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; @@ -29,6 +26,10 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawString; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public abstract class ChanceMachineRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java index ae29dba17..9798418ad 100644 --- a/src/main/java/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java @@ -1,10 +1,6 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -15,6 +11,7 @@ import mekanism.client.gui.GuiChemicalCrystallizer; import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; @@ -27,6 +24,9 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public class ChemicalCrystallizerRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/ChemicalDissolutionChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalDissolutionChamberRecipeHandler.java index 65266ccb9..2262797fe 100644 --- a/src/main/java/mekanism/client/nei/ChemicalDissolutionChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalDissolutionChamberRecipeHandler.java @@ -1,10 +1,6 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -16,10 +12,9 @@ import mekanism.client.gui.GuiChemicalDissolutionChamber; import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; @@ -30,6 +25,9 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public class ChemicalDissolutionChamberRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java index 5285369e1..1e0d60eb0 100644 --- a/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java @@ -1,21 +1,18 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import mekanism.api.recipe.ChemicalPair; import mekanism.api.gas.GasStack; +import mekanism.api.recipe.ChemicalPair; import mekanism.client.gui.GuiChemicalInfuser; import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.gui.inventory.GuiContainer; import org.lwjgl.opengl.GL11; @@ -26,6 +23,9 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public class ChemicalInfuserRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java index b27be1dde..7ccc736a4 100644 --- a/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java @@ -4,13 +4,14 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import mekanism.api.util.ListUtils; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiChemicalInjectionChamber; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java index 9e680ef45..c76772352 100644 --- a/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java @@ -1,10 +1,6 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -21,11 +17,11 @@ import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.client.gui.GuiSlot; import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; -import mekanism.client.nei.ElectrolyticSeparatorRecipeHandler.CachedIORecipe; import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; @@ -38,6 +34,9 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public class ChemicalOxidizerRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java index 80ea2b2a5..df2d77892 100644 --- a/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java @@ -1,10 +1,6 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -15,6 +11,7 @@ import mekanism.client.gui.GuiChemicalWasher; import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -27,6 +24,9 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public class ChemicalWasherRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java b/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java index c10206645..2769fc8bc 100644 --- a/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java @@ -3,12 +3,13 @@ package mekanism.client.nei; import java.util.List; import java.util.Set; -import mekanism.api.util.ListUtils; import mekanism.api.gas.Gas; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiCombiner; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; + import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/client/nei/CrusherRecipeHandler.java b/src/main/java/mekanism/client/nei/CrusherRecipeHandler.java index 8032df384..a292e27b8 100644 --- a/src/main/java/mekanism/client/nei/CrusherRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/CrusherRecipeHandler.java @@ -3,12 +3,9 @@ package mekanism.client.nei; import java.util.Set; import mekanism.client.gui.GuiCrusher; -import mekanism.client.gui.GuiSlot; import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; public class CrusherRecipeHandler extends MachineRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java b/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java index 37fdfa665..a79ab3b4e 100644 --- a/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java @@ -1,17 +1,13 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import mekanism.api.recipe.ChemicalPair; import mekanism.api.gas.GasStack; +import mekanism.api.recipe.ChemicalPair; import mekanism.client.gui.GuiElectrolyticSeparator; import mekanism.client.gui.GuiElement; import mekanism.client.gui.GuiFluidGauge; @@ -25,12 +21,12 @@ import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.client.gui.GuiSlot; import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; -import mekanism.common.FluidSlot; import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraftforge.fluids.FluidStack; @@ -42,6 +38,9 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public class ElectrolyticSeparatorRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/ElementBoundHandler.java b/src/main/java/mekanism/client/nei/ElementBoundHandler.java index 08a3cb23d..1b5016abf 100644 --- a/src/main/java/mekanism/client/nei/ElementBoundHandler.java +++ b/src/main/java/mekanism/client/nei/ElementBoundHandler.java @@ -2,7 +2,9 @@ package mekanism.client.nei; import mekanism.client.gui.GuiElement; import mekanism.client.gui.GuiMekanism; + import net.minecraft.client.gui.inventory.GuiContainer; + import codechicken.lib.vec.Rectangle4i; import codechicken.nei.api.INEIGuiAdapter; diff --git a/src/main/java/mekanism/client/nei/MachineRecipeHandler.java b/src/main/java/mekanism/client/nei/MachineRecipeHandler.java index e12abc42b..97290f8f3 100644 --- a/src/main/java/mekanism/client/nei/MachineRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/MachineRecipeHandler.java @@ -1,9 +1,6 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Rectangle; +import java.awt.*; import java.util.Map; import java.util.Map.Entry; import java.util.Set; @@ -19,6 +16,7 @@ import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; @@ -27,6 +25,9 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public abstract class MachineRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/MekanismRecipeHandler.java b/src/main/java/mekanism/client/nei/MekanismRecipeHandler.java index 6a60008bb..fe0d3b464 100644 --- a/src/main/java/mekanism/client/nei/MekanismRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/MekanismRecipeHandler.java @@ -11,10 +11,12 @@ import mekanism.common.base.IFactory; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.MekanismRecipe; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.oredict.OreDictionary; + import codechicken.nei.PositionedStack; import codechicken.nei.recipe.ShapedRecipeHandler; diff --git a/src/main/java/mekanism/client/nei/MekanismSlotClickHandler.java b/src/main/java/mekanism/client/nei/MekanismSlotClickHandler.java index 229831a5b..7eae53fb9 100644 --- a/src/main/java/mekanism/client/nei/MekanismSlotClickHandler.java +++ b/src/main/java/mekanism/client/nei/MekanismSlotClickHandler.java @@ -1,8 +1,10 @@ package mekanism.client.nei; import mekanism.client.gui.GuiMekanism; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Slot; + import codechicken.nei.guihook.IContainerSlotClickHandler; public class MekanismSlotClickHandler implements IContainerSlotClickHandler diff --git a/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java b/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java index 7474ae81b..c95dc40bc 100644 --- a/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java @@ -1,9 +1,6 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Rectangle; +import java.awt.*; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -28,6 +25,7 @@ import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; @@ -36,6 +34,9 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public class MetallurgicInfuserRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/NEIMekanismConfig.java b/src/main/java/mekanism/client/nei/NEIMekanismConfig.java index 81300150f..612f15b78 100644 --- a/src/main/java/mekanism/client/nei/NEIMekanismConfig.java +++ b/src/main/java/mekanism/client/nei/NEIMekanismConfig.java @@ -21,6 +21,7 @@ import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; import net.minecraft.item.ItemStack; + import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; import codechicken.nei.guihook.GuiContainerManager; diff --git a/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java b/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java index ff0b05ba2..7f5bd7330 100644 --- a/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java @@ -3,13 +3,14 @@ package mekanism.client.nei; import java.util.List; import java.util.Set; -import mekanism.api.util.ListUtils; import mekanism.api.gas.Gas; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiOsmiumCompressor; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.MekanismItems; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; public class OsmiumCompressorRecipeHandler extends AdvancedMachineRecipeHandler diff --git a/src/main/java/mekanism/client/nei/PRCRecipeHandler.java b/src/main/java/mekanism/client/nei/PRCRecipeHandler.java index 487e73299..d21981a97 100644 --- a/src/main/java/mekanism/client/nei/PRCRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/PRCRecipeHandler.java @@ -1,18 +1,14 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import mekanism.api.gas.GasStack; import mekanism.api.recipe.PressurizedReactants; import mekanism.api.recipe.PressurizedRecipe; -import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiElement; import mekanism.client.gui.GuiFluidGauge; import mekanism.client.gui.GuiGasGauge; @@ -31,6 +27,7 @@ import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -44,6 +41,9 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public class PRCRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java index 2988b25d7..b70c40129 100644 --- a/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java @@ -4,13 +4,14 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import mekanism.api.util.ListUtils; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.client.gui.GuiPurificationChamber; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; + import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java b/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java index 0dd4f1322..dba22a46e 100644 --- a/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java @@ -1,11 +1,6 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawString; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; import mekanism.api.gas.Gas; @@ -15,6 +10,7 @@ import mekanism.client.gui.GuiRotaryCondensentrator; import mekanism.common.ObfuscatedNames; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraftforge.fluids.FluidStack; @@ -26,6 +22,10 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawString; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public class RotaryCondensentratorRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/SalinationControllerRecipeHandler.java b/src/main/java/mekanism/client/nei/SalinationControllerRecipeHandler.java index 7cc24c6ab..dfdc4a3d3 100644 --- a/src/main/java/mekanism/client/nei/SalinationControllerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/SalinationControllerRecipeHandler.java @@ -1,9 +1,6 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; +import java.awt.*; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -14,6 +11,7 @@ import mekanism.client.gui.GuiSalinationController; import mekanism.common.ObfuscatedNames; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -26,6 +24,9 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public class SalinationControllerRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/render/CTM.java b/src/main/java/mekanism/client/render/CTM.java index 426b0f587..3c0f04eea 100644 --- a/src/main/java/mekanism/client/render/CTM.java +++ b/src/main/java/mekanism/client/render/CTM.java @@ -1,7 +1,5 @@ package mekanism.client.render; -import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map.Entry; diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 5b4d6cd52..372ed8d9e 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -14,6 +14,7 @@ import mekanism.client.render.tileentity.RenderSalinationController; import mekanism.common.ObfuscatedNames; import mekanism.common.base.ISpecialBounds; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GLAllocation; @@ -34,14 +35,13 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + @SideOnly(Side.CLIENT) public class MekanismRenderer { diff --git a/src/main/java/mekanism/client/render/MinerVisualRenderer.java b/src/main/java/mekanism/client/render/MinerVisualRenderer.java index fb09de124..f8790d135 100644 --- a/src/main/java/mekanism/client/render/MinerVisualRenderer.java +++ b/src/main/java/mekanism/client/render/MinerVisualRenderer.java @@ -10,10 +10,10 @@ import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.tile.TileEntityDigitalMiner; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.init.Blocks; -import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/ModelCustomArmor.java b/src/main/java/mekanism/client/render/ModelCustomArmor.java index 071937055..d908e0984 100644 --- a/src/main/java/mekanism/client/render/ModelCustomArmor.java +++ b/src/main/java/mekanism/client/render/ModelCustomArmor.java @@ -7,18 +7,18 @@ import mekanism.client.model.ModelJetpack; import mekanism.client.model.ModelScubaTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelCustomArmor extends ModelBiped { diff --git a/src/main/java/mekanism/client/render/RenderGlowPanel.java b/src/main/java/mekanism/client/render/RenderGlowPanel.java index bd78468dd..a007219d7 100644 --- a/src/main/java/mekanism/client/render/RenderGlowPanel.java +++ b/src/main/java/mekanism/client/render/RenderGlowPanel.java @@ -6,8 +6,10 @@ import mekanism.api.EnumColor; import mekanism.common.multipart.PartGlowPanel; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; + import codechicken.lib.colour.Colour; import codechicken.lib.colour.ColourRGBA; import codechicken.lib.lighting.LightModel; diff --git a/src/main/java/mekanism/client/render/RenderPartTransmitter.java b/src/main/java/mekanism/client/render/RenderPartTransmitter.java index 4e182ea5b..68acc3d23 100644 --- a/src/main/java/mekanism/client/render/RenderPartTransmitter.java +++ b/src/main/java/mekanism/client/render/RenderPartTransmitter.java @@ -21,6 +21,7 @@ import mekanism.common.multipart.TransmitterType.Size; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.TransporterUtils; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; @@ -37,6 +38,8 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @@ -52,8 +55,6 @@ import codechicken.lib.render.TextureUtils.IIconSelfRegister; import codechicken.lib.render.uv.IconTransformation; import codechicken.lib.vec.Translation; import codechicken.lib.vec.Vector3; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderPartTransmitter implements IIconSelfRegister diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index daf5e7998..7dc6499c0 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -15,6 +15,7 @@ import mekanism.common.item.ItemFlamethrower; import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemScubaTank; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.ScaledResolution; diff --git a/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java b/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java index 511b9c8ec..e16f35cc2 100644 --- a/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java @@ -7,13 +7,12 @@ import mekanism.common.MekanismBlocks; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class BasicRenderingHandler implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/mekanism/client/render/block/CTMRenderingHandler.java b/src/main/java/mekanism/client/render/block/CTMRenderingHandler.java index ade6d4401..68a60cbc4 100644 --- a/src/main/java/mekanism/client/render/block/CTMRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/CTMRenderingHandler.java @@ -6,13 +6,10 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.CTMData; import mekanism.common.base.IBlockCTM; import mekanism.common.tile.TileEntityBasicBlock; -import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; /** diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index 2faee1764..8d469627f 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -22,17 +22,17 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class MachineRenderingHandler implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java b/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java index af12f556e..42e810020 100644 --- a/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java +++ b/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java @@ -1,8 +1,5 @@ package mekanism.client.render.block; -import java.util.HashMap; -import java.util.List; - import mekanism.client.render.CTM; import mekanism.common.CTMData; diff --git a/src/main/java/mekanism/client/render/block/TextureSubmap.java b/src/main/java/mekanism/client/render/block/TextureSubmap.java index f71c24470..a103cdfa7 100644 --- a/src/main/java/mekanism/client/render/block/TextureSubmap.java +++ b/src/main/java/mekanism/client/render/block/TextureSubmap.java @@ -1,9 +1,9 @@ package mekanism.client.render.block; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.util.IIcon; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; /** * Multi-texture class adapted from Chisel diff --git a/src/main/java/mekanism/client/render/entity/RenderBalloon.java b/src/main/java/mekanism/client/render/entity/RenderBalloon.java index 880a3369f..b2f8571bf 100644 --- a/src/main/java/mekanism/client/render/entity/RenderBalloon.java +++ b/src/main/java/mekanism/client/render/entity/RenderBalloon.java @@ -5,17 +5,17 @@ import mekanism.client.model.ModelBalloon; import mekanism.common.entity.EntityBalloon; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderBalloon extends Render { diff --git a/src/main/java/mekanism/client/render/entity/RenderFlame.java b/src/main/java/mekanism/client/render/entity/RenderFlame.java index e3cd32b13..6be32ba78 100644 --- a/src/main/java/mekanism/client/render/entity/RenderFlame.java +++ b/src/main/java/mekanism/client/render/entity/RenderFlame.java @@ -2,17 +2,17 @@ package mekanism.client.render.entity; import mekanism.client.render.MekanismRenderer; import mekanism.common.entity.EntityFlame; + import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class RenderFlame extends Render { diff --git a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java index 51a4e5ce5..d6385a48d 100644 --- a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java +++ b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java @@ -4,17 +4,17 @@ import mekanism.client.model.ModelObsidianTNT; import mekanism.common.entity.EntityObsidianTNT; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderObsidianTNTPrimed extends Render { diff --git a/src/main/java/mekanism/client/render/entity/RenderRobit.java b/src/main/java/mekanism/client/render/entity/RenderRobit.java index d585102a2..2cb6c6bbf 100644 --- a/src/main/java/mekanism/client/render/entity/RenderRobit.java +++ b/src/main/java/mekanism/client/render/entity/RenderRobit.java @@ -4,6 +4,7 @@ import mekanism.client.model.ModelRobit; import mekanism.common.entity.EntityRobit; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index 5b44cb227..4fe072dbb 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -46,6 +46,7 @@ import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityPortableTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -64,13 +65,11 @@ import net.minecraft.src.FMLRenderAccessLibrary; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; - -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ItemRenderingHandler implements IItemRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderBin.java b/src/main/java/mekanism/client/render/tileentity/RenderBin.java index e4b9d2839..cf21f9a86 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderBin.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderBin.java @@ -2,6 +2,7 @@ package mekanism.client.render.tileentity; import mekanism.api.Coord4D; import mekanism.common.tile.TileEntityBin; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.OpenGlHelper; @@ -15,12 +16,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderBin extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java index 96c439baf..d95105987 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelChargepad; import mekanism.common.tile.TileEntityChargepad; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderChargepad extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java index 73f91d754..483650f29 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java @@ -5,14 +5,14 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityChemicalCrystallizer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderChemicalCrystallizer extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java index 2fee0e8d1..d269af136 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelChemicalDissolutionChamber; import mekanism.common.tile.TileEntityChemicalDissolutionChamber; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderChemicalDissolutionChamber extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java index 290fb04b1..8685ed7cc 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java @@ -11,6 +11,7 @@ import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java index 6d094c4a2..1b23615e5 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java @@ -11,6 +11,7 @@ import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java index 04c8f889d..c3e61a58e 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java @@ -4,6 +4,7 @@ import mekanism.client.model.ModelChemicalWasher; import mekanism.common.tile.TileEntityChemicalWasher; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java index 0f2710560..7911a3747 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java @@ -10,6 +10,7 @@ import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.base.IInvConfiguration; import mekanism.common.item.ItemConfigurator; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -21,13 +22,12 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderConfigurableMachine extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java b/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java index 0d1375db4..24c40c04d 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java @@ -5,14 +5,14 @@ import mekanism.client.render.MinerVisualRenderer; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderDigitalMiner extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java index 18cc5c837..9c129e6e0 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java @@ -7,10 +7,10 @@ import mekanism.api.Coord4D; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; -import mekanism.common.Mekanism; -import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.content.tank.SynchronizedTankData.ValveData; +import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.tile.TileEntityDynamicTank; + import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; @@ -18,12 +18,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderDynamicTank extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectricChest.java b/src/main/java/mekanism/client/render/tileentity/RenderElectricChest.java index 6cc21badb..2e661fc50 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectricChest.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectricChest.java @@ -3,15 +3,15 @@ package mekanism.client.render.tileentity; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderElectricChest extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java b/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java index 0c08cb083..b852e29c6 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelElectricPump; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderElectricPump extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java b/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java index 79b1885ba..c3eefb923 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelElectrolyticSeparator; import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderElectrolyticSeparator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java index 534042bd1..9d73f6d37 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java @@ -8,14 +8,14 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderEnergyCube extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java b/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java index 52c1375b0..344b6dc4b 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelFluidicPlenisher; import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderFluidicPlenisher extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java index 6f2878cdf..67206eedc 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelGasTank; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderGasTank extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLaser.java b/src/main/java/mekanism/client/render/tileentity/RenderLaser.java index 406512407..33de64489 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLaser.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLaser.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelLaser; import mekanism.common.tile.TileEntityLaser; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderLaser extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java b/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java index 00d80ff2f..eb7024820 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java @@ -5,14 +5,14 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderLaserAmplifier extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java b/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java index 3adaa8efd..0a0416bb0 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelLogisticalSorter; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderLogisticalSorter extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java b/src/main/java/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java index c0e8b3410..f0bab79e8 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java @@ -5,14 +5,14 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderMetallurgicInfuser extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderObsidianTNT.java b/src/main/java/mekanism/client/render/tileentity/RenderObsidianTNT.java index 0e0621cc4..321ff39e7 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderObsidianTNT.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderObsidianTNT.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelObsidianTNT; import mekanism.common.tile.TileEntityObsidianTNT; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderObsidianTNT extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java b/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java index b7c5bb9c9..15436e30f 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java @@ -10,16 +10,16 @@ import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.tile.TileEntityPortableTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.Fluid; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderPortableTank extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java b/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java index ba955e013..0c8a43068 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java @@ -5,14 +5,14 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityPRC; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderPressurizedReactionChamber extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java b/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java index f1a96863e..41ec74148 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelRotaryCondensentrator; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderRotaryCondensentrator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSalinationController.java b/src/main/java/mekanism/client/render/tileentity/RenderSalinationController.java index 76baa299b..8fed1e948 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSalinationController.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSalinationController.java @@ -7,21 +7,20 @@ import mekanism.api.Coord4D; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; -import mekanism.common.Mekanism; import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.tile.TileEntitySalinationController; + import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderSalinationController extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java b/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java index de2980387..f0b965fe7 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java @@ -5,14 +5,14 @@ import mekanism.common.Mekanism; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderSeismicVibrator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java b/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java index fcc05fecc..0c7790a73 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java @@ -10,6 +10,7 @@ import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.MekanismBlocks; import mekanism.common.tile.TileEntityTeleporter; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/client/sound/Sound.java b/src/main/java/mekanism/client/sound/Sound.java index a3a3fab04..86e2e110f 100644 --- a/src/main/java/mekanism/client/sound/Sound.java +++ b/src/main/java/mekanism/client/sound/Sound.java @@ -2,11 +2,10 @@ package mekanism.client.sound; import mekanism.api.MekanismConfig.client; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.client.audio.ISound; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * Generic ISound class with lots of constructor functionality. diff --git a/src/main/java/mekanism/client/sound/SoundHandler.java b/src/main/java/mekanism/client/sound/SoundHandler.java index b9ceba453..5134985ee 100644 --- a/src/main/java/mekanism/client/sound/SoundHandler.java +++ b/src/main/java/mekanism/client/sound/SoundHandler.java @@ -3,9 +3,9 @@ package mekanism.client.sound; import java.util.HashMap; import java.util.Map; -import mekanism.common.Mekanism; import mekanism.common.ObfuscatedNames; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.Minecraft; import net.minecraft.client.audio.ISound; import net.minecraft.client.audio.ITickableSound; diff --git a/src/main/java/mekanism/client/voice/VoiceClient.java b/src/main/java/mekanism/client/voice/VoiceClient.java index 1adbb3872..3cc58e32f 100644 --- a/src/main/java/mekanism/client/voice/VoiceClient.java +++ b/src/main/java/mekanism/client/voice/VoiceClient.java @@ -7,13 +7,14 @@ import java.io.DataOutputStream; import java.net.ConnectException; import java.net.Socket; -import javax.sound.sampled.AudioFormat; - import mekanism.api.MekanismConfig.general; import mekanism.common.Mekanism; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import javax.sound.sampled.AudioFormat; + @SideOnly(Side.CLIENT) public class VoiceClient extends Thread { diff --git a/src/main/java/mekanism/client/voice/VoiceInput.java b/src/main/java/mekanism/client/voice/VoiceInput.java index c4c418cd2..4147eae88 100644 --- a/src/main/java/mekanism/client/voice/VoiceInput.java +++ b/src/main/java/mekanism/client/voice/VoiceInput.java @@ -1,15 +1,16 @@ package mekanism.client.voice; +import mekanism.client.MekanismKeyHandler; +import mekanism.common.Mekanism; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioSystem; import javax.sound.sampled.DataLine; import javax.sound.sampled.TargetDataLine; -import mekanism.client.MekanismKeyHandler; -import mekanism.common.Mekanism; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class VoiceInput extends Thread { diff --git a/src/main/java/mekanism/client/voice/VoiceOutput.java b/src/main/java/mekanism/client/voice/VoiceOutput.java index f037c2481..01c5e609f 100644 --- a/src/main/java/mekanism/client/voice/VoiceOutput.java +++ b/src/main/java/mekanism/client/voice/VoiceOutput.java @@ -1,13 +1,14 @@ package mekanism.client.voice; +import mekanism.common.Mekanism; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import javax.sound.sampled.AudioSystem; import javax.sound.sampled.DataLine; import javax.sound.sampled.SourceDataLine; -import mekanism.common.Mekanism; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class VoiceOutput extends Thread { diff --git a/src/main/java/mekanism/common/BoxBlacklistParser.java b/src/main/java/mekanism/common/BoxBlacklistParser.java index 37150cd81..9f4307661 100644 --- a/src/main/java/mekanism/common/BoxBlacklistParser.java +++ b/src/main/java/mekanism/common/BoxBlacklistParser.java @@ -8,6 +8,7 @@ import java.io.FileWriter; import java.io.IOException; import mekanism.api.MekanismAPI; + import net.minecraft.block.Block; public final class BoxBlacklistParser diff --git a/src/main/java/mekanism/common/CommandMekanism.java b/src/main/java/mekanism/common/CommandMekanism.java index 6b4b71a36..737081f4e 100644 --- a/src/main/java/mekanism/common/CommandMekanism.java +++ b/src/main/java/mekanism/common/CommandMekanism.java @@ -6,6 +6,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; import mekanism.common.util.MekanismUtils; + import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/common/CommonPlayerTickHandler.java b/src/main/java/mekanism/common/CommonPlayerTickHandler.java index 65b4e2568..e166bacf8 100644 --- a/src/main/java/mekanism/common/CommonPlayerTickHandler.java +++ b/src/main/java/mekanism/common/CommonPlayerTickHandler.java @@ -11,6 +11,7 @@ import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.item.ItemScubaTank; import mekanism.common.network.PacketStatusUpdate.StatusUpdateMessage; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/CommonPlayerTracker.java b/src/main/java/mekanism/common/CommonPlayerTracker.java index cbe9e93a8..e8e761c3e 100644 --- a/src/main/java/mekanism/common/CommonPlayerTracker.java +++ b/src/main/java/mekanism/common/CommonPlayerTracker.java @@ -6,6 +6,7 @@ import mekanism.common.network.PacketJetpackData.JetpackDataMessage; import mekanism.common.network.PacketJetpackData.JetpackPacket; import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage; import mekanism.common.network.PacketScubaTankData.ScubaTankPacket; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index f28ab8ef5..391edf1db 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -86,6 +86,7 @@ import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySalinationController; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntityTeleporter; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; diff --git a/src/main/java/mekanism/common/CommonWorldTickHandler.java b/src/main/java/mekanism/common/CommonWorldTickHandler.java index 424420cc3..283769fcc 100644 --- a/src/main/java/mekanism/common/CommonWorldTickHandler.java +++ b/src/main/java/mekanism/common/CommonWorldTickHandler.java @@ -1,14 +1,12 @@ package mekanism.common; -import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.LinkedList; import java.util.Queue; import java.util.Random; -import mekanism.api.Coord4D; import mekanism.common.multiblock.MultiblockManager; + import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; import cpw.mods.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index c45ffdb9d..4c83110f0 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -1,8 +1,5 @@ package mekanism.common; -import ic2.api.energy.EnergyNet; -import ic2.api.energy.tile.IEnergySink; - import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -22,14 +19,18 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.api.util.ListUtils; import mekanism.common.util.CableUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.Event; + import buildcraft.api.mj.IBatteryObject; import buildcraft.api.mj.MjAPI; import cofh.api.energy.IEnergyHandler; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.Event; +import ic2.api.energy.EnergyNet; +import ic2.api.energy.tile.IEnergySink; public class EnergyNetwork extends DynamicNetwork { diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java index 5f8d86182..26f54a3d7 100644 --- a/src/main/java/mekanism/common/FluidNetwork.java +++ b/src/main/java/mekanism/common/FluidNetwork.java @@ -18,6 +18,7 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.api.util.ListUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.PipeUtils; + import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/mekanism/common/FuelHandler.java b/src/main/java/mekanism/common/FuelHandler.java index f62f72ed4..74d3db4e1 100644 --- a/src/main/java/mekanism/common/FuelHandler.java +++ b/src/main/java/mekanism/common/FuelHandler.java @@ -3,12 +3,13 @@ package mekanism.common; import java.util.HashMap; import mekanism.api.MekanismConfig.general; - import mekanism.api.gas.Gas; + import net.minecraftforge.fluids.FluidContainerRegistry; +import cpw.mods.fml.common.ModAPIManager; + import buildcraft.api.fuels.IronEngineFuel; import buildcraft.api.fuels.IronEngineFuel.Fuel; -import cpw.mods.fml.common.ModAPIManager; public class FuelHandler { diff --git a/src/main/java/mekanism/common/InventoryNetwork.java b/src/main/java/mekanism/common/InventoryNetwork.java index 0cf568830..0859f7c54 100644 --- a/src/main/java/mekanism/common/InventoryNetwork.java +++ b/src/main/java/mekanism/common/InventoryNetwork.java @@ -18,6 +18,7 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.base.ILogisticalTransporter; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.util.TransporterUtils; + import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/ItemAttacher.java b/src/main/java/mekanism/common/ItemAttacher.java index c7d35e585..58e135f2e 100644 --- a/src/main/java/mekanism/common/ItemAttacher.java +++ b/src/main/java/mekanism/common/ItemAttacher.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import mekanism.common.multipart.TransmitterType; + import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index c8132aaa9..1af080539 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -75,6 +75,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.voice.VoiceServerManager; import mekanism.common.world.GenHandler; + import net.minecraft.entity.EnumCreatureType; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -96,13 +97,6 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import net.minecraftforge.oredict.ShapelessOreRecipe; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import rebelkeithy.mods.metallurgy.api.IOreInfo; -import rebelkeithy.mods.metallurgy.api.MetallurgyAPI; -import codechicken.multipart.handler.MultipartProxy; import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.IFuelHandler; @@ -120,6 +114,12 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; +import codechicken.multipart.handler.MultipartProxy; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import rebelkeithy.mods.metallurgy.api.IOreInfo; +import rebelkeithy.mods.metallurgy.api.MetallurgyAPI; + /** * Mekanism - a Minecraft mod * @author AidanBrady diff --git a/src/main/java/mekanism/common/MekanismBlocks.java b/src/main/java/mekanism/common/MekanismBlocks.java index 70e3bbd8f..bddb156d0 100644 --- a/src/main/java/mekanism/common/MekanismBlocks.java +++ b/src/main/java/mekanism/common/MekanismBlocks.java @@ -23,8 +23,11 @@ import net.minecraft.block.Block; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; -import static mekanism.common.block.BlockBasic.BasicBlock.*; -import static mekanism.common.block.BlockMachine.MachineBlock.*; +import static mekanism.common.block.BlockBasic.BasicBlock.BASIC_BLOCK_1; +import static mekanism.common.block.BlockBasic.BasicBlock.BASIC_BLOCK_2; +import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_1; +import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_2; +import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_3; @ObjectHolder("Mekanism") public class MekanismBlocks diff --git a/src/main/java/mekanism/common/MekanismItems.java b/src/main/java/mekanism/common/MekanismItems.java index 6a604dfb5..01b2bd201 100644 --- a/src/main/java/mekanism/common/MekanismItems.java +++ b/src/main/java/mekanism/common/MekanismItems.java @@ -37,7 +37,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; -import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; diff --git a/src/main/java/mekanism/common/OreDictCache.java b/src/main/java/mekanism/common/OreDictCache.java index ce8df9988..3ed1d43a0 100644 --- a/src/main/java/mekanism/common/OreDictCache.java +++ b/src/main/java/mekanism/common/OreDictCache.java @@ -6,6 +6,7 @@ import java.util.List; import mekanism.api.util.ItemInfo; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index 4787964c8..5f42841cb 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -1,11 +1,8 @@ package mekanism.common; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.List; -import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.network.PacketBoxBlacklist; import mekanism.common.network.PacketBoxBlacklist.BoxBlacklistMessage; @@ -63,6 +60,7 @@ import mekanism.common.network.PacketTransmitterUpdate; import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage; import mekanism.common.network.PacketWalkieTalkieState; import mekanism.common.network.PacketWalkieTalkieState.WalkieTalkieStateMessage; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; @@ -79,6 +77,8 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; +import io.netty.buffer.ByteBuf; + /** * Mekanism packet handler. As always, use packets sparingly! * @author AidanBrady diff --git a/src/main/java/mekanism/common/RobitAIFollow.java b/src/main/java/mekanism/common/RobitAIFollow.java index 64738d22f..dd43c42d0 100644 --- a/src/main/java/mekanism/common/RobitAIFollow.java +++ b/src/main/java/mekanism/common/RobitAIFollow.java @@ -1,6 +1,7 @@ package mekanism.common; import mekanism.common.entity.EntityRobit; + import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.pathfinding.PathNavigate; diff --git a/src/main/java/mekanism/common/RobitAIPickup.java b/src/main/java/mekanism/common/RobitAIPickup.java index bf4e6f25f..28f3aeaed 100644 --- a/src/main/java/mekanism/common/RobitAIPickup.java +++ b/src/main/java/mekanism/common/RobitAIPickup.java @@ -4,6 +4,7 @@ import java.util.Iterator; import java.util.List; import mekanism.common.entity.EntityRobit; + import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.pathfinding.PathNavigate; diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index 0a4d2eb28..96766e2f6 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -2,6 +2,7 @@ package mekanism.common; import mekanism.api.EnumColor; import mekanism.common.multipart.TransmitterType; + import net.minecraft.util.ResourceLocation; /** diff --git a/src/main/java/mekanism/common/Upgrade.java b/src/main/java/mekanism/common/Upgrade.java index 18200c2d4..0a097c20d 100644 --- a/src/main/java/mekanism/common/Upgrade.java +++ b/src/main/java/mekanism/common/Upgrade.java @@ -9,6 +9,7 @@ import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; import mekanism.common.base.IUpgradeTile; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/mekanism/common/asm/LoadingHook.java b/src/main/java/mekanism/common/asm/LoadingHook.java index f2807c9cf..e84895469 100644 --- a/src/main/java/mekanism/common/asm/LoadingHook.java +++ b/src/main/java/mekanism/common/asm/LoadingHook.java @@ -2,9 +2,10 @@ package mekanism.common.asm; import java.util.Map; -import codechicken.core.launch.DepLoader; import cpw.mods.fml.relauncher.IFMLLoadingPlugin; +import codechicken.core.launch.DepLoader; + public class LoadingHook implements IFMLLoadingPlugin { public LoadingHook() diff --git a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java index 697ccb3ab..e2407f61b 100644 --- a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java @@ -1,18 +1,20 @@ package mekanism.common.base; -import ic2.api.energy.tile.IEnergySink; import mekanism.api.Coord4D; import mekanism.api.IConfigurable; import mekanism.api.IFilterAccess; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; + import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; -import buildcraft.api.power.IPowerReceptor; -import cofh.api.energy.IEnergyHandler; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; + +import buildcraft.api.power.IPowerReceptor; +import cofh.api.energy.IEnergyHandler; import dan200.computercraft.api.peripheral.IPeripheral; +import ic2.api.energy.tile.IEnergySink; @InterfaceList({ @Interface(iface = "buildcraft.api.power.IPowerReceptor", modid = "BuildCraftAPI|power"), diff --git a/src/main/java/mekanism/common/base/IBlockCTM.java b/src/main/java/mekanism/common/base/IBlockCTM.java index 8475b14df..36a54a45c 100644 --- a/src/main/java/mekanism/common/base/IBlockCTM.java +++ b/src/main/java/mekanism/common/base/IBlockCTM.java @@ -3,7 +3,6 @@ package mekanism.common.base; import mekanism.common.CTMData; import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; public interface IBlockCTM { diff --git a/src/main/java/mekanism/common/base/IEjector.java b/src/main/java/mekanism/common/base/IEjector.java index 45206dd64..3f961de6b 100644 --- a/src/main/java/mekanism/common/base/IEjector.java +++ b/src/main/java/mekanism/common/base/IEjector.java @@ -1,6 +1,7 @@ package mekanism.common.base; import mekanism.api.EnumColor; + import net.minecraftforge.common.util.ForgeDirection; public interface IEjector diff --git a/src/main/java/mekanism/common/base/IEnergyCube.java b/src/main/java/mekanism/common/base/IEnergyCube.java index eaad70a4e..de2c866fe 100644 --- a/src/main/java/mekanism/common/base/IEnergyCube.java +++ b/src/main/java/mekanism/common/base/IEnergyCube.java @@ -1,7 +1,7 @@ package mekanism.common.base; -import mekanism.common.Tier; import mekanism.common.Tier.EnergyCubeTier; + import net.minecraft.item.ItemStack; /** diff --git a/src/main/java/mekanism/common/base/IFactory.java b/src/main/java/mekanism/common/base/IFactory.java index 4ae40f778..7e03c9662 100644 --- a/src/main/java/mekanism/common/base/IFactory.java +++ b/src/main/java/mekanism/common/base/IFactory.java @@ -2,15 +2,16 @@ package mekanism.common.base; import java.util.Map; -import mekanism.api.recipe.AdvancedInput; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; +import mekanism.api.recipe.AdvancedInput; +import mekanism.api.util.StackUtils; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.util.MekanismUtils; -import mekanism.api.util.StackUtils; + import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; diff --git a/src/main/java/mekanism/common/base/ILogisticalTransporter.java b/src/main/java/mekanism/common/base/ILogisticalTransporter.java index 98c6212bb..c17de1e0b 100644 --- a/src/main/java/mekanism/common/base/ILogisticalTransporter.java +++ b/src/main/java/mekanism/common/base/ILogisticalTransporter.java @@ -7,6 +7,7 @@ import mekanism.api.transmitters.IGridTransmitter; import mekanism.common.InventoryNetwork; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.tile.TileEntityLogisticalSorter; + import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/mekanism/common/base/IModule.java b/src/main/java/mekanism/common/base/IModule.java index 41c83c629..fe3583491 100644 --- a/src/main/java/mekanism/common/base/IModule.java +++ b/src/main/java/mekanism/common/base/IModule.java @@ -1,11 +1,11 @@ package mekanism.common.base; -import io.netty.buffer.ByteBuf; - import java.io.IOException; import mekanism.common.Version; +import io.netty.buffer.ByteBuf; + /** * Implement in your main class if your mod happens to be completely reliant on Mekanism, or in other words, is a Mekanism module. * @author aidancbrady diff --git a/src/main/java/mekanism/common/base/ITileComponent.java b/src/main/java/mekanism/common/base/ITileComponent.java index d69119553..5253b98d2 100644 --- a/src/main/java/mekanism/common/base/ITileComponent.java +++ b/src/main/java/mekanism/common/base/ITileComponent.java @@ -1,11 +1,11 @@ package mekanism.common.base; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import net.minecraft.nbt.NBTTagCompound; +import io.netty.buffer.ByteBuf; + public interface ITileComponent { public void tick(); diff --git a/src/main/java/mekanism/common/base/ITileNetwork.java b/src/main/java/mekanism/common/base/ITileNetwork.java index 49f055270..cf9c6227f 100644 --- a/src/main/java/mekanism/common/base/ITileNetwork.java +++ b/src/main/java/mekanism/common/base/ITileNetwork.java @@ -1,9 +1,9 @@ package mekanism.common.base; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; +import io.netty.buffer.ByteBuf; + /** * Internal interface used for blocks that send data between clients and the server * @author AidanBrady diff --git a/src/main/java/mekanism/common/base/IUpgradeItem.java b/src/main/java/mekanism/common/base/IUpgradeItem.java index ec33efa5a..c3f485c98 100644 --- a/src/main/java/mekanism/common/base/IUpgradeItem.java +++ b/src/main/java/mekanism/common/base/IUpgradeItem.java @@ -1,6 +1,7 @@ package mekanism.common.base; import mekanism.common.Upgrade; + import net.minecraft.item.ItemStack; public interface IUpgradeItem diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 48df4c49f..db627e492 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -8,12 +8,12 @@ import java.util.Random; import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.client.ClientProxy; -import mekanism.common.base.IBlockCTM; import mekanism.common.CTMData; import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.base.IActiveState; +import mekanism.common.base.IBlockCTM; import mekanism.common.base.IBoundingBlock; import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.inventory.InventoryBin; @@ -26,6 +26,7 @@ import mekanism.common.tile.TileEntitySalinationBlock; import mekanism.common.tile.TileEntitySalinationController; import mekanism.common.tile.TileEntitySalinationValve; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/mekanism/common/block/BlockBounding.java b/src/main/java/mekanism/common/block/BlockBounding.java index 9276a4100..103f0c818 100644 --- a/src/main/java/mekanism/common/block/BlockBounding.java +++ b/src/main/java/mekanism/common/block/BlockBounding.java @@ -4,6 +4,7 @@ import java.util.Random; import mekanism.common.tile.TileEntityAdvancedBoundingBlock; import mekanism.common.tile.TileEntityBoundingBlock; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/mekanism/common/block/BlockCardboardBox.java b/src/main/java/mekanism/common/block/BlockCardboardBox.java index 22e73c11d..5adab71a6 100644 --- a/src/main/java/mekanism/common/block/BlockCardboardBox.java +++ b/src/main/java/mekanism/common/block/BlockCardboardBox.java @@ -6,6 +6,7 @@ import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.item.ItemBlockCardboardBox; import mekanism.common.tile.TileEntityCardboardBox; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index e64fd70de..43bda91ee 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -15,6 +15,7 @@ import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -32,15 +33,16 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.tools.IToolWrench; -import dan200.computercraft.api.peripheral.IPeripheral; -import dan200.computercraft.api.peripheral.IPeripheralProvider; import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import buildcraft.api.tools.IToolWrench; +import dan200.computercraft.api.peripheral.IPeripheral; +import dan200.computercraft.api.peripheral.IPeripheralProvider; + /** * Block class for handling multiple energy cube block IDs. * 0: Basic Energy Cube diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index b4ba0062d..f7f7e3277 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -25,11 +25,12 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.tools.IToolWrench; import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import buildcraft.api.tools.IToolWrench; + public class BlockGasTank extends BlockContainer { public BlockGasTank() diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 70ee6abcb..5893e6f59 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -16,6 +16,7 @@ import mekanism.common.base.IActiveState; import mekanism.common.base.IBoundingBlock; import mekanism.common.base.IElectricChest; import mekanism.common.base.IFactory; +import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.IInvConfiguration; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISpecialBounds; @@ -23,7 +24,6 @@ import mekanism.common.base.ISustainedData; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ISustainedTank; import mekanism.common.base.IUpgradeTile; -import mekanism.common.base.IFactory.RecipeType; import mekanism.common.item.ItemBlockMachine; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; @@ -66,6 +66,7 @@ import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -91,12 +92,13 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import buildcraft.api.tools.IToolWrench; import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + +import buildcraft.api.tools.IToolWrench; import dan200.computercraft.api.peripheral.IPeripheral; import dan200.computercraft.api.peripheral.IPeripheralProvider; diff --git a/src/main/java/mekanism/common/block/BlockObsidianTNT.java b/src/main/java/mekanism/common/block/BlockObsidianTNT.java index fe37074a0..580ed6aa7 100644 --- a/src/main/java/mekanism/common/block/BlockObsidianTNT.java +++ b/src/main/java/mekanism/common/block/BlockObsidianTNT.java @@ -3,6 +3,7 @@ package mekanism.common.block; import mekanism.common.Mekanism; import mekanism.common.entity.EntityObsidianTNT; import mekanism.common.tile.TileEntityObsidianTNT; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/mekanism/common/block/BlockOre.java b/src/main/java/mekanism/common/block/BlockOre.java index d8679fa69..538383975 100644 --- a/src/main/java/mekanism/common/block/BlockOre.java +++ b/src/main/java/mekanism/common/block/BlockOre.java @@ -3,6 +3,7 @@ package mekanism.common.block; import java.util.List; import mekanism.common.Mekanism; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/mekanism/common/block/BlockPlasticFence.java b/src/main/java/mekanism/common/block/BlockPlasticFence.java index 0d5c245d7..e315c5865 100644 --- a/src/main/java/mekanism/common/block/BlockPlasticFence.java +++ b/src/main/java/mekanism/common/block/BlockPlasticFence.java @@ -1,10 +1,10 @@ package mekanism.common.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; + import mekanism.api.EnumColor; import mekanism.common.Mekanism; -import mekanism.common.MekanismBlocks; + import net.minecraft.block.BlockFence; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -13,8 +13,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockPlasticFence extends BlockFence { diff --git a/src/main/java/mekanism/common/content/boiler/BoilerCache.java b/src/main/java/mekanism/common/content/boiler/BoilerCache.java index 4be969b7e..3cb9c3db4 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerCache.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerCache.java @@ -1,7 +1,7 @@ package mekanism.common.content.boiler; -import mekanism.common.content.turbine.SynchronizedTurbineData; import mekanism.common.multiblock.MultiblockCache; + import net.minecraft.nbt.NBTTagCompound; public class BoilerCache extends MultiblockCache diff --git a/src/main/java/mekanism/common/content/matrix/MatrixCache.java b/src/main/java/mekanism/common/content/matrix/MatrixCache.java index 1adece842..8a99e36b4 100644 --- a/src/main/java/mekanism/common/content/matrix/MatrixCache.java +++ b/src/main/java/mekanism/common/content/matrix/MatrixCache.java @@ -1,6 +1,7 @@ package mekanism.common.content.matrix; import mekanism.common.multiblock.MultiblockCache; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/mekanism/common/content/matrix/SynchronizedMatrixData.java b/src/main/java/mekanism/common/content/matrix/SynchronizedMatrixData.java index 805d69710..a786867f4 100644 --- a/src/main/java/mekanism/common/content/matrix/SynchronizedMatrixData.java +++ b/src/main/java/mekanism/common/content/matrix/SynchronizedMatrixData.java @@ -2,6 +2,7 @@ package mekanism.common.content.matrix; import mekanism.common.content.tank.SynchronizedTankData; import mekanism.common.multiblock.SynchronizedData; + import net.minecraft.item.ItemStack; public class SynchronizedMatrixData extends SynchronizedData diff --git a/src/main/java/mekanism/common/content/miner/MItemStackFilter.java b/src/main/java/mekanism/common/content/miner/MItemStackFilter.java index d4ac726f0..8dee7b9b2 100644 --- a/src/main/java/mekanism/common/content/miner/MItemStackFilter.java +++ b/src/main/java/mekanism/common/content/miner/MItemStackFilter.java @@ -1,14 +1,15 @@ package mekanism.common.content.miner; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import io.netty.buffer.ByteBuf; + public class MItemStackFilter extends MinerFilter { public ItemStack itemType; diff --git a/src/main/java/mekanism/common/content/miner/MMaterialFilter.java b/src/main/java/mekanism/common/content/miner/MMaterialFilter.java index a429c4c33..5fb478ab1 100644 --- a/src/main/java/mekanism/common/content/miner/MMaterialFilter.java +++ b/src/main/java/mekanism/common/content/miner/MMaterialFilter.java @@ -1,11 +1,10 @@ package mekanism.common.content.miner; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.common.content.transporter.Finder.MaterialFinder; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.item.Item; @@ -13,6 +12,8 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import io.netty.buffer.ByteBuf; + public class MMaterialFilter extends MinerFilter { public ItemStack materialItem; diff --git a/src/main/java/mekanism/common/content/miner/MModIDFilter.java b/src/main/java/mekanism/common/content/miner/MModIDFilter.java index c92ba95c5..afa592e96 100644 --- a/src/main/java/mekanism/common/content/miner/MModIDFilter.java +++ b/src/main/java/mekanism/common/content/miner/MModIDFilter.java @@ -1,15 +1,16 @@ package mekanism.common.content.miner; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.common.PacketHandler; import mekanism.common.content.transporter.Finder.ModIDFinder; + import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import io.netty.buffer.ByteBuf; + public class MModIDFilter extends MinerFilter { public String modID; diff --git a/src/main/java/mekanism/common/content/miner/MOreDictFilter.java b/src/main/java/mekanism/common/content/miner/MOreDictFilter.java index 8ebeef491..d40cf00a6 100644 --- a/src/main/java/mekanism/common/content/miner/MOreDictFilter.java +++ b/src/main/java/mekanism/common/content/miner/MOreDictFilter.java @@ -1,15 +1,16 @@ package mekanism.common.content.miner; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.common.PacketHandler; import mekanism.common.content.transporter.Finder.OreDictFinder; + import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import io.netty.buffer.ByteBuf; + public class MOreDictFilter extends MinerFilter { public String oreDictName; diff --git a/src/main/java/mekanism/common/content/miner/MinerFilter.java b/src/main/java/mekanism/common/content/miner/MinerFilter.java index 560fced04..483075d5b 100644 --- a/src/main/java/mekanism/common/content/miner/MinerFilter.java +++ b/src/main/java/mekanism/common/content/miner/MinerFilter.java @@ -1,14 +1,15 @@ package mekanism.common.content.miner; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import io.netty.buffer.ByteBuf; + public abstract class MinerFilter { public ItemStack replaceStack; diff --git a/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java b/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java index ddef2d5cc..b87a5fa04 100644 --- a/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java +++ b/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java @@ -10,6 +10,7 @@ import mekanism.api.util.BlockInfo; import mekanism.common.tile.TileEntityBoundingBlock; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java b/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java index b6b19c8ef..722f87593 100644 --- a/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java +++ b/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java @@ -4,6 +4,7 @@ import mekanism.api.Coord4D; import mekanism.common.content.tank.SynchronizedTankData.ValveData; import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.util.MekanismUtils; + import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidTank; diff --git a/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java b/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java index 0b62e82f6..564021541 100644 --- a/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java +++ b/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java @@ -6,6 +6,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.common.multiblock.SynchronizedData; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; + import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/mekanism/common/content/tank/TankCache.java b/src/main/java/mekanism/common/content/tank/TankCache.java index eb23200c4..cb2a1b1cd 100644 --- a/src/main/java/mekanism/common/content/tank/TankCache.java +++ b/src/main/java/mekanism/common/content/tank/TankCache.java @@ -2,6 +2,7 @@ package mekanism.common.content.tank; import mekanism.common.multiblock.MultiblockCache; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java b/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java index f6322a84e..804ac8868 100644 --- a/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java @@ -13,9 +13,8 @@ import mekanism.common.multiblock.SynchronizedData; import mekanism.common.multiblock.UpdateProtocol; import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.tile.TileEntityDynamicValve; + import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; public class TankUpdateProtocol extends UpdateProtocol { diff --git a/src/main/java/mekanism/common/content/teleportation/SharedInventory.java b/src/main/java/mekanism/common/content/teleportation/SharedInventory.java index 713b3a15b..f5d108a30 100644 --- a/src/main/java/mekanism/common/content/teleportation/SharedInventory.java +++ b/src/main/java/mekanism/common/content/teleportation/SharedInventory.java @@ -1,12 +1,10 @@ package mekanism.common.content.teleportation; -import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.api.gas.IGasHandler; -import mekanism.common.tile.component.TileComponentUpgrade; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/mekanism/common/content/teleportation/SharedInventoryManager.java b/src/main/java/mekanism/common/content/teleportation/SharedInventoryManager.java index c43e66857..0c8a7a5a8 100644 --- a/src/main/java/mekanism/common/content/teleportation/SharedInventoryManager.java +++ b/src/main/java/mekanism/common/content/teleportation/SharedInventoryManager.java @@ -8,7 +8,6 @@ import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidRegistry.FluidRegisterEvent; import net.minecraftforge.fluids.FluidStack; public class SharedInventoryManager diff --git a/src/main/java/mekanism/common/content/transporter/Finder.java b/src/main/java/mekanism/common/content/transporter/Finder.java index 533db0e78..2afe51af6 100644 --- a/src/main/java/mekanism/common/content/transporter/Finder.java +++ b/src/main/java/mekanism/common/content/transporter/Finder.java @@ -2,8 +2,9 @@ package mekanism.common.content.transporter; import java.util.List; -import mekanism.common.util.MekanismUtils; import mekanism.api.util.StackUtils; +import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/mekanism/common/content/transporter/PathfinderCache.java b/src/main/java/mekanism/common/content/transporter/PathfinderCache.java index 30a8fc2b1..8b3abd742 100644 --- a/src/main/java/mekanism/common/content/transporter/PathfinderCache.java +++ b/src/main/java/mekanism/common/content/transporter/PathfinderCache.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Map; import mekanism.api.Coord4D; -import mekanism.common.Mekanism; + import net.minecraftforge.common.util.ForgeDirection; public class PathfinderCache diff --git a/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java b/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java index 511a6d42f..b24eb4052 100644 --- a/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java @@ -1,18 +1,19 @@ package mekanism.common.content.transporter; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.common.content.transporter.Finder.ItemStackFinder; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class TItemStackFilter extends TransporterFilter { public boolean sizeMode; diff --git a/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java b/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java index 63c13f21a..df8060e22 100644 --- a/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java @@ -1,12 +1,11 @@ package mekanism.common.content.transporter; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.common.content.transporter.Finder.MaterialFinder; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.inventory.IInventory; @@ -16,6 +15,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class TMaterialFilter extends TransporterFilter { public ItemStack materialItem; diff --git a/src/main/java/mekanism/common/content/transporter/TModIDFilter.java b/src/main/java/mekanism/common/content/transporter/TModIDFilter.java index b05358101..795087cdc 100644 --- a/src/main/java/mekanism/common/content/transporter/TModIDFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TModIDFilter.java @@ -1,17 +1,18 @@ package mekanism.common.content.transporter; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.common.PacketHandler; import mekanism.common.content.transporter.Finder.ModIDFinder; import mekanism.common.util.InventoryUtils; + import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class TModIDFilter extends TransporterFilter { public String modID; diff --git a/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java b/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java index f3614a04a..733a5bd13 100644 --- a/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java @@ -1,17 +1,18 @@ package mekanism.common.content.transporter; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.common.PacketHandler; import mekanism.common.content.transporter.Finder.OreDictFinder; import mekanism.common.util.InventoryUtils; + import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class TOreDictFilter extends TransporterFilter { public String oreDictName; diff --git a/src/main/java/mekanism/common/content/transporter/TransporterFilter.java b/src/main/java/mekanism/common/content/transporter/TransporterFilter.java index 339ed8a53..0a69ea0ff 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterFilter.java @@ -1,16 +1,17 @@ package mekanism.common.content.transporter; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.EnumColor; import mekanism.common.util.TransporterUtils; + import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public abstract class TransporterFilter { public EnumColor color; diff --git a/src/main/java/mekanism/common/content/transporter/TransporterManager.java b/src/main/java/mekanism/common/content/transporter/TransporterManager.java index 0d103524e..cc8538027 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterManager.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterManager.java @@ -12,12 +12,14 @@ import mekanism.common.content.transporter.TransporterStack.Path; import mekanism.common.tile.TileEntityBin; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.Loader; + import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; public class TransporterManager diff --git a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java index a93b24f57..925640816 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java @@ -12,14 +12,13 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.common.InventoryNetwork; import mekanism.common.InventoryNetwork.AcceptorData; -import mekanism.common.Mekanism; import mekanism.common.base.ILogisticalTransporter; import mekanism.common.content.transporter.PathfinderCache.PathData; import mekanism.common.content.transporter.TransporterPathfinder.Pathfinder.DestChecker; import mekanism.common.content.transporter.TransporterStack.Path; import mekanism.common.tile.TileEntityLogisticalSorter; -import mekanism.common.util.DebugUtils; import mekanism.common.util.InventoryUtils; + import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/mekanism/common/content/transporter/TransporterStack.java b/src/main/java/mekanism/common/content/transporter/TransporterStack.java index f8fde49a3..c211df2f4 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterStack.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterStack.java @@ -1,7 +1,5 @@ package mekanism.common.content.transporter; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.List; @@ -12,12 +10,15 @@ import mekanism.common.content.transporter.TransporterPathfinder.Destination; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; + import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class TransporterStack { public ItemStack itemStack; diff --git a/src/main/java/mekanism/common/content/turbine/TurbineCache.java b/src/main/java/mekanism/common/content/turbine/TurbineCache.java index 66a72e43d..f2ac0a065 100644 --- a/src/main/java/mekanism/common/content/turbine/TurbineCache.java +++ b/src/main/java/mekanism/common/content/turbine/TurbineCache.java @@ -1,6 +1,7 @@ package mekanism.common.content.turbine; import mekanism.common.multiblock.MultiblockCache; + import net.minecraft.nbt.NBTTagCompound; public class TurbineCache extends MultiblockCache diff --git a/src/main/java/mekanism/common/entity/EntityBalloon.java b/src/main/java/mekanism/common/entity/EntityBalloon.java index 0a1300d4f..ff0ce20bc 100644 --- a/src/main/java/mekanism/common/entity/EntityBalloon.java +++ b/src/main/java/mekanism/common/entity/EntityBalloon.java @@ -1,12 +1,11 @@ package mekanism.common.entity; -import io.netty.buffer.ByteBuf; - import java.util.UUID; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Pos3D; + import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.particle.EntityReddustFX; @@ -20,6 +19,8 @@ import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; + public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData { public EnumColor color = EnumColor.DARK_BLUE; diff --git a/src/main/java/mekanism/common/entity/EntityFlame.java b/src/main/java/mekanism/common/entity/EntityFlame.java index 281fdab89..77b0fb952 100644 --- a/src/main/java/mekanism/common/entity/EntityFlame.java +++ b/src/main/java/mekanism/common/entity/EntityFlame.java @@ -1,13 +1,12 @@ package mekanism.common.entity; -import io.netty.buffer.ByteBuf; - import java.util.List; import mekanism.api.Coord4D; import mekanism.api.Pos3D; -import mekanism.common.util.MekanismUtils; import mekanism.api.util.StackUtils; +import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -25,6 +24,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; +import io.netty.buffer.ByteBuf; + public class EntityFlame extends Entity implements IEntityAdditionalSpawnData { public static final int LIFESPAN = 60; diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index 8b7dee4ab..4defbd6b3 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -1,8 +1,5 @@ package mekanism.common.entity; -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; - import java.math.BigDecimal; import java.math.RoundingMode; import java.util.List; @@ -11,7 +8,6 @@ import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; -import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.MekanismItems; import mekanism.common.RobitAIFollow; @@ -21,7 +17,7 @@ import mekanism.common.item.ItemConfigurator; import mekanism.common.item.ItemRobit; import mekanism.common.tile.TileEntityChargepad; import mekanism.common.util.MekanismUtils; -import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable; + import net.minecraft.entity.EntityCreature; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.EntityAILookIdle; @@ -43,8 +39,11 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.util.Constants; import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.Method; + import cofh.api.energy.IEnergyContainerItem; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; +import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable; @Interface(iface = "micdoodle8.mods.galacticraft.api.entity.IEntityBreathable", modid = "Galacticraft API") public class EntityRobit extends EntityCreature implements IInventory, ISustainedInventory, IEntityBreathable diff --git a/src/main/java/mekanism/common/integration/IC2ItemManager.java b/src/main/java/mekanism/common/integration/IC2ItemManager.java index 7e4ae13f8..5c4031437 100644 --- a/src/main/java/mekanism/common/integration/IC2ItemManager.java +++ b/src/main/java/mekanism/common/integration/IC2ItemManager.java @@ -1,13 +1,13 @@ package mekanism.common.integration; -import ic2.api.item.IElectricItemManager; - import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; +import ic2.api.item.IElectricItemManager; + public class IC2ItemManager implements IElectricItemManager { public IEnergizedItem energizedItem; diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index ed0a1f55a..7f2cca45d 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -9,6 +9,7 @@ import mekanism.common.MekanismItems; import mekanism.common.block.BlockMachine; import mekanism.common.recipe.RecipeHandler; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -18,6 +19,7 @@ import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.common.event.FMLInterModComms; + import dan200.computercraft.api.ComputerCraftAPI; import ic2.api.recipe.IRecipeInput; import ic2.api.recipe.RecipeInputItemStack; diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index 5f25a4e87..8d795da1d 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -1,8 +1,5 @@ package mekanism.common.integration; -import ic2.api.recipe.RecipeInputOreDict; -import ic2.api.recipe.Recipes; - import java.util.ArrayList; import mekanism.api.gas.GasRegistry; @@ -19,6 +16,7 @@ import mekanism.common.MekanismItems; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -30,6 +28,9 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.Optional.Method; +import ic2.api.recipe.RecipeInputOreDict; +import ic2.api.recipe.Recipes; + public final class OreDictManager { public static void init() diff --git a/src/main/java/mekanism/common/inventory/InventoryBin.java b/src/main/java/mekanism/common/inventory/InventoryBin.java index 1ce4c1e39..a56ae67fc 100644 --- a/src/main/java/mekanism/common/inventory/InventoryBin.java +++ b/src/main/java/mekanism/common/inventory/InventoryBin.java @@ -2,6 +2,7 @@ package mekanism.common.inventory; import mekanism.api.util.StackUtils; import mekanism.common.item.ItemBlockBasic; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/inventory/InventoryElectricChest.java b/src/main/java/mekanism/common/inventory/InventoryElectricChest.java index 5de410c4a..c12dcb6a0 100644 --- a/src/main/java/mekanism/common/inventory/InventoryElectricChest.java +++ b/src/main/java/mekanism/common/inventory/InventoryElectricChest.java @@ -2,6 +2,7 @@ package mekanism.common.inventory; import mekanism.common.base.IElectricChest; import mekanism.common.base.ISustainedInventory; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.InventoryBasic; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java index 5125ce8b4..9f4bdf5f2 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java @@ -7,6 +7,7 @@ import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java index 4aee40228..14c224245 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java @@ -5,6 +5,7 @@ import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.recipe.RecipeHandler; import mekanism.common.tile.TileEntityChanceMachine; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java index fab2cfbaa..551843237 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java @@ -6,6 +6,7 @@ import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.tile.TileEntityChemicalCrystallizer; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java index 7c362ee91..aed3f3689 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java @@ -7,6 +7,7 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.tile.TileEntityChemicalDissolutionChamber; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java index 819f26cb8..508d48434 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java @@ -5,6 +5,7 @@ import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java index aa399dc73..8f0cde358 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java @@ -7,6 +7,7 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java index f715faee0..8770f3bc2 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java @@ -6,6 +6,7 @@ import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.tile.TileEntityChemicalWasher; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java b/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java index a2f1ecbd7..864104316 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java @@ -3,6 +3,7 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java b/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java index 2102eae2f..93057f6c9 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java @@ -2,6 +2,7 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntityDynamicTank; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricChest.java b/src/main/java/mekanism/common/inventory/container/ContainerElectricChest.java index 21651d283..4bfcb5548 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricChest.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectricChest.java @@ -1,12 +1,12 @@ package mekanism.common.inventory.container; -import invtweaks.api.container.ChestContainer; import mekanism.common.base.IElectricChest; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.slot.SlotElectricChest; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -14,6 +14,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import invtweaks.api.container.ChestContainer; + @ChestContainer(isLargeChest=true) public class ContainerElectricChest extends Container { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java index 4045db1d6..798ff549c 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java @@ -5,6 +5,7 @@ import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.recipe.RecipeHandler; import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java b/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java index f47acc965..bf5a39c4e 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java @@ -4,6 +4,7 @@ import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java b/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java index b2e8e301c..c1a7c5192 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java @@ -7,6 +7,7 @@ import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.recipe.RecipeHandler; import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java b/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java index b545ba3e1..a31c05dfb 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java @@ -1,6 +1,5 @@ package mekanism.common.inventory.container; -import ic2.api.item.IElectricItem; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.tile.TileEntityEnergyCube; @@ -14,6 +13,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import ic2.api.item.IElectricItem; + public class ContainerEnergyCube extends Container { private TileEntityEnergyCube tileEntity; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFactory.java b/src/main/java/mekanism/common/inventory/container/ContainerFactory.java index 9304b14be..feec0d29c 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFactory.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFactory.java @@ -8,6 +8,7 @@ import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.item.ItemBlockMachine; import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFilter.java b/src/main/java/mekanism/common/inventory/container/ContainerFilter.java index ff4ad72bb..c8b11d4d9 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFilter.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFilter.java @@ -1,6 +1,7 @@ package mekanism.common.inventory.container; import mekanism.common.tile.TileEntityContainerBlock; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java b/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java index 4306c04a1..9e41d5785 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java @@ -4,6 +4,7 @@ import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java b/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java index 8f9283952..cafbf2e18 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java @@ -3,6 +3,7 @@ package mekanism.common.inventory.container; import mekanism.api.gas.IGasItem; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.tile.TileEntityGasTank; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerLaserAmplifier.java b/src/main/java/mekanism/common/inventory/container/ContainerLaserAmplifier.java index 8984ef879..e6886a12a 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerLaserAmplifier.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerLaserAmplifier.java @@ -1,16 +1,11 @@ package mekanism.common.inventory.container; -import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; -import mekanism.common.inventory.slot.SlotOutput; -import mekanism.common.recipe.RecipeHandler; -import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.tile.TileEntityLaserAmplifier; -import mekanism.common.util.ChargeUtils; + 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; public class ContainerLaserAmplifier extends Container { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java b/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java index 74774f4c6..e671865b4 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java @@ -8,6 +8,7 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerNull.java b/src/main/java/mekanism/common/inventory/container/ContainerNull.java index eb8b6ed52..e330bc472 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerNull.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerNull.java @@ -1,6 +1,7 @@ package mekanism.common.inventory.container; import mekanism.common.tile.TileEntityContainerBlock; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerPRC.java b/src/main/java/mekanism/common/inventory/container/ContainerPRC.java index 02c2e6808..4d11ea3f1 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerPRC.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerPRC.java @@ -5,6 +5,7 @@ import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.recipe.RecipeHandler; import mekanism.common.tile.TileEntityPRC; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java b/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java index bb4b1a9bd..a1efb2434 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java @@ -2,6 +2,7 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntityPortableTank; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java index 92d44b6be..57cf97c55 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java @@ -1,6 +1,7 @@ package mekanism.common.inventory.container; import mekanism.common.entity.EntityRobit; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java index f0db34ebe..ae76b9b29 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java @@ -2,6 +2,7 @@ package mekanism.common.inventory.container; import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java index acff166b5..543018c05 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java @@ -1,6 +1,7 @@ package mekanism.common.inventory.container; import mekanism.common.entity.EntityRobit; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java b/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java index bda6cdb44..dbae9eac6 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java @@ -6,6 +6,7 @@ import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerSalinationController.java b/src/main/java/mekanism/common/inventory/container/ContainerSalinationController.java index 3bc87aa20..aa3bf9759 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerSalinationController.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerSalinationController.java @@ -2,6 +2,7 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntitySalinationController; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java b/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java index 5b9677253..1cc6acc99 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java @@ -3,6 +3,7 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java b/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java index b4ea02a91..e2f2e26f6 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java @@ -3,6 +3,7 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java b/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java index 977a9bca6..9507478d9 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java @@ -4,6 +4,7 @@ import mekanism.common.base.IUpgradeItem; import mekanism.common.base.IUpgradeTile; import mekanism.common.inventory.slot.SlotMachineUpgrade; import mekanism.common.tile.TileEntityContainerBlock; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/slot/SlotElectricChest.java b/src/main/java/mekanism/common/inventory/slot/SlotElectricChest.java index 0cdd623ad..dd6b157ee 100644 --- a/src/main/java/mekanism/common/inventory/slot/SlotElectricChest.java +++ b/src/main/java/mekanism/common/inventory/slot/SlotElectricChest.java @@ -2,6 +2,7 @@ package mekanism.common.inventory.slot; import mekanism.common.base.IElectricChest; import mekanism.common.block.BlockMachine.MachineType; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/src/main/java/mekanism/common/inventory/slot/SlotEnergy.java b/src/main/java/mekanism/common/inventory/slot/SlotEnergy.java index 370bcc29e..b860ff6b6 100644 --- a/src/main/java/mekanism/common/inventory/slot/SlotEnergy.java +++ b/src/main/java/mekanism/common/inventory/slot/SlotEnergy.java @@ -1,6 +1,7 @@ package mekanism.common.inventory.slot; import mekanism.common.util.ChargeUtils; + import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/inventory/slot/SlotMachineUpgrade.java b/src/main/java/mekanism/common/inventory/slot/SlotMachineUpgrade.java index 3b2882ee4..97b75d886 100644 --- a/src/main/java/mekanism/common/inventory/slot/SlotMachineUpgrade.java +++ b/src/main/java/mekanism/common/inventory/slot/SlotMachineUpgrade.java @@ -1,6 +1,7 @@ package mekanism.common.inventory.slot; import mekanism.common.base.IUpgradeItem; + import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/inventory/slot/SlotStorageTank.java b/src/main/java/mekanism/common/inventory/slot/SlotStorageTank.java index eed145d7b..a2348dd38 100644 --- a/src/main/java/mekanism/common/inventory/slot/SlotStorageTank.java +++ b/src/main/java/mekanism/common/inventory/slot/SlotStorageTank.java @@ -5,6 +5,7 @@ import java.util.Collections; import mekanism.api.gas.Gas; import mekanism.api.gas.IGasItem; + import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index 64c127ddc..1922bdb3e 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -10,6 +10,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.util.ListUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/mekanism/common/item/ItemBalloon.java b/src/main/java/mekanism/common/item/ItemBalloon.java index 50c697ce2..190201869 100644 --- a/src/main/java/mekanism/common/item/ItemBalloon.java +++ b/src/main/java/mekanism/common/item/ItemBalloon.java @@ -7,6 +7,7 @@ import mekanism.api.EnumColor; import mekanism.api.Pos3D; import mekanism.common.entity.EntityBalloon; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.BlockDispenser; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 96b26c78c..84624fef8 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -6,6 +6,7 @@ import mekanism.api.EnumColor; import mekanism.common.MekanismBlocks; import mekanism.common.inventory.InventoryBin; import mekanism.common.tile.TileEntityBin; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java index 208900fed..6f3606e7a 100644 --- a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java +++ b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java @@ -9,6 +9,7 @@ import mekanism.common.block.BlockCardboardBox.BlockData; import mekanism.common.tile.TileEntityCardboardBox; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index abd01a756..ee145035a 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -1,8 +1,5 @@ package mekanism.common.item; -import ic2.api.item.IElectricItemManager; -import ic2.api.item.ISpecialElectricItem; - import java.util.ArrayList; import java.util.List; @@ -20,6 +17,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -29,16 +27,18 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants.NBT; - -import org.lwjgl.input.Keyboard; - -import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.input.Keyboard; + +import cofh.api.energy.IEnergyContainerItem; +import ic2.api.item.IElectricItemManager; +import ic2.api.item.ISpecialElectricItem; + @InterfaceList({ @Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHAPI|energy"), @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2API") diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 89de7d86d..6ac4ae6ac 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -12,6 +12,7 @@ import mekanism.common.base.ISustainedInventory; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 791d548d1..b3de9dd35 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -1,10 +1,5 @@ package mekanism.common.item; -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; -import ic2.api.item.IElectricItemManager; -import ic2.api.item.ISpecialElectricItem; - import java.util.List; import java.util.Map; @@ -20,11 +15,11 @@ import mekanism.common.base.IElectricChest; import mekanism.common.base.IFactory; import mekanism.common.base.IInvConfiguration; import mekanism.common.base.IRedstoneControl; +import mekanism.common.base.IRedstoneControl.RedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ISustainedTank; import mekanism.common.base.IUpgradeTile; -import mekanism.common.base.IRedstoneControl.RedstoneControl; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.integration.IC2ItemManager; import mekanism.common.inventory.InventoryElectricChest; @@ -37,6 +32,7 @@ import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityPortableTank; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; @@ -57,16 +53,20 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; - -import org.lwjgl.input.Keyboard; - -import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.input.Keyboard; + +import cofh.api.energy.IEnergyContainerItem; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; +import ic2.api.item.IElectricItemManager; +import ic2.api.item.ISpecialElectricItem; + /** * Item class for handling multiple machine block IDs. * 0:0: Enrichment Chamber diff --git a/src/main/java/mekanism/common/item/ItemBlockOre.java b/src/main/java/mekanism/common/item/ItemBlockOre.java index 50b7c7209..3e2fd2d48 100644 --- a/src/main/java/mekanism/common/item/ItemBlockOre.java +++ b/src/main/java/mekanism/common/item/ItemBlockOre.java @@ -4,17 +4,17 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; - -import org.lwjgl.input.Keyboard; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.input.Keyboard; + /** * Item class for handling multiple ore block IDs. * 0: Osmium Ore diff --git a/src/main/java/mekanism/common/item/ItemBlockPlastic.java b/src/main/java/mekanism/common/item/ItemBlockPlastic.java index 1816b3390..5d3eb309d 100644 --- a/src/main/java/mekanism/common/item/ItemBlockPlastic.java +++ b/src/main/java/mekanism/common/item/ItemBlockPlastic.java @@ -1,6 +1,7 @@ package mekanism.common.item; import mekanism.api.EnumColor; + import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/item/ItemClump.java b/src/main/java/mekanism/common/item/ItemClump.java index cf416027f..3dd70440e 100644 --- a/src/main/java/mekanism/common/item/ItemClump.java +++ b/src/main/java/mekanism/common/item/ItemClump.java @@ -4,6 +4,7 @@ import java.util.List; import mekanism.common.Mekanism; import mekanism.common.Resource; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index c6ccb2a26..ab80ca976 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -16,6 +16,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -26,10 +27,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.tools.IToolWrench; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; +import buildcraft.api.tools.IToolWrench; + @Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraftAPI|tools") public class ItemConfigurator extends ItemEnergized implements IMekWrench, IToolWrench { diff --git a/src/main/java/mekanism/common/item/ItemControlCircuit.java b/src/main/java/mekanism/common/item/ItemControlCircuit.java index 5d8d94c08..531b57c59 100644 --- a/src/main/java/mekanism/common/item/ItemControlCircuit.java +++ b/src/main/java/mekanism/common/item/ItemControlCircuit.java @@ -4,6 +4,7 @@ import java.util.List; import mekanism.common.Mekanism; import mekanism.common.Tier.BaseTier; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemCrystal.java b/src/main/java/mekanism/common/item/ItemCrystal.java index 7cce13099..a3ae6e58a 100644 --- a/src/main/java/mekanism/common/item/ItemCrystal.java +++ b/src/main/java/mekanism/common/item/ItemCrystal.java @@ -4,6 +4,7 @@ import java.util.List; import mekanism.common.Mekanism; import mekanism.common.Resource; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemDictionary.java b/src/main/java/mekanism/common/item/ItemDictionary.java index 217c8af08..2f8af5b31 100644 --- a/src/main/java/mekanism/common/item/ItemDictionary.java +++ b/src/main/java/mekanism/common/item/ItemDictionary.java @@ -5,6 +5,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/item/ItemDirtyDust.java b/src/main/java/mekanism/common/item/ItemDirtyDust.java index 31c2b284b..8805a6854 100644 --- a/src/main/java/mekanism/common/item/ItemDirtyDust.java +++ b/src/main/java/mekanism/common/item/ItemDirtyDust.java @@ -4,6 +4,7 @@ import java.util.List; import mekanism.common.Mekanism; import mekanism.common.Resource; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemDust.java b/src/main/java/mekanism/common/item/ItemDust.java index c73d13e28..4a7824848 100644 --- a/src/main/java/mekanism/common/item/ItemDust.java +++ b/src/main/java/mekanism/common/item/ItemDust.java @@ -3,6 +3,7 @@ package mekanism.common.item; import java.util.List; import mekanism.common.Mekanism; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemElectricBow.java b/src/main/java/mekanism/common/item/ItemElectricBow.java index 21441cfd2..124109aa7 100644 --- a/src/main/java/mekanism/common/item/ItemElectricBow.java +++ b/src/main/java/mekanism/common/item/ItemElectricBow.java @@ -5,6 +5,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index 1d62f4a0f..6eff56f21 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -1,8 +1,5 @@ package mekanism.common.item; -import ic2.api.item.IElectricItemManager; -import ic2.api.item.ISpecialElectricItem; - import java.util.List; import mekanism.api.EnumColor; @@ -11,6 +8,7 @@ import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; import mekanism.common.integration.IC2ItemManager; import mekanism.common.util.MekanismUtils; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -21,6 +19,8 @@ import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; import cofh.api.energy.IEnergyContainerItem; +import ic2.api.item.IElectricItemManager; +import ic2.api.item.ISpecialElectricItem; @InterfaceList({ @Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHAPI|energy"), diff --git a/src/main/java/mekanism/common/item/ItemFilterCard.java b/src/main/java/mekanism/common/item/ItemFilterCard.java index fb366245e..d5f20c75b 100644 --- a/src/main/java/mekanism/common/item/ItemFilterCard.java +++ b/src/main/java/mekanism/common/item/ItemFilterCard.java @@ -5,6 +5,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.api.IFilterAccess; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/item/ItemFlamethrower.java b/src/main/java/mekanism/common/item/ItemFlamethrower.java index f78519cb7..17831e733 100644 --- a/src/main/java/mekanism/common/item/ItemFlamethrower.java +++ b/src/main/java/mekanism/common/item/ItemFlamethrower.java @@ -6,6 +6,7 @@ import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index c82f0cbe3..cb05f58ad 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -1,8 +1,5 @@ package mekanism.common.item; -import ic2.api.item.IElectricItemManager; -import ic2.api.item.ISpecialElectricItem; - import java.util.List; import mekanism.api.EnumColor; @@ -13,6 +10,7 @@ import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; import mekanism.common.integration.IC2ItemManager; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -24,11 +22,8 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.entity.living.LivingAttackEvent; -import cofh.api.energy.IEnergyContainerItem; - import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; @@ -36,6 +31,10 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import cofh.api.energy.IEnergyContainerItem; +import ic2.api.item.IElectricItemManager; +import ic2.api.item.ISpecialElectricItem; + @InterfaceList({ @Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHAPI|energy"), @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2API") diff --git a/src/main/java/mekanism/common/item/ItemGasMask.java b/src/main/java/mekanism/common/item/ItemGasMask.java index 72017a512..e647f251c 100644 --- a/src/main/java/mekanism/common/item/ItemGasMask.java +++ b/src/main/java/mekanism/common/item/ItemGasMask.java @@ -3,6 +3,7 @@ package mekanism.common.item; import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; + import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -10,7 +11,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.entity.living.LivingAttackEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/mekanism/common/item/ItemHDPE.java b/src/main/java/mekanism/common/item/ItemHDPE.java index 068e42271..5badc57f0 100644 --- a/src/main/java/mekanism/common/item/ItemHDPE.java +++ b/src/main/java/mekanism/common/item/ItemHDPE.java @@ -3,6 +3,7 @@ package mekanism.common.item; import java.util.List; import mekanism.common.Mekanism; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemIngot.java b/src/main/java/mekanism/common/item/ItemIngot.java index 1679b8ab1..1323dda65 100644 --- a/src/main/java/mekanism/common/item/ItemIngot.java +++ b/src/main/java/mekanism/common/item/ItemIngot.java @@ -3,6 +3,7 @@ package mekanism.common.item; import java.util.List; import mekanism.common.Mekanism; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemJetpack.java b/src/main/java/mekanism/common/item/ItemJetpack.java index a5a2f19b8..912c0e7a2 100644 --- a/src/main/java/mekanism/common/item/ItemJetpack.java +++ b/src/main/java/mekanism/common/item/ItemJetpack.java @@ -12,6 +12,7 @@ import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; import mekanism.common.MekanismItems; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/mekanism/common/item/ItemMekanism.java b/src/main/java/mekanism/common/item/ItemMekanism.java index b7156ebff..81cd58200 100644 --- a/src/main/java/mekanism/common/item/ItemMekanism.java +++ b/src/main/java/mekanism/common/item/ItemMekanism.java @@ -1,6 +1,7 @@ package mekanism.common.item; import mekanism.common.Mekanism; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemNetworkReader.java b/src/main/java/mekanism/common/item/ItemNetworkReader.java index 2438925e5..5b26e5cfb 100644 --- a/src/main/java/mekanism/common/item/ItemNetworkReader.java +++ b/src/main/java/mekanism/common/item/ItemNetworkReader.java @@ -9,6 +9,7 @@ import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.ITransmitterNetwork; import mekanism.api.transmitters.TransmitterNetworkRegistry; import mekanism.common.Mekanism; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java index 1b962bb28..71d19bb1d 100644 --- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java +++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java @@ -4,6 +4,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/item/ItemProxy.java b/src/main/java/mekanism/common/item/ItemProxy.java index efb7bb841..afa8dbda8 100644 --- a/src/main/java/mekanism/common/item/ItemProxy.java +++ b/src/main/java/mekanism/common/item/ItemProxy.java @@ -1,6 +1,5 @@ package mekanism.common.item; -import mekanism.common.Mekanism; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/common/item/ItemRobit.java b/src/main/java/mekanism/common/item/ItemRobit.java index 152375752..7a830f887 100644 --- a/src/main/java/mekanism/common/item/ItemRobit.java +++ b/src/main/java/mekanism/common/item/ItemRobit.java @@ -8,6 +8,7 @@ import mekanism.common.base.ISustainedInventory; import mekanism.common.entity.EntityRobit; import mekanism.common.tile.TileEntityChargepad; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/item/ItemScubaTank.java b/src/main/java/mekanism/common/item/ItemScubaTank.java index 7a830ed55..bbbe27b33 100644 --- a/src/main/java/mekanism/common/item/ItemScubaTank.java +++ b/src/main/java/mekanism/common/item/ItemScubaTank.java @@ -11,6 +11,7 @@ import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/mekanism/common/item/ItemSeismicReader.java b/src/main/java/mekanism/common/item/ItemSeismicReader.java index 09b53ee2c..4244bb50c 100644 --- a/src/main/java/mekanism/common/item/ItemSeismicReader.java +++ b/src/main/java/mekanism/common/item/ItemSeismicReader.java @@ -4,6 +4,7 @@ import mekanism.api.Chunk3D; import mekanism.api.EnumColor; import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentText; diff --git a/src/main/java/mekanism/common/item/ItemShard.java b/src/main/java/mekanism/common/item/ItemShard.java index ca372a484..9b1624552 100644 --- a/src/main/java/mekanism/common/item/ItemShard.java +++ b/src/main/java/mekanism/common/item/ItemShard.java @@ -4,6 +4,7 @@ import java.util.List; import mekanism.common.Mekanism; import mekanism.common.Resource; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemUpgrade.java b/src/main/java/mekanism/common/item/ItemUpgrade.java index abcf2a801..8ef86e8b2 100644 --- a/src/main/java/mekanism/common/item/ItemUpgrade.java +++ b/src/main/java/mekanism/common/item/ItemUpgrade.java @@ -2,17 +2,17 @@ package mekanism.common.item; import java.util.List; -import org.lwjgl.input.Keyboard; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.EnumColor; import mekanism.common.Upgrade; import mekanism.common.base.IUpgradeItem; -import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +import org.lwjgl.input.Keyboard; public class ItemUpgrade extends ItemMekanism implements IUpgradeItem { diff --git a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java index 3b0faecb6..89402f7da 100644 --- a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java +++ b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java @@ -4,6 +4,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/multiblock/MultiblockCache.java b/src/main/java/mekanism/common/multiblock/MultiblockCache.java index c4b653fd0..df3f56388 100644 --- a/src/main/java/mekanism/common/multiblock/MultiblockCache.java +++ b/src/main/java/mekanism/common/multiblock/MultiblockCache.java @@ -3,6 +3,7 @@ package mekanism.common.multiblock; import java.util.HashSet; import mekanism.api.Coord4D; + import net.minecraft.nbt.NBTTagCompound; public abstract class MultiblockCache diff --git a/src/main/java/mekanism/common/multiblock/MultiblockManager.java b/src/main/java/mekanism/common/multiblock/MultiblockManager.java index 7b2b63ee3..fa4e30075 100644 --- a/src/main/java/mekanism/common/multiblock/MultiblockManager.java +++ b/src/main/java/mekanism/common/multiblock/MultiblockManager.java @@ -8,6 +8,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.common.tile.TileEntityMultiblock; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/multiblock/SynchronizedData.java b/src/main/java/mekanism/common/multiblock/SynchronizedData.java index 5400f2a30..f3ffed487 100644 --- a/src/main/java/mekanism/common/multiblock/SynchronizedData.java +++ b/src/main/java/mekanism/common/multiblock/SynchronizedData.java @@ -4,6 +4,7 @@ import java.util.HashSet; import java.util.Set; import mekanism.api.Coord4D; + import net.minecraft.item.ItemStack; public abstract class SynchronizedData diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index 3cc49854f..5b8770d70 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -8,6 +8,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.common.Mekanism; import mekanism.common.tile.TileEntityMultiblock; + import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java index 051834121..5b182216f 100644 --- a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java @@ -4,6 +4,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.Mekanism; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -11,6 +12,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.microblock.HollowMicroblock; @@ -18,9 +22,6 @@ import codechicken.multipart.JItemMultiPart; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - public class ItemGlowPanel extends JItemMultiPart { public ItemGlowPanel() diff --git a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java index 7e032b7e2..b565cabf8 100644 --- a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java @@ -11,6 +11,7 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.Tier; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -19,6 +20,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; @@ -26,8 +29,6 @@ import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.multipart.JItemMultiPart; import codechicken.multipart.TMultiPart; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemPartTransmitter extends JItemMultiPart { diff --git a/src/main/java/mekanism/common/multipart/MultipartMekanism.java b/src/main/java/mekanism/common/multipart/MultipartMekanism.java index ed152585b..5de292635 100644 --- a/src/main/java/mekanism/common/multipart/MultipartMekanism.java +++ b/src/main/java/mekanism/common/multipart/MultipartMekanism.java @@ -3,16 +3,19 @@ package mekanism.common.multipart; import mekanism.common.MekanismBlocks; import mekanism.common.Tier; import mekanism.common.block.BlockMachine.MachineType; + import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.event.FMLInterModComms; + import codechicken.microblock.BlockMicroMaterial; import codechicken.microblock.MicroMaterialRegistry; import codechicken.multipart.MultiPartRegistry; import codechicken.multipart.MultiPartRegistry.IPartFactory; import codechicken.multipart.MultipartGenerator; import codechicken.multipart.TMultiPart; -import cpw.mods.fml.common.event.FMLInterModComms; -import static mekanism.common.block.BlockMachine.MachineBlock.*; +import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_1; +import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_2; public class MultipartMekanism implements IPartFactory { diff --git a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java index d7794a005..29f30dd0e 100644 --- a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java @@ -1,7 +1,5 @@ package mekanism.common.multipart; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -11,12 +9,15 @@ import mekanism.common.Mekanism; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class PartDiversionTransporter extends PartLogisticalTransporter { public int[] modes = {0, 0, 0, 0, 0, 0}; diff --git a/src/main/java/mekanism/common/multipart/PartGlowPanel.java b/src/main/java/mekanism/common/multipart/PartGlowPanel.java index 64200f982..34f7f3ffe 100644 --- a/src/main/java/mekanism/common/multipart/PartGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/PartGlowPanel.java @@ -13,6 +13,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.lib.vec.Cuboid6; @@ -27,8 +30,6 @@ import codechicken.multipart.JNormalOcclusion; import codechicken.multipart.NormalOcclusionTest; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class PartGlowPanel extends JCuboidPart implements JNormalOcclusion, JIconHitEffects { diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java index b23dc15c3..9a5394fd3 100644 --- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java @@ -1,7 +1,5 @@ package mekanism.common.multipart; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.HashSet; import java.util.Set; @@ -27,6 +25,7 @@ import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -38,14 +37,17 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.transport.IPipeTile; -import buildcraft.api.transport.PipeWire; -import codechicken.lib.vec.Vector3; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; + +import buildcraft.api.transport.IPipeTile; +import buildcraft.api.transport.PipeWire; +import codechicken.lib.vec.Vector3; + @Interface(iface = "buildcraft.api.transport.IPipeTile", modid = "BuildCraftAPI|transport") public class PartLogisticalTransporter extends PartTransmitter implements ILogisticalTransporter, IPipeTile { diff --git a/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java b/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java index e17056f3f..c691f6ae8 100644 --- a/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java +++ b/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java @@ -9,6 +9,7 @@ import mekanism.common.FluidNetwork; import mekanism.common.Tier; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -20,10 +21,11 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import codechicken.lib.vec.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.vec.Vector3; + public class PartMechanicalPipe extends PartTransmitter implements IFluidHandler { public Tier.PipeTier tier; diff --git a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java index 3e81b7477..f796dc28f 100644 --- a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java +++ b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java @@ -10,17 +10,18 @@ import mekanism.api.gas.IGasHandler; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; import mekanism.client.render.RenderPartTransmitter; -import mekanism.common.multipart.PartSidedPipe.ConnectionType; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; -import codechicken.lib.vec.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.vec.Vector3; + public class PartPressurizedTube extends PartTransmitter implements IGasHandler { public static TransmitterIcons tubeIcons = new TransmitterIcons(1, 2); diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index 16940aede..684e692ec 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -1,7 +1,5 @@ package mekanism.common.multipart; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -20,7 +18,6 @@ import mekanism.client.render.RenderPartTransmitter; import mekanism.common.MekanismItems; import mekanism.common.Tier; import mekanism.common.base.ITileNetwork; -import mekanism.common.item.ItemConfigurator; import mekanism.common.multipart.TransmitterType.Size; import mekanism.common.util.MekanismUtils; @@ -33,7 +30,11 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.tools.IToolWrench; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +import io.netty.buffer.ByteBuf; + import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.lib.raytracer.ExtendedMOP; @@ -51,9 +52,6 @@ import codechicken.multipart.NormalOcclusionTest; import codechicken.multipart.PartMap; import codechicken.multipart.TMultiPart; import codechicken.multipart.TSlottedPart; -import cpw.mods.fml.common.ModAPIManager; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, JNormalOcclusion, ISidedHollowConnect, JIconHitEffects, ITileNetwork, IBlockableConnection, IConfigurable, ITransmitter, INeighborTileChange { diff --git a/src/main/java/mekanism/common/multipart/PartTransmitter.java b/src/main/java/mekanism/common/multipart/PartTransmitter.java index b57d5aa0c..1b5b3823f 100644 --- a/src/main/java/mekanism/common/multipart/PartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/PartTransmitter.java @@ -12,8 +12,10 @@ import mekanism.client.ClientTickHandler; import mekanism.common.Mekanism; import mekanism.common.network.PacketTransmitterUpdate.PacketType; import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage; + import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; + import codechicken.multipart.TileMultipart; public abstract class PartTransmitter> extends PartSidedPipe implements IGridTransmitter diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index 2c4a9dfbf..b05601669 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -1,7 +1,5 @@ package mekanism.common.multipart; -import ic2.api.energy.tile.IEnergySource; - import java.util.List; import java.util.Set; @@ -15,23 +13,26 @@ import mekanism.common.EnergyNetwork; import mekanism.common.Tier; import mekanism.common.util.CableUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.power.IPowerReceptor; -import buildcraft.api.power.PowerHandler; -import buildcraft.api.power.PowerHandler.PowerReceiver; -import codechicken.lib.vec.Vector3; -import cofh.api.energy.IEnergyHandler; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import buildcraft.api.power.IPowerReceptor; +import buildcraft.api.power.PowerHandler; +import buildcraft.api.power.PowerHandler.PowerReceiver; +import codechicken.lib.vec.Vector3; +import cofh.api.energy.IEnergyHandler; +import ic2.api.energy.tile.IEnergySource; + @InterfaceList({ @Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHAPI|energy"), @Interface(iface = "buildcraft.api.power.IPowerReceptor", modid = "BuildCraftAPI|power"), diff --git a/src/main/java/mekanism/common/multipart/PlasticMicroMaterial.java b/src/main/java/mekanism/common/multipart/PlasticMicroMaterial.java index 70bf96d20..715fb696d 100644 --- a/src/main/java/mekanism/common/multipart/PlasticMicroMaterial.java +++ b/src/main/java/mekanism/common/multipart/PlasticMicroMaterial.java @@ -1,6 +1,7 @@ package mekanism.common.multipart; import net.minecraft.block.Block; + import codechicken.microblock.BlockMicroMaterial; public class PlasticMicroMaterial extends BlockMicroMaterial diff --git a/src/main/java/mekanism/common/multipart/TransmitterType.java b/src/main/java/mekanism/common/multipart/TransmitterType.java index 41a0527df..d466b9af4 100644 --- a/src/main/java/mekanism/common/multipart/TransmitterType.java +++ b/src/main/java/mekanism/common/multipart/TransmitterType.java @@ -1,6 +1,7 @@ package mekanism.common.multipart; import mekanism.api.transmitters.TransmissionType; + import net.minecraft.util.IIcon; diff --git a/src/main/java/mekanism/common/network/PacketBoxBlacklist.java b/src/main/java/mekanism/common/network/PacketBoxBlacklist.java index d291e7526..738da38f6 100644 --- a/src/main/java/mekanism/common/network/PacketBoxBlacklist.java +++ b/src/main/java/mekanism/common/network/PacketBoxBlacklist.java @@ -1,16 +1,17 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; - -import mekanism.api.util.BlockInfo; import mekanism.api.MekanismAPI; +import mekanism.api.util.BlockInfo; import mekanism.common.Mekanism; import mekanism.common.network.PacketBoxBlacklist.BoxBlacklistMessage; + import net.minecraft.block.Block; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketBoxBlacklist implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index e289aef40..f8060e4eb 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -1,16 +1,18 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; import mekanism.api.util.EnergyUtils.EnergyType; import mekanism.common.Mekanism; import mekanism.common.base.IModule; import mekanism.common.network.PacketConfigSync.ConfigSyncMessage; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketConfigSync implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index 761306ecf..f78a40567 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -1,7 +1,5 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -15,6 +13,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; @@ -23,6 +22,8 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketConfigurationUpdate implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketConfiguratorState.java b/src/main/java/mekanism/common/network/PacketConfiguratorState.java index 97da2433b..797419416 100644 --- a/src/main/java/mekanism/common/network/PacketConfiguratorState.java +++ b/src/main/java/mekanism/common/network/PacketConfiguratorState.java @@ -1,14 +1,16 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.common.PacketHandler; import mekanism.common.item.ItemConfigurator; import mekanism.common.network.PacketConfiguratorState.ConfiguratorStateMessage; + import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketConfiguratorState implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketContainerEditMode.java b/src/main/java/mekanism/common/network/PacketContainerEditMode.java index 5e72dfed1..8eee7ea6d 100644 --- a/src/main/java/mekanism/common/network/PacketContainerEditMode.java +++ b/src/main/java/mekanism/common/network/PacketContainerEditMode.java @@ -1,17 +1,19 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; import mekanism.common.base.IFluidContainerManager; import mekanism.common.network.PacketContainerEditMode.ContainerEditModeMessage; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketContainerEditMode implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketDataRequest.java b/src/main/java/mekanism/common/network/PacketDataRequest.java index c58b5e931..c4b635454 100644 --- a/src/main/java/mekanism/common/network/PacketDataRequest.java +++ b/src/main/java/mekanism/common/network/PacketDataRequest.java @@ -1,7 +1,5 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -13,6 +11,7 @@ import mekanism.common.base.ITileNetwork; import mekanism.common.network.PacketDataRequest.DataRequestMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityDynamicTank; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; @@ -22,6 +21,8 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketDataRequest implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketDigitUpdate.java b/src/main/java/mekanism/common/network/PacketDigitUpdate.java index ef7dc188d..853eec5a9 100644 --- a/src/main/java/mekanism/common/network/PacketDigitUpdate.java +++ b/src/main/java/mekanism/common/network/PacketDigitUpdate.java @@ -1,14 +1,16 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.common.PacketHandler; import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.network.PacketDigitUpdate.DigitUpdateMessage; + import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketDigitUpdate implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java index e92801c02..931d3b7d4 100644 --- a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java +++ b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java @@ -1,7 +1,5 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -21,6 +19,7 @@ import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.TileEntityDigitalMiner; + import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -33,6 +32,8 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; + public class PacketDigitalMinerGui implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketEditFilter.java b/src/main/java/mekanism/common/network/PacketEditFilter.java index 422a0dc95..49280a708 100644 --- a/src/main/java/mekanism/common/network/PacketEditFilter.java +++ b/src/main/java/mekanism/common/network/PacketEditFilter.java @@ -1,7 +1,5 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -13,6 +11,7 @@ import mekanism.common.network.PacketEditFilter.EditFilterMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.tile.TileEntityLogisticalSorter; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.world.World; @@ -21,6 +20,8 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketEditFilter implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketElectricBowState.java b/src/main/java/mekanism/common/network/PacketElectricBowState.java index 1c9b05569..10ab0c739 100644 --- a/src/main/java/mekanism/common/network/PacketElectricBowState.java +++ b/src/main/java/mekanism/common/network/PacketElectricBowState.java @@ -1,14 +1,16 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.common.PacketHandler; import mekanism.common.item.ItemElectricBow; import mekanism.common.network.PacketElectricBowState.ElectricBowStateMessage; + import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketElectricBowState implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketElectricChest.java b/src/main/java/mekanism/common/network/PacketElectricChest.java index 646970c10..032110c1a 100644 --- a/src/main/java/mekanism/common/network/PacketElectricChest.java +++ b/src/main/java/mekanism/common/network/PacketElectricChest.java @@ -1,6 +1,5 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; @@ -9,9 +8,9 @@ import mekanism.common.base.IElectricChest; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.InventoryElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; -import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -19,6 +18,8 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketElectricChest implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketFlamethrowerActive.java b/src/main/java/mekanism/common/network/PacketFlamethrowerActive.java index 79847b5d6..9f3b1b43e 100644 --- a/src/main/java/mekanism/common/network/PacketFlamethrowerActive.java +++ b/src/main/java/mekanism/common/network/PacketFlamethrowerActive.java @@ -1,17 +1,16 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.item.ItemJetpack; import mekanism.common.network.PacketFlamethrowerActive.FlamethrowerActiveMessage; -import mekanism.common.network.PacketJetpackData.JetpackPacket; + import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketFlamethrowerActive implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketJetpackData.java b/src/main/java/mekanism/common/network/PacketJetpackData.java index 7f1de1a51..ccd5cf1cc 100644 --- a/src/main/java/mekanism/common/network/PacketJetpackData.java +++ b/src/main/java/mekanism/common/network/PacketJetpackData.java @@ -1,17 +1,19 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemJetpack.JetpackMode; import mekanism.common.network.PacketJetpackData.JetpackDataMessage; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketJetpackData implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketKey.java b/src/main/java/mekanism/common/network/PacketKey.java index 05fad0273..d700a6932 100644 --- a/src/main/java/mekanism/common/network/PacketKey.java +++ b/src/main/java/mekanism/common/network/PacketKey.java @@ -1,13 +1,15 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.network.PacketKey.KeyMessage; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketKey implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java index 5250048ee..a5dcb9ac4 100644 --- a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java +++ b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java @@ -1,6 +1,5 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.client.gui.GuiLogisticalSorter; import mekanism.client.gui.GuiTFilterSelect; @@ -15,6 +14,7 @@ import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.TileEntityLogisticalSorter; + import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -27,6 +27,8 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; + public class PacketLogisticalSorterGui implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketNewFilter.java b/src/main/java/mekanism/common/network/PacketNewFilter.java index 0781a3b4c..8b7991e42 100644 --- a/src/main/java/mekanism/common/network/PacketNewFilter.java +++ b/src/main/java/mekanism/common/network/PacketNewFilter.java @@ -1,7 +1,5 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -13,6 +11,7 @@ import mekanism.common.network.PacketNewFilter.NewFilterMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.tile.TileEntityLogisticalSorter; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.world.World; @@ -21,6 +20,8 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketNewFilter implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketPortableTankState.java b/src/main/java/mekanism/common/network/PacketPortableTankState.java index c04a30158..28069cde4 100644 --- a/src/main/java/mekanism/common/network/PacketPortableTankState.java +++ b/src/main/java/mekanism/common/network/PacketPortableTankState.java @@ -1,14 +1,16 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.common.PacketHandler; import mekanism.common.item.ItemBlockMachine; import mekanism.common.network.PacketPortableTankState.PortableTankStateMessage; + import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketPortableTankState implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketPortableTeleport.java b/src/main/java/mekanism/common/network/PacketPortableTeleport.java index 08bcd3cf8..1ae6852c6 100644 --- a/src/main/java/mekanism/common/network/PacketPortableTeleport.java +++ b/src/main/java/mekanism/common/network/PacketPortableTeleport.java @@ -1,6 +1,5 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; @@ -12,6 +11,7 @@ import mekanism.common.network.PacketPortableTeleport.PortableTeleportMessage; import mekanism.common.network.PacketPortalFX.PortalFXMessage; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -22,6 +22,8 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketPortableTeleport implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketPortalFX.java b/src/main/java/mekanism/common/network/PacketPortalFX.java index 0ed7b2fe4..da959db99 100644 --- a/src/main/java/mekanism/common/network/PacketPortalFX.java +++ b/src/main/java/mekanism/common/network/PacketPortalFX.java @@ -1,17 +1,18 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; - import java.util.Random; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; import mekanism.common.network.PacketPortalFX.PortalFXMessage; + import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketPortalFX implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketRedstoneControl.java b/src/main/java/mekanism/common/network/PacketRedstoneControl.java index 358bafb58..7c54789b0 100644 --- a/src/main/java/mekanism/common/network/PacketRedstoneControl.java +++ b/src/main/java/mekanism/common/network/PacketRedstoneControl.java @@ -1,17 +1,19 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.IRedstoneControl.RedstoneControl; import mekanism.common.network.PacketRedstoneControl.RedstoneControlMessage; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketRedstoneControl implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java b/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java index cf3fee070..2561a404b 100644 --- a/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java +++ b/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java @@ -1,20 +1,20 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; -import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.Upgrade; import mekanism.common.base.IUpgradeTile; import mekanism.common.network.PacketRemoveUpgrade.RemoveUpgradeMessage; import mekanism.common.tile.TileEntityBasicBlock; + import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketRemoveUpgrade implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketRobit.java b/src/main/java/mekanism/common/network/PacketRobit.java index bf5069455..77a6d09d3 100644 --- a/src/main/java/mekanism/common/network/PacketRobit.java +++ b/src/main/java/mekanism/common/network/PacketRobit.java @@ -1,15 +1,17 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.entity.EntityRobit; import mekanism.common.network.PacketRobit.RobitMessage; + import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketRobit implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketScubaTankData.java b/src/main/java/mekanism/common/network/PacketScubaTankData.java index a44ffbb36..82c2a4500 100644 --- a/src/main/java/mekanism/common/network/PacketScubaTankData.java +++ b/src/main/java/mekanism/common/network/PacketScubaTankData.java @@ -1,16 +1,18 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.item.ItemScubaTank; import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketScubaTankData implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketSimpleGui.java b/src/main/java/mekanism/common/network/PacketSimpleGui.java index 050c8b8d0..367d4f2bb 100644 --- a/src/main/java/mekanism/common/network/PacketSimpleGui.java +++ b/src/main/java/mekanism/common/network/PacketSimpleGui.java @@ -1,11 +1,11 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.tile.TileEntityBasicBlock; + import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -17,6 +17,8 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; + public class PacketSimpleGui implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketStatusUpdate.java b/src/main/java/mekanism/common/network/PacketStatusUpdate.java index 9d53843fa..a6cb005e6 100644 --- a/src/main/java/mekanism/common/network/PacketStatusUpdate.java +++ b/src/main/java/mekanism/common/network/PacketStatusUpdate.java @@ -1,14 +1,16 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.common.PacketHandler; import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.network.PacketStatusUpdate.StatusUpdateMessage; + import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketStatusUpdate implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketTileEntity.java b/src/main/java/mekanism/common/network/PacketTileEntity.java index 3f8f42de7..c569ed578 100644 --- a/src/main/java/mekanism/common/network/PacketTileEntity.java +++ b/src/main/java/mekanism/common/network/PacketTileEntity.java @@ -1,18 +1,19 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; import mekanism.common.base.ITileNetwork; import mekanism.common.network.PacketTileEntity.TileEntityMessage; + import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketTileEntity implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java index 9d2493179..2b9c4dfa7 100644 --- a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java +++ b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java @@ -1,6 +1,5 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasNetwork; @@ -12,6 +11,7 @@ import mekanism.common.EnergyNetwork; import mekanism.common.FluidNetwork; import mekanism.common.PacketHandler; import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.Fluid; @@ -21,6 +21,8 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketTransmitterUpdate implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java b/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java index 561ce8b72..130de17a1 100644 --- a/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java +++ b/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java @@ -1,14 +1,16 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.common.PacketHandler; import mekanism.common.item.ItemWalkieTalkie; import mekanism.common.network.PacketWalkieTalkieState.WalkieTalkieStateMessage; + import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketWalkieTalkieState implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/recipe/BinRecipe.java b/src/main/java/mekanism/common/recipe/BinRecipe.java index 294efbc55..ecdfe22ce 100644 --- a/src/main/java/mekanism/common/recipe/BinRecipe.java +++ b/src/main/java/mekanism/common/recipe/BinRecipe.java @@ -4,6 +4,7 @@ import mekanism.common.MekanismItems; import mekanism.common.inventory.InventoryBin; import mekanism.common.item.ItemBlockBasic; import mekanism.common.item.ItemProxy; + import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/recipe/MekanismRecipe.java b/src/main/java/mekanism/common/recipe/MekanismRecipe.java index f37cfc478..f0a1ab081 100644 --- a/src/main/java/mekanism/common/recipe/MekanismRecipe.java +++ b/src/main/java/mekanism/common/recipe/MekanismRecipe.java @@ -11,6 +11,7 @@ import mekanism.common.Upgrade; import mekanism.common.base.IEnergyCube; import mekanism.common.base.IFactory; import mekanism.common.block.BlockMachine.MachineType; + import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/recipe/RecipeHandler.java b/src/main/java/mekanism/common/recipe/RecipeHandler.java index 2de6ade3f..34c001ddb 100644 --- a/src/main/java/mekanism/common/recipe/RecipeHandler.java +++ b/src/main/java/mekanism/common/recipe/RecipeHandler.java @@ -4,18 +4,19 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; +import mekanism.api.gas.GasRegistry; +import mekanism.api.gas.GasStack; +import mekanism.api.gas.GasTank; +import mekanism.api.infuse.InfusionInput; +import mekanism.api.infuse.InfusionOutput; import mekanism.api.recipe.AdvancedInput; import mekanism.api.recipe.ChanceOutput; import mekanism.api.recipe.ChemicalPair; import mekanism.api.recipe.PressurizedProducts; import mekanism.api.recipe.PressurizedReactants; import mekanism.api.recipe.PressurizedRecipe; -import mekanism.api.gas.GasRegistry; -import mekanism.api.gas.GasStack; -import mekanism.api.gas.GasTank; -import mekanism.api.infuse.InfusionInput; -import mekanism.api.infuse.InfusionOutput; import mekanism.api.util.StackUtils; + import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java index 780deadbb..f3d2f2748 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java @@ -1,12 +1,12 @@ package mekanism.common.tile; -import ic2.api.energy.tile.IEnergySink; import mekanism.api.Coord4D; import mekanism.api.IConfigurable; import mekanism.api.IFilterAccess; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.common.base.IAdvancedBoundingBlock; import mekanism.common.util.InventoryUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; @@ -14,16 +14,18 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.common.Optional.Interface; +import cpw.mods.fml.common.Optional.InterfaceList; +import cpw.mods.fml.common.Optional.Method; + import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerHandler; import buildcraft.api.power.PowerHandler.PowerReceiver; import cofh.api.energy.IEnergyHandler; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.InterfaceList; -import cpw.mods.fml.common.Optional.Method; import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; +import ic2.api.energy.tile.IEnergySink; @InterfaceList({ @Interface(iface = "buildcraft.api.power.IPowerReceptor", modid = "BuildCraftAPI|power"), diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java index 911261f2f..c0a025db4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java @@ -1,17 +1,16 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.Map; -import mekanism.api.recipe.AdvancedInput; import mekanism.api.EnumColor; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.ITubeConnection; +import mekanism.api.recipe.AdvancedInput; +import mekanism.api.util.StackUtils; import mekanism.common.Mekanism; import mekanism.common.MekanismItems; import mekanism.common.SideData; @@ -22,11 +21,14 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import mekanism.api.util.StackUtils; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.Optional.Method; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.peripheral.IComputerAccess; diff --git a/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java b/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java index e23416b63..930adc05d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java +++ b/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java @@ -2,7 +2,6 @@ package mekanism.common.tile; import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.Random; diff --git a/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java b/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java index e35ab7608..f1ef99200 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java @@ -1,8 +1,5 @@ package mekanism.common.tile; -import ic2.api.tile.IWrenchable; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -15,6 +12,7 @@ import mekanism.common.base.ITileNetwork; import mekanism.common.network.PacketDataRequest.DataRequestMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -24,6 +22,10 @@ import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; +import io.netty.buffer.ByteBuf; + +import ic2.api.tile.IWrenchable; + @Interface(iface = "ic2.api.tile.IWrenchable", modid = "IC2API") public abstract class TileEntityBasicBlock extends TileEntity implements IWrenchable, ITileNetwork { diff --git a/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java b/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java index 3c98639c5..1a2673d48 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java @@ -1,12 +1,10 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; -import mekanism.api.Range4D; import mekanism.api.MekanismConfig.general; +import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.SideData; import mekanism.common.base.IEjector; @@ -24,6 +22,8 @@ import net.minecraft.util.ResourceLocation; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index 5d551844b..5fe70bdb8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -18,6 +16,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; @@ -25,9 +24,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; import cpw.mods.fml.common.Optional.Interface; +import io.netty.buffer.ByteBuf; + +import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; + @Interface(iface = "powercrystals.minefactoryreloaded.api.IDeepStorageUnit", modid = "MineFactoryReloaded") public class TileEntityBin extends TileEntityBasicBlock implements ISidedInventory, IActiveState, IDeepStorageUnit, IConfigurable { diff --git a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java index 1af80e150..60b590d10 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -10,10 +8,13 @@ import mekanism.common.Mekanism; import mekanism.common.base.ITileNetwork; import mekanism.common.network.PacketDataRequest.DataRequestMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; + import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import io.netty.buffer.ByteBuf; + public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork { public int mainX; diff --git a/src/main/java/mekanism/common/tile/TileEntityCardboardBox.java b/src/main/java/mekanism/common/tile/TileEntityCardboardBox.java index 768da48de..26c250109 100644 --- a/src/main/java/mekanism/common/tile/TileEntityCardboardBox.java +++ b/src/main/java/mekanism/common/tile/TileEntityCardboardBox.java @@ -1,6 +1,7 @@ package mekanism.common.tile; import mekanism.common.block.BlockCardboardBox.BlockData; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java b/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java index a53649f30..3551e48ba 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java @@ -2,8 +2,8 @@ package mekanism.common.tile; import java.util.Map; -import mekanism.api.recipe.ChanceOutput; import mekanism.api.EnumColor; +import mekanism.api.recipe.ChanceOutput; import mekanism.common.MekanismItems; import mekanism.common.SideData; import mekanism.common.recipe.RecipeHandler; @@ -12,9 +12,11 @@ import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import cpw.mods.fml.common.Optional.Method; + import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.peripheral.IComputerAccess; diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index 10981aae6..4af8c3d1f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java +++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java @@ -1,33 +1,33 @@ package mekanism.common.tile; -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.EnumSet; import java.util.List; import java.util.Random; import mekanism.api.Coord4D; -import mekanism.api.Range4D; import mekanism.api.MekanismConfig.general; +import mekanism.api.Range4D; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; -import mekanism.client.sound.IHasSound; import mekanism.common.Mekanism; -import mekanism.common.base.IActiveState; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.entity.EntityRobit; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; + +import io.netty.buffer.ByteBuf; + import cofh.api.energy.IEnergyContainerItem; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; public class TileEntityChargepad extends TileEntityNoisyElectricBlock { diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index 31489a6c3..5049fd3a4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -1,13 +1,11 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.Range4D; import mekanism.api.MekanismConfig.usage; +import mekanism.api.Range4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -16,10 +14,8 @@ import mekanism.api.gas.GasTransmission; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; -import mekanism.client.sound.IHasSound; import mekanism.common.Mekanism; import mekanism.common.SideData; -import mekanism.common.base.IActiveState; import mekanism.common.base.IEjector; import mekanism.common.base.IInvConfiguration; import mekanism.common.base.IRedstoneControl; @@ -33,6 +29,7 @@ import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -41,6 +38,8 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; +import io.netty.buffer.ByteBuf; + public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock implements IGasHandler, ITubeConnection, IRedstoneControl, IInvConfiguration, IUpgradeTile, ISustainedData { public static final int MAX_GAS = 10000; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java index 1d9404376..216a63ec8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java @@ -1,12 +1,10 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; -import mekanism.api.Range4D; import mekanism.api.MekanismConfig.usage; +import mekanism.api.Range4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -15,9 +13,7 @@ import mekanism.api.gas.GasTransmission; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; -import mekanism.client.sound.IHasSound; import mekanism.common.Mekanism; -import mekanism.common.base.IActiveState; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.base.IUpgradeTile; @@ -29,11 +25,14 @@ import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectricBlock implements ITubeConnection, IRedstoneControl, IGasHandler, IUpgradeTile, ISustainedData { public GasTank injectTank = new GasTank(MAX_GAS); diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java index a0bc58462..5bd0bf3b4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -1,12 +1,10 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; -import mekanism.api.Range4D; import mekanism.api.MekanismConfig.usage; +import mekanism.api.Range4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -15,9 +13,7 @@ import mekanism.api.gas.GasTransmission; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; -import mekanism.client.sound.IHasSound; import mekanism.common.Mekanism; -import mekanism.common.base.IActiveState; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.block.BlockMachine.MachineType; @@ -26,6 +22,7 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -33,6 +30,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock implements IGasHandler, ITubeConnection, IRedstoneControl, ISustainedData { public GasTank leftTank = new GasTank(MAX_GAS); diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java index d7a25a0f0..ead6b954c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java @@ -14,6 +14,7 @@ import mekanism.common.MekanismBlocks; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java index a3951ce91..f4949541f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java @@ -1,12 +1,10 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; -import mekanism.api.Range4D; import mekanism.api.MekanismConfig.usage; +import mekanism.api.Range4D; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; @@ -14,9 +12,7 @@ import mekanism.api.gas.GasTransmission; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; -import mekanism.client.sound.IHasSound; import mekanism.common.Mekanism; -import mekanism.common.base.IActiveState; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.base.IUpgradeTile; @@ -28,11 +24,14 @@ import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class TileEntityChemicalOxidizer extends TileEntityNoisyElectricBlock implements ITubeConnection, IRedstoneControl, IUpgradeTile, ISustainedData { public GasTank gasTank = new GasTank(MAX_GAS); diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index 7f6512b1a..8b2757aae 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -1,12 +1,10 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; -import mekanism.api.Range4D; import mekanism.api.MekanismConfig.usage; +import mekanism.api.Range4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -15,9 +13,7 @@ import mekanism.api.gas.GasTransmission; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; -import mekanism.client.sound.IHasSound; import mekanism.common.Mekanism; -import mekanism.common.base.IActiveState; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.block.BlockMachine.MachineType; @@ -28,6 +24,7 @@ import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -43,6 +40,8 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; +import io.netty.buffer.ByteBuf; + public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock implements IGasHandler, ITubeConnection, IRedstoneControl, IFluidHandler, ISustainedData { public FluidTank fluidTank = new FluidTank(MAX_FLUID); diff --git a/src/main/java/mekanism/common/tile/TileEntityCombiner.java b/src/main/java/mekanism/common/tile/TileEntityCombiner.java index c521a4921..effe3e575 100644 --- a/src/main/java/mekanism/common/tile/TileEntityCombiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityCombiner.java @@ -8,6 +8,7 @@ import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java b/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java index 9b6225d6b..e6bc16ead 100644 --- a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java @@ -3,6 +3,7 @@ package mekanism.common.tile; import mekanism.common.base.ISustainedInventory; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 041496d5c..cfc213889 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.BitSet; import java.util.HashMap; @@ -40,6 +38,7 @@ import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MinerUtils; import mekanism.common.util.TransporterUtils; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -56,6 +55,9 @@ import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index 6723f9d86..ddcb2b6c5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -18,12 +16,15 @@ import mekanism.common.multiblock.MultiblockManager; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; + import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; +import io.netty.buffer.ByteBuf; + public class TileEntityDynamicTank extends TileEntityMultiblock implements IFluidContainerManager, IMultiblock { /** A client-sided and server-sided map of valves on this tank's structure, used on the client for rendering fluids. */ diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java b/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java index 0ce93bea6..7405c3a72 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java @@ -2,6 +2,7 @@ package mekanism.common.tile; import mekanism.common.content.tank.DynamicFluidTank; import mekanism.common.util.PipeUtils; + import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index 0fe87523e..02f0829cb 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -1,11 +1,5 @@ package mekanism.common.tile; -import ic2.api.energy.event.EnergyTileLoadEvent; -import ic2.api.energy.event.EnergyTileUnloadEvent; -import ic2.api.energy.tile.IEnergySink; -import ic2.api.tile.IEnergyStorage; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.EnumSet; @@ -18,19 +12,27 @@ import mekanism.api.transmitters.IGridTransmitter; import mekanism.common.Mekanism; import mekanism.common.base.ITileNetwork; import mekanism.common.util.MekanismUtils; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.common.Optional.Interface; +import cpw.mods.fml.common.Optional.InterfaceList; +import cpw.mods.fml.common.Optional.Method; + +import io.netty.buffer.ByteBuf; + import buildcraft.api.power.IPowerEmitter; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerHandler; import buildcraft.api.power.PowerHandler.PowerReceiver; import cofh.api.energy.IEnergyHandler; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.InterfaceList; -import cpw.mods.fml.common.Optional.Method; +import ic2.api.energy.event.EnergyTileLoadEvent; +import ic2.api.energy.event.EnergyTileUnloadEvent; +import ic2.api.energy.tile.IEnergySink; +import ic2.api.tile.IEnergyStorage; @InterfaceList({ @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2API", striprefs = true), diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricChest.java b/src/main/java/mekanism/common/tile/TileEntityElectricChest.java index e46163f5f..827de3ce2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricChest.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricChest.java @@ -1,16 +1,17 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.common.PacketHandler; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import io.netty.buffer.ByteBuf; + public class TileEntityElectricChest extends TileEntityElectricBlock { public static int[] INV; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java index 8e363cf6a..77011da84 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java @@ -11,8 +11,10 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.item.ItemStack; import cpw.mods.fml.common.Optional.Method; + import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.peripheral.IComputerAccess; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index ea1e7a801..a2ef0d98f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -14,13 +12,12 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; import mekanism.api.MekanismConfig.usage; -import mekanism.common.Mekanism; import mekanism.common.base.ISustainedTank; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -37,6 +34,8 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; +import io.netty.buffer.ByteBuf; + public class TileEntityElectricPump extends TileEntityElectricBlock implements IFluidHandler, ISustainedTank, IConfigurable { /** This pump's tank */ diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index 49dd3abcf..41977ebc7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -1,12 +1,9 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; -import mekanism.api.MekanismConfig.general; -import mekanism.api.recipe.ChemicalPair; import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; @@ -16,6 +13,7 @@ import mekanism.api.gas.GasTransmission; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; +import mekanism.api.recipe.ChemicalPair; import mekanism.common.Mekanism; import mekanism.common.base.ISustainedData; import mekanism.common.block.BlockMachine.MachineType; @@ -26,6 +24,7 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -40,6 +39,9 @@ import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java b/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java index a8e684653..2866ac577 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java @@ -5,6 +5,7 @@ import java.util.Map; import mekanism.api.MekanismConfig.usage; import mekanism.common.block.BlockMachine.MachineType; + import net.minecraft.item.ItemStack; public class TileEntityEnergizedSmelter extends TileEntityElectricMachine diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index 1cc51a4dc..24c98d9c4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.EnumSet; @@ -15,12 +13,16 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.CableUtils; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; diff --git a/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java b/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java index 5aa46ef9e..51bcb7f6a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java @@ -11,12 +11,14 @@ import mekanism.common.PacketHandler; import mekanism.common.content.teleportation.SharedInventory; import mekanism.common.content.teleportation.SharedInventoryManager; import mekanism.common.util.CableUtils; + import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + import io.netty.buffer.ByteBuf; public class TileEntityEntangledBlock extends TileEntityElectricBlock implements IFluidHandler, IGasHandler, ITubeConnection diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 7f878bcd2..f15c22253 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -1,15 +1,13 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.Range4D; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; +import mekanism.api.Range4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; @@ -17,17 +15,16 @@ import mekanism.api.gas.GasTransmission; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; -import mekanism.client.sound.IHasSound; +import mekanism.api.util.StackUtils; import mekanism.common.Mekanism; import mekanism.common.MekanismItems; import mekanism.common.SideData; import mekanism.common.Tier.FactoryTier; -import mekanism.common.base.IActiveState; import mekanism.common.base.IEjector; +import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.IInvConfiguration; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.IUpgradeTile; -import mekanism.common.base.IFactory.RecipeType; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.component.TileComponentEjector; @@ -35,7 +32,7 @@ import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; -import mekanism.api.util.StackUtils; + import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -43,6 +40,9 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index 5ec00eed7..3525e3fa7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.EnumSet; import java.util.HashSet; @@ -17,6 +15,7 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -32,6 +31,8 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; +import io.netty.buffer.ByteBuf; + public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implements IConfigurable, IFluidHandler, ISustainedTank { public Set activeNodes = new HashSet(); diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index e043bfe3e..a552e8025 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -17,6 +15,7 @@ import mekanism.common.Mekanism; import mekanism.common.base.IRedstoneControl; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -24,6 +23,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class TileEntityGasTank extends TileEntityContainerBlock implements IGasHandler, ITubeConnection, IRedstoneControl { /** The type of gas stored in this tank. */ diff --git a/src/main/java/mekanism/common/tile/TileEntityLaser.java b/src/main/java/mekanism/common/tile/TileEntityLaser.java index 5aadae7e0..9a601b521 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaser.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaser.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -9,9 +7,12 @@ import mekanism.api.MekanismConfig.usage; import mekanism.common.LaserManager; import mekanism.common.Mekanism; import mekanism.common.network.PacketTileEntity.TileEntityMessage; + import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class TileEntityLaser extends TileEntityElectricBlock { public boolean on; diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index d9e20d202..c529f8bd1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.EnumSet; @@ -16,15 +14,16 @@ import mekanism.common.base.ILogisticalTransporter; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.content.transporter.Finder.FirstFinder; import mekanism.common.content.transporter.InvStack; import mekanism.common.content.transporter.TItemStackFilter; import mekanism.common.content.transporter.TransporterFilter; import mekanism.common.content.transporter.TransporterManager; -import mekanism.common.content.transporter.Finder.FirstFinder; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.IInventory; @@ -35,6 +34,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class TileEntityLogisticalSorter extends TileEntityElectricBlock implements IRedstoneControl, IActiveState, IFilterAccess, ISustainedData { public HashList filters = new HashList(); diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index 07e10cd35..09e6e14f3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -1,25 +1,21 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.Range4D; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; +import mekanism.api.Range4D; import mekanism.api.infuse.InfuseObject; import mekanism.api.infuse.InfuseRegistry; import mekanism.api.infuse.InfuseType; import mekanism.api.infuse.InfusionInput; import mekanism.api.infuse.InfusionOutput; -import mekanism.client.sound.IHasSound; import mekanism.common.Mekanism; import mekanism.common.MekanismItems; import mekanism.common.PacketHandler; import mekanism.common.SideData; -import mekanism.common.base.IActiveState; import mekanism.common.base.IEjector; import mekanism.common.base.IInvConfiguration; import mekanism.common.base.IRedstoneControl; @@ -33,10 +29,14 @@ import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index 34f39d8bb..6d4ffecb8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -1,18 +1,16 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; -import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.multiblock.IMultiblock; import mekanism.common.multiblock.MultiblockManager; import mekanism.common.multiblock.SynchronizedData; import mekanism.common.multiblock.UpdateProtocol; import mekanism.common.network.PacketTileEntity.TileEntityMessage; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; @@ -20,6 +18,8 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; + public abstract class TileEntityMultiblock extends TileEntityContainerBlock implements IMultiblock { /** The tank data for this structure. */ diff --git a/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java index 1f88d7246..dd0febe3c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java @@ -7,9 +7,7 @@ import mekanism.client.sound.IResettableSound; import mekanism.client.sound.ISoundSource; import mekanism.client.sound.SoundHandler; import mekanism.client.sound.TileSound; -import mekanism.common.Upgrade; import mekanism.common.base.IActiveState; -import mekanism.common.base.IUpgradeTile; import net.minecraft.client.audio.ISound; import net.minecraft.client.audio.ISound.AttenuationType; diff --git a/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java b/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java index c9e819edf..aeefdfd89 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java +++ b/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java @@ -8,6 +8,7 @@ import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; + import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index ab52df021..e0ff26877 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -1,21 +1,19 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.Map; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.usage; -import mekanism.api.recipe.PressurizedProducts; -import mekanism.api.recipe.PressurizedRecipe; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.ITubeConnection; +import mekanism.api.recipe.PressurizedProducts; +import mekanism.api.recipe.PressurizedRecipe; import mekanism.common.SideData; import mekanism.common.base.ISustainedData; import mekanism.common.block.BlockMachine.MachineType; @@ -27,6 +25,7 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -39,6 +38,9 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import cpw.mods.fml.common.Optional.Method; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.peripheral.IComputerAccess; diff --git a/src/main/java/mekanism/common/tile/TileEntityPortableTank.java b/src/main/java/mekanism/common/tile/TileEntityPortableTank.java index 3865c4333..6bb2896d9 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPortableTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityPortableTank.java @@ -1,13 +1,11 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.IConfigurable; -import mekanism.api.Range4D; import mekanism.api.MekanismConfig.general; +import mekanism.api.Range4D; import mekanism.api.gas.IGasItem; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; @@ -18,6 +16,7 @@ import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -32,6 +31,8 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; +import io.netty.buffer.ByteBuf; + public class TileEntityPortableTank extends TileEntityContainerBlock implements IActiveState, IConfigurable, IFluidHandler, ISustainedTank, IFluidContainerManager { public boolean isActive; diff --git a/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java b/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java index c34036156..aedea4c2f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java @@ -13,6 +13,7 @@ import mekanism.api.gas.ITubeConnection; import mekanism.common.MekanismBlocks; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; + import net.minecraft.block.Block; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index 97087c8af..d91ce836b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -24,6 +22,7 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -38,6 +37,8 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; +import io.netty.buffer.ByteBuf; + public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock implements IActiveState, ISustainedData, IFluidHandler, IGasHandler, ITubeConnection, IRedstoneControl { public GasTank gasTank = new GasTank(MAX_FLUID); diff --git a/src/main/java/mekanism/common/tile/TileEntitySalinationBlock.java b/src/main/java/mekanism/common/tile/TileEntitySalinationBlock.java index 88afb87d3..2c5861b9c 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySalinationBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntitySalinationBlock.java @@ -4,9 +4,9 @@ import java.util.HashSet; import java.util.Set; import mekanism.api.Coord4D; + import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; public class TileEntitySalinationBlock extends TileEntityContainerBlock diff --git a/src/main/java/mekanism/common/tile/TileEntitySalinationController.java b/src/main/java/mekanism/common/tile/TileEntitySalinationController.java index a3ff8501d..c6d343c2d 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySalinationController.java +++ b/src/main/java/mekanism/common/tile/TileEntitySalinationController.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.HashSet; import java.util.Set; @@ -14,6 +12,7 @@ import mekanism.common.base.IActiveState; import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -27,6 +26,8 @@ import net.minecraftforge.fluids.FluidTank; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; + public class TileEntitySalinationController extends TileEntitySalinationBlock implements IActiveState { public static final int MAX_BRINE = 10000; diff --git a/src/main/java/mekanism/common/tile/TileEntitySalinationValve.java b/src/main/java/mekanism/common/tile/TileEntitySalinationValve.java index b9faf1708..46f95a699 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySalinationValve.java +++ b/src/main/java/mekanism/common/tile/TileEntitySalinationValve.java @@ -1,8 +1,8 @@ package mekanism.common.tile; import mekanism.api.Coord4D; -import mekanism.common.Mekanism; import mekanism.common.util.PipeUtils; + import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index 69069d227..572fd43e6 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.EnumSet; @@ -16,10 +14,13 @@ import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class TileEntitySeismicVibrator extends TileEntityElectricBlock implements IActiveState, IRedstoneControl { public boolean isActive; diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index a9160fb60..e601ada8a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; @@ -18,6 +16,7 @@ import mekanism.common.network.PacketPortalFX.PortalFXMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.player.EntityPlayerMP; @@ -35,6 +34,9 @@ import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index a3591e098..7ac35160c 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -1,7 +1,5 @@ package mekanism.common.tile.component; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.List; @@ -17,12 +15,15 @@ import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; + import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class TileComponentEjector implements ITileComponent, IEjector { public TileEntityContainerBlock tileEntity; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java index d7363dfad..5002abe75 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java @@ -1,7 +1,5 @@ package mekanism.common.tile.component; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -12,8 +10,11 @@ import mekanism.common.Upgrade; import mekanism.common.base.ITileComponent; import mekanism.common.base.IUpgradeItem; import mekanism.common.tile.TileEntityContainerBlock; + import net.minecraft.nbt.NBTTagCompound; +import io.netty.buffer.ByteBuf; + public class TileComponentUpgrade implements ITileComponent { /** How long it takes this machine to install an upgrade. */ diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index 7dac5c4ec..58166a6d4 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -1,10 +1,5 @@ package mekanism.common.util; -import ic2.api.energy.EnergyNet; -import ic2.api.energy.tile.IEnergyAcceptor; -import ic2.api.energy.tile.IEnergySink; -import ic2.api.energy.tile.IEnergySource; - import java.util.ArrayList; import java.util.EnumSet; import java.util.List; @@ -17,13 +12,19 @@ import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; import mekanism.common.tile.TileEntityElectricBlock; + import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.mj.IBatteryObject; import buildcraft.api.mj.MjAPI; import buildcraft.api.power.IPowerEmitter; import cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyHandler; +import ic2.api.energy.EnergyNet; +import ic2.api.energy.tile.IEnergyAcceptor; +import ic2.api.energy.tile.IEnergySink; +import ic2.api.energy.tile.IEnergySource; public final class CableUtils { diff --git a/src/main/java/mekanism/common/util/ChargeUtils.java b/src/main/java/mekanism/common/util/ChargeUtils.java index ab15baf83..34e7303a8 100644 --- a/src/main/java/mekanism/common/util/ChargeUtils.java +++ b/src/main/java/mekanism/common/util/ChargeUtils.java @@ -1,16 +1,17 @@ package mekanism.common.util; -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; - import mekanism.api.MekanismConfig.general; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; import mekanism.common.tile.TileEntityElectricBlock; + import net.minecraft.init.Items; import net.minecraft.item.ItemStack; + import cofh.api.energy.IEnergyContainerItem; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; public final class ChargeUtils { diff --git a/src/main/java/mekanism/common/util/InventoryUtils.java b/src/main/java/mekanism/common/util/InventoryUtils.java index cf46ebcf3..13cbe1bca 100644 --- a/src/main/java/mekanism/common/util/InventoryUtils.java +++ b/src/main/java/mekanism/common/util/InventoryUtils.java @@ -7,6 +7,7 @@ import mekanism.common.content.transporter.Finder; import mekanism.common.content.transporter.InvStack; import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityLogisticalSorter; + import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.InventoryLargeChest; diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 231c696bb..5664e2ec7 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -16,9 +16,9 @@ import java.util.Map; import mekanism.api.Chunk3D; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.IMekWrench; import mekanism.api.MekanismConfig.client; import mekanism.api.MekanismConfig.general; -import mekanism.api.IMekWrench; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.util.EnergyUtils; @@ -33,12 +33,12 @@ import mekanism.common.Upgrade; import mekanism.common.Version; import mekanism.common.base.IActiveState; import mekanism.common.base.IFactory; +import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.IInvConfiguration; import mekanism.common.base.IModule; import mekanism.common.base.IRedstoneControl; -import mekanism.common.base.IUpgradeTile; -import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.IRedstoneControl.RedstoneControl; +import mekanism.common.base.IUpgradeTile; import mekanism.common.inventory.container.ContainerElectricChest; import mekanism.common.item.ItemBlockEnergyCube; import mekanism.common.item.ItemBlockGasTank; @@ -47,6 +47,7 @@ import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityAdvancedBoundingBlock; import mekanism.common.tile.TileEntityBoundingBlock; import mekanism.common.tile.TileEntityElectricChest; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/mekanism/common/util/MinerUtils.java b/src/main/java/mekanism/common/util/MinerUtils.java index 31d3ecc23..16af57855 100644 --- a/src/main/java/mekanism/common/util/MinerUtils.java +++ b/src/main/java/mekanism/common/util/MinerUtils.java @@ -5,6 +5,7 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.util.ListUtils; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/util/PipeUtils.java b/src/main/java/mekanism/common/util/PipeUtils.java index 38d50b615..aefb79452 100644 --- a/src/main/java/mekanism/common/util/PipeUtils.java +++ b/src/main/java/mekanism/common/util/PipeUtils.java @@ -5,6 +5,7 @@ import java.util.Arrays; import mekanism.api.Coord4D; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; + import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidTankInfo; diff --git a/src/main/java/mekanism/common/util/TransporterUtils.java b/src/main/java/mekanism/common/util/TransporterUtils.java index a8db6716e..d28986111 100644 --- a/src/main/java/mekanism/common/util/TransporterUtils.java +++ b/src/main/java/mekanism/common/util/TransporterUtils.java @@ -5,12 +5,13 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.util.ListUtils; import mekanism.api.transmitters.IGridTransmitter; +import mekanism.api.util.ListUtils; import mekanism.common.base.ILogisticalTransporter; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.tile.TileEntityLogisticalSorter; + import net.minecraft.entity.item.EntityItem; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; @@ -18,6 +19,7 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerHandler.Type; diff --git a/src/main/java/mekanism/common/voice/VoiceConnection.java b/src/main/java/mekanism/common/voice/VoiceConnection.java index a68ab4acc..0d3027295 100644 --- a/src/main/java/mekanism/common/voice/VoiceConnection.java +++ b/src/main/java/mekanism/common/voice/VoiceConnection.java @@ -11,6 +11,7 @@ import java.util.List; import mekanism.common.Mekanism; import mekanism.common.item.ItemWalkieTalkie; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; diff --git a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java index 77cb9639b..7421edcf7 100644 --- a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java +++ b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java @@ -5,23 +5,23 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelAdvancedSolarGenerator; import mekanism.generators.client.model.ModelBioGenerator; -import mekanism.generators.client.model.ModelHeatGenerator; import mekanism.generators.client.model.ModelGasGenerator; +import mekanism.generators.client.model.ModelHeatGenerator; import mekanism.generators.client.model.ModelSolarGenerator; import mekanism.generators.client.model.ModelWindTurbine; import mekanism.generators.common.GeneratorsBlocks; import mekanism.generators.common.block.BlockGenerator.GeneratorType; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class BlockRenderingHandler implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java index 3fbf3772a..72adcd1fd 100644 --- a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java +++ b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java @@ -1,8 +1,8 @@ package mekanism.generators.client; import mekanism.generators.client.gui.GuiBioGenerator; -import mekanism.generators.client.gui.GuiHeatGenerator; import mekanism.generators.client.gui.GuiGasGenerator; +import mekanism.generators.client.gui.GuiHeatGenerator; import mekanism.generators.client.gui.GuiNeutronCapture; import mekanism.generators.client.gui.GuiReactorController; import mekanism.generators.client.gui.GuiReactorFuel; @@ -12,16 +12,16 @@ import mekanism.generators.client.gui.GuiSolarGenerator; import mekanism.generators.client.gui.GuiWindTurbine; import mekanism.generators.client.render.RenderAdvancedSolarGenerator; import mekanism.generators.client.render.RenderBioGenerator; -import mekanism.generators.client.render.RenderHeatGenerator; import mekanism.generators.client.render.RenderGasGenerator; +import mekanism.generators.client.render.RenderHeatGenerator; import mekanism.generators.client.render.RenderReactor; import mekanism.generators.client.render.RenderSolarGenerator; import mekanism.generators.client.render.RenderWindTurbine; import mekanism.generators.common.GeneratorsCommonProxy; import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; import mekanism.generators.common.tile.TileEntityBioGenerator; -import mekanism.generators.common.tile.TileEntityHeatGenerator; import mekanism.generators.common.tile.TileEntityGasGenerator; +import mekanism.generators.common.tile.TileEntityHeatGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; import mekanism.generators.common.tile.TileEntityWindTurbine; import mekanism.generators.common.tile.reactor.TileEntityReactorController; diff --git a/src/main/java/mekanism/generators/client/gui/GeneratorsGuiFactory.java b/src/main/java/mekanism/generators/client/gui/GeneratorsGuiFactory.java index 0544b5ebc..924cb9b54 100644 --- a/src/main/java/mekanism/generators/client/gui/GeneratorsGuiFactory.java +++ b/src/main/java/mekanism/generators/client/gui/GeneratorsGuiFactory.java @@ -2,8 +2,6 @@ package mekanism.generators.client.gui; import java.util.Set; -import mekanism.client.gui.GuiMekanismConfig; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import cpw.mods.fml.client.IModGuiFactory; diff --git a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java index 226aa2b65..54560afd2 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java @@ -16,13 +16,13 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerBioGenerator; import mekanism.generators.common.tile.TileEntityBioGenerator; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiBioGenerator extends GuiMekanism { diff --git a/src/main/java/mekanism/generators/client/gui/GuiFuelTab.java b/src/main/java/mekanism/generators/client/gui/GuiFuelTab.java index bc637a2eb..15e065862 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiFuelTab.java +++ b/src/main/java/mekanism/generators/client/gui/GuiFuelTab.java @@ -4,8 +4,6 @@ import mekanism.api.Coord4D; import mekanism.client.gui.GuiElement; import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; -import mekanism.common.Mekanism; -import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.MekanismGenerators; @@ -13,10 +11,11 @@ import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessa import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.vec.Rectangle4i; + @SideOnly(Side.CLIENT) public class GuiFuelTab extends GuiElement { diff --git a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java index 39435bebd..cc5c7ec82 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java @@ -2,8 +2,8 @@ package mekanism.generators.client.gui; import java.util.List; -import mekanism.api.util.ListUtils; import mekanism.api.gas.GasTank; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiEnergyInfo; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiGasGauge; @@ -19,13 +19,13 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerGasGenerator; import mekanism.generators.common.tile.TileEntityGasGenerator; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiGasGenerator extends GuiMekanism { diff --git a/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java b/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java index 4cc8732ac..cc60772cc 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java +++ b/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java @@ -4,7 +4,6 @@ import mekanism.common.Mekanism; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; -import net.minecraftforge.common.config.Configuration; import cpw.mods.fml.client.config.GuiConfig; /** diff --git a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java index c7be00746..c461486ad 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java @@ -19,14 +19,14 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerHeatGenerator; import mekanism.generators.common.tile.TileEntityHeatGenerator; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiHeatGenerator extends GuiMekanism { diff --git a/src/main/java/mekanism/generators/client/gui/GuiHeatTab.java b/src/main/java/mekanism/generators/client/gui/GuiHeatTab.java index e6cb80ff2..4e4d5ad37 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiHeatTab.java +++ b/src/main/java/mekanism/generators/client/gui/GuiHeatTab.java @@ -4,8 +4,6 @@ import mekanism.api.Coord4D; import mekanism.client.gui.GuiElement; import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; -import mekanism.common.Mekanism; -import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.MekanismGenerators; @@ -13,10 +11,11 @@ import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessa import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.vec.Rectangle4i; + @SideOnly(Side.CLIENT) public class GuiHeatTab extends GuiElement { diff --git a/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java b/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java index c4ba6e8eb..c0da03fd4 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java +++ b/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java @@ -19,6 +19,7 @@ import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture; import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java index 1026cd2f0..a6bf9bac5 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java @@ -17,6 +17,7 @@ import mekanism.generators.common.tile.reactor.TileEntityReactorController; import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java index 18c7c4043..b544b4dfb 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.util.ListUtils; import mekanism.api.gas.GasTank; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiEnergyInfo; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiGasGauge; @@ -17,9 +17,7 @@ import mekanism.client.gui.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.container.ContainerNull; -import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -29,9 +27,9 @@ import mekanism.generators.common.tile.reactor.TileEntityReactorController; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java index 9e4b310a8..f0f44a4e5 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.util.ListUtils; import mekanism.api.energy.IStrictEnergyStorage; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiEnergyGauge; import mekanism.client.gui.GuiEnergyGauge.IEnergyInfoHandler; import mekanism.client.gui.GuiEnergyInfo; @@ -33,6 +33,7 @@ import net.minecraft.util.IIcon; import net.minecraftforge.fluids.FluidTank; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java index ec484a1f5..a53768290 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java @@ -17,13 +17,13 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage; import mekanism.generators.common.tile.reactor.TileEntityReactorController; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiReactorStats extends GuiMekanism { diff --git a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java index 8dcb49078..038ef9033 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java @@ -15,13 +15,13 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerSolarGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiSolarGenerator extends GuiMekanism { diff --git a/src/main/java/mekanism/generators/client/gui/GuiStatTab.java b/src/main/java/mekanism/generators/client/gui/GuiStatTab.java index 8062b9a1b..6290da58a 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiStatTab.java +++ b/src/main/java/mekanism/generators/client/gui/GuiStatTab.java @@ -4,8 +4,6 @@ import mekanism.api.Coord4D; import mekanism.client.gui.GuiElement; import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; -import mekanism.common.Mekanism; -import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.MekanismGenerators; @@ -13,10 +11,11 @@ import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessa import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.vec.Rectangle4i; + @SideOnly(Side.CLIENT) public class GuiStatTab extends GuiElement { diff --git a/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java b/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java index c5e06b775..4d87b92ae 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java +++ b/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java @@ -18,13 +18,13 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerWindTurbine; import mekanism.generators.common.tile.TileEntityWindTurbine; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiWindTurbine extends GuiMekanism { diff --git a/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java index d1d9515d7..23a211b18 100644 --- a/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java @@ -1,6 +1,7 @@ package mekanism.generators.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java index 036cd9aff..4d634eee4 100644 --- a/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java @@ -4,14 +4,14 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelAdvancedSolarGenerator; import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderAdvancedSolarGenerator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java index 6b3e9a9e6..3a856510a 100644 --- a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java @@ -10,16 +10,16 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelBioGenerator; import mekanism.generators.common.tile.TileEntityBioGenerator; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderBioGenerator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java b/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java index a8db431d2..9c975ed0a 100644 --- a/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java @@ -4,14 +4,14 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelGasGenerator; import mekanism.generators.common.tile.TileEntityGasGenerator; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderGasGenerator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java b/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java index af366eec4..8b9866218 100644 --- a/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java @@ -4,14 +4,14 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelHeatGenerator; import mekanism.generators.common.tile.TileEntityHeatGenerator; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderHeatGenerator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/generators/client/render/RenderReactor.java b/src/main/java/mekanism/generators/client/render/RenderReactor.java index 304ce64db..abd1ccaf5 100644 --- a/src/main/java/mekanism/generators/client/render/RenderReactor.java +++ b/src/main/java/mekanism/generators/client/render/RenderReactor.java @@ -3,22 +3,18 @@ package mekanism.generators.client.render; import mekanism.api.EnumColor; import mekanism.client.MekanismClient; import mekanism.client.model.ModelEnergyCube.ModelEnergyCore; -import mekanism.client.model.ModelLaser; import mekanism.client.render.MekanismRenderer; -import mekanism.common.Tier.EnergyCubeTier; -import mekanism.common.tile.TileEntityLaser; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.tile.reactor.TileEntityReactorController; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderReactor extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java b/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java index e4c90d06f..59a244546 100644 --- a/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java @@ -4,6 +4,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelSolarGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/generators/client/render/RenderWindTurbine.java b/src/main/java/mekanism/generators/client/render/RenderWindTurbine.java index d35096479..c42c05ef4 100644 --- a/src/main/java/mekanism/generators/client/render/RenderWindTurbine.java +++ b/src/main/java/mekanism/generators/client/render/RenderWindTurbine.java @@ -5,6 +5,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelWindTurbine; import mekanism.generators.common.tile.TileEntityWindTurbine; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index e725fb552..b8b4ca45d 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -16,18 +16,18 @@ import mekanism.api.reactor.INeutronCapture; import mekanism.api.reactor.IReactorBlock; import mekanism.common.Mekanism; import mekanism.common.network.PacketTileEntity.TileEntityMessage; -import mekanism.generators.common.item.ItemHohlraum; import mekanism.generators.common.tile.reactor.TileEntityReactorController; + import net.minecraft.block.Block; import net.minecraft.item.ItemCoal; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; -import static java.lang.Math.min; + import static java.lang.Math.max; +import static java.lang.Math.min; public class FusionReactor implements IFusionReactor { diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index 3cf00d5d4..058c5c082 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -4,16 +4,16 @@ import mekanism.api.MekanismConfig.generators; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; import mekanism.generators.common.inventory.container.ContainerBioGenerator; -import mekanism.generators.common.inventory.container.ContainerHeatGenerator; import mekanism.generators.common.inventory.container.ContainerGasGenerator; +import mekanism.generators.common.inventory.container.ContainerHeatGenerator; import mekanism.generators.common.inventory.container.ContainerNeutronCapture; import mekanism.generators.common.inventory.container.ContainerReactorController; import mekanism.generators.common.inventory.container.ContainerSolarGenerator; import mekanism.generators.common.inventory.container.ContainerWindTurbine; import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; import mekanism.generators.common.tile.TileEntityBioGenerator; -import mekanism.generators.common.tile.TileEntityHeatGenerator; import mekanism.generators.common.tile.TileEntityGasGenerator; +import mekanism.generators.common.tile.TileEntityHeatGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; import mekanism.generators.common.tile.TileEntityWindTurbine; import mekanism.generators.common.tile.reactor.TileEntityReactorController; diff --git a/src/main/java/mekanism/generators/common/GeneratorsPacketHandler.java b/src/main/java/mekanism/generators/common/GeneratorsPacketHandler.java index c69fe425f..8ee96c4e7 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsPacketHandler.java +++ b/src/main/java/mekanism/generators/common/GeneratorsPacketHandler.java @@ -1,7 +1,5 @@ package mekanism.generators.common; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.List; @@ -20,6 +18,8 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; +import io.netty.buffer.ByteBuf; + /** * Mekanism packet handler. As always, use packets sparingly! * @author AidanBrady diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 491be1e1d..baa6cecf8 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -1,7 +1,5 @@ package mekanism.generators.common; -import io.netty.buffer.ByteBuf; - import java.io.IOException; import mekanism.api.MekanismConfig.general; @@ -15,6 +13,7 @@ import mekanism.common.MekanismItems; import mekanism.common.Version; import mekanism.common.base.IModule; import mekanism.common.recipe.MekanismRecipe; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -22,7 +21,6 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; -import buildcraft.api.fuels.IronEngineFuel; import cpw.mods.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; @@ -36,6 +34,10 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.NetworkRegistry; +import io.netty.buffer.ByteBuf; + +import buildcraft.api.fuels.IronEngineFuel; + @Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "8.0.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") public class MekanismGenerators implements IModule { diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index c6497344d..23a04cfa7 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -25,6 +25,7 @@ import mekanism.generators.common.tile.TileEntityGasGenerator; import mekanism.generators.common.tile.TileEntityHeatGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; import mekanism.generators.common.tile.TileEntityWindTurbine; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -41,15 +42,16 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.tools.IToolWrench; -import dan200.computercraft.api.peripheral.IPeripheral; -import dan200.computercraft.api.peripheral.IPeripheralProvider; import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import buildcraft.api.tools.IToolWrench; +import dan200.computercraft.api.peripheral.IPeripheral; +import dan200.computercraft.api.peripheral.IPeripheralProvider; + /** * Block class for handling multiple generator block IDs. * 0: Heat Generator diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index 5551351e2..78f05895b 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -9,7 +9,6 @@ import mekanism.client.ClientProxy; import mekanism.common.CTMData; import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; -import mekanism.common.MekanismBlocks; import mekanism.common.base.IBlockCTM; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; @@ -22,6 +21,7 @@ import mekanism.generators.common.tile.reactor.TileEntityReactorGlass; import mekanism.generators.common.tile.reactor.TileEntityReactorLaserFocusMatrix; import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture; import mekanism.generators.common.tile.reactor.TileEntityReactorPort; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -36,12 +36,12 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.tools.IToolWrench; import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import buildcraft.api.tools.IToolWrench; + public class BlockReactor extends BlockContainer implements IBlockCTM { public IIcon[][] icons = new IIcon[16][16]; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java index ebf9396ff..0aa6bbd57 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java @@ -3,6 +3,7 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tile.TileEntityBioGenerator; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java index 3088950f2..a9b0116c1 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java @@ -5,6 +5,7 @@ import mekanism.api.gas.IGasItem; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tile.TileEntityGasGenerator; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java index 2b2b465a0..b70668dc6 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java @@ -3,6 +3,7 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tile.TileEntityHeatGenerator; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerNeutronCapture.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerNeutronCapture.java index eb0dff8ab..c218c4992 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerNeutronCapture.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerNeutronCapture.java @@ -2,7 +2,6 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; -import mekanism.generators.common.tile.reactor.TileEntityReactorController; import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java index ffed7e8dc..775dba5d5 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java @@ -3,6 +3,7 @@ package mekanism.generators.common.inventory.container; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.item.ItemHohlraum; import mekanism.generators.common.tile.reactor.TileEntityReactorController; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java index 6883ce957..c7400fcfc 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java @@ -3,6 +3,7 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tile.TileEntitySolarGenerator; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerWindTurbine.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerWindTurbine.java index 696f9c885..9e6efd0a6 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerWindTurbine.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerWindTurbine.java @@ -3,6 +3,7 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tile.TileEntityWindTurbine; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 7260eedcf..81c553d41 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -1,8 +1,5 @@ package mekanism.generators.common.item; -import ic2.api.item.IElectricItemManager; -import ic2.api.item.ISpecialElectricItem; - import java.util.List; import mekanism.api.EnumColor; @@ -17,6 +14,7 @@ import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.block.BlockGenerator.GeneratorType; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -28,16 +26,18 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.input.Keyboard; - -import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.input.Keyboard; + +import cofh.api.energy.IEnergyContainerItem; +import ic2.api.item.IElectricItemManager; +import ic2.api.item.ISpecialElectricItem; + /** * Item class for handling multiple generator block IDs. * 0: Heat Generator diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java b/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java index 84e03ab09..4af39d0b6 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java @@ -13,6 +13,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import org.lwjgl.input.Keyboard; public class ItemBlockReactor extends ItemBlock diff --git a/src/main/java/mekanism/generators/common/network/PacketGeneratorsGui.java b/src/main/java/mekanism/generators/common/network/PacketGeneratorsGui.java index e12e3bff0..21fe4fcc2 100644 --- a/src/main/java/mekanism/generators/common/network/PacketGeneratorsGui.java +++ b/src/main/java/mekanism/generators/common/network/PacketGeneratorsGui.java @@ -1,9 +1,8 @@ package mekanism.generators.common.network; -import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; -import mekanism.generators.common.GeneratorsPacketHandler; import mekanism.common.tile.TileEntityBasicBlock; +import mekanism.generators.common.GeneratorsPacketHandler; import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage; @@ -18,6 +17,8 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; + public class PacketGeneratorsGui implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java index 01da0a5eb..8fc359d32 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java @@ -7,6 +7,7 @@ import mekanism.api.ISalinationSolar; import mekanism.api.MekanismConfig.generators; import mekanism.common.base.IBoundingBlock; import mekanism.common.util.MekanismUtils; + import net.minecraftforge.common.util.ForgeDirection; public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator implements IBoundingBlock, ISalinationSolar diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index 45b498a75..66a16a940 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -1,7 +1,5 @@ package mekanism.generators.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.EnumSet; @@ -12,6 +10,7 @@ import mekanism.common.MekanismItems; import mekanism.common.base.ISustainedData; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; @@ -23,6 +22,8 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import cpw.mods.fml.common.Optional.Method; +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.peripheral.IComputerAccess; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index 42a5e477f..0c43c5cda 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -1,7 +1,5 @@ package mekanism.generators.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.MekanismConfig.general; @@ -14,15 +12,19 @@ import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; import mekanism.common.FuelHandler; -import mekanism.common.Mekanism; import mekanism.common.FuelHandler.FuelGas; +import mekanism.common.Mekanism; import mekanism.common.base.ISustainedData; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.Optional.Method; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.peripheral.IComputerAccess; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index 068aedcf7..6d3a022c7 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -1,13 +1,11 @@ package mekanism.generators.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.EnumSet; import mekanism.api.Coord4D; -import mekanism.api.Range4D; import mekanism.api.MekanismConfig.general; +import mekanism.api.Range4D; import mekanism.client.sound.IHasSound; import mekanism.client.sound.ISoundSource; import mekanism.client.sound.TileSound; @@ -26,6 +24,9 @@ import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index 81b2e9840..332dc10a6 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -1,7 +1,5 @@ package mekanism.generators.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.MekanismConfig.generators; @@ -11,6 +9,7 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -26,6 +25,9 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; import cpw.mods.fml.common.Optional.Method; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.peripheral.IComputerAccess; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index d39ab474e..55e230547 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -1,7 +1,5 @@ package mekanism.generators.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.EnumSet; @@ -10,14 +8,17 @@ import mekanism.common.Mekanism; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; -import micdoodle8.mods.galacticraft.api.world.ISolarLevel; import net.minecraft.item.ItemStack; import net.minecraft.world.biome.BiomeGenDesert; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.common.Optional.Method; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.peripheral.IComputerAccess; +import micdoodle8.mods.galacticraft.api.world.ISolarLevel; public class TileEntitySolarGenerator extends TileEntityGenerator { diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java b/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java index c48700731..cd897ea8f 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java @@ -6,9 +6,10 @@ import mekanism.common.Mekanism; import mekanism.common.base.IBoundingBlock; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; -import mekanism.generators.common.MekanismGenerators; + import net.minecraft.item.ItemStack; import cpw.mods.fml.common.Optional.Method; + import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.peripheral.IComputerAccess; diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java index cac38a4c0..e33a30901 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java @@ -8,6 +8,7 @@ import mekanism.api.Coord4D; import mekanism.api.reactor.IFusionReactor; import mekanism.api.reactor.IReactorBlock; import mekanism.common.tile.TileEntityElectricBlock; + import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java index c8fe14a18..f5344f1e4 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java @@ -11,7 +11,7 @@ import mekanism.common.base.IActiveState; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.FusionReactor; -import net.minecraft.block.Block; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; @@ -21,6 +21,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import io.netty.buffer.ByteBuf; public class TileEntityReactorController extends TileEntityReactorBlock implements IActiveState diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java index 441344837..be0543ef3 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java @@ -1,7 +1,6 @@ package mekanism.generators.common.tile.reactor; import mekanism.api.lasers.ILaserReceptor; -import mekanism.api.reactor.IFusionReactor; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java index 5ca402789..148d51ecf 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -2,8 +2,6 @@ package mekanism.generators.common.tile.reactor; import java.util.EnumSet; -import mekanism.api.energy.ICableOutputter; -import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; diff --git a/src/main/java/mekanism/tools/client/gui/ToolsGuiFactory.java b/src/main/java/mekanism/tools/client/gui/ToolsGuiFactory.java index 80da391be..12d1ac6ba 100644 --- a/src/main/java/mekanism/tools/client/gui/ToolsGuiFactory.java +++ b/src/main/java/mekanism/tools/client/gui/ToolsGuiFactory.java @@ -2,7 +2,6 @@ package mekanism.tools.client.gui; import java.util.Set; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import cpw.mods.fml.client.IModGuiFactory; diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index 4be4e3b00..bb71db4d6 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -1,7 +1,5 @@ package mekanism.tools.common; -import io.netty.buffer.ByteBuf; - import java.io.IOException; import mekanism.api.MekanismConfig.tools; @@ -9,6 +7,7 @@ import mekanism.common.Mekanism; import mekanism.common.Version; import mekanism.common.base.IModule; import mekanism.common.recipe.MekanismRecipe; + import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.init.Items; @@ -29,6 +28,8 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import io.netty.buffer.ByteBuf; + @Mod(modid = "MekanismTools", name = "MekanismTools", version = "8.0.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") public class MekanismTools implements IModule { diff --git a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java index b5db6d106..78c18f0f8 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java @@ -2,11 +2,11 @@ package mekanism.tools.item; import java.util.List; +import mekanism.api.util.StackUtils; import mekanism.client.render.ModelCustomArmor; import mekanism.common.Mekanism; import mekanism.common.MekanismItems; import mekanism.common.util.MekanismUtils; -import mekanism.api.util.StackUtils; import mekanism.tools.common.MekanismTools; import mekanism.tools.common.ToolsItems; diff --git a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java index ab6626f06..a0f447174 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java @@ -2,9 +2,10 @@ package mekanism.tools.item; import java.util.List; +import mekanism.api.util.StackUtils; import mekanism.common.item.ItemMekanism; import mekanism.common.util.MekanismUtils; -import mekanism.api.util.StackUtils; + import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java b/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java index 2a1b993d5..774b9be56 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java @@ -4,7 +4,6 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.ForgeHooks; public class ItemMekanismPaxel extends ItemMekanismTool { diff --git a/src/main/java/mekanism/tools/item/ItemMekanismSword.java b/src/main/java/mekanism/tools/item/ItemMekanismSword.java index ed6157252..9a8ddd366 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismSword.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismSword.java @@ -4,6 +4,7 @@ import java.util.List; import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/tools/item/ItemMekanismTool.java b/src/main/java/mekanism/tools/item/ItemMekanismTool.java index 461c61243..9a40f1c24 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismTool.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismTool.java @@ -4,11 +4,12 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; +import mekanism.api.util.StackUtils; import mekanism.common.Mekanism; import mekanism.common.MekanismItems; import mekanism.common.util.MekanismUtils; -import mekanism.api.util.StackUtils; import mekanism.tools.common.MekanismTools; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer;