organize imports

java/src/game/Game.java

@@ -1,7 +1,6 @@
 package game;
 
 import java.awt.Desktop;
-import java.awt.GraphicsEnvironment;
 import java.awt.image.BufferedImage;
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
@@ -40,7 +39,6 @@ import java.util.concurrent.FutureTask;
 import java.util.function.Function;
 
 import javax.imageio.ImageIO;
-import javax.swing.JOptionPane;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -123,19 +121,19 @@ import game.util.FileUtils;
 import game.util.PerfSection;
 import game.util.Timing;
 import game.util.Util;
+import game.vars.BaseVar.VarFunction;
 import game.vars.BoolVar;
+import game.vars.BoolVar.BoolFunction;
 import game.vars.CVar;
 import game.vars.CVarCategory;
 import game.vars.ColorVar;
 import game.vars.EnumVar;
-import game.vars.FloatVar;
-import game.vars.IntVar;
-import game.vars.Variable;
-import game.vars.BaseVar.VarFunction;
-import game.vars.BoolVar.BoolFunction;
 import game.vars.EnumVar.EnumFunction;
+import game.vars.FloatVar;
 import game.vars.FloatVar.FloatFunction;
+import game.vars.IntVar;
 import game.vars.IntVar.IntFunction;
+import game.vars.Variable;
 import game.vars.Variable.IntType;
 import game.window.Bind;
 import game.window.Button;

java/src/game/Server.java

@@ -69,6 +69,9 @@ import game.world.PortalType;
 import game.world.Position;
 import game.world.Region;
 import game.world.Region.FolderInfo;
+import game.world.World;
+import game.world.WorldPos;
+import game.world.WorldServer;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelException;
@@ -85,9 +88,6 @@ import io.netty.channel.socket.nio.NioServerSocketChannel;
 import io.netty.handler.timeout.ReadTimeoutHandler;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
-import game.world.World;
-import game.world.WorldPos;
-import game.world.WorldServer;
 
 public final class Server implements Runnable, IThreadListener {
 	private static final LazyLoadBase<NioEventLoopGroup> SERVER_NIO_EVENTLOOP = new LazyLoadBase<NioEventLoopGroup>() {

java/src/game/ai/EntityAIFindEntityNearest.java

@@ -2,6 +2,7 @@ package game.ai;
 
 import java.util.Collections;
 import java.util.List;
+
 import com.google.common.base.Predicate;
 
 import game.entity.attributes.AttributeInstance;

java/src/game/ai/EntityAINearestAttackableTarget.java

@@ -3,6 +3,7 @@ package game.ai;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+
 import com.google.common.base.Predicate;
 
 import game.entity.Entity;

java/src/game/audio/AudioInterface.java

@@ -7,12 +7,11 @@ import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.AudioFormat.Encoding;
 import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.DataLine.Info;
-
-import com.google.common.collect.Lists;
-
 import javax.sound.sampled.LineUnavailableException;
 import javax.sound.sampled.SourceDataLine;
 
+import com.google.common.collect.Lists;
+
 import game.log.Log;
 
 public class AudioInterface implements Runnable {

java/src/game/block/BlockHopper.java

@@ -1,6 +1,7 @@
 package game.block;
 
 import java.util.List;
+
 import com.google.common.base.Predicate;
 
 import game.entity.Entity;

java/src/game/entity/attributes/AttributeMap.java

@@ -3,12 +3,11 @@ package game.entity.attributes;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
-import java.util.Set;
-
 public class AttributeMap
 {
     protected final Map<Attribute, AttributeInstance> attributes = Maps.<Attribute, AttributeInstance>newHashMap();

java/src/game/entity/item/EntityHopperCart.java

@@ -1,6 +1,7 @@
 package game.entity.item;
 
 import java.util.List;
+
 import com.google.common.base.Predicate;
 
 import game.entity.DamageSource;

java/src/game/entity/npc/EntityZombie.java

@@ -1,6 +1,7 @@
 package game.entity.npc;
 
 import java.util.List;
+
 import com.google.common.base.Predicate;
 
 import game.ai.EntityAIMoveThroughVillage;

java/src/game/entity/types/EntityLiving.java

@@ -4,8 +4,8 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import com.google.common.base.Predicate;
 
+import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 

java/src/game/gui/Gui.java

@@ -6,8 +6,8 @@ import com.google.common.collect.Lists;
 
 import game.Game;
 import game.gui.element.Dropdown;
-import game.gui.element.Element;
 import game.gui.element.Dropdown.Handle;
+import game.gui.element.Element;
 import game.renderer.DefaultVertexFormats;
 import game.renderer.Drawing;
 import game.renderer.GlState;

java/src/game/gui/GuiBinds.java

@@ -2,8 +2,8 @@ package game.gui;
 
 import game.color.TextColor;
 import game.gui.element.ActButton;
-import game.gui.element.Label;
 import game.gui.element.ActButton.Mode;
+import game.gui.element.Label;
 import game.util.Formatter;
 import game.window.Bind;
 

java/src/game/gui/GuiConfirm.java

@@ -1,9 +1,9 @@
 package game.gui;
 
 import game.gui.element.ActButton;
+import game.gui.element.ActButton.Mode;
 import game.gui.element.Label;
 import game.gui.element.Textbox;
-import game.gui.element.ActButton.Mode;
 
 public class GuiConfirm extends Gui implements ActButton.Callback {
 	public static interface Callback {

java/src/game/gui/GuiConsole.java

@@ -7,8 +7,8 @@ import com.google.common.collect.Lists;
 import game.gui.element.ActButton;
 import game.gui.element.Fill;
 import game.gui.element.Textbox;
-import game.gui.element.TransparentBox;
 import game.gui.element.Textbox.Action;
+import game.gui.element.TransparentBox;
 import game.log.Log;
 import game.network.NetHandlerPlayServer;
 import game.packet.CPacketComplete;

java/src/game/gui/GuiGameOver.java

@@ -2,8 +2,8 @@ package game.gui;
 
 import game.color.TextColor;
 import game.gui.element.ActButton;
-import game.gui.element.Label;
 import game.gui.element.ActButton.Mode;
+import game.gui.element.Label;
 
 public class GuiGameOver extends Gui {
 	public static final GuiGameOver INSTANCE = new GuiGameOver();

java/src/game/gui/GuiStyle.java

@@ -1,14 +1,14 @@
 package game.gui;
 
 import game.gui.element.ActButton;
+import game.gui.element.ActButton.Mode;
 import game.gui.element.Dropdown;
 import game.gui.element.SelectedButton;
 import game.gui.element.Slider;
 import game.gui.element.Switch;
 import game.gui.element.Textbox;
-import game.gui.element.Toggle;
-import game.gui.element.ActButton.Mode;
 import game.gui.element.Textbox.Action;
+import game.gui.element.Toggle;
 
 public class GuiStyle extends GuiOptions implements Dropdown.Callback<String>, ActButton.Callback, Toggle.Callback, Switch.Callback<String>, Slider.Callback, Textbox.Callback {
 	private static final String[] STYLE_CVARS = {

java/src/game/gui/container/GuiContainer.java

@@ -16,9 +16,9 @@ import game.item.CheatTab;
 import game.item.ItemStack;
 import game.packet.CPacketCheat;
 import game.renderer.Drawing;
+import game.renderer.Drawing.Vec2i;
 import game.renderer.GlState;
 import game.renderer.ItemRenderer;
-import game.renderer.Drawing.Vec2i;
 import game.renderer.entity.RenderItem;
 import game.util.ExtMath;
 import game.window.Button;

java/src/game/gui/element/GuiList.java

@@ -8,10 +8,10 @@ import game.gui.Gui;
 import game.renderer.DefaultVertexFormats;
 import game.renderer.Drawing;
 import game.renderer.GlState;
+import game.renderer.RenderBuffer;
 import game.renderer.Tessellator;
 import game.util.ExtMath;
 import game.window.Button;
-import game.renderer.RenderBuffer;
 
 public abstract class GuiList<T extends ListEntry> extends Gui
 {

java/src/game/gui/world/GuiEdit.java

@@ -5,9 +5,9 @@ import java.io.File;
 import game.color.TextColor;
 import game.gui.Gui;
 import game.gui.element.ActButton;
+import game.gui.element.ActButton.Mode;
 import game.gui.element.Label;
 import game.gui.element.Textbox;
-import game.gui.element.ActButton.Mode;
 import game.gui.element.Textbox.Action;
 import game.network.NetHandlerPlayServer;
 import game.world.Region;

java/src/game/gui/world/GuiWorlds.java

@@ -17,9 +17,9 @@ import game.dimension.Dimension;
 import game.gui.GuiConfirm;
 import game.gui.GuiMenu;
 import game.gui.element.ActButton;
+import game.gui.element.ActButton.Mode;
 import game.gui.element.GuiList;
 import game.gui.element.ListEntry;
-import game.gui.element.ActButton.Mode;
 import game.gui.world.GuiEdit.Callback;
 import game.init.Config;
 import game.init.UniverseRegistry;
@@ -34,8 +34,8 @@ import game.window.WCF;
 import game.world.Converter;
 import game.world.Converter.SaveVersion;
 import game.world.Region;
-import game.world.World;
 import game.world.Region.FolderInfo;
+import game.world.World;
 
 public class GuiWorlds extends GuiList<GuiWorlds.SaveInfo> implements ActButton.Callback
 {

java/src/game/init/RotationRegistry.java

@@ -3,8 +3,8 @@ package game.init;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import com.google.common.base.Predicate;
 
+import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 

java/src/game/init/SmeltingRegistry.java

@@ -2,11 +2,10 @@ package game.init;
 
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import com.google.common.collect.Maps;
 
-import java.util.Set;
-
 import game.block.Block;
 import game.block.BlockStoneBrick;
 import game.color.DyeColor;

java/src/game/init/UniverseRegistry.java

@@ -3,13 +3,12 @@ package game.init;
 import java.util.List;
 import java.util.Map;
 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 java.util.Set;
-
 import game.biome.Biome;
 import game.block.BlockColored;
 import game.block.BlockSand;
@@ -20,7 +19,6 @@ import game.dimension.DimType;
 import game.dimension.Dimension;
 import game.dimension.Dimension.GeneratorType;
 import game.dimension.Dimension.ReplacerType;
-import game.log.Log;
 import game.dimension.Domain;
 import game.dimension.Galaxy;
 import game.dimension.Moon;
@@ -29,6 +27,7 @@ import game.dimension.Sector;
 import game.dimension.Semi;
 import game.dimension.Space;
 import game.dimension.Star;
+import game.log.Log;
 import game.nbt.NBTException;
 import game.nbt.NBTParser;
 import game.nbt.NBTTagCompound;

java/src/game/item/ItemArmor.java

@@ -3,8 +3,8 @@ package game.item;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import com.google.common.base.Predicate;
 
+import com.google.common.base.Predicate;
 import com.google.common.collect.Sets;
 
 import game.block.BlockDispenser;

java/src/game/item/ItemMagnet.java

@@ -1,6 +1,7 @@
 package game.item;
 
 import java.util.List;
+
 import com.google.common.base.Predicate;
 
 import game.entity.Entity;

java/src/game/item/ItemPotion.java

@@ -4,12 +4,11 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
-import java.util.Set;
-
 import game.color.TextColor;
 import game.entity.attributes.Attribute;
 import game.entity.attributes.AttributeModifier;

java/src/game/item/ItemStack.java

@@ -4,12 +4,11 @@ import java.text.DecimalFormat;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
-import java.util.Set;
-
 import game.block.Block;
 import game.color.TextColor;
 import game.enchantment.Enchantment;

java/src/game/model/ModelBakery.java

@@ -5,13 +5,12 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 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 java.util.Set;
-
 import game.init.BlockRegistry;
 import game.init.FluidRegistry;
 import game.init.IRegistry;

java/src/game/model/ModelManager.java

@@ -3,11 +3,10 @@ package game.model;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import com.google.common.collect.Maps;
 
-import java.util.Set;
-
 import game.block.Block;
 import game.block.BlockLiquid;
 import game.init.BlockRegistry;

java/src/game/nbt/NBTTagCompound.java

@@ -5,11 +5,10 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import com.google.common.collect.Maps;
 
-import java.util.Set;
-
 public class NBTTagCompound extends NBTBase
 {
     private Map<String, NBTBase> tagMap = Maps.<String, NBTBase>newHashMap();

java/src/game/network/NetHandlerPlayClient.java

@@ -3,11 +3,10 @@ package game.network;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import com.google.common.collect.Maps;
 
-import java.util.Set;
-
 import game.Game;
 import game.audio.PositionedSound;
 import game.dimension.Dimension;

java/src/game/network/NetHandlerPlayServer.java

@@ -6,8 +6,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Set;
-import com.google.common.base.Predicate;
 
+import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.Futures;
 

java/src/game/potion/Potion.java

@@ -2,11 +2,10 @@ package game.potion;
 
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import com.google.common.collect.Maps;
 
-import java.util.Set;
-
 import game.entity.DamageSource;
 import game.entity.attributes.Attribute;
 import game.entity.attributes.AttributeInstance;

java/src/game/renderer/EntityRenderer.java

@@ -4,6 +4,7 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.FloatBuffer;
 import java.util.List;
+
 import com.google.common.base.Predicate;
 
 import game.Game;

java/src/game/renderer/entity/Render.java

@@ -5,11 +5,11 @@ import game.block.Block;
 import game.entity.Entity;
 import game.renderer.DefaultVertexFormats;
 import game.renderer.Drawing;
+import game.renderer.Drawing.Vec2i;
 import game.renderer.Frustum;
 import game.renderer.GlState;
 import game.renderer.RenderBuffer;
 import game.renderer.Tessellator;
-import game.renderer.Drawing.Vec2i;
 import game.renderer.texture.TextureAtlasSprite;
 import game.renderer.texture.TextureMap;
 import game.window.WCF;

java/src/game/renderer/texture/EntityTexManager.java

@@ -8,13 +8,12 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 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 java.util.Set;
-
 import game.Game;
 import game.entity.npc.EntityNPC;
 import game.init.SpeciesRegistry;

java/src/game/renderer/tileentity/TileEntitySignRenderer.java

@@ -4,8 +4,8 @@ import game.block.Block;
 import game.gui.Font;
 import game.init.Blocks;
 import game.renderer.Drawing;
-import game.renderer.GlState;
 import game.renderer.Drawing.Vec2i;
+import game.renderer.GlState;
 import game.renderer.model.ModelSign;
 import game.tileentity.TileEntitySign;
 import game.window.WCF;

java/src/game/rng/WeightedList.java

@@ -3,9 +3,10 @@ package game.rng;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
-import com.google.common.base.Predicate;
 import java.util.function.UnaryOperator;
 
+import com.google.common.base.Predicate;
+
 public class WeightedList<E extends RngItem> extends ArrayList<E> {
 	protected boolean modified;
 	protected int total;

java/src/game/tileentity/TileEntityHopper.java

@@ -1,6 +1,7 @@
 package game.tileentity;
 
 import java.util.List;
+
 import com.google.common.base.Predicate;
 
 import game.block.Block;

java/src/game/window/WCF.java

@@ -1,8 +1,9 @@
 package game.window;
 
+import static org.lwjgl.glfw.Callbacks.glfwFreeCallbacks;
 import static org.lwjgl.glfw.GLFW.*;
-import static org.lwjgl.glfw.Callbacks.*;
+import static org.lwjgl.system.MemoryUtil.NULL;
-import static org.lwjgl.system.MemoryUtil.*;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

java/src/game/world/Chunk.java

@@ -4,8 +4,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentLinkedQueue;
-import com.google.common.base.Predicate;
 
+import com.google.common.base.Predicate;
 import com.google.common.collect.Maps;
 
 import game.biome.Biome;

java/src/game/world/EmptyChunk.java

@@ -1,6 +1,7 @@
 package game.world;
 
 import java.util.List;
+
 import com.google.common.base.Predicate;
 
 import game.block.Block;

java/src/game/world/Facing.java

@@ -2,8 +2,8 @@ package game.world;
 
 import java.util.Iterator;
 import java.util.Map;
-import com.google.common.base.Predicate;
 
+import com.google.common.base.Predicate;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Maps;
 

java/src/game/world/State.java

@@ -7,11 +7,11 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import com.google.common.base.Function;
+import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableTable;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
-import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Table;
 
 import game.block.Block;

java/src/game/world/World.java

@@ -4,8 +4,8 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import com.google.common.base.Predicate;
 
+import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 

java/src/game/world/WorldServer.java

@@ -11,8 +11,8 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
-import com.google.common.base.Predicate;
 
+import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;