From ae6844407be97824e2db9355fdcf04608592a7a9 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Sat, 21 Jul 2018 19:12:11 +1000
Subject: + Gave Tokens icons. $ Fixed some invalid recipe logging for recipes
 that contained nulls. $ Fixed Custom ores not having a default texture. %
 Moved Pump Logging, it was moved to WARNING from INFO. - Removed most of old
 Pump tool code.

---
 .../gtPlusPlus/api/objects/minecraft/ShapedRecipe.java     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/Java/gtPlusPlus/api')

diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java b/src/Java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java
index 4be90061a0..1073e63914 100644
--- a/src/Java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java
@@ -71,11 +71,13 @@ public class ShapedRecipe {
 			if (aOutput != null && xNull < 9) {
 
 				for (ItemStack q : mBlackList) {
-					if (q.isItemEqual(aOutput)) {
-						Logger.RECIPE("Found recipe Alkalus is Debugging.");	
-					}					
+					if (q != null) {
+						if (q.isItemEqual(aOutput)) {
+							Logger.RECIPE("Found recipe Alkalus is Debugging.");	
+						}				
+					}
 				}
-				
+
 				Object[] mVarags2 = null;
 				Logger.RECIPE("Generating Shaped Crafting Recipe for "+aOutput.getDisplayName());
 
@@ -188,14 +190,14 @@ public class ShapedRecipe {
 					for (Pair<Character, Object> r : aRecipePairs) {			
 						char c = r.getKey();
 						Object o = r.getValue();	
-						
+
 						if (o instanceof ItemStack || o instanceof Item) {
 							if (o instanceof Item) {
 								o = ItemUtils.getSimpleStack((Item) o);
 							}
 							o = ((ItemStack) o).copy();
 						}
-						
+
 						mVarags2[counter2] = (char) c;
 						mVarags2[counter2+1] = o;	
 						counter2 += 2;
-- 
cgit