Add PrimitiveBlastFurnaceRecipe, builder and map

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Jun 11 18:36:34 KRAT 2017
+#Fri Apr 20 14:59:31 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip

gradlew

@@ -1,25 +1,43 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

src/main/java/gregtech/api/capability/impl/FluidTankHandler.java

@@ -55,7 +55,7 @@ public IFluidTankProperties[] getTankProperties() {
         if (properties == null) {
             List<IFluidTankProperties> props = Lists.newArrayList();
             fluidTanks.forEach(tank -> Collections.addAll(props, tank.getTankProperties()));
-            properties = props.toArray(new IFluidTankProperties[props.size()]);
+            properties = props.toArray(new IFluidTankProperties[0]);
         }
         return properties;
     }

src/main/java/gregtech/api/recipes/Recipe.java

@@ -10,7 +10,6 @@
 import net.minecraft.util.NonNullList;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.items.IItemHandlerModifiable;
 import org.apache.commons.lang3.Validate;
 
@@ -344,8 +343,35 @@ public int getDuration() {
 			return duration;
 		}
 
-		public int getEUt() {
-			return EUt;
-		}
-	}
+        public int getEUt() {
+            return EUt;
+        }
+    }
+
+    public static class PrimitiveBlastFurnaceRecipe {
+
+        private final int duration;
+
+        private final int fuelAmount;
+
+        private final ItemStack output;
+
+        public PrimitiveBlastFurnaceRecipe(int duration, int fuelAmount, ItemStack output) {
+            this.duration = duration;
+            this.fuelAmount = fuelAmount;
+            this.output = output;
+        }
+
+        public int getDuration() {
+            return duration;
+        }
+
+        public int getFuelAmount() {
+            return fuelAmount;
+        }
+
+        public ItemStack getOutput() {
+            return output;
+        }
+    }
 }

src/main/java/gregtech/api/recipes/RecipeMaps.java

@@ -4,6 +4,10 @@
 import gregtech.api.gui.widgets.ProgressWidget.MoveType;
 import gregtech.api.recipes.builders.*;
 import gregtech.api.recipes.machines.*;
+import gregtech.api.unification.stack.SimpleItemStack;
+
+import java.util.HashMap;
+import java.util.Map;
 
 public class RecipeMaps {
 
@@ -610,4 +614,9 @@ public class RecipeMaps {
 
     public static final RecipeMap<DefaultRecipeBuilder> LARGE_NAQUADAH_REACTOR_FUELS = new RecipeMap<>("largenaquadahreactor", 1, 1, 0, 0, 0, 1, 0, 0, 1, new DefaultRecipeBuilder());
 
+    /**
+     * Create recipes via {@link PrimitiveBlastFurnaceRecipeBuilder}
+     */
+    public static final Map<SimpleItemStack, Recipe.PrimitiveBlastFurnaceRecipe> PRIMITIVE_BLAST_FURNACE = new HashMap<>();
+
 }

src/main/java/gregtech/api/recipes/builders/AssemblyLineRecipeBuilder.java

@@ -1,7 +1,6 @@
 package gregtech.api.recipes.builders;
 
 import gregtech.api.recipes.Recipe;
-import gregtech.api.recipes.RecipeBuilder;
 import gregtech.api.util.EnumValidationResult;
 import gregtech.api.util.GTLog;
 import gregtech.api.util.GTUtility;
@@ -85,12 +84,12 @@ protected EnumValidationResult validate() {
 			result = EnumValidationResult.INVALID;
 		}
 
-		if (output == null) {
-			GTLog.logger.error("Output ItemStack cannot be null", new IllegalArgumentException());
+		if (output == null || output.isEmpty()) {
+			GTLog.logger.error("Output ItemStack cannot be null or empty", new IllegalArgumentException());
 			result = EnumValidationResult.INVALID;
 		}
-		if (researchItem == null) {
-			GTLog.logger.error("Research ItemStack cannot be null", new IllegalArgumentException());
+		if (researchItem == null || output.isEmpty()) {
+			GTLog.logger.error("Research ItemStack cannot be null or empty", new IllegalArgumentException());
 			result = EnumValidationResult.INVALID;
 		}
 

src/main/java/gregtech/api/recipes/builders/PrimitiveBlastFurnaceRecipeBuilder.java

@@ -0,0 +1,73 @@
+package gregtech.api.recipes.builders;
+
+import gregtech.api.recipes.Recipe;
+import gregtech.api.recipes.RecipeMaps;
+import gregtech.api.unification.stack.SimpleItemStack;
+import gregtech.api.util.EnumValidationResult;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.ValidationResult;
+import net.minecraft.item.ItemStack;
+
+public class PrimitiveBlastFurnaceRecipeBuilder {
+
+    private int duration = -1;
+    private int fuelAmount = -1;
+
+    private ItemStack output;
+
+	private PrimitiveBlastFurnaceRecipeBuilder() {
+	}
+
+	public static PrimitiveBlastFurnaceRecipeBuilder start() {
+		return new PrimitiveBlastFurnaceRecipeBuilder();
+	}
+
+    public PrimitiveBlastFurnaceRecipeBuilder setDuration(int duration) {
+        this.duration = duration;
+        return this;
+    }
+
+    public PrimitiveBlastFurnaceRecipeBuilder setFuelAmount(int fuelAmount) {
+        this.fuelAmount = fuelAmount;
+        return this;
+    }
+
+    public PrimitiveBlastFurnaceRecipeBuilder setOutput(ItemStack output) {
+        this.output = output;
+        return this;
+    }
+
+    public ValidationResult<Recipe.PrimitiveBlastFurnaceRecipe> build() {
+		return ValidationResult.newResult(validate(),
+				new Recipe.PrimitiveBlastFurnaceRecipe(duration, fuelAmount, output));
+	}
+
+	protected EnumValidationResult validate() {
+		EnumValidationResult result = EnumValidationResult.VALID;
+
+		if (output == null || output.isEmpty()) {
+			GTLog.logger.error("Output ItemStack cannot be null or empty", new IllegalArgumentException());
+			result = EnumValidationResult.INVALID;
+		}
+
+		if (fuelAmount <= 0) {
+			GTLog.logger.error("Research Time cannot be less or equal to 0", new IllegalArgumentException());
+			result = EnumValidationResult.INVALID;
+		}
+		if (duration <= 0) {
+			GTLog.logger.error("Duration cannot be less or equal to 0", new IllegalArgumentException());
+			result = EnumValidationResult.INVALID;
+		}
+
+		return result;
+	}
+
+	public void buildAndRegister() {
+		ValidationResult<Recipe.PrimitiveBlastFurnaceRecipe> result = build();
+
+		if (result.getType() == EnumValidationResult.VALID) {
+            Recipe.PrimitiveBlastFurnaceRecipe recipe = result.getResult();
+            RecipeMaps.PRIMITIVE_BLAST_FURNACE.put(new SimpleItemStack(recipe.getOutput()), recipe);
+		}
+	}
+}

src/main/java/gregtech/api/unification/ore/OrePrefix.java

@@ -331,7 +331,6 @@ static class Conditions {
         nugget.ignoredMaterials.add(Materials.Gold);
         plate.ignoredMaterials.add(Materials.Paper);
 
-
         bucket.ignoredMaterials.add(Materials.Lava);
         bucket.ignoredMaterials.add(Materials.Milk);
         bucket.ignoredMaterials.add(Materials.Water);