Revert "$ Cleaned up the entire project."

This reverts commit 0669f5eb9d5029a8b94ec552171b0837605f7747.

# Conflicts:
#	src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
#	src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java

Revert "% Cleaned up Imports."

This reverts commit 3654052fb63a571c5eaca7f20714b87c17f7e966.

3 files changed, 53 insertions, 109 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java
index 5ba404c506..01b62e23ca 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java
@@ -6,62 +6,41 @@ import net.minecraftforge.fluids.FluidStack;
 
 public class RECIPEHANDLER_CokeOven {
 
-	public static void debug1() {
+	public static void debug1(){
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("Walking Through CokeOven Recipe Creation.");
 		Utils.LOG_WARNING("My name is Ralph and I will be your humble host.");
 	}
-
-	public static void debug2(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput,
-			final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) {
+	public static void debug2(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUt){
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("Taking a step forward.");
 		Utils.LOG_WARNING("aInput1 == null && aFluidInput == null || aOutput == null && aFluidOutput == null");
-		Utils.LOG_WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:"
-				+ aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString()
-				+ " aDuration:" + aDuration + " aEU/t:" + aEUt);
+		Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
 		Utils.LOG_WARNING("Passed.");
 	}
-
-	public static void debug3(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput,
-			final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) {
+	public static void debug3(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUt){
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("Taking a step forward.");
-		Utils.LOG_WARNING(
-				"(aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aOutput, aDuration)) <= 0)");
-		Utils.LOG_WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:"
-				+ aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString()
-				+ " aDuration:" + aDuration + " aEU/t:" + aEUt);
+		Utils.LOG_WARNING("(aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aOutput, aDuration)) <= 0)");
+		Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
 		Utils.LOG_WARNING("Passed.");
 	}
-
-	public static void debug4(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput,
-			final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) {
+	public static void debug4(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUt){
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("Taking a step forward.");
-		Utils.LOG_WARNING(
-				"(aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aFluidOutput.getFluid().getName(), aDuration)) <= 0)");
-		Utils.LOG_WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:"
-				+ aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString()
-				+ " aDuration:" + aDuration + " aEU/t:" + aEUt);
+		Utils.LOG_WARNING("(aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aFluidOutput.getFluid().getName(), aDuration)) <= 0)");
+		Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
 		Utils.LOG_WARNING("Passed.");
-		Utils.LOG_WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:"
-				+ aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString()
-				+ " aDuration:" + aDuration + " aEU/t:" + aEUt);
+		Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
 
 	}
-
-	public static void debug5(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput,
-			final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) {
-		Utils.LOG_INFO("Successfully added a Coke Oven recipe for: " + aOutput.getDisplayName() + " & "
-				+ aFluidOutput.getFluid().getName() + ", Using " + aInput1.getDisplayName() + " & "
-				+ aInput2.getDisplayName() + " & liquid " + aFluidInput.getFluid().getName() + ". This takes "
-				+ aDuration / 20 + " seconds for " + aEUt + "eu/t.");
+	public static void debug5(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUt){
+		Utils.LOG_INFO("Successfully added a Coke Oven recipe for: "+aOutput.getDisplayName()+" & "+aFluidOutput.getFluid().getName()+", Using "+aInput1.getDisplayName()+" & "+aInput2.getDisplayName()+" & liquid "+aFluidInput.getFluid().getName()+". This takes "+(aDuration/20)+" seconds for "+aEUt+"eu/t.");
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("==================================================================================");
 	}
-
+	
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java
index ee41b1f8fe..0a5094412f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java
@@ -7,95 +7,75 @@ import net.minecraftforge.fluids.FluidStack;
 
 public class RECIPEHANDLER_Dehydrator {
 
-	public static void debug1() {
+	public static void debug1(){
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("Walking Through Chemical Dehydrator Recipe Creation.");
 		Utils.LOG_WARNING("My name is Willus and I will be your humble host.");
 	}
-
-	public static void debug2(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput,
-			final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) {
+	public static void debug2(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUt){
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("Taking a step forward.");
 		Utils.LOG_WARNING("aInput1 == null && aFluidInput == null || aOutput == null && aFluidOutput == null");
-		Utils.LOG_WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:"
-				+ aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString()
-				+ " aDuration:" + aDuration + " aEU/t:" + aEUt);
+		Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
 		Utils.LOG_WARNING("Passed.");
 	}
-
-	public static void debug3(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput,
-			final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) {
+	public static void debug3(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUt){
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("Taking a step forward.");
-		Utils.LOG_WARNING(
-				"(aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aOutput, aDuration)) <= 0)");
-		Utils.LOG_WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:"
-				+ aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString()
-				+ " aDuration:" + aDuration + " aEU/t:" + aEUt);
+		Utils.LOG_WARNING("(aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aOutput, aDuration)) <= 0)");
+		Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
 		Utils.LOG_WARNING("Passed.");
 	}
-
-	public static void debug4(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput,
-			final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) {
+	public static void debug4(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUt){
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("Taking a step forward.");
-		Utils.LOG_WARNING(
-				"(aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aFluidOutput.getFluid().getName(), aDuration)) <= 0)");
-		Utils.LOG_WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:"
-				+ aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString()
-				+ " aDuration:" + aDuration + " aEU/t:" + aEUt);
+		Utils.LOG_WARNING("(aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aFluidOutput.getFluid().getName(), aDuration)) <= 0)");
+		Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
 		Utils.LOG_WARNING("Passed.");
-		Utils.LOG_WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:"
-				+ aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString()
-				+ " aDuration:" + aDuration + " aEU/t:" + aEUt);
+		Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
 
 	}
-
-	public static void debug5(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput,
-			final FluidStack aFluidOutput, final ItemStack[] aOutput, final int aDuration, final int aEUt) {
-
+	public static void debug5(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack[] aOutput, int aDuration, int aEUt){
+		
 		String inputAname;
 		String inputBname;
 		String inputFluidname;
 		String outputFluidName;
-
-		if (aInput1 != null) {
+		
+		if (aInput1 != null){
 			inputAname = aInput1.getDisplayName();
 		}
 		else {
 			inputAname = "null";
 		}
-
-		if (aInput2 != null) {
+		
+		if (aInput2 != null){
 			inputBname = aInput2.getDisplayName();
 		}
 		else {
 			inputBname = "null";
 		}
-
-		if (aFluidInput != null) {
+		
+		if (aFluidInput != null){
 			inputFluidname = aFluidInput.getFluid().getName();
 		}
 		else {
 			inputFluidname = "null";
 		}
-
-		if (aFluidOutput != null) {
+		
+		if (aFluidOutput != null){
 			outputFluidName = aFluidOutput.getFluid().getName();
 		}
 		else {
 			outputFluidName = "null";
 		}
-
-		Utils.LOG_INFO("Successfully added a Chemical Dehydrator recipe for: " + ItemUtils.getArrayStackNames(aOutput)
-				+ " & " + outputFluidName + ", Using " + inputAname + " & " + inputBname + " & liquid " + inputFluidname
-				+ ". This takes " + aDuration / 20 + " seconds for " + aEUt + "eu/t.");
+		
+		Utils.LOG_INFO("Successfully added a Chemical Dehydrator recipe for: "+ItemUtils.getArrayStackNames(aOutput)+" & "+outputFluidName+", Using "+inputAname+" & "+inputBname+" & liquid "+inputFluidname+". This takes "+(aDuration/20)+" seconds for "+aEUt+"eu/t.");
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("==================================================================================");
 	}
-
+	
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java
index e9df8334be..ff9f87d805 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java
@@ -5,66 +5,51 @@ import net.minecraftforge.fluids.FluidStack;
 
 public class RECIPEHANDLER_MatterFabricator {
 
-	public static void debug1() {
+	public static void debug1(){
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("Walking Through Matter Fabrication Recipe Creation.");
 		Utils.LOG_WARNING("My name is Ralph and I will be your humble host.");
 	}
-
-	public static void debug2(final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration,
-			final int aEUt) {
+	public static void debug2(FluidStack aFluidInput, FluidStack aFluidOutput, int aDuration, int aEUt){
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("Taking a step forward.");
 		Utils.LOG_WARNING("aInput1 == null && aFluidInput == null || aOutput == null && aFluidOutput == null");
-		Utils.LOG_WARNING("aFluidInput:" + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString()
-				+ " aDuration:" + aDuration + " aEU/t:" + aEUt);
+		Utils.LOG_WARNING("aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
 		Utils.LOG_WARNING("Passed.");
 	}
-
-	public static void debug3(final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration,
-			final int aEUt) {
+	public static void debug3(FluidStack aFluidInput, FluidStack aFluidOutput, int aDuration, int aEUt){
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("Taking a step forward.");
-		Utils.LOG_WARNING(
-				"(aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aOutput, aDuration)) <= 0)");
-		Utils.LOG_WARNING("aFluidInput:" + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString()
-				+ " aDuration:" + aDuration + " aEU/t:" + aEUt);
+		Utils.LOG_WARNING("(aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aOutput, aDuration)) <= 0)");
+		Utils.LOG_WARNING("aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
 		Utils.LOG_WARNING("Passed.");
 	}
-
-	public static void debug4(final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration,
-			final int aEUt) {
+	public static void debug4(FluidStack aFluidInput, FluidStack aFluidOutput, int aDuration, int aEUt){
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("Taking a step forward.");
-		Utils.LOG_WARNING(
-				"(aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aFluidOutput.getFluid().getName(), aDuration)) <= 0)");
-		Utils.LOG_WARNING("aFluidInput:" + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString()
-				+ " aDuration:" + aDuration + " aEU/t:" + aEUt);
+		Utils.LOG_WARNING("(aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aFluidOutput.getFluid().getName(), aDuration)) <= 0)");
+		Utils.LOG_WARNING("aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
 		Utils.LOG_WARNING("Passed.");
-		Utils.LOG_WARNING("aFluidInput:" + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString()
-				+ " aDuration:" + aDuration + " aEU/t:" + aEUt);
+		Utils.LOG_WARNING("aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
 
 	}
-
-	public static void debug5(final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration,
-			final int aEUt) {
+	public static void debug5(FluidStack aFluidInput, FluidStack aFluidOutput, int aDuration, int aEUt){
 		String a = "nothing";
 		String b = "";
-
-		if (aFluidInput != null) {
+		
+		if (aFluidInput != null){
 			a = aFluidInput.getFluid().getName();
 		}
-		if (aFluidOutput != null) {
+		if (aFluidOutput != null){
 			b = aFluidOutput.getFluid().getName();
 		}
-
-		Utils.LOG_INFO("Successfully added a Matter Fabrication recipe for: " + b + ", Using " + " liquid " + a
-				+ ". This takes " + aDuration / 20 + " seconds for " + aEUt + "eu/t.");
+		
+		Utils.LOG_INFO("Successfully added a Matter Fabrication recipe for: "+b+", Using "+" liquid "+a+". This takes "+(aDuration/20)+" seconds for "+aEUt+"eu/t.");
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("==================================================================================");
 		Utils.LOG_WARNING("==================================================================================");
 	}
-
+	
 }