+ Added Round-Robinator recipes.

% Adjusted Zirconium Carbide tier, and changed the materials used for LV tiered recipes.
% Finished work on the Round-Robinator logic.
$ Removed PSS log spam.
$ Many minor bug fixes.

2 files changed, 28 insertions, 2 deletions

diff --git a/src/Java/gtPlusPlus/nei/DecayableRecipeHandler.java b/src/Java/gtPlusPlus/nei/DecayableRecipeHandler.java
index b5f5fa7989..dae1a663d7 100644
--- a/src/Java/gtPlusPlus/nei/DecayableRecipeHandler.java
+++ b/src/Java/gtPlusPlus/nei/DecayableRecipeHandler.java
@@ -220,7 +220,8 @@ public class DecayableRecipeHandler extends TemplateRecipeHandler {
 
 		@Override
 		public int compareTo(CachedRecipe o) {
-			if (o instanceof DecayableRecipeNEI) {
+			boolean b = DecayableRecipeNEI.class.isInstance(o);
+			if (b) {
 				DecayableRecipeNEI p = (DecayableRecipeNEI) o;
 				if (p.time > this.time) {
 					return 1;
@@ -232,5 +233,30 @@ public class DecayableRecipeHandler extends TemplateRecipeHandler {
 			}
 			return 0;
 		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (obj != null) {
+				if (DecayableRecipeNEI.class.isInstance(obj)) {
+					DecayableRecipeNEI p = (DecayableRecipeNEI) obj;
+					if (p != null) {
+						// Time check first to keep it simple and not unbox the Recipes.
+						if (p.time == this.time) {
+							ItemStack aInput = p.input.item;
+							ItemStack aOutput = p.output.item;
+							if (GT_Utility.areStacksEqual(aInput, this.input.item, true)) {
+								if (GT_Utility.areStacksEqual(aOutput, this.output.item, true)) {
+									return true;
+								}
+							}
+						}
+					}
+					
+				}
+			}
+			return false;
+		}
+		
+		
 	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_MultiBlockHandler.java b/src/Java/gtPlusPlus/nei/GT_NEI_MultiBlockHandler.java
index 6612ab703f..e3c980e6a4 100644
--- a/src/Java/gtPlusPlus/nei/GT_NEI_MultiBlockHandler.java
+++ b/src/Java/gtPlusPlus/nei/GT_NEI_MultiBlockHandler.java
@@ -928,7 +928,7 @@ extends TemplateRecipeHandler {
 	}
 
 
-	public class recipeCompare implements Comparator<GT_Recipe> {
+	public class RecipeCompare implements Comparator<GT_Recipe> {
 		public int compare(GT_Recipe a, GT_Recipe b) {
 			if (a.mEUt != b.mEUt) {
 				return a.mEUt - b.mEUt;