+ Added a power cost of 32eu/action for the Tree Farmer. (Will eventually get a config option).

% Moved the internal power buffer variable out of the cut method into the class.

% Massive project tidy up, lots of old unused code removed or tidied up.
$ Fixed lots of String comparisons that used == instead of .equals().
$ Fixed Double/Triple/Quad null checks in certain places.
$ Fixed returns that set values at the same time.
$ Swapped 3.14 and 1.57 to Math.PI and Math.PI/2.
$ Fixed possible cases where a NPE may be thrown, by calling logging outside of null checks.

+ Added PI to CORE.java, since it's a double and MC uses it as a float in each instance.
- Stripped 95% of the useless code out of Meta_GT_Proxy.java

1 files changed, 5 insertions, 5 deletions

diff --git a/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java b/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java
index fe4399a579..c1972f4cfd 100644
--- a/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java
+++ b/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java
@@ -87,7 +87,11 @@ public class RecipeUtils {
 					Utils.LOG_WARNING("Adding 1.");
 					j++;
 				}
-				else if (j >= 3){
+				else if (j == l){
+					Utils.LOG_WARNING("Done iteration.");
+					break;
+				}
+				else {
 					Utils.LOG_WARNING("ArrayList Values: '"+validSlots.get(j)+"' "+validSlots.get(j+1));
 					if (j < (l-2)){
 						Utils.LOG_WARNING("Adding 2.");
@@ -98,10 +102,6 @@ public class RecipeUtils {
 						break;
 					}
 				}
-				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));
 				}