$ Organized imports.

$ FindBugs fixes.

10 files changed, 20 insertions, 14 deletions

diff --git a/src/Java/gtPlusPlus/core/inventories/BaseInventoryBackpack.java b/src/Java/gtPlusPlus/core/inventories/BaseInventoryBackpack.java
index 9d0f75acba..256fedb13c 100644
--- a/src/Java/gtPlusPlus/core/inventories/BaseInventoryBackpack.java
+++ b/src/Java/gtPlusPlus/core/inventories/BaseInventoryBackpack.java
@@ -2,12 +2,13 @@ package gtPlusPlus.core.inventories;
 
 import java.util.UUID;
 
-import gtPlusPlus.core.item.base.BaseItemBackpack;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
+
+import gtPlusPlus.core.item.base.BaseItemBackpack;
 import net.minecraftforge.common.util.Constants;
 
 public class BaseInventoryBackpack implements IInventory{
diff --git a/src/Java/gtPlusPlus/core/inventories/BaseInventoryGrindle.java b/src/Java/gtPlusPlus/core/inventories/BaseInventoryGrindle.java
index ca7fcd6d03..a7acb96ade 100644
--- a/src/Java/gtPlusPlus/core/inventories/BaseInventoryGrindle.java
+++ b/src/Java/gtPlusPlus/core/inventories/BaseInventoryGrindle.java
@@ -2,12 +2,13 @@ package gtPlusPlus.core.inventories;
 
 import java.util.UUID;
 
-import gtPlusPlus.core.item.base.BaseItemBackpack;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
+
+import gtPlusPlus.core.item.base.BaseItemBackpack;
 import net.minecraftforge.common.util.Constants;
 
 public class BaseInventoryGrindle implements IInventory{
diff --git a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java b/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java
index e86f21c559..f49540b5e2 100644
--- a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java
+++ b/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java
@@ -1,7 +1,9 @@
 package gtPlusPlus.core.inventories;
 
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.*;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
diff --git a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java b/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java
index 702a2c8670..1966e8fdca 100644
--- a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java
+++ b/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java
@@ -1,6 +1,5 @@
 package gtPlusPlus.core.inventories;
 
-import gtPlusPlus.api.objects.Logger;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.InventoryCraftResult;
@@ -8,6 +7,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 
+import gtPlusPlus.api.objects.Logger;
+
 public class InventoryWorkbenchHoloSlots implements IInventory{
 
 	private final String name = "Inventory Holo";
diff --git a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchTools.java b/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchTools.java
index c7ff680cbc..6543f6e9ea 100644
--- a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchTools.java
+++ b/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchTools.java
@@ -1,12 +1,13 @@
 package gtPlusPlus.core.inventories;
 
-import gregtech.api.items.GT_MetaGenerated_Tool;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 
+import gregtech.api.items.GT_MetaGenerated_Tool;
+
 public class InventoryWorkbenchTools implements IInventory{
 
 	private final String name = "Inventory Tools";
diff --git a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchToolsElectric.java b/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchToolsElectric.java
index 1cc3f45844..29bf306b08 100644
--- a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchToolsElectric.java
+++ b/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchToolsElectric.java
@@ -1,8 +1,5 @@
 package gtPlusPlus.core.inventories;
 
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gtPlusPlus.core.slots.SlotGtToolElectric;
-import ic2.api.item.IElectricItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
@@ -10,6 +7,11 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 
+import gregtech.api.items.GT_MetaGenerated_Tool;
+
+import gtPlusPlus.core.slots.SlotGtToolElectric;
+import ic2.api.item.IElectricItem;
+
 public class InventoryWorkbenchToolsElectric implements IInventory{
 
 	private final String name = "Inventory Tools";
diff --git a/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularMain.java b/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularMain.java
index 590286a923..825a9a8851 100644
--- a/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularMain.java
+++ b/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularMain.java
@@ -1,14 +1,13 @@
 package gtPlusPlus.core.inventories.modulartable;
 
-import gtPlusPlus.core.slots.SlotModularBauble;
-import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable;
-import gtPlusPlus.core.util.Utils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 
+import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable;
+
 public class InventoryModularMain implements IInventory{
 
 	private final String name = "Inventory Grid";
diff --git a/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java b/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java
index 998750e3e3..d3c59ee2a4 100644
--- a/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java
+++ b/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java
@@ -1,12 +1,13 @@
 package gtPlusPlus.core.inventories.modulartable;
 
-import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 
+import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable;
+
 public class InventoryModularOutput implements IInventory {
 
 	private final String name = "Inventory Output";
diff --git a/src/Java/gtPlusPlus/core/inventories/projecttable/InventoryProjectMain.java b/src/Java/gtPlusPlus/core/inventories/projecttable/InventoryProjectMain.java
index 4857c9b29c..2d91869027 100644
--- a/src/Java/gtPlusPlus/core/inventories/projecttable/InventoryProjectMain.java
+++ b/src/Java/gtPlusPlus/core/inventories/projecttable/InventoryProjectMain.java
@@ -1,6 +1,5 @@
 package gtPlusPlus.core.inventories.projecttable;
 
-import gtPlusPlus.core.util.Utils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/gtPlusPlus/core/inventories/tradetable/InventoryTradeMain.java b/src/Java/gtPlusPlus/core/inventories/tradetable/InventoryTradeMain.java
index 7b125edcb0..aa7e8b1866 100644
--- a/src/Java/gtPlusPlus/core/inventories/tradetable/InventoryTradeMain.java
+++ b/src/Java/gtPlusPlus/core/inventories/tradetable/InventoryTradeMain.java
@@ -1,6 +1,5 @@
 package gtPlusPlus.core.inventories.tradetable;
 
-import gtPlusPlus.core.util.Utils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;