$ Organized imports.

$ FindBugs fixes.

15 files changed, 48 insertions, 27 deletions

diff --git a/src/Java/gtPlusPlus/core/slots/SlotBlueprint.java b/src/Java/gtPlusPlus/core/slots/SlotBlueprint.java
index 603021237a..532f2f0822 100644
--- a/src/Java/gtPlusPlus/core/slots/SlotBlueprint.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotBlueprint.java
@@ -1,11 +1,12 @@
 package gtPlusPlus.core.slots;
 
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.interfaces.IItemBlueprint;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.interfaces.IItemBlueprint;
+
 public class SlotBlueprint extends Slot {
 
 	public SlotBlueprint(final IInventory inventory, final int x, final int y, final int z) {
diff --git a/src/Java/gtPlusPlus/core/slots/SlotBuzzSaw.java b/src/Java/gtPlusPlus/core/slots/SlotBuzzSaw.java
index af7c7c9c59..94b0b9ecc7 100644
--- a/src/Java/gtPlusPlus/core/slots/SlotBuzzSaw.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotBuzzSaw.java
@@ -1,12 +1,13 @@
 package gtPlusPlus.core.slots;
 
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.GT_MetaGenerated_Item_02;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.common.items.GT_MetaGenerated_Item_02;
+
 public class SlotBuzzSaw extends Slot {
 
 	public SAWTOOL currentTool = SAWTOOL.NONE;
diff --git a/src/Java/gtPlusPlus/core/slots/SlotCrafting.java b/src/Java/gtPlusPlus/core/slots/SlotCrafting.java
index 4ad26d6093..42b7b585e2 100644
--- a/src/Java/gtPlusPlus/core/slots/SlotCrafting.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotCrafting.java
@@ -1,6 +1,7 @@
 package gtPlusPlus.core.slots;
 
 import cpw.mods.fml.common.FMLCommonHandler;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -8,6 +9,7 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.*;
 import net.minecraft.stats.AchievementList;
+
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;
 
diff --git a/src/Java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java b/src/Java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java
index 286eff9612..3608c3724c 100644
--- a/src/Java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java
@@ -1,6 +1,7 @@
 package gtPlusPlus.core.slots;
 
 import cpw.mods.fml.common.FMLCommonHandler;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
diff --git a/src/Java/gtPlusPlus/core/slots/SlotDataStick.java b/src/Java/gtPlusPlus/core/slots/SlotDataStick.java
index 26a7261f91..66bc4d4b5d 100644
--- a/src/Java/gtPlusPlus/core/slots/SlotDataStick.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotDataStick.java
@@ -1,12 +1,14 @@
 package gtPlusPlus.core.slots;
 
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
 import gregtech.api.enums.ItemList;
 import gregtech.common.items.GT_MetaGenerated_Item_01;
+
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
 
 public class SlotDataStick extends Slot {
 
diff --git a/src/Java/gtPlusPlus/core/slots/SlotElectric.java b/src/Java/gtPlusPlus/core/slots/SlotElectric.java
index 6b11cf5264..a747432a74 100644
--- a/src/Java/gtPlusPlus/core/slots/SlotElectric.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotElectric.java
@@ -1,13 +1,15 @@
 package gtPlusPlus.core.slots;
 
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.items.GT_MetaGenerated_Tool;
+
 import ic2.api.info.Info;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
 
 public class SlotElectric extends Slot {
 	
diff --git a/src/Java/gtPlusPlus/core/slots/SlotFrame.java b/src/Java/gtPlusPlus/core/slots/SlotFrame.java
index 590a68fbb7..4168ded5bc 100644
--- a/src/Java/gtPlusPlus/core/slots/SlotFrame.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotFrame.java
@@ -1,10 +1,11 @@
 package gtPlusPlus.core.slots;
 
-import forestry.api.apiculture.IHiveFrame;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
+import forestry.api.apiculture.IHiveFrame;
+
 public class SlotFrame extends Slot {
 
 	public SlotFrame(final IInventory inventory, final int x, final int y, final int z) {
diff --git a/src/Java/gtPlusPlus/core/slots/SlotFuelRod.java b/src/Java/gtPlusPlus/core/slots/SlotFuelRod.java
index 94a8b8ce0a..b50b679665 100644
--- a/src/Java/gtPlusPlus/core/slots/SlotFuelRod.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotFuelRod.java
@@ -1,11 +1,13 @@
 package gtPlusPlus.core.slots;
 
-import gregtech.api.enums.ItemList;
-import ic2.core.Ic2Items;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
+import gregtech.api.enums.ItemList;
+
+import ic2.core.Ic2Items;
+
 public class SlotFuelRod extends Slot {
 
 	public SlotFuelRod(final IInventory inventory, final int index, final int x, final int y) {
diff --git a/src/Java/gtPlusPlus/core/slots/SlotGtTool.java b/src/Java/gtPlusPlus/core/slots/SlotGtTool.java
index e70ae728c9..54e25362db 100644
--- a/src/Java/gtPlusPlus/core/slots/SlotGtTool.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotGtTool.java
@@ -1,11 +1,13 @@
 package gtPlusPlus.core.slots;
 
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gtPlusPlus.api.objects.Logger;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
+import gregtech.api.items.GT_MetaGenerated_Tool;
+
+import gtPlusPlus.api.objects.Logger;
+
 public class SlotGtTool extends Slot {
 
 	public SlotGtTool(final IInventory inventory, final int x, final int y, final int z) {
diff --git a/src/Java/gtPlusPlus/core/slots/SlotGtToolElectric.java b/src/Java/gtPlusPlus/core/slots/SlotGtToolElectric.java
index 1e488a0e46..c0e3340769 100644
--- a/src/Java/gtPlusPlus/core/slots/SlotGtToolElectric.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotGtToolElectric.java
@@ -1,13 +1,15 @@
 package gtPlusPlus.core.slots;
 
+import net.minecraft.init.Items;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+
 import gregtech.api.items.GT_MetaGenerated_Tool;
+
 import gtPlusPlus.api.objects.Logger;
 import ic2.api.info.Info;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
-import net.minecraft.init.Items;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
 
 public class SlotGtToolElectric extends SlotGtTool {
 	public int tier;
diff --git a/src/Java/gtPlusPlus/core/slots/SlotItemBackpackInv.java b/src/Java/gtPlusPlus/core/slots/SlotItemBackpackInv.java
index bc74e65844..3aa551f966 100644
--- a/src/Java/gtPlusPlus/core/slots/SlotItemBackpackInv.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotItemBackpackInv.java
@@ -1,10 +1,11 @@
 package gtPlusPlus.core.slots;
 
-import gtPlusPlus.core.item.base.BaseItemBackpack;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
+import gtPlusPlus.core.item.base.BaseItemBackpack;
+
 public class SlotItemBackpackInv extends Slot {
 	public SlotItemBackpackInv(final IInventory inv, final int index, final int xPos, final int yPos) {
 		super(inv, index, xPos, yPos);
diff --git a/src/Java/gtPlusPlus/core/slots/SlotModularBauble.java b/src/Java/gtPlusPlus/core/slots/SlotModularBauble.java
index 88735aaa55..4aef5bc877 100644
--- a/src/Java/gtPlusPlus/core/slots/SlotModularBauble.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotModularBauble.java
@@ -1,10 +1,11 @@
 package gtPlusPlus.core.slots;
 
-import gtPlusPlus.core.item.bauble.ModularBauble;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
+import gtPlusPlus.core.item.bauble.ModularBauble;
+
 public class SlotModularBauble extends Slot {
 
 	public SlotModularBauble(final IInventory inventory, final int slot, final int x, final int y) {
diff --git a/src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java b/src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java
index a7ab3792ef..dae62f0415 100644
--- a/src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java
@@ -1,18 +1,18 @@
 package gtPlusPlus.core.slots;
 
-import static gtPlusPlus.core.tileentities.machines.TileEntityModularityTable.mValidUpgradeList;
-import static gtPlusPlus.core.tileentities.machines.TileEntityModularityTable.mValidUpgradeListFormChange;
+import static gtPlusPlus.core.tileentities.machines.TileEntityModularityTable.*;
 
 import java.util.Iterator;
 import java.util.Map.Entry;
 
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.util.minecraft.ModularArmourUtils.BT;
 import gtPlusPlus.core.util.minecraft.ModularArmourUtils.Modifiers;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
 
 public class SlotModularBaubleUpgrades extends Slot {
 
diff --git a/src/Java/gtPlusPlus/core/slots/SlotOutput.java b/src/Java/gtPlusPlus/core/slots/SlotOutput.java
index 018df63a4c..f22e0645f5 100644
--- a/src/Java/gtPlusPlus/core/slots/SlotOutput.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotOutput.java
@@ -1,10 +1,12 @@
 package gtPlusPlus.core.slots;
 
 import cpw.mods.fml.common.FMLCommonHandler;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
+
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;
 
diff --git a/src/Java/gtPlusPlus/core/slots/SlotRTG.java b/src/Java/gtPlusPlus/core/slots/SlotRTG.java
index 66d41a147c..181052cc57 100644
--- a/src/Java/gtPlusPlus/core/slots/SlotRTG.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotRTG.java
@@ -1,10 +1,11 @@
 package gtPlusPlus.core.slots;
 
-import ic2.core.Ic2Items;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
+import ic2.core.Ic2Items;
+
 public class SlotRTG extends Slot {
 
 	public SlotRTG(final IInventory inventory, final int x, final int y, final int z) {