Organize imports

2014-12-29 21:59:05 +01:00
parent ddf71c5072
commit 9b7b0fc0fb
492 changed files with 1142 additions and 557 deletions
@@ -30,6 +30,9 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;

+import com.google.common.base.Joiner;
+import com.google.common.base.Stopwatch;
+
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
@@ -49,9 +52,6 @@ import net.minecraft.util.ResourceLocation;

 import cpw.mods.fml.common.ObfuscationReflectionHelper;

-import com.google.common.base.Joiner;
-import com.google.common.base.Stopwatch;
-
 import appeng.api.storage.data.IAEItemStack;
 import appeng.client.gui.widgets.GuiScrollbar;
 import appeng.client.gui.widgets.ITooltip;
@@ -25,6 +25,7 @@ import java.util.Locale;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
+
 import appeng.api.storage.data.IAEItemStack;
 import appeng.client.me.SlotME;
 import appeng.core.AEConfig;
@@ -22,6 +22,7 @@ import java.util.Set;

 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
+
 import cpw.mods.fml.client.IModGuiFactory;

 public class AEConfigGuiFactory implements IModGuiFactory
@@ -20,13 +20,13 @@ package appeng.client.gui.implementations;

 import java.io.IOException;

+import org.lwjgl.input.Mouse;
+
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;

-import org.lwjgl.input.Mouse;
-
 import appeng.api.config.ActionItems;
 import appeng.api.config.CopyMode;
 import appeng.api.config.FuzzyMode;
@@ -20,6 +20,7 @@ package appeng.client.gui.implementations;

 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
+
 import appeng.client.gui.AEBaseGui;
 import appeng.client.gui.widgets.GuiTabButton;
 import appeng.container.implementations.ContainerChest;
@@ -21,6 +21,7 @@ package appeng.client.gui.implementations;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
+
 import appeng.api.AEApi;
 import appeng.api.storage.ITerminalHost;
 import appeng.client.gui.AEBaseGui;
@@ -26,6 +26,8 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;

+import com.google.common.base.Joiner;
+
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;

@@ -33,8 +35,6 @@ import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;

-import com.google.common.base.Joiner;
-
 import appeng.api.AEApi;
 import appeng.api.storage.ITerminalHost;
 import appeng.api.storage.data.IAEItemStack;
@@ -25,14 +25,14 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;

+import com.google.common.base.Joiner;
+
 import org.lwjgl.opengl.GL11;

 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;

-import com.google.common.base.Joiner;
-
 import appeng.api.AEApi;
 import appeng.api.config.SortDir;
 import appeng.api.config.SortOrder;
@@ -23,12 +23,12 @@ package appeng.client.gui.implementations;

 import java.io.IOException;

+import org.lwjgl.input.Mouse;
+
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;

-import org.lwjgl.input.Mouse;
-
 import appeng.api.AEApi;
 import appeng.api.storage.ITerminalHost;
 import appeng.client.gui.widgets.GuiTabButton;
@@ -22,6 +22,7 @@ import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
+
 import appeng.api.config.ActionItems;
 import appeng.api.config.Settings;
 import appeng.api.storage.ITerminalHost;
@@ -20,6 +20,7 @@ package appeng.client.gui.implementations;

 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
+
 import appeng.client.gui.AEBaseGui;
 import appeng.client.gui.widgets.GuiTabButton;
 import appeng.container.implementations.ContainerDrive;
@@ -20,6 +20,7 @@ package appeng.client.gui.implementations;

 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
+
 import appeng.api.config.FuzzyMode;
 import appeng.api.config.Settings;
 import appeng.client.gui.widgets.GuiImgButton;
@@ -19,6 +19,7 @@
 package appeng.client.gui.implementations;

 import net.minecraft.entity.player.InventoryPlayer;
+
 import appeng.client.gui.AEBaseGui;
 import appeng.container.implementations.ContainerGrinder;
 import appeng.core.localization.GuiText;
@@ -18,11 +18,11 @@

 package appeng.client.gui.implementations;

+import org.lwjgl.input.Mouse;
+
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;

-import org.lwjgl.input.Mouse;
-
 import appeng.api.AEApi;
 import appeng.api.config.FullnessMode;
 import appeng.api.config.OperationMode;
@@ -19,6 +19,7 @@
 package appeng.client.gui.implementations;

 import net.minecraft.entity.player.InventoryPlayer;
+
 import appeng.client.gui.AEBaseGui;
 import appeng.client.gui.widgets.GuiProgressBar;
 import appeng.client.gui.widgets.GuiProgressBar.Direction;
@@ -18,11 +18,11 @@

 package appeng.client.gui.implementations;

+import org.lwjgl.input.Mouse;
+
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;

-import org.lwjgl.input.Mouse;
-
 import appeng.api.config.Settings;
 import appeng.api.config.YesNo;
 import appeng.client.gui.widgets.GuiImgButton;
@@ -28,6 +28,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.WeakHashMap;

+import com.google.common.collect.HashMultimap;
+
 import org.lwjgl.opengl.GL11;

 import net.minecraft.entity.player.InventoryPlayer;
@@ -35,8 +37,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;

-import com.google.common.collect.HashMultimap;
-
 import appeng.api.AEApi;
 import appeng.client.gui.AEBaseGui;
 import appeng.client.gui.widgets.GuiScrollbar;
@@ -20,11 +20,11 @@ package appeng.client.gui.implementations;

 import java.io.IOException;

+import org.lwjgl.input.Mouse;
+
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;

-import org.lwjgl.input.Mouse;
-
 import appeng.api.config.FuzzyMode;
 import appeng.api.config.LevelType;
 import appeng.api.config.RedstoneMode;
@@ -19,6 +19,7 @@
 package appeng.client.gui.implementations;

 import net.minecraft.entity.player.InventoryPlayer;
+
 import appeng.api.config.RedstoneMode;
 import appeng.api.config.Settings;
 import appeng.client.gui.widgets.GuiImgButton;
@@ -21,13 +21,13 @@ package appeng.client.gui.implementations;
 import java.io.IOException;
 import java.util.List;

+import org.lwjgl.input.Mouse;
+
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;

-import org.lwjgl.input.Mouse;
-
 import appeng.api.config.SearchBoxMode;
 import appeng.api.config.Settings;
 import appeng.api.config.TerminalStyle;
@@ -19,6 +19,7 @@
 package appeng.client.gui.implementations;

 import net.minecraft.entity.player.InventoryPlayer;
+
 import appeng.api.implementations.guiobjects.IPortableCell;
 import appeng.container.implementations.ContainerMEPortableCell;

@@ -22,6 +22,7 @@ import java.io.IOException;

 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
+
 import appeng.api.implementations.guiobjects.INetworkTool;
 import appeng.client.gui.AEBaseGui;
 import appeng.client.gui.widgets.GuiToggleButton;
@@ -24,6 +24,7 @@ import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
+
 import appeng.api.config.ActionItems;
 import appeng.api.config.Settings;
 import appeng.api.storage.ITerminalHost;
@@ -23,6 +23,7 @@ import java.io.IOException;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
+
 import appeng.api.AEApi;
 import appeng.client.gui.AEBaseGui;
 import appeng.client.gui.widgets.GuiNumberBox;
@@ -19,6 +19,7 @@
 package appeng.client.gui.implementations;

 import net.minecraft.entity.player.InventoryPlayer;
+
 import appeng.client.gui.AEBaseGui;
 import appeng.container.implementations.ContainerQNB;
 import appeng.core.localization.GuiText;
@@ -22,6 +22,7 @@ import java.io.IOException;

 import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.entity.player.InventoryPlayer;
+
 import appeng.client.gui.AEBaseGui;
 import appeng.container.implementations.ContainerQuartzKnife;
 import appeng.core.AELog;
@@ -19,6 +19,7 @@
 package appeng.client.gui.implementations;

 import net.minecraft.entity.player.InventoryPlayer;
+
 import appeng.client.gui.AEBaseGui;
 import appeng.container.implementations.ContainerSkyChest;
 import appeng.core.AppEng;
@@ -20,11 +20,11 @@ package appeng.client.gui.implementations;

 import java.io.IOException;

+import org.lwjgl.input.Mouse;
+
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;

-import org.lwjgl.input.Mouse;
-
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.ActionItems;
 import appeng.api.config.FuzzyMode;
@@ -18,11 +18,11 @@

 package appeng.client.gui.implementations;

+import org.lwjgl.input.Mouse;
+
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;

-import org.lwjgl.input.Mouse;
-
 import appeng.api.config.FuzzyMode;
 import appeng.api.config.RedstoneMode;
 import appeng.api.config.Settings;
@@ -18,10 +18,10 @@

 package appeng.client.gui.implementations;

-import net.minecraft.entity.player.InventoryPlayer;
-
 import org.lwjgl.opengl.GL11;

+import net.minecraft.entity.player.InventoryPlayer;
+
 import appeng.client.gui.AEBaseGui;
 import appeng.client.gui.widgets.GuiProgressBar;
 import appeng.client.gui.widgets.GuiProgressBar.Direction;
@@ -18,11 +18,11 @@

 package appeng.client.gui.implementations;

+import org.lwjgl.input.Mouse;
+
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;

-import org.lwjgl.input.Mouse;
-
 import appeng.api.config.Settings;
 import appeng.client.gui.AEBaseGui;
 import appeng.client.gui.widgets.GuiImgButton;
@@ -19,6 +19,7 @@
 package appeng.client.gui.implementations;

 import net.minecraft.entity.player.InventoryPlayer;
+
 import appeng.api.implementations.guiobjects.IPortableCell;

 public class GuiWirelessTerm extends GuiMEPortableCell