diff --git a/src/main/java/cofh/api/item/IAugmentItem.java b/src/main/java/cofh/api/item/IAugmentItem.java index e17fa8dec..56f21f7a3 100644 --- a/src/main/java/cofh/api/item/IAugmentItem.java +++ b/src/main/java/cofh/api/item/IAugmentItem.java @@ -1,9 +1,9 @@ package cofh.api.item; -import java.util.Set; - import net.minecraft.item.ItemStack; +import java.util.Set; + public interface IAugmentItem { /** diff --git a/src/main/java/com/jadarstudios/developercapes/HDImageBuffer.java b/src/main/java/com/jadarstudios/developercapes/HDImageBuffer.java index 884c8ca7c..393709263 100644 --- a/src/main/java/com/jadarstudios/developercapes/HDImageBuffer.java +++ b/src/main/java/com/jadarstudios/developercapes/HDImageBuffer.java @@ -10,7 +10,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.IImageBuffer; -import java.awt.Graphics; +import java.awt.*; import java.awt.image.BufferedImage; /** diff --git a/src/main/java/com/jadarstudios/developercapes/cape/CapeConfigManager.java b/src/main/java/com/jadarstudios/developercapes/cape/CapeConfigManager.java index d91bc7f0a..1c9ade627 100644 --- a/src/main/java/com/jadarstudios/developercapes/cape/CapeConfigManager.java +++ b/src/main/java/com/jadarstudios/developercapes/cape/CapeConfigManager.java @@ -15,10 +15,7 @@ import com.jadarstudios.developercapes.user.Group; import com.jadarstudios.developercapes.user.GroupManager; import com.jadarstudios.developercapes.user.User; import com.jadarstudios.developercapes.user.UserManager; -import org.apache.commons.lang3.ObjectUtils; -import java.io.BufferedReader; -import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.BitSet; diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index 4a62f845b..1a0f7e4d5 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -1,9 +1,7 @@ package mekanism.api; +import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import io.netty.buffer.ByteBuf; - -import java.util.ArrayList; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; @@ -17,7 +15,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; + +import java.util.ArrayList; /** * Coord4D - an integer-based way to keep track of and perform operations on blocks in a Minecraft-based environment. This also takes diff --git a/src/main/java/mekanism/api/MekanismAPI.java b/src/main/java/mekanism/api/MekanismAPI.java index 8594b6c44..312c2d6ca 100644 --- a/src/main/java/mekanism/api/MekanismAPI.java +++ b/src/main/java/mekanism/api/MekanismAPI.java @@ -1,13 +1,13 @@ package mekanism.api; -import java.util.HashSet; -import java.util.Set; - +import cpw.mods.fml.common.eventhandler.Event; import mekanism.api.util.BlockInfo; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.eventhandler.Event; + +import java.util.HashSet; +import java.util.Set; public class MekanismAPI { diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index a9f93a097..61a8375c4 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -1,12 +1,12 @@ package mekanism.api; +import mekanism.api.util.UnitDisplayUtils.EnergyType; +import mekanism.api.util.UnitDisplayUtils.TempType; + import java.util.HashMap; import java.util.List; import java.util.Map; -import mekanism.api.util.UnitDisplayUtils.EnergyType; -import mekanism.api.util.UnitDisplayUtils.TempType; - public class MekanismConfig { public static class general diff --git a/src/main/java/mekanism/api/Range4D.java b/src/main/java/mekanism/api/Range4D.java index 40905a66d..64a8ff186 100644 --- a/src/main/java/mekanism/api/Range4D.java +++ b/src/main/java/mekanism/api/Range4D.java @@ -1,7 +1,7 @@ package mekanism.api; -import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.common.FMLCommonHandler; +import net.minecraft.entity.player.EntityPlayer; public class Range4D { diff --git a/src/main/java/mekanism/api/gas/GasNetwork.java b/src/main/java/mekanism/api/gas/GasNetwork.java index 688c63bca..7258167c2 100644 --- a/src/main/java/mekanism/api/gas/GasNetwork.java +++ b/src/main/java/mekanism/api/gas/GasNetwork.java @@ -1,12 +1,8 @@ package mekanism.api.gas; -import java.util.Collection; -import java.util.Collections; -import java.util.EnumSet; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - +import com.google.common.collect.Lists; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.Event; import mekanism.api.Coord4D; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; @@ -14,10 +10,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; -import com.google.common.collect.Lists; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.Event; +import java.util.*; /** * A DynamicNetwork extension created specifically for the transfer of Gasses. By default this is server-only, but if ticked on diff --git a/src/main/java/mekanism/api/gas/GasRegistry.java b/src/main/java/mekanism/api/gas/GasRegistry.java index 25db9667e..ef11b8665 100644 --- a/src/main/java/mekanism/api/gas/GasRegistry.java +++ b/src/main/java/mekanism/api/gas/GasRegistry.java @@ -1,10 +1,10 @@ package mekanism.api.gas; +import net.minecraftforge.fluids.Fluid; + import java.util.ArrayList; import java.util.List; -import net.minecraftforge.fluids.Fluid; - public class GasRegistry { private static ArrayList registeredGasses = new ArrayList(); diff --git a/src/main/java/mekanism/api/gas/GasTransmission.java b/src/main/java/mekanism/api/gas/GasTransmission.java index ef6cc4d3b..cd2f1065d 100644 --- a/src/main/java/mekanism/api/gas/GasTransmission.java +++ b/src/main/java/mekanism/api/gas/GasTransmission.java @@ -1,11 +1,5 @@ package mekanism.api.gas; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.List; - import mekanism.api.Coord4D; import mekanism.api.transmitters.ITransmitterTile; import mekanism.api.transmitters.TransmissionType; @@ -13,6 +7,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import java.util.*; + /** * A handy class containing several utilities for efficient gas transfer. * @author AidanBrady diff --git a/src/main/java/mekanism/api/infuse/InfuseRegistry.java b/src/main/java/mekanism/api/infuse/InfuseRegistry.java index 308b9c5be..fa2338773 100644 --- a/src/main/java/mekanism/api/infuse/InfuseRegistry.java +++ b/src/main/java/mekanism/api/infuse/InfuseRegistry.java @@ -1,10 +1,10 @@ package mekanism.api.infuse; +import net.minecraft.item.ItemStack; + import java.util.HashMap; import java.util.Map; -import net.minecraft.item.ItemStack; - /** * Use this class to add a new object that registers as an infuse object. * @author AidanBrady diff --git a/src/main/java/mekanism/api/recipe/RecipeHelper.java b/src/main/java/mekanism/api/recipe/RecipeHelper.java index a125a8cbb..66fa9be57 100644 --- a/src/main/java/mekanism/api/recipe/RecipeHelper.java +++ b/src/main/java/mekanism/api/recipe/RecipeHelper.java @@ -1,12 +1,12 @@ package mekanism.api.recipe; -import java.lang.reflect.Method; - import mekanism.api.gas.GasStack; import mekanism.api.infuse.InfuseType; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import java.lang.reflect.Method; + /** * SET TO BE REMOVED NEXT MINOR MEKANISM VERSION, PLEASE USE IMC INSTEAD. * Use this handy class to add recipes to Mekanism machinery. diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java index 1bf01a879..ee4e8a2b7 100644 --- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java +++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java @@ -1,13 +1,10 @@ package mekanism.api.transmitters; -import java.util.Collection; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.Map.Entry; -import java.util.Set; - +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.Event; import mekanism.api.Coord4D; import mekanism.api.IClientTicker; import mekanism.api.Range4D; @@ -17,12 +14,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.Event; +import java.util.*; +import java.util.Map.Entry; public abstract class DynamicNetwork> implements IClientTicker, INetworkDataHandler { diff --git a/src/main/java/mekanism/api/transmitters/IGridTransmitter.java b/src/main/java/mekanism/api/transmitters/IGridTransmitter.java index c0ea3d5fd..9d82d486b 100644 --- a/src/main/java/mekanism/api/transmitters/IGridTransmitter.java +++ b/src/main/java/mekanism/api/transmitters/IGridTransmitter.java @@ -1,11 +1,11 @@ package mekanism.api.transmitters; -import java.util.Collection; - import mekanism.api.Coord4D; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import java.util.Collection; + public interface IGridTransmitter> extends ITransmitter { public boolean hasTransmitterNetwork(); diff --git a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java index 0f9c1c5fb..79445e30b 100644 --- a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java +++ b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java @@ -1,23 +1,20 @@ package mekanism.api.transmitters; -import java.util.HashMap; -import java.util.HashSet; - -import mekanism.api.Coord4D; -import mekanism.api.MekanismAPI; -import net.minecraftforge.common.util.ForgeDirection; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent; import cpw.mods.fml.relauncher.Side; +import mekanism.api.Coord4D; +import mekanism.api.MekanismAPI; +import net.minecraftforge.common.util.ForgeDirection; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.util.HashMap; +import java.util.HashSet; public class TransmitterNetworkRegistry { diff --git a/src/main/java/mekanism/api/util/StackUtils.java b/src/main/java/mekanism/api/util/StackUtils.java index 649046583..4dcc12cf2 100644 --- a/src/main/java/mekanism/api/util/StackUtils.java +++ b/src/main/java/mekanism/api/util/StackUtils.java @@ -1,12 +1,12 @@ package mekanism.api.util; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import java.util.ArrayList; +import java.util.List; + public final class StackUtils { public static List split(ItemStack stack) diff --git a/src/main/java/mekanism/client/CapeBufferDownload.java b/src/main/java/mekanism/client/CapeBufferDownload.java index f84d8dbbe..4534fd661 100644 --- a/src/main/java/mekanism/client/CapeBufferDownload.java +++ b/src/main/java/mekanism/client/CapeBufferDownload.java @@ -1,14 +1,14 @@ package mekanism.client; -import java.io.File; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ThreadDownloadImageData; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StringUtils; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.io.File; @SideOnly(Side.CLIENT) public class CapeBufferDownload extends Thread diff --git a/src/main/java/mekanism/client/ClientPlayerTracker.java b/src/main/java/mekanism/client/ClientPlayerTracker.java index 67e36a2e4..4041f156a 100644 --- a/src/main/java/mekanism/client/ClientPlayerTracker.java +++ b/src/main/java/mekanism/client/ClientPlayerTracker.java @@ -1,10 +1,10 @@ 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; import cpw.mods.fml.relauncher.SideOnly; +import mekanism.common.Mekanism; @SideOnly(Side.CLIENT) public class ClientPlayerTracker diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 6e72497d6..9792d1542 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -1,68 +1,21 @@ package mekanism.client; -import java.io.File; - import com.jadarstudios.developercapes.DevCapes; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.client; import mekanism.api.Pos3D; import mekanism.client.SparkleAnimation.INodeChecker; import mekanism.client.entity.EntityLaser; -import mekanism.client.gui.GuiAmbientAccumulator; -import mekanism.client.gui.GuiBoilerStats; -import mekanism.client.gui.GuiChemicalCrystallizer; -import mekanism.client.gui.GuiChemicalDissolutionChamber; -import mekanism.client.gui.GuiChemicalInfuser; -import mekanism.client.gui.GuiChemicalInjectionChamber; -import mekanism.client.gui.GuiChemicalOxidizer; -import mekanism.client.gui.GuiChemicalWasher; -import mekanism.client.gui.GuiCombiner; -import mekanism.client.gui.GuiCredits; -import mekanism.client.gui.GuiCrusher; -import mekanism.client.gui.GuiDictionary; -import mekanism.client.gui.GuiDigitalMiner; -import mekanism.client.gui.GuiDynamicTank; -import mekanism.client.gui.GuiElectricPump; -import mekanism.client.gui.GuiElectrolyticSeparator; -import mekanism.client.gui.GuiEnergizedSmelter; -import mekanism.client.gui.GuiEnergyCube; -import mekanism.client.gui.GuiEnrichmentChamber; -import mekanism.client.gui.GuiFactory; -import mekanism.client.gui.GuiFluidTank; -import mekanism.client.gui.GuiFluidicPlenisher; -import mekanism.client.gui.GuiFormulaicAssemblicator; -import mekanism.client.gui.GuiFuelwoodHeater; -import mekanism.client.gui.GuiGasTank; -import mekanism.client.gui.GuiInductionMatrix; -import mekanism.client.gui.GuiLaserAmplifier; -import mekanism.client.gui.GuiLaserTractorBeam; -import mekanism.client.gui.GuiMatrixStats; -import mekanism.client.gui.GuiMetallurgicInfuser; -import mekanism.client.gui.GuiOredictionificator; -import mekanism.client.gui.GuiOsmiumCompressor; -import mekanism.client.gui.GuiPRC; -import mekanism.client.gui.GuiPersonalChest; -import mekanism.client.gui.GuiPrecisionSawmill; -import mekanism.client.gui.GuiPurificationChamber; -import mekanism.client.gui.GuiQuantumEntangloporter; -import mekanism.client.gui.GuiResistiveHeater; -import mekanism.client.gui.GuiRobitCrafting; -import mekanism.client.gui.GuiRobitInventory; -import mekanism.client.gui.GuiRobitMain; -import mekanism.client.gui.GuiRobitRepair; -import mekanism.client.gui.GuiRobitSmelting; -import mekanism.client.gui.GuiRotaryCondensentrator; -import mekanism.client.gui.GuiSecurityDesk; -import mekanism.client.gui.GuiSeismicReader; -import mekanism.client.gui.GuiSeismicVibrator; -import mekanism.client.gui.GuiSideConfiguration; -import mekanism.client.gui.GuiSolarNeutronActivator; -import mekanism.client.gui.GuiTeleporter; -import mekanism.client.gui.GuiThermalEvaporationController; -import mekanism.client.gui.GuiThermoelectricBoiler; -import mekanism.client.gui.GuiTransporterConfig; -import mekanism.client.gui.GuiUpgradeManagement; +import mekanism.client.gui.*; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.RenderGlowPanel; import mekanism.client.render.RenderPartTransmitter; @@ -76,39 +29,7 @@ import mekanism.client.render.entity.RenderFlame; import mekanism.client.render.entity.RenderObsidianTNTPrimed; import mekanism.client.render.entity.RenderRobit; import mekanism.client.render.item.ItemRenderingHandler; -import mekanism.client.render.tileentity.RenderBin; -import mekanism.client.render.tileentity.RenderChargepad; -import mekanism.client.render.tileentity.RenderChemicalCrystallizer; -import mekanism.client.render.tileentity.RenderChemicalDissolutionChamber; -import mekanism.client.render.tileentity.RenderChemicalInfuser; -import mekanism.client.render.tileentity.RenderChemicalOxidizer; -import mekanism.client.render.tileentity.RenderChemicalWasher; -import mekanism.client.render.tileentity.RenderConfigurableMachine; -import mekanism.client.render.tileentity.RenderDigitalMiner; -import mekanism.client.render.tileentity.RenderDynamicTank; -import mekanism.client.render.tileentity.RenderElectricPump; -import mekanism.client.render.tileentity.RenderElectrolyticSeparator; -import mekanism.client.render.tileentity.RenderEnergyCube; -import mekanism.client.render.tileentity.RenderFluidTank; -import mekanism.client.render.tileentity.RenderFluidicPlenisher; -import mekanism.client.render.tileentity.RenderGasTank; -import mekanism.client.render.tileentity.RenderLaser; -import mekanism.client.render.tileentity.RenderLaserAmplifier; -import mekanism.client.render.tileentity.RenderLaserTractorBeam; -import mekanism.client.render.tileentity.RenderLogisticalSorter; -import mekanism.client.render.tileentity.RenderMetallurgicInfuser; -import mekanism.client.render.tileentity.RenderObsidianTNT; -import mekanism.client.render.tileentity.RenderPersonalChest; -import mekanism.client.render.tileentity.RenderPressurizedReactionChamber; -import mekanism.client.render.tileentity.RenderQuantumEntangloporter; -import mekanism.client.render.tileentity.RenderResistiveHeater; -import mekanism.client.render.tileentity.RenderRotaryCondensentrator; -import mekanism.client.render.tileentity.RenderSecurityDesk; -import mekanism.client.render.tileentity.RenderSeismicVibrator; -import mekanism.client.render.tileentity.RenderSolarNeutronActivator; -import mekanism.client.render.tileentity.RenderTeleporter; -import mekanism.client.render.tileentity.RenderThermalEvaporationController; -import mekanism.client.render.tileentity.RenderThermoelectricBoiler; +import mekanism.client.render.tileentity.*; import mekanism.common.CommonProxy; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; @@ -116,73 +37,13 @@ import mekanism.common.MekanismItems; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.BlockMachine.MachineType; -import mekanism.common.entity.EntityBabySkeleton; -import mekanism.common.entity.EntityBalloon; -import mekanism.common.entity.EntityFlame; -import mekanism.common.entity.EntityObsidianTNT; -import mekanism.common.entity.EntityRobit; +import mekanism.common.entity.*; import mekanism.common.inventory.InventoryPersonalChest; import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.item.ItemSeismicReader; import mekanism.common.multiblock.MultiblockManager; import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage; -import mekanism.common.tile.TileEntityAdvancedElectricMachine; -import mekanism.common.tile.TileEntityAdvancedFactory; -import mekanism.common.tile.TileEntityAmbientAccumulator; -import mekanism.common.tile.TileEntityBin; -import mekanism.common.tile.TileEntityBoilerCasing; -import mekanism.common.tile.TileEntityBoilerValve; -import mekanism.common.tile.TileEntityChargepad; -import mekanism.common.tile.TileEntityChemicalCrystallizer; -import mekanism.common.tile.TileEntityChemicalDissolutionChamber; -import mekanism.common.tile.TileEntityChemicalInfuser; -import mekanism.common.tile.TileEntityChemicalInjectionChamber; -import mekanism.common.tile.TileEntityChemicalOxidizer; -import mekanism.common.tile.TileEntityChemicalWasher; -import mekanism.common.tile.TileEntityCombiner; -import mekanism.common.tile.TileEntityCrusher; -import mekanism.common.tile.TileEntityDigitalMiner; -import mekanism.common.tile.TileEntityDynamicTank; -import mekanism.common.tile.TileEntityDynamicValve; -import mekanism.common.tile.TileEntityElectricMachine; -import mekanism.common.tile.TileEntityElectricPump; -import mekanism.common.tile.TileEntityElectrolyticSeparator; -import mekanism.common.tile.TileEntityEliteFactory; -import mekanism.common.tile.TileEntityEnergizedSmelter; -import mekanism.common.tile.TileEntityEnergyCube; -import mekanism.common.tile.TileEntityEnrichmentChamber; -import mekanism.common.tile.TileEntityFactory; -import mekanism.common.tile.TileEntityFluidTank; -import mekanism.common.tile.TileEntityFluidicPlenisher; -import mekanism.common.tile.TileEntityFormulaicAssemblicator; -import mekanism.common.tile.TileEntityFuelwoodHeater; -import mekanism.common.tile.TileEntityGasTank; -import mekanism.common.tile.TileEntityInductionCasing; -import mekanism.common.tile.TileEntityInductionCell; -import mekanism.common.tile.TileEntityInductionPort; -import mekanism.common.tile.TileEntityInductionProvider; -import mekanism.common.tile.TileEntityLaser; -import mekanism.common.tile.TileEntityLaserAmplifier; -import mekanism.common.tile.TileEntityLaserTractorBeam; -import mekanism.common.tile.TileEntityLogisticalSorter; -import mekanism.common.tile.TileEntityMetallurgicInfuser; -import mekanism.common.tile.TileEntityMultiblock; -import mekanism.common.tile.TileEntityObsidianTNT; -import mekanism.common.tile.TileEntityOredictionificator; -import mekanism.common.tile.TileEntityOsmiumCompressor; -import mekanism.common.tile.TileEntityPRC; -import mekanism.common.tile.TileEntityPersonalChest; -import mekanism.common.tile.TileEntityPrecisionSawmill; -import mekanism.common.tile.TileEntityPurificationChamber; -import mekanism.common.tile.TileEntityQuantumEntangloporter; -import mekanism.common.tile.TileEntityResistiveHeater; -import mekanism.common.tile.TileEntityRotaryCondensentrator; -import mekanism.common.tile.TileEntitySecurityDesk; -import mekanism.common.tile.TileEntitySeismicVibrator; -import mekanism.common.tile.TileEntitySolarNeutronActivator; -import mekanism.common.tile.TileEntityStructuralGlass; -import mekanism.common.tile.TileEntityTeleporter; -import mekanism.common.tile.TileEntityThermalEvaporationController; +import mekanism.common.tile.*; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; @@ -195,14 +56,8 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.io.File; /** * Client proxy for the Mekanism mod. diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index c3d87fc29..b2204614d 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -1,14 +1,11 @@ package mekanism.client; -import static mekanism.client.sound.SoundHandler.Channel.FLAMETHROWER; -import static mekanism.client.sound.SoundHandler.Channel.GASMASK; -import static mekanism.client.sound.SoundHandler.Channel.JETPACK; - -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - +import cpw.mods.fml.client.FMLClientHandler; +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.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.IClientTicker; import mekanism.api.MekanismConfig.client; import mekanism.api.gas.GasStack; @@ -16,12 +13,8 @@ import mekanism.client.sound.SoundHandler; import mekanism.common.CommonPlayerTickHandler; import mekanism.common.KeySync; import mekanism.common.Mekanism; -import mekanism.common.item.ItemFlamethrower; -import mekanism.common.item.ItemFreeRunners; -import mekanism.common.item.ItemGasMask; -import mekanism.common.item.ItemJetpack; +import mekanism.common.item.*; import mekanism.common.item.ItemJetpack.JetpackMode; -import mekanism.common.item.ItemScubaTank; import mekanism.common.network.PacketFlamethrowerData; import mekanism.common.network.PacketFlamethrowerData.FlamethrowerDataMessage; import mekanism.common.network.PacketJetpackData.JetpackDataMessage; @@ -34,12 +27,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; -import cpw.mods.fml.client.FMLClientHandler; -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.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import static mekanism.client.sound.SoundHandler.Channel.*; /** * Client-side tick handler for Mekanism. Used mainly for the update check upon startup. diff --git a/src/main/java/mekanism/client/HolidayManager.java b/src/main/java/mekanism/client/HolidayManager.java index d62563d33..608de305d 100644 --- a/src/main/java/mekanism/client/HolidayManager.java +++ b/src/main/java/mekanism/client/HolidayManager.java @@ -1,9 +1,5 @@ package mekanism.client; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; - import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.client; import mekanism.common.Mekanism; @@ -12,6 +8,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ChatComponentText; import net.minecraft.util.ResourceLocation; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + public final class HolidayManager { private static Calendar calendar = Calendar.getInstance(); diff --git a/src/main/java/mekanism/client/MekKeyHandler.java b/src/main/java/mekanism/client/MekKeyHandler.java index 36dfab718..60cd646eb 100644 --- a/src/main/java/mekanism/client/MekKeyHandler.java +++ b/src/main/java/mekanism/client/MekKeyHandler.java @@ -1,7 +1,6 @@ package mekanism.client; import net.minecraft.client.settings.KeyBinding; - import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; diff --git a/src/main/java/mekanism/client/MekanismClient.java b/src/main/java/mekanism/client/MekanismClient.java index 47ffe97c1..a07b138d2 100644 --- a/src/main/java/mekanism/client/MekanismClient.java +++ b/src/main/java/mekanism/client/MekanismClient.java @@ -1,8 +1,5 @@ package mekanism.client; -import java.util.HashMap; -import java.util.Map; - import mekanism.api.MekanismAPI; import mekanism.api.MekanismAPI.BoxBlacklistEvent; import mekanism.client.sound.SoundHandler; @@ -15,6 +12,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.settings.KeyBinding; import net.minecraftforge.common.MinecraftForge; +import java.util.HashMap; +import java.util.Map; + public class MekanismClient extends Mekanism { public static Map clientSecurityMap = new HashMap(); diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index 3550760dc..daaa51887 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -1,18 +1,20 @@ package mekanism.client; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.InputEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.EnumColor; import mekanism.api.util.StackUtils; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine.MachineType; -import mekanism.common.item.ItemBlockMachine; -import mekanism.common.item.ItemConfigurator; +import mekanism.common.item.*; import mekanism.common.item.ItemConfigurator.ConfiguratorMode; -import mekanism.common.item.ItemElectricBow; -import mekanism.common.item.ItemFlamethrower; -import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemJetpack.JetpackMode; -import mekanism.common.item.ItemScubaTank; import mekanism.common.network.PacketConfiguratorState.ConfiguratorStateMessage; import mekanism.common.network.PacketElectricBowState.ElectricBowStateMessage; import mekanism.common.network.PacketFlamethrowerData; @@ -28,17 +30,8 @@ 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; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.InputEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class MekanismKeyHandler extends MekKeyHandler { diff --git a/src/main/java/mekanism/client/SparkleAnimation.java b/src/main/java/mekanism/client/SparkleAnimation.java index 1222bebc5..3f4fbcca9 100644 --- a/src/main/java/mekanism/client/SparkleAnimation.java +++ b/src/main/java/mekanism/client/SparkleAnimation.java @@ -1,18 +1,18 @@ package mekanism.client; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig.client; +import mekanism.api.MekanismConfig.general; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + import java.util.HashSet; import java.util.Random; import java.util.Set; -import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.client; -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; - @SideOnly(Side.CLIENT) public class SparkleAnimation { diff --git a/src/main/java/mekanism/client/entity/EntityLaser.java b/src/main/java/mekanism/client/entity/EntityLaser.java index c91db933b..309443492 100644 --- a/src/main/java/mekanism/client/entity/EntityLaser.java +++ b/src/main/java/mekanism/client/entity/EntityLaser.java @@ -1,5 +1,7 @@ package mekanism.client.entity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Pos3D; import mekanism.client.render.MekanismRenderer; import net.minecraft.client.Minecraft; @@ -8,12 +10,8 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.ResourceLocation; 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; - @SideOnly(Side.CLIENT) public class EntityLaser extends EntityFX { diff --git a/src/main/java/mekanism/client/gui/ConfigGuiFactory.java b/src/main/java/mekanism/client/gui/ConfigGuiFactory.java index 48138f6bd..81ae0f749 100644 --- a/src/main/java/mekanism/client/gui/ConfigGuiFactory.java +++ b/src/main/java/mekanism/client/gui/ConfigGuiFactory.java @@ -1,10 +1,10 @@ package mekanism.client.gui; -import java.util.Set; - +import cpw.mods.fml.client.IModGuiFactory; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; -import cpw.mods.fml.client.IModGuiFactory; + +import java.util.Set; public class ConfigGuiFactory implements IModGuiFactory { diff --git a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java index c66857b35..aea20d337 100644 --- a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -1,34 +1,24 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.gas.GasStack; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; -import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSecurityTab; -import mekanism.client.gui.element.GuiSideConfigurationTab; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.gui.element.GuiTransporterConfigTab; -import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.render.MekanismRenderer; import mekanism.common.inventory.container.ContainerAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.util.LangUtils; 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 java.util.List; @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 37fd31e9f..fc7e36295 100644 --- a/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java +++ b/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java @@ -10,7 +10,6 @@ import mekanism.common.util.LangUtils; 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/GuiBoilerStats.java b/src/main/java/mekanism/client/gui/GuiBoilerStats.java index b14dab367..0de8db878 100644 --- a/src/main/java/mekanism/client/gui/GuiBoilerStats.java +++ b/src/main/java/mekanism/client/gui/GuiBoilerStats.java @@ -1,7 +1,7 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.MekanismConfig.general; import mekanism.api.util.ListUtils; import mekanism.api.util.UnitDisplayUtils; @@ -19,11 +19,9 @@ import mekanism.common.util.LangUtils; 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 java.util.List; @SideOnly(Side.CLIENT) public class GuiBoilerStats extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiChanceMachine.java b/src/main/java/mekanism/client/gui/GuiChanceMachine.java index d2cf784b5..f088f620e 100644 --- a/src/main/java/mekanism/client/gui/GuiChanceMachine.java +++ b/src/main/java/mekanism/client/gui/GuiChanceMachine.java @@ -1,32 +1,22 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; -import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSecurityTab; -import mekanism.client.gui.element.GuiSideConfigurationTab; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.gui.element.GuiTransporterConfigTab; -import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerChanceMachine; import mekanism.common.tile.TileEntityChanceMachine; import mekanism.common.util.LangUtils; 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 java.util.List; @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 cc1da4df8..360a4b9c3 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java @@ -1,29 +1,18 @@ package mekanism.client.gui; -import java.util.ArrayList; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.gas.Gas; import mekanism.api.gas.GasTank; import mekanism.api.gas.OreGas; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; -import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.element.GuiGauge; -import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSecurityTab; -import mekanism.client.gui.element.GuiSideConfigurationTab; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.gui.element.GuiTransporterConfigTab; -import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerChemicalCrystallizer; import mekanism.common.recipe.machines.CrystallizerRecipe; import mekanism.common.tile.TileEntityChemicalCrystallizer; @@ -34,11 +23,10 @@ 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 java.util.ArrayList; +import java.util.List; @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 a57a0ce17..9a3adb13a 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java @@ -1,34 +1,25 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; -import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiGasGauge; -import mekanism.client.gui.element.GuiSecurityTab; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.element.GuiGauge; -import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerChemicalDissolutionChamber; import mekanism.common.tile.TileEntityChemicalDissolutionChamber; import mekanism.common.util.LangUtils; 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 java.util.List; @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 b64e82884..980941807 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java @@ -1,34 +1,25 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; -import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.element.GuiGauge; -import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSecurityTab; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerChemicalInfuser; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.util.LangUtils; 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 java.util.List; @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 49ad53994..427bac022 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java @@ -1,10 +1,10 @@ package mekanism.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.gui.element.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; @SideOnly(Side.CLIENT) public class GuiChemicalInjectionChamber extends GuiAdvancedElectricMachine diff --git a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java index 24a2c9715..8862ff962 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java @@ -1,34 +1,25 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; -import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.element.GuiGauge; -import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSecurityTab; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerChemicalOxidizer; import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.util.LangUtils; 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 java.util.List; @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 01b90d539..56130ae00 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java @@ -1,27 +1,18 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; -import mekanism.client.gui.element.GuiBucketIO; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiElement.IInfoHandler; -import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; -import mekanism.client.gui.element.GuiGasGauge; import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiGauge.Type; -import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSecurityTab; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerChemicalWasher; import mekanism.common.tile.TileEntityChemicalWasher; import mekanism.common.util.LangUtils; @@ -29,11 +20,9 @@ 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 java.util.List; @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 70dad2b1c..d0921a452 100644 --- a/src/main/java/mekanism/client/gui/GuiCombiner.java +++ b/src/main/java/mekanism/client/gui/GuiCombiner.java @@ -1,10 +1,10 @@ package mekanism.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.gui.element.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; @SideOnly(Side.CLIENT) public class GuiCombiner extends GuiAdvancedElectricMachine diff --git a/src/main/java/mekanism/client/gui/GuiCredits.java b/src/main/java/mekanism/client/gui/GuiCredits.java index 41945f32e..6b1c42305 100644 --- a/src/main/java/mekanism/client/gui/GuiCredits.java +++ b/src/main/java/mekanism/client/gui/GuiCredits.java @@ -1,12 +1,12 @@ package mekanism.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.EnumColor; import mekanism.common.Mekanism; import mekanism.common.Version; import mekanism.common.base.IModule; import net.minecraft.client.gui.GuiScreen; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiCredits extends GuiScreen diff --git a/src/main/java/mekanism/client/gui/GuiCrusher.java b/src/main/java/mekanism/client/gui/GuiCrusher.java index 0283f3aa8..4e20f7370 100644 --- a/src/main/java/mekanism/client/gui/GuiCrusher.java +++ b/src/main/java/mekanism/client/gui/GuiCrusher.java @@ -1,10 +1,10 @@ package mekanism.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.gui.element.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; @SideOnly(Side.CLIENT) public class GuiCrusher extends GuiElectricMachine diff --git a/src/main/java/mekanism/client/gui/GuiDictionary.java b/src/main/java/mekanism/client/gui/GuiDictionary.java index e89dbcf7d..234ba4062 100644 --- a/src/main/java/mekanism/client/gui/GuiDictionary.java +++ b/src/main/java/mekanism/client/gui/GuiDictionary.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.gui.element.GuiScrollList; import mekanism.client.sound.SoundHandler; import mekanism.common.inventory.container.ContainerDictionary; @@ -9,13 +11,9 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; - 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 d823730a6..45d155db7 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -1,21 +1,14 @@ package mekanism.client.gui; -import java.util.ArrayList; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; -import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSecurityTab; -import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.gui.element.GuiUpgradeTab; -import mekanism.client.gui.element.GuiVisualsTab; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -30,12 +23,11 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.List; @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 1588686da..d8745df5f 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -1,12 +1,7 @@ package mekanism.client.gui; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig; @@ -14,11 +9,7 @@ import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.OreDictCache; -import mekanism.common.content.miner.MItemStackFilter; -import mekanism.common.content.miner.MMaterialFilter; -import mekanism.common.content.miner.MModIDFilter; -import mekanism.common.content.miner.MOreDictFilter; -import mekanism.common.content.miner.MinerFilter; +import mekanism.common.content.miner.*; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage; import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; @@ -31,13 +22,11 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; - import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.*; @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 46c5b07b8..9adb7dd42 100644 --- a/src/main/java/mekanism/client/gui/GuiDynamicTank.java +++ b/src/main/java/mekanism/client/gui/GuiDynamicTank.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.gui.element.GuiContainerEditMode; import mekanism.client.render.MekanismRenderer; import mekanism.common.content.tank.TankUpdateProtocol; @@ -10,12 +12,8 @@ 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; - @SideOnly(Side.CLIENT) public class GuiDynamicTank extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiElectricMachine.java b/src/main/java/mekanism/client/gui/GuiElectricMachine.java index 66dd6e8b4..d70998a2a 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiElectricMachine.java @@ -1,32 +1,22 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; -import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSecurityTab; -import mekanism.client.gui.element.GuiSideConfigurationTab; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.gui.element.GuiTransporterConfigTab; -import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerElectricMachine; import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.util.LangUtils; 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 java.util.List; @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 adc345534..e7ac0e07a 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricPump.java +++ b/src/main/java/mekanism/client/gui/GuiElectricPump.java @@ -1,20 +1,13 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; -import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; -import mekanism.client.gui.element.GuiGauge; -import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSecurityTab; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerElectricPump; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.util.LangUtils; @@ -23,11 +16,9 @@ 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 java.util.List; @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 1885defa2..7b7482c06 100755 --- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -1,28 +1,18 @@ package mekanism.client.gui; -import java.util.ArrayList; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; -import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; -import mekanism.client.gui.element.GuiGasGauge; import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.element.GuiGauge; -import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSecurityTab; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerElectrolyticSeparator; @@ -34,11 +24,10 @@ 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 java.util.ArrayList; +import java.util.List; @SideOnly(Side.CLIENT) public class GuiElectrolyticSeparator extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java b/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java index b5857c959..3185ad8dc 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java +++ b/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java @@ -1,10 +1,10 @@ package mekanism.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.gui.element.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; @SideOnly(Side.CLIENT) public class GuiEnergizedSmelter extends GuiElectricMachine diff --git a/src/main/java/mekanism/client/gui/GuiEnergyCube.java b/src/main/java/mekanism/client/gui/GuiEnergyCube.java index 00f2f29aa..f4a2d32b2 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergyCube.java +++ b/src/main/java/mekanism/client/gui/GuiEnergyCube.java @@ -1,31 +1,23 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; -import mekanism.client.gui.element.GuiEnergyGauge; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiEnergyGauge.IEnergyInfoHandler; -import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSecurityTab; -import mekanism.client.gui.element.GuiSideConfigurationTab; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.common.inventory.container.ContainerEnergyCube; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.LangUtils; 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 java.util.List; @SideOnly(Side.CLIENT) public class GuiEnergyCube extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java b/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java index 3df82f662..0ac7b6184 100644 --- a/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java +++ b/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java @@ -1,10 +1,10 @@ package mekanism.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.gui.element.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; @SideOnly(Side.CLIENT) public class GuiEnrichmentChamber extends GuiElectricMachine diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index d9766e355..7b05df6ef 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -1,39 +1,28 @@ package mekanism.client.gui; -import java.util.ArrayList; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; -import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiRecipeType; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSecurityTab; -import mekanism.client.gui.element.GuiSideConfigurationTab; -import mekanism.client.gui.element.GuiSortingTab; -import mekanism.client.gui.element.GuiTransporterConfigTab; -import mekanism.client.gui.element.GuiUpgradeTab; +import mekanism.client.gui.element.*; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.Tier.FactoryTier; import mekanism.common.base.IFactory.RecipeType; import mekanism.common.inventory.container.ContainerFactory; -import mekanism.common.item.ItemGaugeDropper; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; - import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.List; @SideOnly(Side.CLIENT) public class GuiFactory extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiFluidTank.java b/src/main/java/mekanism/client/gui/GuiFluidTank.java index c453d9848..eeb36f49a 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidTank.java +++ b/src/main/java/mekanism/client/gui/GuiFluidTank.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.gui.element.GuiContainerEditMode; import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; @@ -14,12 +16,8 @@ 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; - @SideOnly(Side.CLIENT) public class GuiFluidTank extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java index ced3e4ed5..01ec7e3a6 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java +++ b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java @@ -1,20 +1,13 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; -import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; -import mekanism.client.gui.element.GuiGauge; -import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSecurityTab; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerFluidicPlenisher; import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.util.LangUtils; @@ -23,11 +16,9 @@ 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 java.util.List; @SideOnly(Side.CLIENT) public class GuiFluidicPlenisher extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java index 573ee0fca..2bac0f1a3 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -1,21 +1,13 @@ package mekanism.client.gui; -import java.util.ArrayList; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; -import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSecurityTab; -import mekanism.client.gui.element.GuiSideConfigurationTab; -import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.gui.element.GuiTransporterConfigTab; -import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -30,11 +22,10 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.List; @SideOnly(Side.CLIENT) public class GuiFormulaicAssemblicator extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java b/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java index 71d1b3050..d78bb4d60 100644 --- a/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java +++ b/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java @@ -1,7 +1,7 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.MekanismConfig.general; import mekanism.api.util.ListUtils; import mekanism.api.util.UnitDisplayUtils; @@ -17,11 +17,9 @@ import mekanism.common.util.LangUtils; 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 java.util.List; @SideOnly(Side.CLIENT) public class GuiFuelwoodHeater extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index 99a1eb195..6626db85b 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -1,15 +1,11 @@ package mekanism.client.gui; -import java.util.ArrayList; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSecurityTab; -import mekanism.client.gui.element.GuiSideConfigurationTab; -import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerGasTank; @@ -19,11 +15,9 @@ import mekanism.common.util.LangUtils; 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 java.util.ArrayList; @SideOnly(Side.CLIENT) public class GuiGasTank extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java index fce2961c2..84fa9e8f8 100644 --- a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java +++ b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java @@ -1,7 +1,7 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; @@ -14,11 +14,9 @@ import mekanism.common.util.LangUtils; 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 java.util.List; @SideOnly(Side.CLIENT) public class GuiInductionMatrix extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java index 93c8b2130..45251e4a5 100644 --- a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java +++ b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java @@ -1,7 +1,7 @@ package mekanism.client.gui; -import java.util.ArrayList; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.client.gui.element.GuiAmplifierTab; import mekanism.client.gui.element.GuiGauge.Type; @@ -20,12 +20,10 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.IIcon; - import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; @SideOnly(Side.CLIENT) public class GuiLaserAmplifier extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java b/src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java index 1f5641b62..c51c74f13 100644 --- a/src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java +++ b/src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java @@ -7,7 +7,6 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; - import org.lwjgl.opengl.GL11; public class GuiLaserTractorBeam extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index a16f508bd..9b381d1ea 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -1,12 +1,7 @@ package mekanism.client.gui; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.gui.element.GuiRedstoneControl; @@ -15,11 +10,7 @@ import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.OreDictCache; -import mekanism.common.content.transporter.TItemStackFilter; -import mekanism.common.content.transporter.TMaterialFilter; -import mekanism.common.content.transporter.TModIDFilter; -import mekanism.common.content.transporter.TOreDictFilter; -import mekanism.common.content.transporter.TransporterFilter; +import mekanism.common.content.transporter.*; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage; import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; @@ -31,14 +22,12 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; - import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.*; @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 37fc8e773..7c88e3990 100644 --- a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -12,12 +14,8 @@ 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; - @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 debcd3c43..cd8bdc16f 100644 --- a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.sound.SoundHandler; @@ -20,13 +22,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; - 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 9696101bc..e08f03894 100644 --- a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.sound.SoundHandler; @@ -20,13 +22,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; - 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 ee49b66e4..6c1d2356f 100644 --- a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java @@ -1,7 +1,7 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.sound.SoundHandler; @@ -25,12 +25,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; - import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; @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 f4c55c396..fd3c2ffb0 100644 --- a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java @@ -1,7 +1,7 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.sound.SoundHandler; @@ -25,12 +25,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; - import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; @SideOnly(Side.CLIENT) public class GuiMOreDictFilter extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiMatrixStats.java b/src/main/java/mekanism/client/gui/GuiMatrixStats.java index 2697af13c..25fe43f7b 100644 --- a/src/main/java/mekanism/client/gui/GuiMatrixStats.java +++ b/src/main/java/mekanism/client/gui/GuiMatrixStats.java @@ -1,7 +1,7 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; @@ -18,11 +18,9 @@ import mekanism.common.util.LangUtils; 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 java.util.List; @SideOnly(Side.CLIENT) public class GuiMatrixStats extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiMekanism.java b/src/main/java/mekanism/client/gui/GuiMekanism.java index 84a396088..dc62c85df 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanism.java +++ b/src/main/java/mekanism/client/gui/GuiMekanism.java @@ -1,10 +1,5 @@ package mekanism.client.gui; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import mekanism.api.transmitters.TransmissionType; import mekanism.client.gui.element.GuiElement; import mekanism.common.SideData; @@ -18,10 +13,14 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; - import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper { public Set guiElements = new HashSet(); diff --git a/src/main/java/mekanism/client/gui/GuiMekanismConfig.java b/src/main/java/mekanism/client/gui/GuiMekanismConfig.java index 546ade237..bf251bb95 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanismConfig.java +++ b/src/main/java/mekanism/client/gui/GuiMekanismConfig.java @@ -1,18 +1,18 @@ package mekanism.client.gui; -import java.util.ArrayList; -import java.util.List; - -import mekanism.common.Mekanism; -import mekanism.common.util.LangUtils; -import net.minecraft.client.gui.GuiScreen; -import net.minecraftforge.common.config.ConfigElement; -import net.minecraftforge.common.config.Configuration; import cpw.mods.fml.client.config.DummyConfigElement.DummyCategoryElement; import cpw.mods.fml.client.config.GuiConfig; import cpw.mods.fml.client.config.GuiConfigEntries; import cpw.mods.fml.client.config.GuiConfigEntries.CategoryEntry; import cpw.mods.fml.client.config.IConfigElement; +import mekanism.common.Mekanism; +import mekanism.common.util.LangUtils; +import net.minecraft.client.gui.GuiScreen; +import net.minecraftforge.common.config.ConfigElement; +import net.minecraftforge.common.config.Configuration; + +import java.util.ArrayList; +import java.util.List; public class GuiMekanismConfig extends GuiConfig { diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index b56e47d5e..8bdf7a2b6 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -1,24 +1,15 @@ package mekanism.client.gui; -import java.util.ArrayList; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; -import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSecurityTab; -import mekanism.client.gui.element.GuiSideConfigurationTab; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.gui.element.GuiTransporterConfigTab; -import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -29,11 +20,10 @@ import mekanism.common.util.LangUtils; 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 java.util.ArrayList; +import java.util.List; @SideOnly(Side.CLIENT) public class GuiMetallurgicInfuser extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificator.java b/src/main/java/mekanism/client/gui/GuiOredictionificator.java index f18638c1a..25e69d61f 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificator.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificator.java @@ -1,9 +1,7 @@ package mekanism.client.gui; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.gui.element.GuiProgress; @@ -28,11 +26,11 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; 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 java.util.HashMap; +import java.util.List; +import java.util.Map; @SideOnly(Side.CLIENT) public class GuiOredictionificator extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java index 5535de6b6..3de3ce3fb 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java @@ -1,7 +1,7 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -19,12 +19,10 @@ import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; - import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; @SideOnly(Side.CLIENT) public class GuiOredictionificatorFilter extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java b/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java index bd17dfa1e..3f2c55067 100644 --- a/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java +++ b/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java @@ -1,10 +1,10 @@ package mekanism.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.gui.element.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; @SideOnly(Side.CLIENT) public class GuiOsmiumCompressor extends GuiAdvancedElectricMachine diff --git a/src/main/java/mekanism/client/gui/GuiPRC.java b/src/main/java/mekanism/client/gui/GuiPRC.java index 0f951adc3..a26342ed1 100644 --- a/src/main/java/mekanism/client/gui/GuiPRC.java +++ b/src/main/java/mekanism/client/gui/GuiPRC.java @@ -1,28 +1,17 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; -import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; -import mekanism.client.gui.element.GuiGasGauge; import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.element.GuiGauge; -import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSecurityTab; -import mekanism.client.gui.element.GuiSideConfigurationTab; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.gui.element.GuiTransporterConfigTab; -import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerPRC; import mekanism.common.tile.TileEntityPRC; import mekanism.common.util.LangUtils; @@ -30,11 +19,9 @@ 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 java.util.List; @SideOnly(Side.CLIENT) public class GuiPRC extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiPersonalChest.java b/src/main/java/mekanism/client/gui/GuiPersonalChest.java index 6c51d68e2..6ecfe4e20 100644 --- a/src/main/java/mekanism/client/gui/GuiPersonalChest.java +++ b/src/main/java/mekanism/client/gui/GuiPersonalChest.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.gui.element.GuiSecurityTab; import mekanism.common.inventory.container.ContainerPersonalChest; import mekanism.common.tile.TileEntityPersonalChest; @@ -8,12 +10,8 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; - import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiPersonalChest extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiPrecisionSawmill.java b/src/main/java/mekanism/client/gui/GuiPrecisionSawmill.java index 1b521b90b..9a25febcc 100644 --- a/src/main/java/mekanism/client/gui/GuiPrecisionSawmill.java +++ b/src/main/java/mekanism/client/gui/GuiPrecisionSawmill.java @@ -1,10 +1,10 @@ package mekanism.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.gui.element.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; @SideOnly(Side.CLIENT) public class GuiPrecisionSawmill extends GuiChanceMachine diff --git a/src/main/java/mekanism/client/gui/GuiPurificationChamber.java b/src/main/java/mekanism/client/gui/GuiPurificationChamber.java index c33d40407..19f8942ef 100644 --- a/src/main/java/mekanism/client/gui/GuiPurificationChamber.java +++ b/src/main/java/mekanism/client/gui/GuiPurificationChamber.java @@ -1,10 +1,10 @@ package mekanism.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.gui.element.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; @SideOnly(Side.CLIENT) public class GuiPurificationChamber extends GuiAdvancedElectricMachine diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java index 4980be01d..e0a71cd5d 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -1,8 +1,7 @@ package mekanism.client.gui; -import java.util.ArrayList; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.gui.element.GuiScrollList; @@ -26,12 +25,11 @@ import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; - import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.List; @SideOnly(Side.CLIENT) public class GuiQuantumEntangloporter extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java index 0fbf6800c..f556a2505 100644 --- a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java +++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java @@ -1,20 +1,14 @@ package mekanism.client.gui; -import java.util.ArrayList; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.util.ListUtils; import mekanism.api.util.UnitDisplayUtils; import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.client.gui.element.GuiElement.IInfoHandler; -import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiHeatInfo; -import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSecurityTab; -import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.sound.SoundHandler; @@ -27,12 +21,11 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; - import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.List; @SideOnly(Side.CLIENT) public class GuiResistiveHeater extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java index ca02ba00c..f024cca19 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.entity.EntityRobit; @@ -10,12 +12,8 @@ import mekanism.common.util.LangUtils; 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; - @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 921318bc0..c4e7972ea 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitInventory.java +++ b/src/main/java/mekanism/client/gui/GuiRobitInventory.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.entity.EntityRobit; @@ -10,12 +12,8 @@ import mekanism.common.util.LangUtils; 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; - @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 3e96ce071..c2788fe7e 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitMain.java +++ b/src/main/java/mekanism/client/gui/GuiRobitMain.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.entity.EntityRobit; @@ -12,13 +14,9 @@ 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 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 38b8d46ab..24b24e102 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitRepair.java +++ b/src/main/java/mekanism/client/gui/GuiRobitRepair.java @@ -1,7 +1,7 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.entity.EntityRobit; @@ -19,13 +19,11 @@ import net.minecraft.inventory.ICrafting; import net.minecraft.item.ItemStack; import net.minecraft.network.play.client.C17PacketCustomPayload; import net.minecraft.util.StatCollector; - 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 java.util.List; @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 0f0740e27..46706f607 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitSmelting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitSmelting.java @@ -10,7 +10,6 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; - import org.lwjgl.opengl.GL11; public class GuiRobitSmelting extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index 02d6614fe..67f93b395 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -1,27 +1,18 @@ package mekanism.client.gui; -import java.util.ArrayList; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; -import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; -import mekanism.client.gui.element.GuiGasGauge; import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.element.GuiGauge; -import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSecurityTab; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerRotaryCondensentrator; @@ -32,11 +23,10 @@ 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 java.util.ArrayList; +import java.util.List; @SideOnly(Side.CLIENT) public class GuiRotaryCondensentrator extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java index fa9fa0a9d..77901caa5 100644 --- a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java +++ b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java @@ -1,9 +1,7 @@ package mekanism.client.gui; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.gui.element.GuiScrollList; @@ -21,12 +19,12 @@ import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; - import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; @SideOnly(Side.CLIENT) public class GuiSecurityDesk extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiSeismicReader.java b/src/main/java/mekanism/client/gui/GuiSeismicReader.java index f685f3008..8ee881c3a 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicReader.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicReader.java @@ -1,7 +1,7 @@ package mekanism.client.gui; -import java.util.ArrayList; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; @@ -11,13 +11,11 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.opengl.GL11; import org.lwjgl.util.Rectangle; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; @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 41870e3b4..b2d220984 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java @@ -1,15 +1,11 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.MekanismConfig.usage; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; -import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSecurityTab; -import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerSeismicVibrator; @@ -18,11 +14,9 @@ import mekanism.common.util.LangUtils; 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 java.util.List; @SideOnly(Side.CLIENT) public class GuiSeismicVibrator extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java index 2337fe9be..69afc35f6 100644 --- a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java +++ b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java @@ -1,10 +1,7 @@ package mekanism.client.gui; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.transmitters.TransmissionType; @@ -25,12 +22,13 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; - import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @SideOnly(Side.CLIENT) public class GuiSideConfiguration extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java index abd14af44..e53917cb2 100644 --- a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java +++ b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java @@ -1,30 +1,22 @@ package mekanism.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.gas.GasTank; -import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.element.GuiGauge; -import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSecurityTab; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerSolarNeutronActivator; import mekanism.common.tile.TileEntitySolarNeutronActivator; import mekanism.common.util.LangUtils; 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; - @SideOnly(Side.CLIENT) public class GuiSolarNeutronActivator extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java index 97ccc5d0c..ae8008fe1 100644 --- a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -12,12 +14,8 @@ 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; - @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 e56c4f9bd..4635932cf 100644 --- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer; @@ -20,14 +22,10 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; - 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 f0f8b6a3d..05feae614 100644 --- a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer; @@ -22,14 +24,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; - 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 de19a598f..23b25bc13 100644 --- a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java @@ -1,7 +1,7 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer; @@ -24,13 +24,11 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; - 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; +import java.util.List; @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 0d66c1d4f..2f709f8cc 100644 --- a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java @@ -1,7 +1,7 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer; @@ -24,13 +24,11 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; - 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; +import java.util.List; @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 19e9e3df9..98e04a8d6 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -1,8 +1,7 @@ package mekanism.client.gui; -import java.util.ArrayList; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.gui.element.GuiPowerBar; @@ -34,12 +33,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; - import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.List; @SideOnly(Side.CLIENT) public class GuiTeleporter extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java b/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java index b86467675..1f426c21e 100644 --- a/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java +++ b/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java @@ -1,7 +1,7 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.MekanismConfig.general; import mekanism.api.util.ListUtils; import mekanism.api.util.UnitDisplayUtils; @@ -18,11 +18,9 @@ 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 java.util.List; @SideOnly(Side.CLIENT) public class GuiThermalEvaporationController extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java index 31c553e2f..54ef2205a 100644 --- a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java @@ -1,7 +1,7 @@ package mekanism.client.gui; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.MekanismConfig.general; import mekanism.api.util.ListUtils; import mekanism.api.util.UnitDisplayUtils; @@ -21,11 +21,9 @@ 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 java.util.List; @SideOnly(Side.CLIENT) public class GuiThermoelectricBoiler extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java index c8daf4350..c75b6d198 100644 --- a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java +++ b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java @@ -1,8 +1,7 @@ package mekanism.client.gui; -import java.util.HashMap; -import java.util.Map; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.transmitters.TransmissionType; @@ -23,13 +22,12 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; - 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; +import java.util.HashMap; +import java.util.Map; @SideOnly(Side.CLIENT) public class GuiTransporterConfig extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java index 745110fd0..c3b257fe5 100644 --- a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java +++ b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java @@ -1,7 +1,7 @@ package mekanism.client.gui; -import java.util.Set; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; @@ -17,11 +17,9 @@ 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 java.util.Set; @SideOnly(Side.CLIENT) public class GuiUpgradeManagement extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/IGuiWrapper.java b/src/main/java/mekanism/client/gui/IGuiWrapper.java index c22ccf2f9..ad857a8a0 100644 --- a/src/main/java/mekanism/client/gui/IGuiWrapper.java +++ b/src/main/java/mekanism/client/gui/IGuiWrapper.java @@ -1,10 +1,10 @@ package mekanism.client.gui; -import java.util.List; - import net.minecraft.client.gui.FontRenderer; import net.minecraft.util.IIcon; +import java.util.List; + public interface IGuiWrapper { public void drawTexturedRect(int x, int y, int u, int v, int w, int h); diff --git a/src/main/java/mekanism/client/gui/element/GuiAmplifierTab.java b/src/main/java/mekanism/client/gui/element/GuiAmplifierTab.java index b2eaa1b58..53efef0dd 100644 --- a/src/main/java/mekanism/client/gui/element/GuiAmplifierTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiAmplifierTab.java @@ -1,7 +1,8 @@ package mekanism.client.gui.element; -import java.util.ArrayList; - +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; @@ -13,9 +14,8 @@ 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 java.util.ArrayList; @SideOnly(Side.CLIENT) public class GuiAmplifierTab extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java b/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java index 24d2b24b8..412f7e93d 100644 --- a/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java @@ -1,5 +1,8 @@ package mekanism.client.gui.element; +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; @@ -10,9 +13,6 @@ 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; @SideOnly(Side.CLIENT) public class GuiBoilerTab extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiBucketIO.java b/src/main/java/mekanism/client/gui/element/GuiBucketIO.java index 944479a79..1b7ca0cc4 100644 --- a/src/main/java/mekanism/client/gui/element/GuiBucketIO.java +++ b/src/main/java/mekanism/client/gui/element/GuiBucketIO.java @@ -1,12 +1,12 @@ package mekanism.client.gui.element; +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.gui.IGuiWrapper; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiBucketIO extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java b/src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java index 69aa43e87..e43d98236 100644 --- a/src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java @@ -1,5 +1,8 @@ package mekanism.client.gui.element; +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.transmitters.TransmissionType; import mekanism.client.gui.GuiSideConfiguration; import mekanism.client.gui.IGuiWrapper; @@ -8,9 +11,6 @@ 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; @SideOnly(Side.CLIENT) public class GuiConfigTypeTab extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java b/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java index b265d4c7a..299a51015 100644 --- a/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java +++ b/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java @@ -1,5 +1,8 @@ package mekanism.client.gui.element; +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; @@ -11,9 +14,6 @@ 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; @SideOnly(Side.CLIENT) public class GuiContainerEditMode extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiElement.java b/src/main/java/mekanism/client/gui/element/GuiElement.java index af0c0d74a..4946f2d58 100644 --- a/src/main/java/mekanism/client/gui/element/GuiElement.java +++ b/src/main/java/mekanism/client/gui/element/GuiElement.java @@ -1,7 +1,8 @@ package mekanism.client.gui.element; -import java.util.List; - +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.gui.IGuiWrapper; import mekanism.common.ObfuscatedNames; import mekanism.common.util.MekanismUtils; @@ -9,12 +10,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; -import codechicken.lib.vec.Rectangle4i; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; @SideOnly(Side.CLIENT) public abstract class GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java b/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java index 53a388f3d..c547ed04f 100644 --- a/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java @@ -1,5 +1,6 @@ package mekanism.client.gui.element; +import codechicken.lib.vec.Rectangle4i; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.transmitters.TransmissionType; import mekanism.client.gui.IGuiWrapper; @@ -8,7 +9,6 @@ import mekanism.common.util.LangUtils; 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 { diff --git a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java index c734f0e2a..ee03af081 100644 --- a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java +++ b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java @@ -1,8 +1,8 @@ package mekanism.client.gui.element; -import java.util.ArrayList; -import java.util.List; - +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.MekanismConfig.general; import mekanism.api.util.UnitDisplayUtils.EnergyType; import mekanism.client.gui.IGuiWrapper; @@ -10,9 +10,9 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.ArrayList; +import java.util.List; @SideOnly(Side.CLIENT) public class GuiEnergyInfo extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java index 51ef948eb..5b41d7c8f 100644 --- a/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java @@ -1,7 +1,5 @@ package mekanism.client.gui.element; -import java.util.Arrays; - import mekanism.api.Coord4D; import mekanism.api.transmitters.TransmissionType; import mekanism.client.gui.GuiMekanism; @@ -17,9 +15,10 @@ import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidTank; - import org.lwjgl.input.Keyboard; +import java.util.Arrays; + public class GuiFluidGauge extends GuiGauge { IFluidInfoHandler infoHandler; diff --git a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java index 939edaaa1..815294f99 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java @@ -1,7 +1,5 @@ package mekanism.client.gui.element; -import java.util.Arrays; - import mekanism.api.Coord4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasTank; @@ -17,9 +15,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import org.lwjgl.input.Keyboard; +import java.util.Arrays; + public class GuiGasGauge extends GuiGauge { IGasInfoHandler infoHandler; diff --git a/src/main/java/mekanism/client/gui/element/GuiGauge.java b/src/main/java/mekanism/client/gui/element/GuiGauge.java index 7d43268ae..5d02a6419 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiGauge.java @@ -1,5 +1,6 @@ package mekanism.client.gui.element; +import codechicken.lib.vec.Rectangle4i; import mekanism.api.EnumColor; import mekanism.api.transmitters.TransmissionType; import mekanism.client.gui.GuiMekanism; @@ -14,7 +15,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; public abstract class GuiGauge extends GuiElement { diff --git a/src/main/java/mekanism/client/gui/element/GuiGraph.java b/src/main/java/mekanism/client/gui/element/GuiGraph.java index 4fbd0f4b2..3712f9b7c 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGraph.java +++ b/src/main/java/mekanism/client/gui/element/GuiGraph.java @@ -1,19 +1,17 @@ package mekanism.client.gui.element; -import java.util.ArrayList; -import java.util.List; - +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.gui.IGuiWrapper; import mekanism.client.render.MekanismRenderer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; -import codechicken.lib.vec.Rectangle4i; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.List; @SideOnly(Side.CLIENT) public class GuiGraph extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java b/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java index 41d335736..be8460b64 100644 --- a/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java +++ b/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java @@ -1,8 +1,8 @@ package mekanism.client.gui.element; -import java.util.ArrayList; -import java.util.List; - +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.MekanismConfig.general; import mekanism.api.util.UnitDisplayUtils.TempType; import mekanism.client.gui.IGuiWrapper; @@ -10,9 +10,9 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.ArrayList; +import java.util.List; @SideOnly(Side.CLIENT) public class GuiHeatInfo extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java b/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java index db464f2f6..60771426b 100644 --- a/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java @@ -1,5 +1,8 @@ package mekanism.client.gui.element; +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; @@ -10,9 +13,6 @@ 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; @SideOnly(Side.CLIENT) public class GuiMatrixTab extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiNumberGauge.java b/src/main/java/mekanism/client/gui/element/GuiNumberGauge.java index 8143e7bee..d51cc618d 100644 --- a/src/main/java/mekanism/client/gui/element/GuiNumberGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiNumberGauge.java @@ -1,11 +1,12 @@ package mekanism.client.gui.element; -import static java.lang.Math.min; import mekanism.api.transmitters.TransmissionType; import mekanism.client.gui.IGuiWrapper; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; +import static java.lang.Math.min; + public class GuiNumberGauge extends GuiGauge { INumberInfoHandler infoHandler; diff --git a/src/main/java/mekanism/client/gui/element/GuiPowerBar.java b/src/main/java/mekanism/client/gui/element/GuiPowerBar.java index 16d3d2826..47720a8fd 100644 --- a/src/main/java/mekanism/client/gui/element/GuiPowerBar.java +++ b/src/main/java/mekanism/client/gui/element/GuiPowerBar.java @@ -1,13 +1,13 @@ package mekanism.client.gui.element; +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.client.gui.IGuiWrapper; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiPowerBar extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiProgress.java b/src/main/java/mekanism/client/gui/element/GuiProgress.java index 97c716cca..212f7687d 100644 --- a/src/main/java/mekanism/client/gui/element/GuiProgress.java +++ b/src/main/java/mekanism/client/gui/element/GuiProgress.java @@ -1,12 +1,12 @@ package mekanism.client.gui.element; +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.gui.IGuiWrapper; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiProgress extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiRateBar.java b/src/main/java/mekanism/client/gui/element/GuiRateBar.java index e6c1d450b..e91815588 100644 --- a/src/main/java/mekanism/client/gui/element/GuiRateBar.java +++ b/src/main/java/mekanism/client/gui/element/GuiRateBar.java @@ -1,12 +1,12 @@ package mekanism.client.gui.element; +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.gui.IGuiWrapper; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiRateBar extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiRecipeType.java b/src/main/java/mekanism/client/gui/element/GuiRecipeType.java index cba684451..8dcace43a 100644 --- a/src/main/java/mekanism/client/gui/element/GuiRecipeType.java +++ b/src/main/java/mekanism/client/gui/element/GuiRecipeType.java @@ -1,11 +1,11 @@ package mekanism.client.gui.element; +import codechicken.lib.vec.Rectangle4i; import mekanism.client.gui.IGuiWrapper; 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 { diff --git a/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java b/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java index 02ae61822..8f8a79e81 100644 --- a/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java +++ b/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java @@ -1,5 +1,8 @@ package mekanism.client.gui.element; +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; @@ -11,9 +14,6 @@ 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; @SideOnly(Side.CLIENT) public class GuiRedstoneControl extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiScrollList.java b/src/main/java/mekanism/client/gui/element/GuiScrollList.java index 5c9f0a421..89d7467c5 100644 --- a/src/main/java/mekanism/client/gui/element/GuiScrollList.java +++ b/src/main/java/mekanism/client/gui/element/GuiScrollList.java @@ -1,18 +1,16 @@ package mekanism.client.gui.element; -import java.util.ArrayList; -import java.util.List; - -import mekanism.client.gui.IGuiWrapper; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - import codechicken.lib.vec.Rectangle4i; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import mekanism.client.gui.IGuiWrapper; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; + +import java.util.ArrayList; +import java.util.List; @SideOnly(Side.CLIENT) public class GuiScrollList extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java index ece37160e..33736bb57 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java @@ -1,5 +1,8 @@ package mekanism.client.gui.element; +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; @@ -21,9 +24,6 @@ import mekanism.common.util.SecurityUtils; import net.minecraft.item.ItemStack; 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; @SideOnly(Side.CLIENT) public class GuiSecurityTab extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java b/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java index 21d09df96..089ec1719 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java @@ -1,5 +1,8 @@ package mekanism.client.gui.element; +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; @@ -10,9 +13,6 @@ 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; @SideOnly(Side.CLIENT) public class GuiSideConfigurationTab extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiSlot.java b/src/main/java/mekanism/client/gui/element/GuiSlot.java index c3c8af31d..4b4cbe29a 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSlot.java +++ b/src/main/java/mekanism/client/gui/element/GuiSlot.java @@ -1,10 +1,10 @@ package mekanism.client.gui.element; +import codechicken.lib.vec.Rectangle4i; import mekanism.client.gui.IGuiWrapper; 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 { diff --git a/src/main/java/mekanism/client/gui/element/GuiSortingTab.java b/src/main/java/mekanism/client/gui/element/GuiSortingTab.java index 69400f688..f9ac246b9 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSortingTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSortingTab.java @@ -1,7 +1,8 @@ package mekanism.client.gui.element; -import java.util.ArrayList; - +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; @@ -12,9 +13,8 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.ArrayList; @SideOnly(Side.CLIENT) public class GuiSortingTab extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java b/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java index 35457b507..040d9385e 100644 --- a/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java @@ -1,5 +1,8 @@ package mekanism.client.gui.element; +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; @@ -10,9 +13,6 @@ 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; @SideOnly(Side.CLIENT) public class GuiTransporterConfigTab extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiUpgradeTab.java b/src/main/java/mekanism/client/gui/element/GuiUpgradeTab.java index 051a8eb8a..95ed1f41b 100644 --- a/src/main/java/mekanism/client/gui/element/GuiUpgradeTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiUpgradeTab.java @@ -1,5 +1,6 @@ package mekanism.client.gui.element; +import codechicken.lib.vec.Rectangle4i; import mekanism.api.Coord4D; import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; @@ -10,7 +11,6 @@ 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/gui/element/GuiVisualsTab.java b/src/main/java/mekanism/client/gui/element/GuiVisualsTab.java index a638548b3..466928d38 100644 --- a/src/main/java/mekanism/client/gui/element/GuiVisualsTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiVisualsTab.java @@ -1,5 +1,6 @@ package mekanism.client.gui.element; +import codechicken.lib.vec.Rectangle4i; import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; import mekanism.common.tile.TileEntityDigitalMiner; @@ -7,7 +8,6 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; public class GuiVisualsTab extends GuiElement { diff --git a/src/main/java/mekanism/client/model/ModelArmoredJetpack.java b/src/main/java/mekanism/client/model/ModelArmoredJetpack.java index 55083bec4..7589aff43 100644 --- a/src/main/java/mekanism/client/model/ModelArmoredJetpack.java +++ b/src/main/java/mekanism/client/model/ModelArmoredJetpack.java @@ -3,7 +3,6 @@ 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; public class ModelArmoredJetpack extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java b/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java index c312595f5..a9f2380c0 100644 --- a/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java +++ b/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java @@ -3,7 +3,6 @@ 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; public class ModelAtomicDisassembler extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelBalloon.java b/src/main/java/mekanism/client/model/ModelBalloon.java index dab4fb017..8df046429 100644 --- a/src/main/java/mekanism/client/model/ModelBalloon.java +++ b/src/main/java/mekanism/client/model/ModelBalloon.java @@ -1,13 +1,11 @@ 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 mekanism.api.EnumColor; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class ModelBalloon extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelChargepad.java b/src/main/java/mekanism/client/model/ModelChargepad.java index d6b0cd015..a933f2d5a 100644 --- a/src/main/java/mekanism/client/model/ModelChargepad.java +++ b/src/main/java/mekanism/client/model/ModelChargepad.java @@ -1,5 +1,7 @@ package mekanism.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.render.MekanismRenderer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -7,12 +9,8 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class ModelChargepad extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java b/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java index ac0441e12..6e4e7d3a8 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java @@ -1,10 +1,10 @@ package mekanism.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChemicalCrystallizer extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java b/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java index 9787060be..b82f2bb90 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java @@ -1,10 +1,10 @@ package mekanism.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChemicalDissolutionChamber extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java index 24413cb7c..66b6b6957 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java +++ b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java @@ -1,9 +1,9 @@ package mekanism.client.model; -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 net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; @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 b2cd1a122..2690b1797 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java +++ b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java @@ -1,9 +1,9 @@ package mekanism.client.model; -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 net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; @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 3aa26bc5e..7b266eeae 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalWasher.java +++ b/src/main/java/mekanism/client/model/ModelChemicalWasher.java @@ -1,9 +1,9 @@ package mekanism.client.model; -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 net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; @SideOnly(Side.CLIENT) public class ModelChemicalWasher extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelDigitalMiner.java b/src/main/java/mekanism/client/model/ModelDigitalMiner.java index 00e36202c..74fa91a52 100644 --- a/src/main/java/mekanism/client/model/ModelDigitalMiner.java +++ b/src/main/java/mekanism/client/model/ModelDigitalMiner.java @@ -1,5 +1,7 @@ package mekanism.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.render.MekanismRenderer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -7,12 +9,8 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class ModelDigitalMiner extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelElectricPump.java b/src/main/java/mekanism/client/model/ModelElectricPump.java index dad1e41bc..bfb6e254a 100644 --- a/src/main/java/mekanism/client/model/ModelElectricPump.java +++ b/src/main/java/mekanism/client/model/ModelElectricPump.java @@ -1,9 +1,9 @@ package mekanism.client.model; -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 net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; @SideOnly(Side.CLIENT) public class ModelElectricPump extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java index f424ca347..3463e99d9 100644 --- a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java @@ -1,9 +1,9 @@ package mekanism.client.model; -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 net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; @SideOnly(Side.CLIENT) public class ModelElectrolyticSeparator extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelEnergyCube.java b/src/main/java/mekanism/client/model/ModelEnergyCube.java index 334846a76..8474549c3 100644 --- a/src/main/java/mekanism/client/model/ModelEnergyCube.java +++ b/src/main/java/mekanism/client/model/ModelEnergyCube.java @@ -1,5 +1,7 @@ package mekanism.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.tileentity.RenderEnergyCube; import mekanism.common.SideData.IOState; @@ -11,12 +13,8 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class ModelEnergyCube extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelFlamethrower.java b/src/main/java/mekanism/client/model/ModelFlamethrower.java index c6e72f986..f09b4a632 100644 --- a/src/main/java/mekanism/client/model/ModelFlamethrower.java +++ b/src/main/java/mekanism/client/model/ModelFlamethrower.java @@ -1,9 +1,9 @@ package mekanism.client.model; -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 net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; @SideOnly(Side.CLIENT) public class ModelFlamethrower extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelFluidTank.java b/src/main/java/mekanism/client/model/ModelFluidTank.java index ffc7d375d..d36b4eb81 100644 --- a/src/main/java/mekanism/client/model/ModelFluidTank.java +++ b/src/main/java/mekanism/client/model/ModelFluidTank.java @@ -1,11 +1,11 @@ package mekanism.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.render.MekanismRenderer; import mekanism.common.Tier.FluidTankTier; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelFluidTank extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelFluidicPlenisher.java b/src/main/java/mekanism/client/model/ModelFluidicPlenisher.java index 23912acbe..3c6b9eff0 100644 --- a/src/main/java/mekanism/client/model/ModelFluidicPlenisher.java +++ b/src/main/java/mekanism/client/model/ModelFluidicPlenisher.java @@ -1,9 +1,9 @@ package mekanism.client.model; -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 net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; @SideOnly(Side.CLIENT) public class ModelFluidicPlenisher extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelGasMask.java b/src/main/java/mekanism/client/model/ModelGasMask.java index 469a43070..ae299ff26 100644 --- a/src/main/java/mekanism/client/model/ModelGasMask.java +++ b/src/main/java/mekanism/client/model/ModelGasMask.java @@ -1,13 +1,11 @@ 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 mekanism.client.render.MekanismRenderer; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class ModelGasMask extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelGasTank.java b/src/main/java/mekanism/client/model/ModelGasTank.java index 083381ab0..51c27b21d 100644 --- a/src/main/java/mekanism/client/model/ModelGasTank.java +++ b/src/main/java/mekanism/client/model/ModelGasTank.java @@ -1,9 +1,9 @@ package mekanism.client.model; -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 net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; @SideOnly(Side.CLIENT) public class ModelGasTank extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelJetpack.java b/src/main/java/mekanism/client/model/ModelJetpack.java index 19d31a719..1b8008f75 100644 --- a/src/main/java/mekanism/client/model/ModelJetpack.java +++ b/src/main/java/mekanism/client/model/ModelJetpack.java @@ -1,13 +1,11 @@ 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 mekanism.client.render.MekanismRenderer; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class ModelJetpack extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelLaserAmplifier.java b/src/main/java/mekanism/client/model/ModelLaserAmplifier.java index 344391899..647089908 100644 --- a/src/main/java/mekanism/client/model/ModelLaserAmplifier.java +++ b/src/main/java/mekanism/client/model/ModelLaserAmplifier.java @@ -1,9 +1,9 @@ package mekanism.client.model; -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 net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; @SideOnly(Side.CLIENT) public class ModelLaserAmplifier extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelLogisticalSorter.java b/src/main/java/mekanism/client/model/ModelLogisticalSorter.java index 8fec0d967..acd7c1edc 100644 --- a/src/main/java/mekanism/client/model/ModelLogisticalSorter.java +++ b/src/main/java/mekanism/client/model/ModelLogisticalSorter.java @@ -1,10 +1,10 @@ package mekanism.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelLogisticalSorter extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java b/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java index b12adbee3..6f9f1d67f 100644 --- a/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java @@ -1,9 +1,9 @@ package mekanism.client.model; -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 net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; @SideOnly(Side.CLIENT) public class ModelMetallurgicInfuser extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelObsidianTNT.java b/src/main/java/mekanism/client/model/ModelObsidianTNT.java index 574c63811..747447d78 100644 --- a/src/main/java/mekanism/client/model/ModelObsidianTNT.java +++ b/src/main/java/mekanism/client/model/ModelObsidianTNT.java @@ -1,9 +1,9 @@ package mekanism.client.model; -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 net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; @SideOnly(Side.CLIENT) public class ModelObsidianTNT extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java b/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java index 4e0ae34a3..2bfbd0569 100644 --- a/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java +++ b/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java @@ -1,9 +1,9 @@ package mekanism.client.model; -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 net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; @SideOnly(Side.CLIENT) public class ModelPressurizedReactionChamber extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java b/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java index ce935ceba..b1d85731d 100644 --- a/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java @@ -1,5 +1,7 @@ package mekanism.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.render.MekanismRenderer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -7,12 +9,8 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class ModelQuantumEntangloporter extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelResistiveHeater.java b/src/main/java/mekanism/client/model/ModelResistiveHeater.java index c6ad45b68..5c94b60fd 100644 --- a/src/main/java/mekanism/client/model/ModelResistiveHeater.java +++ b/src/main/java/mekanism/client/model/ModelResistiveHeater.java @@ -1,5 +1,7 @@ package mekanism.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.render.MekanismRenderer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -7,12 +9,8 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class ModelResistiveHeater extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelRobit.java b/src/main/java/mekanism/client/model/ModelRobit.java index 6796e0798..3f6a832c2 100644 --- a/src/main/java/mekanism/client/model/ModelRobit.java +++ b/src/main/java/mekanism/client/model/ModelRobit.java @@ -1,15 +1,13 @@ package mekanism.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; 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; - @SideOnly(Side.CLIENT) public class ModelRobit extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelRotaryCondensentrator.java b/src/main/java/mekanism/client/model/ModelRotaryCondensentrator.java index 5b252f01d..ad27186c1 100644 --- a/src/main/java/mekanism/client/model/ModelRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/model/ModelRotaryCondensentrator.java @@ -1,9 +1,9 @@ package mekanism.client.model; -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 net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; @SideOnly(Side.CLIENT) public class ModelRotaryCondensentrator extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelScubaTank.java b/src/main/java/mekanism/client/model/ModelScubaTank.java index 963eb82b1..f5f2e9560 100644 --- a/src/main/java/mekanism/client/model/ModelScubaTank.java +++ b/src/main/java/mekanism/client/model/ModelScubaTank.java @@ -1,9 +1,9 @@ package mekanism.client.model; -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 net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; @SideOnly(Side.CLIENT) public class ModelScubaTank extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelSecurityDesk.java b/src/main/java/mekanism/client/model/ModelSecurityDesk.java index 0bde64d7c..8816d7297 100644 --- a/src/main/java/mekanism/client/model/ModelSecurityDesk.java +++ b/src/main/java/mekanism/client/model/ModelSecurityDesk.java @@ -1,5 +1,7 @@ package mekanism.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.render.MekanismRenderer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -7,12 +9,8 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class ModelSecurityDesk extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelSeismicVibrator.java b/src/main/java/mekanism/client/model/ModelSeismicVibrator.java index c304a8c71..5433c9049 100644 --- a/src/main/java/mekanism/client/model/ModelSeismicVibrator.java +++ b/src/main/java/mekanism/client/model/ModelSeismicVibrator.java @@ -1,9 +1,9 @@ package mekanism.client.model; -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 net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; @SideOnly(Side.CLIENT) public class ModelSeismicVibrator extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelSolarNeutronActivator.java b/src/main/java/mekanism/client/model/ModelSolarNeutronActivator.java index 7159c810d..93c5e6697 100644 --- a/src/main/java/mekanism/client/model/ModelSolarNeutronActivator.java +++ b/src/main/java/mekanism/client/model/ModelSolarNeutronActivator.java @@ -1,9 +1,9 @@ package mekanism.client.model; -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 net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; @SideOnly(Side.CLIENT) public class ModelSolarNeutronActivator extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelTransporterBox.java b/src/main/java/mekanism/client/model/ModelTransporterBox.java index 9d756e558..890fad3e6 100644 --- a/src/main/java/mekanism/client/model/ModelTransporterBox.java +++ b/src/main/java/mekanism/client/model/ModelTransporterBox.java @@ -1,9 +1,9 @@ package mekanism.client.model; -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 net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; @SideOnly(Side.CLIENT) public class ModelTransporterBox extends ModelBase diff --git a/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java b/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java index 536a86cfc..aa4514f6d 100644 --- a/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java @@ -1,13 +1,11 @@ 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.util.Collection; -import java.util.List; - +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.NEIServerUtils; +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.recipe.TemplateRecipeHandler; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.client.gui.element.GuiElement; @@ -26,15 +24,14 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; - import org.lwjgl.opengl.GL11; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; +import java.awt.*; +import java.util.Collection; +import java.util.List; + +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; public abstract class AdvancedMachineRecipeHandler extends BaseRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/BaseRecipeHandler.java b/src/main/java/mekanism/client/nei/BaseRecipeHandler.java index 5fe5f3879..527765518 100644 --- a/src/main/java/mekanism/client/nei/BaseRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/BaseRecipeHandler.java @@ -1,13 +1,8 @@ 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; - +import codechicken.nei.recipe.GuiCraftingRecipe; +import codechicken.nei.recipe.GuiUsageRecipe; +import codechicken.nei.recipe.TemplateRecipeHandler; import mekanism.api.gas.GasStack; import mekanism.client.gui.IGuiWrapper; import mekanism.client.gui.element.GuiElement; @@ -15,9 +10,12 @@ 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 java.util.HashSet; +import java.util.List; +import java.util.Set; + +import static codechicken.lib.gui.GuiDraw.*; public abstract class BaseRecipeHandler extends TemplateRecipeHandler implements IGuiWrapper { diff --git a/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java b/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java index e9e56e0ac..c389d3e31 100644 --- a/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java @@ -1,12 +1,8 @@ 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.util.Collection; - +import codechicken.nei.NEIServerUtils; +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.TemplateRecipeHandler; import mekanism.client.gui.element.GuiElement; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; @@ -21,12 +17,12 @@ import mekanism.common.recipe.outputs.ChanceOutput; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.item.ItemStack; - import org.lwjgl.opengl.GL11; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; +import java.awt.*; +import java.util.Collection; + +import static codechicken.lib.gui.GuiDraw.*; public abstract class ChanceMachineRecipeHandler extends BaseRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java index 72821cc56..5cf9b0e26 100644 --- a/src/main/java/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java @@ -1,13 +1,11 @@ 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.util.Collection; -import java.util.List; - +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.NEIServerUtils; +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.recipe.TemplateRecipeHandler; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiChemicalCrystallizer; import mekanism.common.ObfuscatedNames; @@ -17,15 +15,14 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; - import org.lwjgl.opengl.GL11; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; +import java.awt.*; +import java.util.Collection; +import java.util.List; + +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; public class ChemicalCrystallizerRecipeHandler extends BaseRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/ChemicalDissolutionChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalDissolutionChamberRecipeHandler.java index 2dc3b302f..dcbf3d97e 100644 --- a/src/main/java/mekanism/client/nei/ChemicalDissolutionChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalDissolutionChamberRecipeHandler.java @@ -1,13 +1,11 @@ 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.util.Collection; -import java.util.List; - +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.NEIServerUtils; +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.recipe.TemplateRecipeHandler; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiChemicalDissolutionChamber; @@ -18,15 +16,14 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; - import org.lwjgl.opengl.GL11; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; +import java.awt.*; +import java.util.Collection; +import java.util.List; + +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; public class ChemicalDissolutionChamberRecipeHandler extends BaseRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java index f0040b32a..19ed5dc3d 100644 --- a/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java @@ -1,13 +1,10 @@ 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.util.Collection; -import java.util.List; - +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.recipe.TemplateRecipeHandler; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiChemicalInfuser; import mekanism.common.ObfuscatedNames; @@ -17,14 +14,14 @@ import mekanism.common.recipe.machines.ChemicalInfuserRecipe; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.client.gui.inventory.GuiContainer; - import org.lwjgl.opengl.GL11; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; +import java.awt.*; +import java.util.Collection; +import java.util.List; + +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; public class ChemicalInfuserRecipeHandler extends BaseRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java index d67d3089e..18be71088 100644 --- a/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java @@ -1,9 +1,5 @@ package mekanism.client.nei; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - import mekanism.api.gas.Gas; import mekanism.api.gas.GasifyableItems; import mekanism.client.gui.GuiChemicalInjectionChamber; @@ -16,6 +12,10 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + public class ChemicalInjectionChamberRecipeHandler extends AdvancedMachineRecipeHandler { @Override diff --git a/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java index 6f5b877c5..5df4c3908 100644 --- a/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java @@ -1,22 +1,16 @@ 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.util.Collection; -import java.util.List; - +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.NEIServerUtils; +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.recipe.TemplateRecipeHandler; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiChemicalOxidizer; -import mekanism.client.gui.element.GuiElement; -import mekanism.client.gui.element.GuiGasGauge; -import mekanism.client.gui.element.GuiGauge; -import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.ObfuscatedNames; @@ -27,15 +21,14 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; - import org.lwjgl.opengl.GL11; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; +import java.awt.*; +import java.util.Collection; +import java.util.List; + +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; public class ChemicalOxidizerRecipeHandler extends BaseRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java index 808029516..0ea6c9ce6 100644 --- a/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java @@ -1,13 +1,10 @@ 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.util.Collection; -import java.util.List; - +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.recipe.TemplateRecipeHandler; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiChemicalWasher; import mekanism.common.ObfuscatedNames; @@ -18,14 +15,14 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; - import org.lwjgl.opengl.GL11; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; +import java.awt.*; +import java.util.Collection; +import java.util.List; + +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; public class ChemicalWasherRecipeHandler extends BaseRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java b/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java index c6e052620..6dde3a2d1 100644 --- a/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java @@ -1,8 +1,5 @@ package mekanism.client.nei; -import java.util.Collection; -import java.util.List; - import mekanism.api.gas.Gas; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiCombiner; @@ -13,6 +10,9 @@ import mekanism.common.util.LangUtils; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import java.util.Collection; +import java.util.List; + public class CombinerRecipeHandler extends AdvancedMachineRecipeHandler { @Override diff --git a/src/main/java/mekanism/client/nei/CrusherRecipeHandler.java b/src/main/java/mekanism/client/nei/CrusherRecipeHandler.java index 0b695e98a..8604e003d 100644 --- a/src/main/java/mekanism/client/nei/CrusherRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/CrusherRecipeHandler.java @@ -1,13 +1,13 @@ package mekanism.client.nei; -import java.util.Collection; - import mekanism.client.gui.GuiCrusher; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.CrusherRecipe; import mekanism.common.util.LangUtils; +import java.util.Collection; + public class CrusherRecipeHandler extends MachineRecipeHandler { @Override diff --git a/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java b/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java index cb5a27450..455ee84cd 100644 --- a/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java @@ -1,25 +1,16 @@ 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.util.Collection; -import java.util.List; - +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.recipe.TemplateRecipeHandler; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiElectrolyticSeparator; -import mekanism.client.gui.element.GuiElement; -import mekanism.client.gui.element.GuiFluidGauge; -import mekanism.client.gui.element.GuiGasGauge; -import mekanism.client.gui.element.GuiGauge; -import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; -import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.ObfuscatedNames; @@ -32,14 +23,14 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraftforge.fluids.FluidStack; - import org.lwjgl.opengl.GL11; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; +import java.awt.*; +import java.util.Collection; +import java.util.List; + +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; public class ElectrolyticSeparatorRecipeHandler extends BaseRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/ElementBoundHandler.java b/src/main/java/mekanism/client/nei/ElementBoundHandler.java index e0b455704..58f67200e 100644 --- a/src/main/java/mekanism/client/nei/ElementBoundHandler.java +++ b/src/main/java/mekanism/client/nei/ElementBoundHandler.java @@ -1,10 +1,10 @@ package mekanism.client.nei; +import codechicken.lib.vec.Rectangle4i; +import codechicken.nei.api.INEIGuiAdapter; import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.element.GuiElement; import net.minecraft.client.gui.inventory.GuiContainer; -import codechicken.lib.vec.Rectangle4i; -import codechicken.nei.api.INEIGuiAdapter; public class ElementBoundHandler extends INEIGuiAdapter { diff --git a/src/main/java/mekanism/client/nei/EnrichmentChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/EnrichmentChamberRecipeHandler.java index f32986f6b..798181819 100644 --- a/src/main/java/mekanism/client/nei/EnrichmentChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/EnrichmentChamberRecipeHandler.java @@ -1,13 +1,13 @@ package mekanism.client.nei; -import java.util.Collection; - import mekanism.client.gui.GuiEnrichmentChamber; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.EnrichmentRecipe; import mekanism.common.util.LangUtils; +import java.util.Collection; + public class EnrichmentChamberRecipeHandler extends MachineRecipeHandler { @Override diff --git a/src/main/java/mekanism/client/nei/MachineRecipeHandler.java b/src/main/java/mekanism/client/nei/MachineRecipeHandler.java index d9551fae2..c5d618025 100644 --- a/src/main/java/mekanism/client/nei/MachineRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/MachineRecipeHandler.java @@ -1,11 +1,8 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Rectangle; -import java.util.Collection; - +import codechicken.nei.NEIServerUtils; +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.TemplateRecipeHandler; import mekanism.client.gui.element.GuiElement; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; @@ -19,12 +16,13 @@ import mekanism.common.recipe.machines.BasicMachineRecipe; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.item.ItemStack; - import org.lwjgl.opengl.GL11; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; +import java.awt.*; +import java.util.Collection; + +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; public abstract class MachineRecipeHandler extends BaseRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/MekanismSlotClickHandler.java b/src/main/java/mekanism/client/nei/MekanismSlotClickHandler.java index 229831a5b..b20b5deee 100644 --- a/src/main/java/mekanism/client/nei/MekanismSlotClickHandler.java +++ b/src/main/java/mekanism/client/nei/MekanismSlotClickHandler.java @@ -1,9 +1,9 @@ package mekanism.client.nei; +import codechicken.nei.guihook.IContainerSlotClickHandler; 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 f8053382e..40c8c75ad 100644 --- a/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java @@ -1,14 +1,8 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - +import codechicken.nei.NEIServerUtils; +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.TemplateRecipeHandler; import mekanism.api.infuse.InfuseObject; import mekanism.api.infuse.InfuseRegistry; import mekanism.api.infuse.InfuseType; @@ -29,12 +23,16 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.item.ItemStack; - import org.lwjgl.opengl.GL11; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; +import java.awt.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; public class MetallurgicInfuserRecipeHandler extends BaseRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/NEIMekanismConfig.java b/src/main/java/mekanism/client/nei/NEIMekanismConfig.java index cecb68de5..d989d2d9b 100644 --- a/src/main/java/mekanism/client/nei/NEIMekanismConfig.java +++ b/src/main/java/mekanism/client/nei/NEIMekanismConfig.java @@ -1,29 +1,12 @@ package mekanism.client.nei; -import mekanism.client.gui.GuiChemicalCrystallizer; -import mekanism.client.gui.GuiChemicalDissolutionChamber; -import mekanism.client.gui.GuiChemicalInfuser; -import mekanism.client.gui.GuiChemicalInjectionChamber; -import mekanism.client.gui.GuiChemicalOxidizer; -import mekanism.client.gui.GuiChemicalWasher; -import mekanism.client.gui.GuiCombiner; -import mekanism.client.gui.GuiCrusher; -import mekanism.client.gui.GuiElectrolyticSeparator; -import mekanism.client.gui.GuiEnrichmentChamber; -import mekanism.client.gui.GuiMetallurgicInfuser; -import mekanism.client.gui.GuiOsmiumCompressor; -import mekanism.client.gui.GuiPRC; -import mekanism.client.gui.GuiPrecisionSawmill; -import mekanism.client.gui.GuiPurificationChamber; -import mekanism.client.gui.GuiRotaryCondensentrator; -import mekanism.client.gui.GuiSolarNeutronActivator; -import mekanism.client.gui.GuiThermalEvaporationController; -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; +import mekanism.client.gui.*; +import mekanism.common.MekanismBlocks; +import mekanism.common.MekanismItems; +import net.minecraft.item.ItemStack; public class NEIMekanismConfig implements IConfigureNEI { diff --git a/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java b/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java index 2b6fb30a6..4c27fdda1 100644 --- a/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java @@ -1,8 +1,5 @@ package mekanism.client.nei; -import java.util.Collection; -import java.util.List; - import mekanism.api.gas.Gas; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiOsmiumCompressor; @@ -13,6 +10,9 @@ import mekanism.common.recipe.machines.OsmiumCompressorRecipe; import mekanism.common.util.LangUtils; import net.minecraft.item.ItemStack; +import java.util.Collection; +import java.util.List; + public class OsmiumCompressorRecipeHandler extends AdvancedMachineRecipeHandler { @Override diff --git a/src/main/java/mekanism/client/nei/PRCRecipeHandler.java b/src/main/java/mekanism/client/nei/PRCRecipeHandler.java index 4dbb1484b..5c11dceac 100644 --- a/src/main/java/mekanism/client/nei/PRCRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/PRCRecipeHandler.java @@ -1,27 +1,17 @@ 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.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.NEIServerUtils; +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.recipe.TemplateRecipeHandler; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiPRC; -import mekanism.client.gui.element.GuiElement; -import mekanism.client.gui.element.GuiFluidGauge; -import mekanism.client.gui.element.GuiGasGauge; -import mekanism.client.gui.element.GuiGauge; -import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.*; import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; -import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.ObfuscatedNames; @@ -34,15 +24,16 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; - import org.lwjgl.opengl.GL11; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; +import java.awt.*; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; public class PRCRecipeHandler extends BaseRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/PrecisionSawmillRecipeHandler.java b/src/main/java/mekanism/client/nei/PrecisionSawmillRecipeHandler.java index 9d3442119..9435ded00 100644 --- a/src/main/java/mekanism/client/nei/PrecisionSawmillRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/PrecisionSawmillRecipeHandler.java @@ -1,13 +1,13 @@ package mekanism.client.nei; -import java.util.Collection; - import mekanism.client.gui.GuiPrecisionSawmill; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.SawmillRecipe; import mekanism.common.util.LangUtils; +import java.util.Collection; + public class PrecisionSawmillRecipeHandler extends ChanceMachineRecipeHandler { @Override diff --git a/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java index db1e61bca..de879eda0 100644 --- a/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java @@ -1,9 +1,5 @@ package mekanism.client.nei; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.util.ListUtils; @@ -17,6 +13,10 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + public class PurificationChamberRecipeHandler extends AdvancedMachineRecipeHandler { @Override diff --git a/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java b/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java index 03afb2ae3..d95a7d111 100644 --- a/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java @@ -1,13 +1,10 @@ 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.util.List; - +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.recipe.TemplateRecipeHandler; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -17,14 +14,12 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraftforge.fluids.FluidStack; - import org.lwjgl.opengl.GL11; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; +import java.awt.*; +import java.util.List; + +import static codechicken.lib.gui.GuiDraw.*; public class RotaryCondensentratorRecipeHandler extends BaseRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/ShapedMekanismRecipeHandler.java b/src/main/java/mekanism/client/nei/ShapedMekanismRecipeHandler.java index 0c87a628a..908e623c9 100644 --- a/src/main/java/mekanism/client/nei/ShapedMekanismRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ShapedMekanismRecipeHandler.java @@ -1,17 +1,17 @@ package mekanism.client.nei; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.ShapedRecipeHandler; import mekanism.common.recipe.ShapedMekanismRecipe; import mekanism.common.util.LangUtils; import mekanism.common.util.RecipeUtils; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.ShapedRecipeHandler; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; public class ShapedMekanismRecipeHandler extends ShapedRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/ShapelessMekanismRecipeHandler.java b/src/main/java/mekanism/client/nei/ShapelessMekanismRecipeHandler.java index f3cecc9a5..0e6f77be6 100644 --- a/src/main/java/mekanism/client/nei/ShapelessMekanismRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ShapelessMekanismRecipeHandler.java @@ -1,16 +1,16 @@ package mekanism.client.nei; -import java.util.ArrayList; -import java.util.List; - +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.ShapelessRecipeHandler; import mekanism.common.recipe.ShapelessMekanismRecipe; import mekanism.common.util.LangUtils; import mekanism.common.util.RecipeUtils; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.ShapelessRecipeHandler; + +import java.util.ArrayList; +import java.util.List; public class ShapelessMekanismRecipeHandler extends ShapelessRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/SolarNeutronRecipeHandler.java b/src/main/java/mekanism/client/nei/SolarNeutronRecipeHandler.java index f7d2b88c2..b5a837042 100644 --- a/src/main/java/mekanism/client/nei/SolarNeutronRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/SolarNeutronRecipeHandler.java @@ -1,13 +1,10 @@ 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.util.Collection; -import java.util.List; - +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.recipe.TemplateRecipeHandler; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiSolarNeutronActivator; import mekanism.common.ObfuscatedNames; @@ -16,14 +13,14 @@ import mekanism.common.recipe.machines.SolarNeutronRecipe; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.client.gui.inventory.GuiContainer; - import org.lwjgl.opengl.GL11; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; +import java.awt.*; +import java.util.Collection; +import java.util.List; + +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; public class SolarNeutronRecipeHandler extends BaseRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/ThermalEvaporationRecipeHandler.java b/src/main/java/mekanism/client/nei/ThermalEvaporationRecipeHandler.java index bf924aae7..588b9c704 100644 --- a/src/main/java/mekanism/client/nei/ThermalEvaporationRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ThermalEvaporationRecipeHandler.java @@ -1,13 +1,10 @@ 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.util.Collection; -import java.util.List; - +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.recipe.TemplateRecipeHandler; import mekanism.client.gui.GuiThermalEvaporationController; import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.RecipeHandler.Recipe; @@ -16,14 +13,14 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraftforge.fluids.FluidStack; - import org.lwjgl.opengl.GL11; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; +import java.awt.*; +import java.util.Collection; +import java.util.List; + +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; public class ThermalEvaporationRecipeHandler extends BaseRecipeHandler { diff --git a/src/main/java/mekanism/client/render/CTM.java b/src/main/java/mekanism/client/render/CTM.java index ee2a1e6f3..93ba2c4d3 100644 --- a/src/main/java/mekanism/client/render/CTM.java +++ b/src/main/java/mekanism/client/render/CTM.java @@ -1,12 +1,12 @@ package mekanism.client.render; +import net.minecraft.block.Block; +import net.minecraft.world.IBlockAccess; + import java.util.HashMap; import java.util.List; import java.util.Map.Entry; -import net.minecraft.block.Block; -import net.minecraft.world.IBlockAccess; - /** * CTM Logic adapted from Chisel. Code licensed under GPLv2 * diff --git a/src/main/java/mekanism/client/render/ColourTemperature.java b/src/main/java/mekanism/client/render/ColourTemperature.java index 18e62ccc2..740c053ab 100644 --- a/src/main/java/mekanism/client/render/ColourTemperature.java +++ b/src/main/java/mekanism/client/render/ColourTemperature.java @@ -1,9 +1,9 @@ package mekanism.client.render; -import java.util.HashMap; - -import mekanism.api.IHeatTransfer; import codechicken.lib.colour.ColourRGBA; +import mekanism.api.IHeatTransfer; + +import java.util.HashMap; public class ColourTemperature extends ColourRGBA { diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 988417ad8..2b313a5d9 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -1,11 +1,8 @@ package mekanism.client.render; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.EnumColor; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; @@ -13,21 +10,13 @@ import mekanism.api.gas.OreGas; import mekanism.api.infuse.InfuseRegistry; import mekanism.api.infuse.InfuseType; import mekanism.api.transmitters.TransmissionType; -import mekanism.client.render.tileentity.RenderConfigurableMachine; -import mekanism.client.render.tileentity.RenderDynamicTank; -import mekanism.client.render.tileentity.RenderFluidTank; -import mekanism.client.render.tileentity.RenderThermalEvaporationController; -import mekanism.client.render.tileentity.RenderThermoelectricBoiler; +import mekanism.client.render.tileentity.*; 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; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureManager; @@ -42,13 +31,10 @@ 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 java.util.*; @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 aeabc8a0a..1f6c1b03b 100644 --- a/src/main/java/mekanism/client/render/MinerVisualRenderer.java +++ b/src/main/java/mekanism/client/render/MinerVisualRenderer.java @@ -1,10 +1,5 @@ package mekanism.client.render; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer.DisplayInteger; @@ -13,9 +8,13 @@ import mekanism.common.tile.TileEntityDigitalMiner; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.init.Blocks; - import org.lwjgl.opengl.GL11; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public final class MinerVisualRenderer { private static Minecraft mc = Minecraft.getMinecraft(); diff --git a/src/main/java/mekanism/client/render/ModelCustomArmor.java b/src/main/java/mekanism/client/render/ModelCustomArmor.java index 071937055..534fe04ae 100644 --- a/src/main/java/mekanism/client/render/ModelCustomArmor.java +++ b/src/main/java/mekanism/client/render/ModelCustomArmor.java @@ -1,10 +1,8 @@ package mekanism.client.render; -import mekanism.client.model.ModelArmoredJetpack; -import mekanism.client.model.ModelFreeRunners; -import mekanism.client.model.ModelGasMask; -import mekanism.client.model.ModelJetpack; -import mekanism.client.model.ModelScubaTank; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import mekanism.client.model.*; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.Minecraft; @@ -13,12 +11,8 @@ 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; - @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 b88fc6f60..70004e247 100644 --- a/src/main/java/mekanism/client/render/RenderGlowPanel.java +++ b/src/main/java/mekanism/client/render/RenderGlowPanel.java @@ -1,13 +1,5 @@ package mekanism.client.render; -import java.util.Map; - -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; @@ -19,6 +11,14 @@ import codechicken.lib.render.TextureUtils.IIconSelfRegister; import codechicken.lib.render.uv.IconTransformation; import codechicken.lib.vec.Translation; import codechicken.lib.vec.Vector3; +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 java.util.Map; public class RenderGlowPanel implements IIconSelfRegister { diff --git a/src/main/java/mekanism/client/render/RenderPartTransmitter.java b/src/main/java/mekanism/client/render/RenderPartTransmitter.java index b88ed0a98..215a0a411 100644 --- a/src/main/java/mekanism/client/render/RenderPartTransmitter.java +++ b/src/main/java/mekanism/client/render/RenderPartTransmitter.java @@ -1,8 +1,19 @@ package mekanism.client.render; -import java.util.HashMap; -import java.util.Map; - +import codechicken.lib.colour.Colour; +import codechicken.lib.colour.ColourRGBA; +import codechicken.lib.lighting.LightModel; +import codechicken.lib.lighting.LightModel.Light; +import codechicken.lib.render.CCModel; +import codechicken.lib.render.CCRenderState; +import codechicken.lib.render.ColourMultiplier; +import codechicken.lib.render.TextureUtils; +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; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.model.ModelTransporterBox; @@ -10,15 +21,8 @@ import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.item.ItemConfigurator; -import mekanism.common.multipart.PartDiversionTransporter; -import mekanism.common.multipart.PartLogisticalTransporter; -import mekanism.common.multipart.PartMechanicalPipe; -import mekanism.common.multipart.PartPressurizedTube; -import mekanism.common.multipart.PartSidedPipe; +import mekanism.common.multipart.*; import mekanism.common.multipart.PartSidedPipe.ConnectionType; -import mekanism.common.multipart.PartThermodynamicConductor; -import mekanism.common.multipart.PartUniversalCable; -import mekanism.common.multipart.TransmitterType; import mekanism.common.multipart.TransmitterType.Size; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -39,23 +43,10 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; - import org.lwjgl.opengl.GL11; -import codechicken.lib.colour.Colour; -import codechicken.lib.colour.ColourRGBA; -import codechicken.lib.lighting.LightModel; -import codechicken.lib.lighting.LightModel.Light; -import codechicken.lib.render.CCModel; -import codechicken.lib.render.CCRenderState; -import codechicken.lib.render.ColourMultiplier; -import codechicken.lib.render.TextureUtils; -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; +import java.util.HashMap; +import java.util.Map; @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 69d5c8ff8..1e7ffacfa 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -1,8 +1,10 @@ package mekanism.client.render; -import java.util.List; -import java.util.Random; - +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent.Phase; +import cpw.mods.fml.common.gameevent.TickEvent.RenderTickEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.MekanismAPI; @@ -24,11 +26,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.common.gameevent.TickEvent.RenderTickEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; +import java.util.Random; @SideOnly(Side.CLIENT) public class RenderTickHandler diff --git a/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java b/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java index 7b59fbfab..7263b701f 100644 --- a/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java @@ -1,5 +1,8 @@ package mekanism.client.render.block; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.ClientProxy; import mekanism.client.model.ModelSecurityDesk; import mekanism.client.render.MekanismRenderer; @@ -11,13 +14,8 @@ 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; - @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 a2ff40b87..f163cb939 100644 --- a/src/main/java/mekanism/client/render/block/CTMRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/CTMRenderingHandler.java @@ -1,5 +1,6 @@ package mekanism.client.render.block; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import mekanism.api.MekanismConfig; import mekanism.client.ClientProxy; import mekanism.client.render.MekanismRenderer; @@ -11,7 +12,6 @@ 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; /** * CTM ISBRH adapted from Chisel diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index a0baa5454..48170c6a0 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -1,26 +1,10 @@ package mekanism.client.render.block; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.ClientProxy; -import mekanism.client.model.ModelChargepad; -import mekanism.client.model.ModelChemicalCrystallizer; -import mekanism.client.model.ModelChemicalDissolutionChamber; -import mekanism.client.model.ModelChemicalInfuser; -import mekanism.client.model.ModelChemicalOxidizer; -import mekanism.client.model.ModelChemicalWasher; -import mekanism.client.model.ModelDigitalMiner; -import mekanism.client.model.ModelElectricPump; -import mekanism.client.model.ModelElectrolyticSeparator; -import mekanism.client.model.ModelFluidicPlenisher; -import mekanism.client.model.ModelLaser; -import mekanism.client.model.ModelLaserAmplifier; -import mekanism.client.model.ModelLogisticalSorter; -import mekanism.client.model.ModelMetallurgicInfuser; -import mekanism.client.model.ModelPressurizedReactionChamber; -import mekanism.client.model.ModelQuantumEntangloporter; -import mekanism.client.model.ModelResistiveHeater; -import mekanism.client.model.ModelRotaryCondensentrator; -import mekanism.client.model.ModelSeismicVibrator; -import mekanism.client.model.ModelSolarNeutronActivator; +import mekanism.client.model.*; import mekanism.client.render.MekanismRenderer; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.util.MekanismUtils; @@ -29,13 +13,8 @@ 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; - @SideOnly(Side.CLIENT) public class MachineRenderingHandler implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java b/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java index 7a4131901..7546c7ac2 100644 --- a/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java @@ -1,5 +1,8 @@ package mekanism.client.render.block; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.ClientProxy; import mekanism.client.render.MekanismRenderer; import mekanism.common.MekanismBlocks; @@ -7,9 +10,6 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class PlasticRenderingHandler implements ISimpleBlockRenderingHandler diff --git a/src/main/java/mekanism/client/render/block/TextureSubmap.java b/src/main/java/mekanism/client/render/block/TextureSubmap.java index a103cdfa7..f71c24470 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/block/TextureVirtual.java b/src/main/java/mekanism/client/render/block/TextureVirtual.java index 2dfba26e1..0e32b66e2 100644 --- a/src/main/java/mekanism/client/render/block/TextureVirtual.java +++ b/src/main/java/mekanism/client/render/block/TextureVirtual.java @@ -1,8 +1,8 @@ package mekanism.client.render.block; -import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.IIcon; /** * Texture component 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 4f0168de8..9b728465a 100644 --- a/src/main/java/mekanism/client/render/entity/RenderBalloon.java +++ b/src/main/java/mekanism/client/render/entity/RenderBalloon.java @@ -1,5 +1,7 @@ package mekanism.client.render.entity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.EnumColor; import mekanism.client.model.ModelBalloon; import mekanism.common.entity.EntityBalloon; @@ -10,12 +12,8 @@ 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; - @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 fd369b0f9..648b07ab0 100644 --- a/src/main/java/mekanism/client/render/entity/RenderFlame.java +++ b/src/main/java/mekanism/client/render/entity/RenderFlame.java @@ -1,18 +1,16 @@ package mekanism.client.render.entity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; 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 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..77c5c4284 100644 --- a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java +++ b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java @@ -1,5 +1,7 @@ package mekanism.client.render.entity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.model.ModelObsidianTNT; import mekanism.common.entity.EntityObsidianTNT; import mekanism.common.util.MekanismUtils; @@ -9,12 +11,8 @@ 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; - @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..9122b2134 100644 --- a/src/main/java/mekanism/client/render/entity/RenderRobit.java +++ b/src/main/java/mekanism/client/render/entity/RenderRobit.java @@ -1,5 +1,7 @@ package mekanism.client.render.entity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.model.ModelRobit; import mekanism.common.entity.EntityRobit; import mekanism.common.util.MekanismUtils; @@ -7,8 +9,6 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderRobit extends RenderLiving diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index 41fb4a13a..a5a5e3d73 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -1,21 +1,14 @@ package mekanism.client.render.item; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.EnumColor; import mekanism.api.energy.IEnergizedItem; import mekanism.client.ClientProxy; import mekanism.client.MekanismClient; -import mekanism.client.model.ModelArmoredJetpack; -import mekanism.client.model.ModelAtomicDisassembler; -import mekanism.client.model.ModelEnergyCube; +import mekanism.client.model.*; import mekanism.client.model.ModelEnergyCube.ModelEnergyCore; -import mekanism.client.model.ModelFlamethrower; -import mekanism.client.model.ModelFreeRunners; -import mekanism.client.model.ModelGasMask; -import mekanism.client.model.ModelGasTank; -import mekanism.client.model.ModelJetpack; -import mekanism.client.model.ModelObsidianTNT; -import mekanism.client.model.ModelRobit; -import mekanism.client.model.ModelScubaTank; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.RenderGlowPanel; import mekanism.client.render.RenderPartTransmitter; @@ -33,16 +26,7 @@ import mekanism.common.base.IEnergyCube; import mekanism.common.block.BlockBasic.BasicType; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.InventoryBin; -import mekanism.common.item.ItemAtomicDisassembler; -import mekanism.common.item.ItemBalloon; -import mekanism.common.item.ItemBlockBasic; -import mekanism.common.item.ItemBlockGasTank; -import mekanism.common.item.ItemBlockMachine; -import mekanism.common.item.ItemFlamethrower; -import mekanism.common.item.ItemFreeRunners; -import mekanism.common.item.ItemGasMask; -import mekanism.common.item.ItemRobit; -import mekanism.common.item.ItemScubaTank; +import mekanism.common.item.*; import mekanism.common.multipart.ItemGlowPanel; import mekanism.common.multipart.ItemPartTransmitter; import mekanism.common.multipart.TransmitterType; @@ -66,13 +50,8 @@ import net.minecraft.item.ItemStack; 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; - @SideOnly(Side.CLIENT) public class ItemRenderingHandler implements IItemRenderer { diff --git a/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java b/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java index cbfa5c1cd..d44814ef4 100644 --- a/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java +++ b/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java @@ -1,12 +1,12 @@ package mekanism.client.render.particle; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFlameFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class EntityJetpackFlameFX extends EntityFlameFX diff --git a/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java b/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java index b7609ecd6..bbdf38355 100644 --- a/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java +++ b/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java @@ -1,12 +1,12 @@ package mekanism.client.render.particle; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntitySmokeFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class EntityJetpackSmokeFX extends EntitySmokeFX diff --git a/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java b/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java index 468f7bd1a..58eadf63e 100644 --- a/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java +++ b/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java @@ -1,12 +1,12 @@ package mekanism.client.render.particle; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityBubbleFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class EntityScubaBubbleFX extends EntityBubbleFX diff --git a/src/main/java/mekanism/client/render/tileentity/RenderBin.java b/src/main/java/mekanism/client/render/tileentity/RenderBin.java index 4b857bcfc..57826f230 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderBin.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderBin.java @@ -1,5 +1,7 @@ package mekanism.client.render.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityBin; @@ -12,12 +14,8 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; 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; - @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 f01e85ec0..0d288c6cb 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java @@ -1,17 +1,15 @@ package mekanism.client.render.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; 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; - @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 847c9f532..f124e9662 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java @@ -1,5 +1,7 @@ package mekanism.client.render.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.model.ModelChemicalCrystallizer; import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityChemicalCrystallizer; @@ -7,12 +9,8 @@ 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; - @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..706310f94 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java @@ -1,17 +1,15 @@ package mekanism.client.render.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; 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; - @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 9b3571c2c..439ca96fd 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java @@ -6,7 +6,6 @@ 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; public class RenderChemicalInfuser extends TileEntitySpecialRenderer diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java index 158ac18af..b49186c99 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java @@ -1,8 +1,5 @@ package mekanism.client.render.tileentity; -import java.util.HashMap; -import java.util.Map; - import mekanism.api.gas.Gas; import mekanism.client.model.ModelChemicalOxidizer; import mekanism.client.render.MekanismRenderer.DisplayInteger; @@ -12,9 +9,11 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.opengl.GL11; +import java.util.HashMap; +import java.util.Map; + public class RenderChemicalOxidizer extends TileEntitySpecialRenderer { private ModelChemicalOxidizer model = new ModelChemicalOxidizer(); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java index 04c8f889d..0f82e6453 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java @@ -6,7 +6,6 @@ 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; public class RenderChemicalWasher extends TileEntitySpecialRenderer diff --git a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java index 6a62c2b1e..6b82428e7 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java @@ -1,7 +1,9 @@ package mekanism.client.render.tileentity; -import java.util.HashMap; - +import codechicken.lib.math.MathHelper; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.transmitters.TransmissionType; import mekanism.client.render.MekanismRenderer; @@ -21,13 +23,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.opengl.GL11; -import codechicken.lib.math.MathHelper; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.HashMap; @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 a731187fa..2a3cabd40 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java @@ -1,5 +1,7 @@ package mekanism.client.render.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.model.ModelDigitalMiner; import mekanism.client.render.MinerVisualRenderer; import mekanism.common.tile.TileEntityDigitalMiner; @@ -7,12 +9,8 @@ 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; - @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 6719019e6..72e1418b0 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java @@ -1,8 +1,7 @@ package mekanism.client.render.tileentity; -import java.util.HashMap; -import java.util.Map; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; @@ -17,11 +16,10 @@ 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 java.util.HashMap; +import java.util.Map; @SideOnly(Side.CLIENT) public class RenderDynamicTank 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 2524e3938..b326fc2b3 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java @@ -1,17 +1,15 @@ package mekanism.client.render.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; 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; - @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 9f3aaee6f..d773a8d7c 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java @@ -1,17 +1,15 @@ package mekanism.client.render.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; 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; - @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 47d718ca3..efae5a0c8 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java @@ -1,8 +1,7 @@ package mekanism.client.render.tileentity; -import java.util.HashMap; -import java.util.Map; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.transmitters.TransmissionType; import mekanism.client.MekanismClient; import mekanism.client.model.ModelEnergyCube; @@ -16,11 +15,10 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.HashMap; +import java.util.Map; @SideOnly(Side.CLIENT) public class RenderEnergyCube extends TileEntitySpecialRenderer diff --git a/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java b/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java index 91a182113..c9e3fdd20 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java @@ -1,8 +1,7 @@ package mekanism.client.render.tileentity; -import java.util.HashMap; -import java.util.Map; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.model.ModelFluidTank; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; @@ -15,11 +14,10 @@ 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 java.util.HashMap; +import java.util.Map; @SideOnly(Side.CLIENT) public class RenderFluidTank 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..ee9789748 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java @@ -1,17 +1,15 @@ package mekanism.client.render.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; 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; - @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 af4af146d..bb9279c57 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java @@ -1,5 +1,7 @@ package mekanism.client.render.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.model.ModelGasTank; import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityGasTank; @@ -7,12 +9,8 @@ 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; - @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 114fc4266..44a206918 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLaser.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLaser.java @@ -1,17 +1,15 @@ package mekanism.client.render.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; 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; - @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 747e8f887..634cce779 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java @@ -1,5 +1,7 @@ package mekanism.client.render.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.model.ModelLaserAmplifier; import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityLaserAmplifier; @@ -7,12 +9,8 @@ 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; - @SideOnly(Side.CLIENT) public class RenderLaserAmplifier extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java b/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java index 522cc8a49..31f6a0040 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java @@ -7,7 +7,6 @@ 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; public class RenderLaserTractorBeam 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 418586b68..b9ac26e28 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java @@ -1,17 +1,15 @@ package mekanism.client.render.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; 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; - @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..02ed88bc6 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java @@ -1,5 +1,7 @@ package mekanism.client.render.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.model.ModelMetallurgicInfuser; import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityMetallurgicInfuser; @@ -7,12 +9,8 @@ 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; - @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..831b8e72a 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderObsidianTNT.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderObsidianTNT.java @@ -1,17 +1,15 @@ package mekanism.client.render.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; 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; - @SideOnly(Side.CLIENT) public class RenderObsidianTNT extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderPersonalChest.java b/src/main/java/mekanism/client/render/tileentity/RenderPersonalChest.java index 4da18412d..5b655caff 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderPersonalChest.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderPersonalChest.java @@ -1,17 +1,15 @@ package mekanism.client.render.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.common.tile.TileEntityPersonalChest; 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; - @SideOnly(Side.CLIENT) public class RenderPersonalChest 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..990b0ad4a 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java @@ -1,5 +1,7 @@ package mekanism.client.render.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.model.ModelPressurizedReactionChamber; import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityPRC; @@ -7,12 +9,8 @@ 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; - @SideOnly(Side.CLIENT) public class RenderPressurizedReactionChamber extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderQuantumEntangloporter.java b/src/main/java/mekanism/client/render/tileentity/RenderQuantumEntangloporter.java index 1187767e5..57192edcc 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderQuantumEntangloporter.java @@ -1,5 +1,7 @@ package mekanism.client.render.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.model.ModelQuantumEntangloporter; import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityQuantumEntangloporter; @@ -7,12 +9,8 @@ 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; - @SideOnly(Side.CLIENT) public class RenderQuantumEntangloporter extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderResistiveHeater.java b/src/main/java/mekanism/client/render/tileentity/RenderResistiveHeater.java index df43ecd60..8b4a1d963 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderResistiveHeater.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderResistiveHeater.java @@ -1,17 +1,15 @@ package mekanism.client.render.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.model.ModelResistiveHeater; import mekanism.common.tile.TileEntityResistiveHeater; 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; - @SideOnly(Side.CLIENT) public class RenderResistiveHeater 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 ac2892a04..6de3cf5d0 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java @@ -1,17 +1,15 @@ package mekanism.client.render.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; 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; - @SideOnly(Side.CLIENT) public class RenderRotaryCondensentrator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java b/src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java index 1644afd11..63c5f40dc 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java @@ -1,17 +1,15 @@ package mekanism.client.render.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.model.ModelSecurityDesk; import mekanism.common.tile.TileEntitySecurityDesk; 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; - @SideOnly(Side.CLIENT) public class RenderSecurityDesk 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 797f44102..98745667b 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java @@ -1,17 +1,15 @@ package mekanism.client.render.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.model.ModelSeismicVibrator; 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; - @SideOnly(Side.CLIENT) public class RenderSeismicVibrator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java b/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java index a02c3882a..ef47c0aec 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java @@ -1,17 +1,15 @@ package mekanism.client.render.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.model.ModelSolarNeutronActivator; import mekanism.common.tile.TileEntitySolarNeutronActivator; 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; - @SideOnly(Side.CLIENT) public class RenderSolarNeutronActivator 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..787106d56 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java @@ -1,7 +1,5 @@ package mekanism.client.render.tileentity; -import java.util.HashMap; - import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.gas.GasRegistry; @@ -14,9 +12,10 @@ 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 java.util.HashMap; + public class RenderTeleporter extends TileEntitySpecialRenderer { private HashMap cachedOverlays = new HashMap(); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java b/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java index 1d6cf6e5e..24b83b848 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java @@ -1,8 +1,7 @@ package mekanism.client.render.tileentity; -import java.util.HashMap; -import java.util.Map; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; @@ -15,11 +14,10 @@ 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 java.util.HashMap; +import java.util.Map; @SideOnly(Side.CLIENT) public class RenderThermalEvaporationController extends TileEntitySpecialRenderer diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java index 106761c66..890711c8b 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java @@ -1,8 +1,7 @@ package mekanism.client.render.tileentity; -import java.util.HashMap; -import java.util.Map; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; @@ -18,11 +17,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; - import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.HashMap; +import java.util.Map; @SideOnly(Side.CLIENT) public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer diff --git a/src/main/java/mekanism/client/sound/FlamethrowerSound.java b/src/main/java/mekanism/client/sound/FlamethrowerSound.java index 982ba4394..c5339cf7e 100644 --- a/src/main/java/mekanism/client/sound/FlamethrowerSound.java +++ b/src/main/java/mekanism/client/sound/FlamethrowerSound.java @@ -1,10 +1,10 @@ package mekanism.client.sound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.ClientTickHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class FlamethrowerSound extends PlayerSound diff --git a/src/main/java/mekanism/client/sound/GasMaskSound.java b/src/main/java/mekanism/client/sound/GasMaskSound.java index b6e4d50cc..7eabc4859 100644 --- a/src/main/java/mekanism/client/sound/GasMaskSound.java +++ b/src/main/java/mekanism/client/sound/GasMaskSound.java @@ -1,11 +1,11 @@ package mekanism.client.sound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.ClientTickHandler; import mekanism.common.item.ItemGasMask; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GasMaskSound extends PlayerSound diff --git a/src/main/java/mekanism/client/sound/IResettableSound.java b/src/main/java/mekanism/client/sound/IResettableSound.java index 77acdb93d..f93bb00dc 100644 --- a/src/main/java/mekanism/client/sound/IResettableSound.java +++ b/src/main/java/mekanism/client/sound/IResettableSound.java @@ -1,8 +1,8 @@ package mekanism.client.sound; -import net.minecraft.client.audio.ITickableSound; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.audio.ITickableSound; @SideOnly(Side.CLIENT) public interface IResettableSound extends ITickableSound diff --git a/src/main/java/mekanism/client/sound/ISoundSource.java b/src/main/java/mekanism/client/sound/ISoundSource.java index 894ef8aa5..3c95ecbab 100644 --- a/src/main/java/mekanism/client/sound/ISoundSource.java +++ b/src/main/java/mekanism/client/sound/ISoundSource.java @@ -1,10 +1,10 @@ package mekanism.client.sound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Pos3D; import net.minecraft.client.audio.ISound.AttenuationType; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public interface ISoundSource { diff --git a/src/main/java/mekanism/client/sound/JetpackSound.java b/src/main/java/mekanism/client/sound/JetpackSound.java index dac03f285..45c6d9244 100644 --- a/src/main/java/mekanism/client/sound/JetpackSound.java +++ b/src/main/java/mekanism/client/sound/JetpackSound.java @@ -1,11 +1,11 @@ package mekanism.client.sound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.ClientTickHandler; import mekanism.common.item.ItemJetpack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class JetpackSound extends PlayerSound diff --git a/src/main/java/mekanism/client/sound/PlayerSound.java b/src/main/java/mekanism/client/sound/PlayerSound.java index e2253aea3..2677f55f0 100644 --- a/src/main/java/mekanism/client/sound/PlayerSound.java +++ b/src/main/java/mekanism/client/sound/PlayerSound.java @@ -1,9 +1,9 @@ package mekanism.client.sound; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ResourceLocation; @SideOnly(Side.CLIENT) public abstract class PlayerSound extends Sound implements IResettableSound diff --git a/src/main/java/mekanism/client/sound/Sound.java b/src/main/java/mekanism/client/sound/Sound.java index bfad38fa7..601f127bc 100644 --- a/src/main/java/mekanism/client/sound/Sound.java +++ b/src/main/java/mekanism/client/sound/Sound.java @@ -1,10 +1,10 @@ package mekanism.client.sound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.MekanismConfig.client; 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 1f00b8c8c..906385900 100644 --- a/src/main/java/mekanism/client/sound/SoundHandler.java +++ b/src/main/java/mekanism/client/sound/SoundHandler.java @@ -1,8 +1,7 @@ package mekanism.client.sound; -import java.util.HashMap; -import java.util.Map; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.common.ObfuscatedNames; import mekanism.common.util.MekanismUtils; import net.minecraft.client.Minecraft; @@ -12,8 +11,9 @@ import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.audio.SoundManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.HashMap; +import java.util.Map; /** * SoundHandler - a class that handles all Sounds used by Mekanism. diff --git a/src/main/java/mekanism/client/sound/TileSound.java b/src/main/java/mekanism/client/sound/TileSound.java index f1fa3a7e9..8b72697dc 100644 --- a/src/main/java/mekanism/client/sound/TileSound.java +++ b/src/main/java/mekanism/client/sound/TileSound.java @@ -1,9 +1,9 @@ package mekanism.client.sound; -import mekanism.common.base.IHasSound; -import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import mekanism.common.base.IHasSound; +import net.minecraft.util.ResourceLocation; @SideOnly(Side.CLIENT) public class TileSound extends Sound implements IResettableSound diff --git a/src/main/java/mekanism/common/asm/LoadingHook.java b/src/main/java/mekanism/common/asm/LoadingHook.java index f2807c9cf..e98370189 100644 --- a/src/main/java/mekanism/common/asm/LoadingHook.java +++ b/src/main/java/mekanism/common/asm/LoadingHook.java @@ -1,10 +1,10 @@ package mekanism.common.asm; -import java.util.Map; - import codechicken.core.launch.DepLoader; import cpw.mods.fml.relauncher.IFMLLoadingPlugin; +import java.util.Map; + public class LoadingHook implements IFMLLoadingPlugin { public LoadingHook() diff --git a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java index 9fd36df50..2167505a5 100644 --- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java +++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java @@ -1,5 +1,6 @@ package mekanism.common.base; +import cofh.api.energy.IEnergyReceiver; import ic2.api.energy.tile.IEnergySink; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; @@ -8,7 +9,6 @@ import mekanism.common.util.CableUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import cofh.api.energy.IEnergyReceiver; public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor { diff --git a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java index 45089a060..b02bd62a3 100644 --- a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java @@ -1,5 +1,8 @@ package mekanism.common.base; +import cofh.api.energy.IEnergyHandler; +import cpw.mods.fml.common.Optional.Interface; +import cpw.mods.fml.common.Optional.InterfaceList; import ic2.api.energy.tile.IEnergySink; import mekanism.api.Coord4D; import mekanism.api.IConfigCardAccess.ISpecialConfigData; @@ -10,9 +13,6 @@ import mekanism.common.security.ISecurityTile; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; -import cofh.api.energy.IEnergyHandler; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.InterfaceList; @InterfaceList({ @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), diff --git a/src/main/java/mekanism/common/base/IElectricMachine.java b/src/main/java/mekanism/common/base/IElectricMachine.java index f2dab9cc2..94f326c25 100644 --- a/src/main/java/mekanism/common/base/IElectricMachine.java +++ b/src/main/java/mekanism/common/base/IElectricMachine.java @@ -1,11 +1,11 @@ package mekanism.common.base; -import java.util.Map; - import mekanism.common.recipe.inputs.MachineInput; import mekanism.common.recipe.machines.MachineRecipe; import mekanism.common.recipe.outputs.MachineOutput; +import java.util.Map; + /** * Internal interface containing methods that are shared by many core Mekanism machines. TODO: remove next minor MC * version. diff --git a/src/main/java/mekanism/common/base/IEnergyWrapper.java b/src/main/java/mekanism/common/base/IEnergyWrapper.java index e1df80f7e..5018dbb10 100644 --- a/src/main/java/mekanism/common/base/IEnergyWrapper.java +++ b/src/main/java/mekanism/common/base/IEnergyWrapper.java @@ -1,19 +1,18 @@ package mekanism.common.base; +import cofh.api.energy.IEnergyHandler; +import cpw.mods.fml.common.Optional.Interface; +import cpw.mods.fml.common.Optional.InterfaceList; import ic2.api.energy.tile.IEnergySink; import ic2.api.energy.tile.IEnergySource; import ic2.api.tile.IEnergyStorage; - -import java.util.EnumSet; - import mekanism.api.energy.ICableOutputter; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; import net.minecraft.inventory.IInventory; import net.minecraftforge.common.util.ForgeDirection; -import cofh.api.energy.IEnergyHandler; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.InterfaceList; + +import java.util.EnumSet; @InterfaceList({ @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), diff --git a/src/main/java/mekanism/common/base/IFactory.java b/src/main/java/mekanism/common/base/IFactory.java index b4859abe2..3fc7e9dab 100644 --- a/src/main/java/mekanism/common/base/IFactory.java +++ b/src/main/java/mekanism/common/base/IFactory.java @@ -1,7 +1,5 @@ package mekanism.common.base; -import java.util.Map; - import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.util.StackUtils; @@ -23,6 +21,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.ForgeDirection; +import java.util.Map; + /** * Internal interface for managing various Factory types. * @author AidanBrady diff --git a/src/main/java/mekanism/common/base/IModule.java b/src/main/java/mekanism/common/base/IModule.java index 37a7a57e6..14f1d308e 100644 --- a/src/main/java/mekanism/common/base/IModule.java +++ b/src/main/java/mekanism/common/base/IModule.java @@ -1,11 +1,10 @@ package mekanism.common.base; import io.netty.buffer.ByteBuf; +import mekanism.common.Version; import java.io.IOException; -import mekanism.common.Version; - /** * 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 d14126ade..f4629870c 100644 --- a/src/main/java/mekanism/common/base/ITileComponent.java +++ b/src/main/java/mekanism/common/base/ITileComponent.java @@ -1,11 +1,10 @@ package mekanism.common.base; import io.netty.buffer.ByteBuf; +import net.minecraft.nbt.NBTTagCompound; import java.util.ArrayList; -import net.minecraft.nbt.NBTTagCompound; - public interface ITileComponent { public void tick(); diff --git a/src/main/java/mekanism/common/base/SoundWrapper.java b/src/main/java/mekanism/common/base/SoundWrapper.java index 83d04d4dc..afc64b386 100644 --- a/src/main/java/mekanism/common/base/SoundWrapper.java +++ b/src/main/java/mekanism/common/base/SoundWrapper.java @@ -1,12 +1,12 @@ package mekanism.common.base; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.sound.IResettableSound; import mekanism.client.sound.ISoundSource; import mekanism.client.sound.SoundHandler; import mekanism.client.sound.TileSound; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class SoundWrapper { diff --git a/src/main/java/mekanism/common/item/ItemBalloon.java b/src/main/java/mekanism/common/item/ItemBalloon.java index 9e1750c04..90ffafe19 100644 --- a/src/main/java/mekanism/common/item/ItemBalloon.java +++ b/src/main/java/mekanism/common/item/ItemBalloon.java @@ -1,7 +1,7 @@ package mekanism.common.item; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Pos3D; @@ -20,8 +20,8 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class ItemBalloon extends ItemMekanism { diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index cfa7dcb33..e6d8f2055 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -1,8 +1,7 @@ package mekanism.common.item; -import java.util.ArrayList; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Range4D; @@ -35,8 +34,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.ArrayList; +import java.util.List; /** * Item class for handling multiple metal block IDs. diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 1f9be49f8..dc3b5ac5c 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -1,8 +1,6 @@ package mekanism.common.item; -import java.util.ArrayList; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; @@ -37,7 +35,9 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants.NBT; -import cpw.mods.fml.relauncher.Side; + +import java.util.ArrayList; +import java.util.List; public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedInventory, ITierItem, ISecurityItem { diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 7d695f6b2..b38430431 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -1,11 +1,13 @@ package mekanism.common.item; +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 ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; - -import java.util.List; -import java.util.Map; - import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; @@ -15,15 +17,8 @@ import mekanism.client.MekanismKeyHandler; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.FluidTankTier; import mekanism.common.Upgrade; -import mekanism.common.base.IFactory; -import mekanism.common.base.IRedstoneControl; +import mekanism.common.base.*; import mekanism.common.base.IRedstoneControl.RedstoneControl; -import mekanism.common.base.ISideConfiguration; -import mekanism.common.base.ISustainedData; -import mekanism.common.base.ISustainedInventory; -import mekanism.common.base.ISustainedTank; -import mekanism.common.base.ITierItem; -import mekanism.common.base.IUpgradeTile; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.integration.IC2ItemManager; import mekanism.common.inventory.InventoryPersonalChest; @@ -57,12 +52,9 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; -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 java.util.List; +import java.util.Map; /** * Item class for handling multiple machine block IDs. diff --git a/src/main/java/mekanism/common/item/ItemBlockOre.java b/src/main/java/mekanism/common/item/ItemBlockOre.java index 14055a59f..4146265b6 100644 --- a/src/main/java/mekanism/common/item/ItemBlockOre.java +++ b/src/main/java/mekanism/common/item/ItemBlockOre.java @@ -1,7 +1,7 @@ package mekanism.common.item; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.EnumColor; import mekanism.client.MekKeyHandler; import mekanism.client.MekanismKeyHandler; @@ -13,8 +13,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; /** * Item class for handling multiple ore block IDs. diff --git a/src/main/java/mekanism/common/item/ItemBlockPlastic.java b/src/main/java/mekanism/common/item/ItemBlockPlastic.java index 1558d3fe2..ceaa791a2 100644 --- a/src/main/java/mekanism/common/item/ItemBlockPlastic.java +++ b/src/main/java/mekanism/common/item/ItemBlockPlastic.java @@ -1,5 +1,7 @@ package mekanism.common.item; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.EnumColor; import mekanism.common.util.LangUtils; import net.minecraft.block.Block; @@ -7,8 +9,6 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemBlockPlastic extends ItemBlock { diff --git a/src/main/java/mekanism/common/item/ItemClump.java b/src/main/java/mekanism/common/item/ItemClump.java index ff03f16b1..e59ea9207 100644 --- a/src/main/java/mekanism/common/item/ItemClump.java +++ b/src/main/java/mekanism/common/item/ItemClump.java @@ -1,7 +1,5 @@ package mekanism.common.item; -import java.util.List; - import mekanism.common.Resource; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -9,6 +7,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import java.util.List; + public class ItemClump extends ItemMekanism { public IIcon[] icons = new IIcon[256]; diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 54cb1d919..e6f984f12 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -1,15 +1,11 @@ package mekanism.common.item; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Random; - -import mekanism.api.Coord4D; -import mekanism.api.EnumColor; -import mekanism.api.IConfigurable; -import mekanism.api.IMekWrench; -import mekanism.api.Range4D; +import buildcraft.api.tools.IToolWrench; +import cofh.api.item.IToolHammer; +import cpw.mods.fml.common.Optional.Interface; +import cpw.mods.fml.common.Optional.InterfaceList; +import cpw.mods.fml.common.Optional.Method; +import mekanism.api.*; import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.SideData; @@ -32,11 +28,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 cofh.api.item.IToolHammer; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.InterfaceList; -import cpw.mods.fml.common.Optional.Method; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Random; @InterfaceList({ @Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraft") diff --git a/src/main/java/mekanism/common/item/ItemCrystal.java b/src/main/java/mekanism/common/item/ItemCrystal.java index b271c9c26..25114cd48 100644 --- a/src/main/java/mekanism/common/item/ItemCrystal.java +++ b/src/main/java/mekanism/common/item/ItemCrystal.java @@ -1,7 +1,5 @@ package mekanism.common.item; -import java.util.List; - import mekanism.common.Resource; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -9,6 +7,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import java.util.List; + public class ItemCrystal extends ItemMekanism { public IIcon[] icons = new IIcon[256]; diff --git a/src/main/java/mekanism/common/item/ItemDictionary.java b/src/main/java/mekanism/common/item/ItemDictionary.java index 88cd564dc..d2164c130 100644 --- a/src/main/java/mekanism/common/item/ItemDictionary.java +++ b/src/main/java/mekanism/common/item/ItemDictionary.java @@ -1,7 +1,5 @@ package mekanism.common.item; -import java.util.List; - import mekanism.api.EnumColor; import mekanism.common.Mekanism; import mekanism.common.util.LangUtils; @@ -12,6 +10,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; +import java.util.List; + public class ItemDictionary extends ItemMekanism { public ItemDictionary() diff --git a/src/main/java/mekanism/common/item/ItemDirtyDust.java b/src/main/java/mekanism/common/item/ItemDirtyDust.java index b76ef2608..4d84d07f5 100644 --- a/src/main/java/mekanism/common/item/ItemDirtyDust.java +++ b/src/main/java/mekanism/common/item/ItemDirtyDust.java @@ -1,7 +1,5 @@ package mekanism.common.item; -import java.util.List; - import mekanism.common.Mekanism; import mekanism.common.Resource; import net.minecraft.client.renderer.texture.IIconRegister; @@ -10,6 +8,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import java.util.List; + public class ItemDirtyDust extends ItemMekanism { public IIcon[] icons = new IIcon[256]; diff --git a/src/main/java/mekanism/common/item/ItemDust.java b/src/main/java/mekanism/common/item/ItemDust.java index 4d47a0fd4..fee12ef25 100644 --- a/src/main/java/mekanism/common/item/ItemDust.java +++ b/src/main/java/mekanism/common/item/ItemDust.java @@ -1,7 +1,5 @@ package mekanism.common.item; -import java.util.List; - import mekanism.common.Resource; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -9,6 +7,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import java.util.List; + public class ItemDust extends ItemMekanism { public IIcon[] icons = new IIcon[256]; diff --git a/src/main/java/mekanism/common/item/ItemElectricBow.java b/src/main/java/mekanism/common/item/ItemElectricBow.java index 1a30b9acc..63b5d892d 100644 --- a/src/main/java/mekanism/common/item/ItemElectricBow.java +++ b/src/main/java/mekanism/common/item/ItemElectricBow.java @@ -1,7 +1,5 @@ package mekanism.common.item; -import java.util.List; - import mekanism.api.EnumColor; import mekanism.common.util.LangUtils; import net.minecraft.enchantment.Enchantment; @@ -14,6 +12,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import java.util.List; + public class ItemElectricBow extends ItemEnergized { public ItemElectricBow() diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index 4400a3ef5..76b4a2fce 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -1,10 +1,11 @@ package mekanism.common.item; +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 ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; - -import java.util.List; - import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; @@ -17,10 +18,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -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 java.util.List; @InterfaceList({ @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") diff --git a/src/main/java/mekanism/common/item/ItemFlamethrower.java b/src/main/java/mekanism/common/item/ItemFlamethrower.java index ab0c9a337..786634c0a 100644 --- a/src/main/java/mekanism/common/item/ItemFlamethrower.java +++ b/src/main/java/mekanism/common/item/ItemFlamethrower.java @@ -1,7 +1,7 @@ package mekanism.common.item; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; import mekanism.api.gas.Gas; @@ -15,8 +15,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class ItemFlamethrower extends ItemMekanism implements IGasItem { diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index 556610497..dbd96b995 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -1,10 +1,14 @@ package mekanism.common.item; +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.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; - -import java.util.List; - import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; @@ -27,13 +31,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; 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; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; @InterfaceList({ @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") diff --git a/src/main/java/mekanism/common/item/ItemGasMask.java b/src/main/java/mekanism/common/item/ItemGasMask.java index 208c3c42b..9e2a63fe8 100644 --- a/src/main/java/mekanism/common/item/ItemGasMask.java +++ b/src/main/java/mekanism/common/item/ItemGasMask.java @@ -1,5 +1,8 @@ package mekanism.common.item; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; @@ -12,9 +15,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.entity.living.LivingAttackEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemGasMask extends ItemArmor { diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java index ac4e83efd..27b8707a1 100644 --- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java +++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java @@ -1,7 +1,7 @@ package mekanism.common.item; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; @@ -18,8 +18,8 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidContainerItem { diff --git a/src/main/java/mekanism/common/item/ItemHDPE.java b/src/main/java/mekanism/common/item/ItemHDPE.java index 068e42271..033b9c4a4 100644 --- a/src/main/java/mekanism/common/item/ItemHDPE.java +++ b/src/main/java/mekanism/common/item/ItemHDPE.java @@ -1,7 +1,5 @@ package mekanism.common.item; -import java.util.List; - import mekanism.common.Mekanism; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -9,6 +7,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import java.util.List; + public class ItemHDPE extends ItemMekanism { public IIcon[] icons = new IIcon[256]; diff --git a/src/main/java/mekanism/common/item/ItemIngot.java b/src/main/java/mekanism/common/item/ItemIngot.java index 9cc87c947..a1572fffe 100644 --- a/src/main/java/mekanism/common/item/ItemIngot.java +++ b/src/main/java/mekanism/common/item/ItemIngot.java @@ -1,13 +1,13 @@ package mekanism.common.item; -import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import java.util.List; + public class ItemIngot extends ItemMekanism { public IIcon[] icons = new IIcon[256]; diff --git a/src/main/java/mekanism/common/item/ItemJetpack.java b/src/main/java/mekanism/common/item/ItemJetpack.java index db5100d2e..a0eedbd43 100644 --- a/src/main/java/mekanism/common/item/ItemJetpack.java +++ b/src/main/java/mekanism/common/item/ItemJetpack.java @@ -1,7 +1,7 @@ package mekanism.common.item; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; import mekanism.api.gas.Gas; @@ -26,8 +26,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.common.util.EnumHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor { diff --git a/src/main/java/mekanism/common/item/ItemOtherDust.java b/src/main/java/mekanism/common/item/ItemOtherDust.java index cdb4aba21..2e2ea34ec 100644 --- a/src/main/java/mekanism/common/item/ItemOtherDust.java +++ b/src/main/java/mekanism/common/item/ItemOtherDust.java @@ -1,13 +1,13 @@ package mekanism.common.item; -import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import java.util.List; + public class ItemOtherDust extends ItemMekanism { public IIcon[] icons = new IIcon[256]; diff --git a/src/main/java/mekanism/common/item/ItemRobit.java b/src/main/java/mekanism/common/item/ItemRobit.java index 84bdbe9ec..a2fcab9b9 100644 --- a/src/main/java/mekanism/common/item/ItemRobit.java +++ b/src/main/java/mekanism/common/item/ItemRobit.java @@ -1,7 +1,7 @@ package mekanism.common.item; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.common.base.ISustainedInventory; @@ -15,8 +15,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class ItemRobit extends ItemEnergized implements ISustainedInventory { diff --git a/src/main/java/mekanism/common/item/ItemScubaTank.java b/src/main/java/mekanism/common/item/ItemScubaTank.java index 7e8953fdd..b3d8adf29 100644 --- a/src/main/java/mekanism/common/item/ItemScubaTank.java +++ b/src/main/java/mekanism/common/item/ItemScubaTank.java @@ -1,7 +1,7 @@ package mekanism.common.item; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; import mekanism.api.gas.Gas; @@ -23,8 +23,8 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.EnumHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class ItemScubaTank extends ItemArmor implements IGasItem { diff --git a/src/main/java/mekanism/common/item/ItemShard.java b/src/main/java/mekanism/common/item/ItemShard.java index 71d379c33..753db333b 100644 --- a/src/main/java/mekanism/common/item/ItemShard.java +++ b/src/main/java/mekanism/common/item/ItemShard.java @@ -1,7 +1,5 @@ package mekanism.common.item; -import java.util.List; - import mekanism.common.Resource; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -9,6 +7,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import java.util.List; + public class ItemShard extends ItemMekanism { public IIcon[] icons = new IIcon[256]; diff --git a/src/main/java/mekanism/common/item/ItemUpgrade.java b/src/main/java/mekanism/common/item/ItemUpgrade.java index 0f081d656..8a93694e0 100644 --- a/src/main/java/mekanism/common/item/ItemUpgrade.java +++ b/src/main/java/mekanism/common/item/ItemUpgrade.java @@ -1,7 +1,7 @@ package mekanism.common.item; -import java.util.List; - +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; @@ -13,11 +13,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import org.lwjgl.input.Keyboard; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; public class ItemUpgrade extends ItemMekanism implements IUpgradeItem { diff --git a/src/main/java/mekanism/tools/client/gui/GuiToolsConfig.java b/src/main/java/mekanism/tools/client/gui/GuiToolsConfig.java index ee3ee64de..edad48538 100644 --- a/src/main/java/mekanism/tools/client/gui/GuiToolsConfig.java +++ b/src/main/java/mekanism/tools/client/gui/GuiToolsConfig.java @@ -1,18 +1,18 @@ package mekanism.tools.client.gui; -import java.util.ArrayList; -import java.util.List; - -import mekanism.common.Mekanism; -import mekanism.common.util.LangUtils; -import net.minecraft.client.gui.GuiScreen; -import net.minecraftforge.common.config.ConfigElement; -import net.minecraftforge.common.config.Configuration; import cpw.mods.fml.client.config.DummyConfigElement.DummyCategoryElement; import cpw.mods.fml.client.config.GuiConfig; import cpw.mods.fml.client.config.GuiConfigEntries; import cpw.mods.fml.client.config.GuiConfigEntries.CategoryEntry; import cpw.mods.fml.client.config.IConfigElement; +import mekanism.common.Mekanism; +import mekanism.common.util.LangUtils; +import net.minecraft.client.gui.GuiScreen; +import net.minecraftforge.common.config.ConfigElement; +import net.minecraftforge.common.config.Configuration; + +import java.util.ArrayList; +import java.util.List; /** * Created by ben on 27/06/14. diff --git a/src/main/java/mekanism/tools/client/gui/ToolsGuiFactory.java b/src/main/java/mekanism/tools/client/gui/ToolsGuiFactory.java index 12d1ac6ba..f8d3b0642 100644 --- a/src/main/java/mekanism/tools/client/gui/ToolsGuiFactory.java +++ b/src/main/java/mekanism/tools/client/gui/ToolsGuiFactory.java @@ -1,10 +1,10 @@ package mekanism.tools.client.gui; -import java.util.Set; - +import cpw.mods.fml.client.IModGuiFactory; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; -import cpw.mods.fml.client.IModGuiFactory; + +import java.util.Set; public class ToolsGuiFactory implements IModGuiFactory { diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index d8bf6bbb9..2804e93c4 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -1,13 +1,17 @@ package mekanism.tools.common; +import cpw.mods.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.Mod.Instance; +import cpw.mods.fml.common.SidedProxy; +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; - -import java.io.IOException; - -import mekanism.api.MekanismConfig; import mekanism.api.MekanismConfig.tools; import mekanism.common.Mekanism; -import mekanism.common.MekanismItems; import mekanism.common.Version; import mekanism.common.base.IModule; import mekanism.common.recipe.ShapedMekanismRecipe; @@ -21,17 +25,10 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.entity.living.LivingSpawnEvent; -import cpw.mods.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.oredict.OreDictionary; +import java.io.IOException; + @Mod(modid = "MekanismTools", name = "MekanismTools", version = "GRADLE_MODVERSION", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") public class MekanismTools implements IModule { diff --git a/src/main/java/mekanism/tools/common/ToolsItems.java b/src/main/java/mekanism/tools/common/ToolsItems.java index 38dd29c8a..9851098b3 100644 --- a/src/main/java/mekanism/tools/common/ToolsItems.java +++ b/src/main/java/mekanism/tools/common/ToolsItems.java @@ -1,17 +1,11 @@ package mekanism.tools.common; -import mekanism.common.Mekanism; -import mekanism.tools.item.ItemMekanismArmor; -import mekanism.tools.item.ItemMekanismAxe; -import mekanism.tools.item.ItemMekanismHoe; -import mekanism.tools.item.ItemMekanismPaxel; -import mekanism.tools.item.ItemMekanismPickaxe; -import mekanism.tools.item.ItemMekanismShovel; -import mekanism.tools.item.ItemMekanismSword; -import net.minecraft.item.Item; -import net.minecraft.item.Item.ToolMaterial; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import mekanism.common.Mekanism; +import mekanism.tools.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.Item.ToolMaterial; @ObjectHolder("MekanismTools") public class ToolsItems diff --git a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java index 7b9574edb..0dfba5c24 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java @@ -1,7 +1,7 @@ package mekanism.tools.item; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.util.StackUtils; import mekanism.client.render.ModelCustomArmor; import mekanism.common.Mekanism; @@ -17,8 +17,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class ItemMekanismArmor extends ItemArmor { diff --git a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java index 16979370f..aca1a9dfc 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java @@ -1,7 +1,8 @@ package mekanism.tools.item; -import java.util.List; - +import cpw.mods.fml.common.eventhandler.Event.Result; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.util.StackUtils; import mekanism.common.item.ItemMekanism; import mekanism.common.util.LangUtils; @@ -13,9 +14,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.UseHoeEvent; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class ItemMekanismHoe extends ItemMekanism { diff --git a/src/main/java/mekanism/tools/item/ItemMekanismSword.java b/src/main/java/mekanism/tools/item/ItemMekanismSword.java index d5f77e355..bc31a26bf 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismSword.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismSword.java @@ -1,7 +1,5 @@ package mekanism.tools.item; -import java.util.List; - import mekanism.common.Mekanism; import mekanism.common.util.LangUtils; import net.minecraft.client.renderer.texture.IIconRegister; @@ -9,6 +7,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; +import java.util.List; + public class ItemMekanismSword extends ItemSword { public ItemMekanismSword(ToolMaterial enumtoolmaterial) diff --git a/src/main/java/mekanism/tools/item/ItemMekanismTool.java b/src/main/java/mekanism/tools/item/ItemMekanismTool.java index 9bac0d63f..d0ca65ca2 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismTool.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismTool.java @@ -1,9 +1,5 @@ package mekanism.tools.item; -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; @@ -16,6 +12,10 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTool; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; + public class ItemMekanismTool extends ItemTool { public ItemMekanismTool(int mobBoost, ToolMaterial toolMaterial, Block[] effectiveBlocks)