$ Organized imports.

$ FindBugs fixes.

10 files changed, 27 insertions, 12 deletions

diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
index 55a0a8ac10..249ea78ff3 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
@@ -2,7 +2,9 @@ package gtPlusPlus.core.common.compat;
 
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.item.general.*;
+import gtPlusPlus.core.item.general.ItemCloakingDevice;
+import gtPlusPlus.core.item.general.ItemHealingDevice;
+import gtPlusPlus.core.item.general.ItemSlowBuildingRing;
 import gtPlusPlus.core.lib.LoadedMods;
 
 public class COMPAT_Baubles {
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java
index c0536acada..3854f6612f 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java
@@ -1,8 +1,10 @@
 package gtPlusPlus.core.common.compat;
 
+import net.minecraft.item.ItemStack;
+
 import gregtech.api.util.GT_OreDictUnificator;
+
 import gtPlusPlus.core.item.ModItems;
-import net.minecraft.item.ItemStack;
 
 public class COMPAT_BigReactors {
 
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java
index 6bf21c695f..a5d0768e72 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java
@@ -1,11 +1,11 @@
 package gtPlusPlus.core.common.compat;
 
-import static gtPlusPlus.core.handler.COMPAT_HANDLER.AddRecipeQueue;
-import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
+import static gtPlusPlus.core.handler.COMPAT_HANDLER.*;
+
+import net.minecraft.item.ItemStack;
 
 import gtPlusPlus.core.recipe.ShapedRecipeObject;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.item.ItemStack;
 
 
 
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java
index 74af212502..6598a7e21e 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java
@@ -1,9 +1,11 @@
 package gtPlusPlus.core.common.compat;
 
+import net.minecraft.item.ItemStack;
+
 import gregtech.api.util.GT_OreDictUnificator;
+
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.item.ItemStack;
 
 public class COMPAT_EnderIO {
 
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
index 873b5b638a..45a70997e4 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
@@ -1,10 +1,11 @@
 package gtPlusPlus.core.common.compat;
 
+import net.minecraft.item.ItemStack;
+
 import gtPlusPlus.core.lib.CORE.ConfigSwitches;
 import gtPlusPlus.core.recipe.RECIPES_Tools;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import net.minecraft.item.ItemStack;
 
 public class COMPAT_ExtraUtils {
 
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
index 30ab5f4372..e1ed2a666a 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
@@ -3,11 +3,12 @@ package gtPlusPlus.core.common.compat;
 
 import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
 
+import net.minecraft.item.ItemStack;
+
 import gtPlusPlus.core.lib.CORE.ConfigSwitches;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.recipe.ShapedRecipeObject;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.item.ItemStack;
 
 
 public class COMPAT_IC2 {
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java
index 9c4161b88d..0f80dc8be4 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java
@@ -1,8 +1,10 @@
 package gtPlusPlus.core.common.compat;
 
+import net.minecraft.item.ItemStack;
+
 import gregtech.api.util.GT_OreDictUnificator;
+
 import gtPlusPlus.core.item.ModItems;
-import net.minecraft.item.ItemStack;
 
 public class COMPAT_PneumaticCraft {
 
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java
index f8c69cc4b7..37c87ad99d 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java
@@ -1,8 +1,10 @@
 package gtPlusPlus.core.common.compat;
 
+import net.minecraft.item.ItemStack;
+
 import gregtech.api.util.GT_OreDictUnificator;
+
 import gtPlusPlus.core.item.ModItems;
-import net.minecraft.item.ItemStack;
 
 public class COMPAT_RFTools {
 
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java
index ea9374d1c2..5f9976acb0 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java
@@ -1,8 +1,10 @@
 package gtPlusPlus.core.common.compat;
 
+import net.minecraft.item.ItemStack;
+
 import gregtech.api.util.GT_OreDictUnificator;
+
 import gtPlusPlus.core.item.ModItems;
-import net.minecraft.item.ItemStack;
 
 public class COMPAT_SimplyJetpacks {
 
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
index 0241d0a0fb..6247face1d 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
@@ -1,9 +1,10 @@
 package gtPlusPlus.core.common.compat;
 
 import gregtech.api.util.GT_OreDictUnificator;
+
 import gtPlusPlus.core.lib.CORE.ConfigSwitches;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class COMPAT_Thaumcraft {