$ Cleaned up the entire project.

> Much neat, very nices.

2 files changed, 395 insertions, 283 deletions

diff --git a/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java b/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java
index d3d91b013d..82ed05db2a 100644
--- a/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java
+++ b/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java
@@ -19,86 +19,237 @@ import net.minecraftforge.oredict.*;
 
 public class RecipeUtils {
 
-	public static boolean recipeBuilder(Object slot_1, Object slot_2, Object slot_3, Object slot_4, Object slot_5, Object slot_6, Object slot_7, Object slot_8, Object slot_9, ItemStack resultItem){	
+	public static boolean addShapedGregtechRecipe(final Object InputItem1, final Object InputItem2,
+			final Object InputItem3, final Object InputItem4, final Object InputItem5, final Object InputItem6,
+			final Object InputItem7, final Object InputItem8, final Object InputItem9, final ItemStack OutputItem) {
+
+		if (!(InputItem1 instanceof ItemStack) && !(InputItem1 instanceof String) && InputItem1 != null
+				|| !(InputItem2 instanceof ItemStack) && !(InputItem2 instanceof String) && InputItem2 != null
+				|| !(InputItem3 instanceof ItemStack) && !(InputItem3 instanceof String) && InputItem3 != null
+				|| !(InputItem4 instanceof ItemStack) && !(InputItem4 instanceof String) && InputItem4 != null
+				|| !(InputItem5 instanceof ItemStack) && !(InputItem5 instanceof String) && InputItem5 != null
+				|| !(InputItem6 instanceof ItemStack) && !(InputItem6 instanceof String) && InputItem6 != null
+				|| !(InputItem7 instanceof ItemStack) && !(InputItem7 instanceof String) && InputItem7 != null
+				|| !(InputItem8 instanceof ItemStack) && !(InputItem8 instanceof String) && InputItem8 != null
+				|| !(InputItem9 instanceof ItemStack) && !(InputItem9 instanceof String) && InputItem9 != null) {
+			Utils.LOG_INFO("One Input item was not an ItemStack of an OreDict String.");
+			return false;
+		}
+
+		if (GT_ModHandler.addCraftingRecipe(OutputItem,
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] {
+						"ABC", "DEF", "GHI", 'A', InputItem1, 'B', InputItem2, 'C', InputItem3, 'D', InputItem4, 'E',
+						InputItem5, 'F', InputItem6, 'G', InputItem7, 'H', InputItem8, 'I', InputItem9
+				})) {
+			Utils.LOG_INFO("Success! Added a recipe for " + OutputItem.getDisplayName());
+			RegistrationHandler.recipesSuccess++;
+			return true;
+		}
+		return false;
+	}
+
+	public static void addShapelessGregtechRecipe(final ItemStack OutputItem, final Object... inputItems) {
+
+		for (final Object whatever : inputItems) {
+			if (!(whatever instanceof ItemStack) && !(whatever instanceof String)) {
+				Utils.LOG_INFO("One Input item was not an ItemStack of an OreDict String.");
+				return;
+			}
+		}
+
+		GT_ModHandler.addShapelessCraftingRecipe(OutputItem,
+				GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {
+						inputItems
+				});
+	}
+
+	private static boolean attemptRecipeRemoval(final Item I) {
+		Utils.LOG_WARNING("Create list of recipes.");
+		final List<IRecipe> recipes = CraftingManager.getInstance().getRecipeList();
+		final Iterator<IRecipe> items = recipes.iterator();
+		Utils.LOG_WARNING("Begin list iteration.");
+		while (items.hasNext()) {
+			final ItemStack is = items.next().getRecipeOutput();
+			if (is != null && is.getItem() == I) {
+				items.remove();
+				Utils.LOG_INFO("Remove a recipe with " + I.getUnlocalizedName() + " as output.");
+				continue;
+			}
+		}
+		Utils.LOG_WARNING("All recipes should be gone?");
+		if (!items.hasNext()) {
+			Utils.LOG_WARNING("We iterated once, let's try again to double check.");
+			final Iterator<IRecipe> items2 = recipes.iterator();
+			while (items2.hasNext()) {
+				final ItemStack is = items2.next().getRecipeOutput();
+				if (is != null && is.getItem() == I) {
+					items.remove();
+					Utils.LOG_WARNING("REMOVING MISSED RECIPE - RECHECK CONSTRUCTORS");
+					return true;
+				}
+			}
+			Utils.LOG_WARNING("Should be all gone now after double checking, so return true.");
+			return true;
+		}
+		Utils.LOG_INFO("Return false, because something went wrong.");
+		return false;
+	}
 
-		ArrayList<Object> validSlots = new ArrayList<Object>();
+	public static boolean buildShapelessRecipe(final ItemStack output, final Object[] input) {
+		return ShapelessUtils.addShapelessRecipe(output, input);
+	}
+
+	public static ItemStack getItemStackFromOreDict(final String oredictName) {
+		final ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName);
+		return oreDictList.get(0);
+	}
 
-		Utils.LOG_INFO("Trying to add a recipe for "+resultItem.toString());
-		String a,b,c,d,e,f,g,h,i;
-		if (slot_1 == null){ a = " ";} else { a = "1";validSlots.add('1');validSlots.add(slot_1);}
+	public static boolean recipeBuilder(final Object slot_1, final Object slot_2, final Object slot_3,
+			final Object slot_4, final Object slot_5, final Object slot_6, final Object slot_7, final Object slot_8,
+			final Object slot_9, final ItemStack resultItem) {
+
+		final ArrayList<Object> validSlots = new ArrayList<Object>();
+
+		Utils.LOG_INFO("Trying to add a recipe for " + resultItem.toString());
+		String a, b, c, d, e, f, g, h, i;
+		if (slot_1 == null) {
+			a = " ";
+		}
+		else {
+			a = "1";
+			validSlots.add('1');
+			validSlots.add(slot_1);
+		}
 		Utils.LOG_WARNING(a);
-		if (slot_2 == null){ b = " ";} else { b = "2";validSlots.add('2');validSlots.add(slot_2);}
+		if (slot_2 == null) {
+			b = " ";
+		}
+		else {
+			b = "2";
+			validSlots.add('2');
+			validSlots.add(slot_2);
+		}
 		Utils.LOG_WARNING(b);
-		if (slot_3 == null){ c = " ";} else { c = "3";validSlots.add('3');validSlots.add(slot_3);}
+		if (slot_3 == null) {
+			c = " ";
+		}
+		else {
+			c = "3";
+			validSlots.add('3');
+			validSlots.add(slot_3);
+		}
 		Utils.LOG_WARNING(c);
-		if (slot_4 == null){ d = " ";} else { d = "4";validSlots.add('4');validSlots.add(slot_4);}
+		if (slot_4 == null) {
+			d = " ";
+		}
+		else {
+			d = "4";
+			validSlots.add('4');
+			validSlots.add(slot_4);
+		}
 		Utils.LOG_WARNING(d);
-		if (slot_5 == null){ e = " ";} else { e = "5";validSlots.add('5');validSlots.add(slot_5);}
+		if (slot_5 == null) {
+			e = " ";
+		}
+		else {
+			e = "5";
+			validSlots.add('5');
+			validSlots.add(slot_5);
+		}
 		Utils.LOG_WARNING(e);
-		if (slot_6 == null){ f = " ";} else { f = "6";validSlots.add('6');validSlots.add(slot_6);}
+		if (slot_6 == null) {
+			f = " ";
+		}
+		else {
+			f = "6";
+			validSlots.add('6');
+			validSlots.add(slot_6);
+		}
 		Utils.LOG_WARNING(f);
-		if (slot_7 == null){ g = " ";} else { g = "7";validSlots.add('7');validSlots.add(slot_7);}
+		if (slot_7 == null) {
+			g = " ";
+		}
+		else {
+			g = "7";
+			validSlots.add('7');
+			validSlots.add(slot_7);
+		}
 		Utils.LOG_WARNING(g);
-		if (slot_8 == null){ h = " ";} else { h = "8";validSlots.add('8');validSlots.add(slot_8);}
+		if (slot_8 == null) {
+			h = " ";
+		}
+		else {
+			h = "8";
+			validSlots.add('8');
+			validSlots.add(slot_8);
+		}
 		Utils.LOG_WARNING(h);
-		if (slot_9 == null){ i = " ";} else { i = "9";validSlots.add('9');validSlots.add(slot_9);}
+		if (slot_9 == null) {
+			i = " ";
+		}
+		else {
+			i = "9";
+			validSlots.add('9');
+			validSlots.add(slot_9);
+		}
 		Utils.LOG_WARNING(i);
 
-
 		Utils.LOG_ERROR("_______");
-		String lineOne = a+b+c;
-		Utils.LOG_ERROR("|"+a+"|"+b+"|"+c+"|");
+		final String lineOne = a + b + c;
+		Utils.LOG_ERROR("|" + a + "|" + b + "|" + c + "|");
 		Utils.LOG_ERROR("_______");
-		String lineTwo = d+e+f;
-		Utils.LOG_ERROR("|"+d+"|"+e+"|"+f+"|");
+		final String lineTwo = d + e + f;
+		Utils.LOG_ERROR("|" + d + "|" + e + "|" + f + "|");
 		Utils.LOG_ERROR("_______");
-		String lineThree = g+h+i;
-		Utils.LOG_ERROR("|"+g+"|"+h+"|"+i+"|");
+		final String lineThree = g + h + i;
+		Utils.LOG_ERROR("|" + g + "|" + h + "|" + i + "|");
 		Utils.LOG_ERROR("_______");
 
 		validSlots.add(0, lineOne);
 		validSlots.add(1, lineTwo);
 		validSlots.add(2, lineThree);
 		boolean advancedLog = false;
-		if (CORE.DEBUG){
+		if (CORE.DEBUG) {
 			advancedLog = true;
-		}		
-		if (advancedLog){
+		}
+		if (advancedLog) {
 			int j = 0;
-			int l = validSlots.size();
-			Utils.LOG_WARNING("l:"+l);
+			final int l = validSlots.size();
+			Utils.LOG_WARNING("l:" + l);
 			while (j <= l) {
-				Utils.LOG_WARNING("j:"+j);
-				if (j <= 2){
-					Utils.LOG_WARNING("ArrayList Values: "+validSlots.get(j));
+				Utils.LOG_WARNING("j:" + j);
+				if (j <= 2) {
+					Utils.LOG_WARNING("ArrayList Values: " + validSlots.get(j));
 					Utils.LOG_WARNING("Adding 1.");
 					j++;
 				}
-				else if (j >= 3){
-					Utils.LOG_WARNING("ArrayList Values: '"+validSlots.get(j)+"' "+validSlots.get(j+1));
-					if (j < (l-2)){
+				else if (j >= 3) {
+					Utils.LOG_WARNING("ArrayList Values: '" + validSlots.get(j) + "' " + validSlots.get(j + 1));
+					if (j < l - 2) {
 						Utils.LOG_WARNING("Adding 2.");
-						j=j+2;
+						j = j + 2;
 					}
 					else {
 						Utils.LOG_WARNING("Done iteration.");
 						break;
 					}
 				}
-				else if (j == l){
+				else if (j == l) {
 					Utils.LOG_WARNING("Done iteration.");
 					break;
 				}
-				if (validSlots.get(j) instanceof String || validSlots.get(j) instanceof ItemStack){
-					//Utils.LOG_WARNING("Is Valid: "+validSlots.get(j));
+				if (validSlots.get(j) instanceof String || validSlots.get(j) instanceof ItemStack) {
+					// Utils.LOG_WARNING("Is Valid: "+validSlots.get(j));
 				}
-			}	
+			}
 		}
 
 		try {
-			GameRegistry.addRecipe(new ShapedOreRecipe(resultItem.copy(), (Object[]) validSlots.toArray()));		
-			Utils.LOG_INFO("Success! Added a recipe for "+resultItem.getDisplayName());
-			if (!COMPAT_HANDLER.areInitItemsLoaded){
+			GameRegistry.addRecipe(new ShapedOreRecipe(resultItem.copy(), validSlots.toArray()));
+			Utils.LOG_INFO("Success! Added a recipe for " + resultItem.getDisplayName());
+			if (!COMPAT_HANDLER.areInitItemsLoaded) {
 				RegistrationHandler.recipesSuccess++;
 			}
 			else {
@@ -106,272 +257,242 @@ public class RecipeUtils {
 			}
 			return true;
 		}
-		catch(NullPointerException | ClassCastException k){
+		catch (NullPointerException | ClassCastException k) {
 			k.getMessage();
 			k.getClass();
 			k.printStackTrace();
 			k.getLocalizedMessage();
-			Utils.LOG_WARNING("@@@: Invalid Recipe detected for: "+resultItem.getUnlocalizedName());
-			if (!COMPAT_HANDLER.areInitItemsLoaded){
+			Utils.LOG_WARNING("@@@: Invalid Recipe detected for: " + resultItem.getUnlocalizedName());
+			if (!COMPAT_HANDLER.areInitItemsLoaded) {
 				RegistrationHandler.recipesFailed++;
 			}
 			else {
 				LateRegistrationHandler.recipesFailed++;
-			}	
+			}
 			return false;
 		}
 	}
 
-	public static void shapelessBuilder(ItemStack Output, Object slot_1, Object slot_2, Object slot_3, Object slot_4, Object slot_5, Object slot_6, Object slot_7, Object slot_8, Object slot_9){
-		//Item output_ITEM = Output.getItem();
-
-		ArrayList<Object> validSlots = new ArrayList<Object>();
-
-		Utils.LOG_INFO("Trying to add a recipe for "+Output.toString());
-		String a,b,c,d,e,f,g,h,i;
-		if (slot_1 == null){ a = " ";} else { a = "1";validSlots.add('1');validSlots.add(slot_1);}
-		Utils.LOG_WARNING(a);
-		if (slot_2 == null){ b = " ";} else { b = "2";validSlots.add('2');validSlots.add(slot_2);}
-		Utils.LOG_WARNING(b);
-		if (slot_3 == null){ c = " ";} else { c = "3";validSlots.add('3');validSlots.add(slot_3);}
-		Utils.LOG_WARNING(c);
-		if (slot_4 == null){ d = " ";} else { d = "4";validSlots.add('4');validSlots.add(slot_4);}
-		Utils.LOG_WARNING(d);
-		if (slot_5 == null){ e = " ";} else { e = "5";validSlots.add('5');validSlots.add(slot_5);}
-		Utils.LOG_WARNING(e);
-		if (slot_6 == null){ f = " ";} else { f = "6";validSlots.add('6');validSlots.add(slot_6);}
-		Utils.LOG_WARNING(f);
-		if (slot_7 == null){ g = " ";} else { g = "7";validSlots.add('7');validSlots.add(slot_7);}
-		Utils.LOG_WARNING(g);
-		if (slot_8 == null){ h = " ";} else { h = "8";validSlots.add('8');validSlots.add(slot_8);}
-		Utils.LOG_WARNING(h);
-		if (slot_9 == null){ i = " ";} else { i = "9";validSlots.add('9');validSlots.add(slot_9);}
-		Utils.LOG_WARNING(i);
-
-
-		Utils.LOG_ERROR("_______");
-		Utils.LOG_ERROR("|"+a+"|"+b+"|"+c+"|");
-		Utils.LOG_ERROR("_______");
-		Utils.LOG_ERROR("|"+d+"|"+e+"|"+f+"|");
-		Utils.LOG_ERROR("_______");
-		Utils.LOG_ERROR("|"+g+"|"+h+"|"+i+"|");
-		Utils.LOG_ERROR("_______");
-
-		validSlots.add(0, a);
-		validSlots.add(1, b);
-		validSlots.add(2, c);
-		validSlots.add(3, d);
-		validSlots.add(4, e);
-		validSlots.add(5, f);
-		validSlots.add(6, g);
-		validSlots.add(7, h);
-		validSlots.add(8, i);
-
-		try {
-			//GameRegistry.addRecipe(new ShapelessOreRecipe(Output, outputAmount), (Object[]) validSlots.toArray());
-			GameRegistry.addRecipe(new ShapelessOreRecipe(Output, (Object[]) validSlots.toArray()));
-			//GameRegistry.addShapelessRecipe(new ItemStack(output_ITEM, 1), new Object[] {slot_1, slot_2});
-			Utils.LOG_INFO("Success! Added a recipe for "+Output.getDisplayName());
-			RegistrationHandler.recipesSuccess++;		
-		}
-		catch(RuntimeException k){
-			k.getMessage();
-			k.getClass();
-			k.printStackTrace();
-			k.getLocalizedMessage();
-			Utils.LOG_WARNING("@@@: Invalid Recipe detected for: "+Output.getUnlocalizedName());
-			RegistrationHandler.recipesFailed++;
-		}
-
-
-		//GameRegistry.addShapelessRecipe(new ItemStack(output_ITEM, 1), new Object[] {slot_1, slot_2});
-	}
-
-	public static void recipeBuilder(Object[] array, ItemStack outPut) {
-		Utils.LOG_SPECIFIC_WARNING("object Array - recipeBuilder", "Attempting to build a recipe using an object array as an input, splitting it, then running the normal recipeBuilder() method.", 396);
-		Object a=null;
-		Object b=null;
-		Object c=null;
-		Object d=null;
-		Object e=null;
-		Object f=null;
-		Object g=null;
-		Object h=null;
-		Object i=null;
-		for(int z =0; z <= array.length; z++){
+	public static void recipeBuilder(final Object[] array, final ItemStack outPut) {
+		Utils.LOG_SPECIFIC_WARNING("object Array - recipeBuilder",
+				"Attempting to build a recipe using an object array as an input, splitting it, then running the normal recipeBuilder() method.",
+				396);
+		Object a = null;
+		Object b = null;
+		Object c = null;
+		Object d = null;
+		Object e = null;
+		Object f = null;
+		Object g = null;
+		Object h = null;
+		Object i = null;
+		for (int z = 0; z <= array.length; z++) {
 			array[z].toString();
-			switch(z)
-			{
-			case 0:
-				a = array[z];
-				break;
-			case 1:
-				b = array[z];
-				break;
-			case 2:
-				c = array[z];
-				break;
-			case 3:
-				d = array[z];
-				break;
-			case 4:
-				e = array[z];
-				break;
-			case 5:
-				f = array[z];
-				break;
-			case 6:
-				g = array[z];
-				break;
-			case 7:
-				h = array[z];
-				break;
-			case 8:
-				i = array[z];
-				break;
-			default:
-				break;
+			switch (z) {
+				case 0:
+					a = array[z];
+					break;
+				case 1:
+					b = array[z];
+					break;
+				case 2:
+					c = array[z];
+					break;
+				case 3:
+					d = array[z];
+					break;
+				case 4:
+					e = array[z];
+					break;
+				case 5:
+					f = array[z];
+					break;
+				case 6:
+					g = array[z];
+					break;
+				case 7:
+					h = array[z];
+					break;
+				case 8:
+					i = array[z];
+					break;
+				default:
+					break;
 			}
-			recipeBuilder(a, b, c, d, e, f, g, h, i, outPut);
+			RecipeUtils.recipeBuilder(a, b, c, d, e, f, g, h, i, outPut);
 		}
 	}
 
-	public static boolean removeCraftingRecipe(Object x){
-		if (null == x){return false;}
-		if (x instanceof String){	
-			Item R = ItemUtils.getItem((String) x);
-			if (R != null){
+	public static boolean removeCraftingRecipe(Object x) {
+		if (null == x) {
+			return false;
+		}
+		if (x instanceof String) {
+			final Item R = ItemUtils.getItem((String) x);
+			if (R != null) {
 				x = R;
 			}
 			else {
 				return false;
 			}
 		}
-		if (x instanceof Item || x instanceof ItemStack){
-			if (x instanceof Item){
-				ItemStack r = new ItemStack((Item) x);
-				Utils.LOG_INFO("Removing Recipe for "+r.getUnlocalizedName());
+		if (x instanceof Item || x instanceof ItemStack) {
+			if (x instanceof Item) {
+				final ItemStack r = new ItemStack((Item) x);
+				Utils.LOG_INFO("Removing Recipe for " + r.getUnlocalizedName());
 			}
 			else {
-				Utils.LOG_INFO("Removing Recipe for "+((ItemStack) x).getUnlocalizedName());
+				Utils.LOG_INFO("Removing Recipe for " + ((ItemStack) x).getUnlocalizedName());
 			}
-			if (x instanceof ItemStack){
-				Item r = ((ItemStack) x).getItem();		
-				if (null != r){
+			if (x instanceof ItemStack) {
+				final Item r = ((ItemStack) x).getItem();
+				if (null != r) {
 					x = r;
 				}
 				else {
 					Utils.LOG_INFO("Recipe removal failed - Tell Alkalus.");
 					return false;
 				}
-			}			
-			if (RecipeUtils.attemptRecipeRemoval((Item) x)){
+			}
+			if (RecipeUtils.attemptRecipeRemoval((Item) x)) {
 				Utils.LOG_INFO("Recipe removal successful");
 				return true;
 			}
 			Utils.LOG_INFO("Recipe removal failed - Tell Alkalus.");
-			return false;			
-		}
-		return false;
-	}
-
-	private static boolean attemptRecipeRemoval(Item I){
-		Utils.LOG_WARNING("Create list of recipes.");
-		List<IRecipe> recipes = CraftingManager.getInstance().getRecipeList();
-		Iterator<IRecipe> items = recipes.iterator();
-		Utils.LOG_WARNING("Begin list iteration.");
-		while (items.hasNext()) {
-			ItemStack is = items.next().getRecipeOutput();
-			if (is != null && is.getItem() == I){
-				items.remove();
-				Utils.LOG_INFO("Remove a recipe with "+I.getUnlocalizedName()+" as output.");
-				continue;
-			}
-		}
-		Utils.LOG_WARNING("All recipes should be gone?");
-		if (!items.hasNext()){
-			Utils.LOG_WARNING("We iterated once, let's try again to double check.");
-			Iterator<IRecipe> items2 = recipes.iterator();
-			while (items2.hasNext()) {
-				ItemStack is = items2.next().getRecipeOutput();
-				if (is != null && is.getItem() == I){
-					items.remove();
-					Utils.LOG_WARNING("REMOVING MISSED RECIPE - RECHECK CONSTRUCTORS");
-					return true;
-				}
-			}
-			Utils.LOG_WARNING("Should be all gone now after double checking, so return true.");
-			return true;
+			return false;
 		}
-		Utils.LOG_INFO("Return false, because something went wrong.");
 		return false;
 	}
 
+	public static void shapelessBuilder(final ItemStack Output, final Object slot_1, final Object slot_2,
+			final Object slot_3, final Object slot_4, final Object slot_5, final Object slot_6, final Object slot_7,
+			final Object slot_8, final Object slot_9) {
+		// Item output_ITEM = Output.getItem();
 
+		final ArrayList<Object> validSlots = new ArrayList<Object>();
 
-
-
-
-	public static boolean addShapedGregtechRecipe( 
-			Object InputItem1, Object InputItem2, Object InputItem3,
-			Object InputItem4, Object InputItem5, Object InputItem6,
-			Object InputItem7, Object InputItem8, Object InputItem9,
-			ItemStack OutputItem){	
-
-		if ((!(InputItem1 instanceof ItemStack) && !(InputItem1 instanceof String) && (InputItem1 != null)) || 
-				(!(InputItem2 instanceof ItemStack) && !(InputItem2 instanceof String) && (InputItem2 != null)) || 
-				(!(InputItem3 instanceof ItemStack) && !(InputItem3 instanceof String) && (InputItem3 != null)) || 
-				(!(InputItem4 instanceof ItemStack) && !(InputItem4 instanceof String) && (InputItem4 != null)) || 
-				(!(InputItem5 instanceof ItemStack) && !(InputItem5 instanceof String) && (InputItem5 != null)) || 
-				(!(InputItem6 instanceof ItemStack) && !(InputItem6 instanceof String) && (InputItem6 != null)) || 
-				(!(InputItem7 instanceof ItemStack) && !(InputItem7 instanceof String) && (InputItem7 != null)) || 
-				(!(InputItem8 instanceof ItemStack) && !(InputItem8 instanceof String) && (InputItem8 != null)) || 
-				(!(InputItem9 instanceof ItemStack) && !(InputItem9 instanceof String) && (InputItem9 != null))){
-			Utils.LOG_INFO("One Input item was not an ItemStack of an OreDict String.");
-			return false;
+		Utils.LOG_INFO("Trying to add a recipe for " + Output.toString());
+		String a, b, c, d, e, f, g, h, i;
+		if (slot_1 == null) {
+			a = " ";
 		}
-
-		if (GT_ModHandler.addCraftingRecipe(OutputItem, 
-				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | 
-				GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
-				new Object[]{"ABC", "DEF", "GHI", 
-				'A', InputItem1,  
-				'B', InputItem2,  
-				'C', InputItem3,  
-				'D', InputItem4,  
-				'E', InputItem5,  
-				'F', InputItem6,  
-				'G', InputItem7,  
-				'H', InputItem8,  
-				'I', InputItem9})){
-			Utils.LOG_INFO("Success! Added a recipe for "+OutputItem.getDisplayName());
-			RegistrationHandler.recipesSuccess++;	
-			return true;
+		else {
+			a = "1";
+			validSlots.add('1');
+			validSlots.add(slot_1);
 		}
-		return false;
-	}
-
-	public static void addShapelessGregtechRecipe(ItemStack OutputItem, Object... inputItems){
-
-		for(Object whatever : inputItems){
-			if (!(whatever instanceof ItemStack) && !(whatever instanceof String)){
-				Utils.LOG_INFO("One Input item was not an ItemStack of an OreDict String.");
-				return;
-			}
+		Utils.LOG_WARNING(a);
+		if (slot_2 == null) {
+			b = " ";
+		}
+		else {
+			b = "2";
+			validSlots.add('2');
+			validSlots.add(slot_2);
+		}
+		Utils.LOG_WARNING(b);
+		if (slot_3 == null) {
+			c = " ";
+		}
+		else {
+			c = "3";
+			validSlots.add('3');
+			validSlots.add(slot_3);
+		}
+		Utils.LOG_WARNING(c);
+		if (slot_4 == null) {
+			d = " ";
+		}
+		else {
+			d = "4";
+			validSlots.add('4');
+			validSlots.add(slot_4);
+		}
+		Utils.LOG_WARNING(d);
+		if (slot_5 == null) {
+			e = " ";
+		}
+		else {
+			e = "5";
+			validSlots.add('5');
+			validSlots.add(slot_5);
 		}
+		Utils.LOG_WARNING(e);
+		if (slot_6 == null) {
+			f = " ";
+		}
+		else {
+			f = "6";
+			validSlots.add('6');
+			validSlots.add(slot_6);
+		}
+		Utils.LOG_WARNING(f);
+		if (slot_7 == null) {
+			g = " ";
+		}
+		else {
+			g = "7";
+			validSlots.add('7');
+			validSlots.add(slot_7);
+		}
+		Utils.LOG_WARNING(g);
+		if (slot_8 == null) {
+			h = " ";
+		}
+		else {
+			h = "8";
+			validSlots.add('8');
+			validSlots.add(slot_8);
+		}
+		Utils.LOG_WARNING(h);
+		if (slot_9 == null) {
+			i = " ";
+		}
+		else {
+			i = "9";
+			validSlots.add('9');
+			validSlots.add(slot_9);
+		}
+		Utils.LOG_WARNING(i);
 
-		GT_ModHandler.addShapelessCraftingRecipe(OutputItem,
-				GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-				new Object[]{inputItems});
-	}
+		Utils.LOG_ERROR("_______");
+		Utils.LOG_ERROR("|" + a + "|" + b + "|" + c + "|");
+		Utils.LOG_ERROR("_______");
+		Utils.LOG_ERROR("|" + d + "|" + e + "|" + f + "|");
+		Utils.LOG_ERROR("_______");
+		Utils.LOG_ERROR("|" + g + "|" + h + "|" + i + "|");
+		Utils.LOG_ERROR("_______");
 
-	public static ItemStack getItemStackFromOreDict(String oredictName){
-		ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName);
-		return oreDictList.get(0);
-	}
+		validSlots.add(0, a);
+		validSlots.add(1, b);
+		validSlots.add(2, c);
+		validSlots.add(3, d);
+		validSlots.add(4, e);
+		validSlots.add(5, f);
+		validSlots.add(6, g);
+		validSlots.add(7, h);
+		validSlots.add(8, i);
+
+		try {
+			// GameRegistry.addRecipe(new ShapelessOreRecipe(Output,
+			// outputAmount), (Object[]) validSlots.toArray());
+			GameRegistry.addRecipe(new ShapelessOreRecipe(Output, validSlots.toArray()));
+			// GameRegistry.addShapelessRecipe(new ItemStack(output_ITEM, 1),
+			// new Object[] {slot_1, slot_2});
+			Utils.LOG_INFO("Success! Added a recipe for " + Output.getDisplayName());
+			RegistrationHandler.recipesSuccess++;
+		}
+		catch (final RuntimeException k) {
+			k.getMessage();
+			k.getClass();
+			k.printStackTrace();
+			k.getLocalizedMessage();
+			Utils.LOG_WARNING("@@@: Invalid Recipe detected for: " + Output.getUnlocalizedName());
+			RegistrationHandler.recipesFailed++;
+		}
 
-	public static boolean buildShapelessRecipe(ItemStack output, Object[] input){
-		return ShapelessUtils.addShapelessRecipe(output, input);				
+		// GameRegistry.addShapelessRecipe(new ItemStack(output_ITEM, 1), new
+		// Object[] {slot_1, slot_2});
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/util/recipe/shapeless/ShapelessUtils.java b/src/Java/gtPlusPlus/core/util/recipe/shapeless/ShapelessUtils.java
index c68bcddca6..812cfa626d 100644
--- a/src/Java/gtPlusPlus/core/util/recipe/shapeless/ShapelessUtils.java
+++ b/src/Java/gtPlusPlus/core/util/recipe/shapeless/ShapelessUtils.java
@@ -11,45 +11,36 @@ import net.minecraft.item.crafting.ShapelessRecipes;
 
 public class ShapelessUtils {
 
+	public static boolean addShapelessRecipe(final ItemStack output, final Object... params) {
+		final ArrayList<ItemStack> arraylist = new ArrayList<ItemStack>();
+		final Object[] aobject = params;
+		final int i = params.length;
 
-	public static boolean addShapelessRecipe(ItemStack output, Object ... params)
-	{
-		ArrayList<ItemStack> arraylist = new ArrayList<ItemStack>();
-		Object[] aobject = params;
-		int i = params.length;
+		for (int j = 0; j < i; ++j) {
+			final Object object1 = aobject[j];
 
-		for (int j = 0; j < i; ++j)
-		{
-			Object object1 = aobject[j];
-
-			if (object1 instanceof ItemStack)
-			{
-				arraylist.add(((ItemStack)object1).copy());
+			if (object1 instanceof ItemStack) {
+				arraylist.add(((ItemStack) object1).copy());
 			}
-			else if (object1 instanceof Item)
-			{
-				arraylist.add(new ItemStack((Item)object1));
+			else if (object1 instanceof Item) {
+				arraylist.add(new ItemStack((Item) object1));
 			}
-			else
-			{
-				if ((object1 == null))
-				{
-					Utils.LOG_INFO(("Invalid shapeless input, ignoring!"));					
+			else {
+				if (object1 == null) {
+					Utils.LOG_INFO("Invalid shapeless input, ignoring!");
 				}
-				else if (!(object1 instanceof Block) && (object1 != null))
-				{
-					Utils.LOG_INFO(("Invalid shapeless recipe!"));
+				else if (!(object1 instanceof Block) && object1 != null) {
+					Utils.LOG_INFO("Invalid shapeless recipe!");
 					return false;
 				}
 				else {
-					arraylist.add(new ItemStack((Block)object1));
+					arraylist.add(new ItemStack((Block) object1));
 				}
 			}
 		}
 		CraftingManager.getInstance().getRecipeList().add(new ShapelessRecipes(output, arraylist));
-		//CraftingManager.getInstance().addShapelessRecipe(output, arraylist);
+		// CraftingManager.getInstance().addShapelessRecipe(output, arraylist);
 		return true;
 	}
 
-
 }