From d6bf108b40f0b281ff7c3c2bc91e43ed2b9883f7 Mon Sep 17 00:00:00 2001
From: Draknyte1 <Draknyte1@hotmail.com>
Date: Mon, 17 Oct 2016 01:39:50 +1000
Subject: + Added Tesseract Generators and Terminals. + Added a handful of new,
 old textures from GT4. % Rewrote portions of the Blueprint item again, to try
 make it work better with NBT. + Added an Example NBT item for myself~ because
 I am a derp. + Added some custom textures for the Industrial Centrifuge. %
 Moved all the GT4 Tile Entities to their own loading class.

---
 src/Java/gtPlusPlus/core/util/item/UtilsItems.java    | 11 +++++++++--
 src/Java/gtPlusPlus/core/util/recipe/UtilsRecipe.java | 11 +++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/util')

diff --git a/src/Java/gtPlusPlus/core/util/item/UtilsItems.java b/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
index ec4e457489..64f06a078c 100644
--- a/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
+++ b/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
@@ -467,8 +467,15 @@ public class UtilsItems {
 	public static String getArrayStackNames(ItemStack[] aStack){
 		String itemNames = "Item Array: ";
 		for (ItemStack alph : aStack){
-			String temp = itemNames;
-			itemNames = temp + ", " + alph.getDisplayName() + " x" + alph.stackSize;
+			
+			if (alph != null){
+				String temp = itemNames;
+				itemNames = temp + ", " + alph.getDisplayName() + " x" + alph.stackSize;				
+			}
+			else {
+				String temp = itemNames;
+				itemNames = temp + ", " + "null" + " x" + "0";
+			}
 		}
 		return itemNames;
 
diff --git a/src/Java/gtPlusPlus/core/util/recipe/UtilsRecipe.java b/src/Java/gtPlusPlus/core/util/recipe/UtilsRecipe.java
index 997aaa95c9..727e40f570 100644
--- a/src/Java/gtPlusPlus/core/util/recipe/UtilsRecipe.java
+++ b/src/Java/gtPlusPlus/core/util/recipe/UtilsRecipe.java
@@ -101,7 +101,7 @@ public class UtilsRecipe {
 
 		try {
 			GameRegistry.addRecipe(new ShapedOreRecipe(resultItem.copy(), (Object[]) validSlots.toArray()));		
-			Utils.LOG_INFO("Success! Added a recipe for "+resultItem.toString());
+			Utils.LOG_INFO("Success! Added a recipe for "+resultItem.getDisplayName());
 			if (!COMPAT_HANDLER.areInitItemsLoaded){
 				RegistrationHandler.recipesSuccess++;
 			}
@@ -173,7 +173,7 @@ public class UtilsRecipe {
 			//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.toString());
+			Utils.LOG_INFO("Success! Added a recipe for "+Output.getDisplayName());
 			RegistrationHandler.recipesSuccess++;		
 		}
 		catch(RuntimeException k){
@@ -333,7 +333,7 @@ public class UtilsRecipe {
 			return;
 		}
 
-		GT_ModHandler.addCraftingRecipe(OutputItem, 
+		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", 
@@ -345,7 +345,10 @@ public class UtilsRecipe {
 				'F', InputItem6,  
 				'G', InputItem7,  
 				'H', InputItem8,  
-				'I', InputItem9});	
+				'I', InputItem9})){
+			Utils.LOG_INFO("Success! Added a recipe for "+OutputItem.getDisplayName());
+			RegistrationHandler.recipesSuccess++;	
+		}
 	}
 
 	public static void addShapelessGregtechRecipe(ItemStack OutputItem, Object... inputItems){
-- 
cgit