Merge branch 'minecraft-1.11.2' into minecraft-1.12

build.gradle

@@ -19,7 +19,6 @@ plugins {
 buildDir = "build-${mc_version}"
 
 apply plugin: 'net.minecraftforge.gradle.forge'
-apply from: 'gradle/scripts/jsonGen.gradle'
 
 version = mc_version + "-" + mod_version
 group = "org.squiddev"
@@ -98,35 +97,35 @@ repositories {
 }
 
 dependencies {
-	compile "dan200.computercraft:ComputerCraft:${project.cc_version}-${project.cc_build}"
+	implementation "dan200.computercraft:ComputerCraft:${project.cc_version}-${project.cc_build}"
 	deobfCompile "mezz.jei:jei_${project.mc_version}:4.7.0.68"
 
-	provided "org.squiddev:CCTweaks:1.11.2-1.5.0-pr0:dev" // TODO: Upload initial 1.12 version
-	compile "cofh:RedstoneFlux:1.12-2.0.0.1:deobf"
-	provided "net.industrial-craft:industrialcraft-2:2.6.99-ex110:dev"
-	deobfProvided "buildcraft:buildcraft:7.99.14"
-	provided "net.darkhax.tesla:Tesla-1.12:1.0.61:deobf"
+	compileOnly "org.squiddev:CCTweaks:1.11.2-1.5.0-pr0:dev" // TODO: Upload initial 1.12 version
+	compileOnly "cofh:RedstoneFlux:1.12-2.0.0.1:deobf"
+	compileOnly "net.industrial-craft:industrialcraft-2:2.6.99-ex110:dev"
+	compileOnly "buildcraft:buildcraft:7.99.14"
+	compileOnly "net.darkhax.tesla:Tesla-1.12:1.0.61:deobf"
 
 	// Tinker's + Dependencies
-	deobfProvided "slimeknights:TConstruct:1.12.2-2.9.0.56"
-	deobfProvided "slimeknights.mantle:Mantle:1.12-1.3.1.22"
+	compileOnly "slimeknights:TConstruct:1.12.2-2.9.0.56"
+	compileOnly "slimeknights.mantle:Mantle:1.12-1.3.1.22"
 
 	// Storage drawers + Dependencies
-	deobfProvided "curseMods:Chameleon:${project.mc_version}-4.1.0"
-	deobfProvided "curseMods:StorageDrawers:${project.mc_version}-5.2.2"
+	compileOnly "curseMods:Chameleon:${project.mc_version}-4.1.0"
+	compileOnly "curseMods:StorageDrawers:${project.mc_version}-5.2.2"
 
-	provided "MCMultiPart2:MCMultiPart:2.2.2:deobf"
-	deobfProvided "refinedstorage:refinedstorage:1.5.8-1240"
-	deobfProvided "curseMods:forestry:${project.mc_version}-5.4.3.128"
-	deobfProvided "curseMods:appliedenergistics2:rv4-alpha-9" // Won't run on 1.12, but here for the future
-	deobfProvided "curseMods:Baubles:1.12-1.5.2"
-	deobfCompile "curseMods:blockcraftery:0.1.3"
-	provided("codechicken:ForgeMultipart:1.12-2.3.0.46:deobf") { exclude group: "codechicken" }
-	provided "codechicken:CodeChickenLib:1.12-3.1.5.330:deobf"
+	compileOnly "MCMultiPart2:MCMultiPart:2.2.2:deobf"
+	compileOnly "refinedstorage:refinedstorage:1.5.8-1240"
+	compileOnly "curseMods:forestry:${project.mc_version}-5.4.3.128"
+	compileOnly "curseMods:appliedenergistics2:rv4-alpha-9" // Won't run on 1.12, but here for the future
+	compileOnly "curseMods:Baubles:1.12-1.5.2"
+	compileOnly "curseMods:blockcraftery:0.1.3"
+	compileOnly("codechicken:ForgeMultipart:1.12-2.3.0.46:deobf") { exclude group: "codechicken" }
+	compileOnly "codechicken:CodeChickenLib:1.12-3.1.5.330:deobf"
 
-	provided('org.squiddev:ConfigGen:1.2.5') { exclude group: 'net.minecraftforge' }
+	compileOnly('org.squiddev:ConfigGen:1.2.5') { exclude group: 'net.minecraftforge' }
 
-	provided "com.google.errorprone:error_prone_annotations:2.0.21"
+	compileOnly "com.google.errorprone:error_prone_annotations:2.0.21"
 }
 
 processResources {

gradle.properties

@@ -1,6 +1,6 @@
 mc_version=1.12
 forge_version=14.21.1.2401
-mod_version=1.1.9
+mod_version=1.1.10
 cc_version=1.80pr1
 cc_build=build0
 # For when one needs to decompile

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Tue Jun 14 10:16:55 BST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.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/org/squiddev/plethora/api/neural/INeuralRegistry.java

@@ -13,7 +13,7 @@ public interface INeuralRegistry {
 	 * Add an predicate which controls whether an entity can have
 	 * the neural interface attached to it.
 	 *
-	 * @param predicate The predicate which will recieve an entity. If {@code false} is returned then the neural
+	 * @param predicate The predicate which will receive an entity. If {@code false} is returned then the neural
 	 *                  interface will be blocked from connecting, otherwise the remaining predicates will be checked.
 	 */
 	void addEquipPredicate(@Nonnull Predicate<EntityLivingBase> predicate);

src/main/java/org/squiddev/plethora/core/ModuleRegistry.java

@@ -11,14 +11,11 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.event.RegistryEvent;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.registries.IForgeRegistry;
 import org.squiddev.plethora.api.Constants;
-import org.squiddev.plethora.api.vehicle.IVehicleUpgradeHandler;
 import org.squiddev.plethora.api.module.IModuleHandler;
 import org.squiddev.plethora.api.module.IModuleRegistry;
-import org.squiddev.plethora.gameplay.Plethora;
+import org.squiddev.plethora.api.vehicle.IVehicleUpgradeHandler;
 
 import javax.annotation.Nonnull;
 import java.util.ArrayList;
@@ -27,8 +24,8 @@
 final class ModuleRegistry implements IModuleRegistry {
 	public static final ModuleRegistry instance = new ModuleRegistry();
 
-	private final List<IPocketUpgrade> pocketUpgrades = new ArrayList<IPocketUpgrade>();
-	private final List<ITurtleUpgrade> turtleUpgrades = new ArrayList<ITurtleUpgrade>();
+	private final List<IPocketUpgrade> pocketUpgrades = new ArrayList<>();
+	private final List<ITurtleUpgrade> turtleUpgrades = new ArrayList<>();
 
 	private ModuleRegistry() {
 	}
@@ -96,7 +93,7 @@ public IVehicleUpgradeHandler toVehicleUpgrade(@Nonnull IModuleHandler handler)
 		return new VehicleUpgradeModule(handler);
 	}
 
-	void addRecipes(IForgeRegistry<IRecipe>  registry) {
+	void addRecipes(IForgeRegistry<IRecipe> registry) {
 		for (ITurtleUpgrade upgrade : turtleUpgrades) {
 			registry.register(new ImpostorRecipe(
 				PlethoraCore.ID + ":turtle_upgrade", 2, 1,