Merge pull request #13 from Robijnvogel/master

Forge and Gradle updates

.gitignore

@@ -7,4 +7,7 @@ out/
 *.iml
 *.ipr
 *.iws
-forge-*-changelog.txt
+forge-*-changelog.txt
+
+#Netbeans
+.nb-gradle/private/cache/

.nb-gradle-properties

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<gradle-project-properties>
+  <!--DO NOT EDIT THIS FILE! - Used by the Gradle plugin of NetBeans.-->
+  <built-in-tasks>
+    <task>
+      <display-name>run</display-name>
+      <non-blocking>no</non-blocking>
+      <task-names>
+        <name must-exist="no">${project}:runclient</name>
+      </task-names>
+      <task-args>
+        <arg>-PcmdLineArgs=${cmd-line-args}</arg>
+      </task-args>
+      <task-jvm-args/>
+    </task>
+  </built-in-tasks>
+</gradle-project-properties>

build.gradle

@@ -21,7 +21,7 @@ compileJava {
 }
 
 minecraft {
-    version = "1.10.2-12.18.2.2171"
+    version = "1.10.2-12.18.3.2185"
     runDir = "run"
     
     // the mappings can be changed at any time, and must be in the following format.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Sep 14 12:28:28 PDT 2015
+#Wed Jan 11 15:34:03 CET 2017
 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-3.3-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+# Attempt to set APP_HOME
-DEFAULT_JVM_OPTS=""
+# 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"
 
@@ -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
+# Escape application args
-function splitJvmOpts() {
+save ( ) {
-    JVM_OPTS=("$@")
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+APP_ARGS=$(save "$@")
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# 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" "$@"

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/com/zixiken/dimdoors/client/ClosingRiftFX.java

@@ -93,13 +93,13 @@ public class ClosingRiftFX extends Particle
 
 		this.setParticleTextureIndex(this.baseTextureIndex + (7 - this.particleAge * 8 / this.particleMaxAge));
 		// this.motionY -= 0.004D;
-		this.moveEntity(this.motionX, this.motionY, this.motionZ);
+		this.move(this.motionX, this.motionY, this.motionZ);
 		this.motionX *= 0.9100000262260437D;
 		this.motionY *= 0.9100000262260437D;
 		this.motionZ *= 0.9100000262260437D;
 
 		if (this.trail && this.particleAge < this.particleMaxAge / 2 && (this.particleAge + this.particleMaxAge) % 2 == 0) {
-			ClosingRiftFX var1 = new ClosingRiftFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0D, 0.0D, 0.0D);
+			ClosingRiftFX var1 = new ClosingRiftFX(this.world, this.posX, this.posY, this.posZ, 0.0D, 0.0D, 0.0D);
 			var1.setRBGColorF(this.particleRed, this.particleGreen, this.particleBlue);
 			var1.particleAge = var1.particleMaxAge / 2;
 

src/main/java/com/zixiken/dimdoors/tileentities/TileEntityDimDoor.java

@@ -43,7 +43,7 @@ public class TileEntityDimDoor extends DDTileEntityBase
 	@Override
 	public float[] getRenderColor(Random rand) {
 		float[] rgbaColor = {1,1,1,1};
-		if (this.worldObj.provider.getDimension() == -1) {
+		if (this.world.provider.getDimension() == -1) {
 			rgbaColor[0] = rand.nextFloat() * 0.5F + 0.4F;
 			rgbaColor[1] = rand.nextFloat() * 0.05F;
 			rgbaColor[2] = rand.nextFloat() * 0.05F;

src/main/java/com/zixiken/dimdoors/tileentities/TileEntityRift.java

@@ -37,7 +37,7 @@ public class TileEntityRift extends DDTileEntityBase implements ITickable {
 	
 	@Override
 	public void update() {
-		if (worldObj.getBlockState(pos).getBlock() != ModBlocks.blockRift) {
+		if (world.getBlockState(pos).getBlock() != ModBlocks.blockRift) {
 			invalidate();
 			return;
 		}
@@ -61,10 +61,10 @@ public class TileEntityRift extends DDTileEntityBase implements ITickable {
 	}
 
 	private void spawnEndermen() {
-		if (worldObj.isRemote) return;
+		if (world.isRemote) return;
 
 		// Ensure that this rift is only spawning one Enderman at a time, to prevent hordes of Endermen
-		Entity entity = worldObj.getEntityByID(this.spawnedEndermenID);
+		Entity entity = world.getEntityByID(this.spawnedEndermenID);
 		if (entity != null && entity instanceof EntityEnderman) {
 			return;
 		}
@@ -72,16 +72,16 @@ public class TileEntityRift extends DDTileEntityBase implements ITickable {
 		if (random.nextInt(MAX_ENDERMAN_SPAWNING_CHANCE) < ENDERMAN_SPAWNING_CHANCE) {
 			// Endermen will only spawn from groups of rifts
 			if (updateNearestRift()) {
-				List<EntityEnderman> list =  worldObj.getEntitiesWithinAABB(EntityEnderman.class,
+				List<EntityEnderman> list =  world.getEntitiesWithinAABB(EntityEnderman.class,
 						new AxisAlignedBB(pos.getX() - 9, pos.getY() - 3, pos.getZ() - 9, pos.getX() + 9, pos.getY() + 3, pos.getZ() + 9));
 
 				if (list.isEmpty()) {
-					EntityEnderman enderman = new EntityEnderman(worldObj);
+					EntityEnderman enderman = new EntityEnderman(world);
 					enderman.setLocationAndAngles(pos.getX() + 0.5, pos.getY() - 1, pos.getZ() + 0.5, 5, 6);
-					worldObj.spawnEntityInWorld(enderman);
+					world.spawnEntity(enderman);
 
 					if (random.nextInt(MAX_HOSTILE_ENDERMAN_CHANCE) < HOSTILE_ENDERMAN_CHANCE) {
-						EntityPlayer player = this.worldObj.getClosestPlayerToEntity(enderman, 50);
+						EntityPlayer player = this.world.getClosestPlayerToEntity(enderman, 50);
 						if (player != null) {
 							enderman.setAttackTarget(player);
 						}
@@ -92,7 +92,7 @@ public class TileEntityRift extends DDTileEntityBase implements ITickable {
 	}
 
 	private void closeRift() {
-		worldObj.setBlockToAir(pos);
+		world.setBlockToAir(pos);
 		growth--;
 	}
 

src/main/java/com/zixiken/dimdoors/tileentities/TileEntityTransTrapdoor.java

@@ -7,14 +7,14 @@ public class TileEntityTransTrapdoor extends DDTileEntityBase {
 	@Override
 	public float[] getRenderColor(Random rand) {
 		float[] rgbaColor = {1,1,1,1};
-		if (this.worldObj.provider.getDimension() == -1) {
+		if (this.world.provider.getDimension() == -1) {
-			rgbaColor[0] = worldObj.rand.nextFloat() * 0.5F + 0.4F;
+			rgbaColor[0] = world.rand.nextFloat() * 0.5F + 0.4F;
-			rgbaColor[1] = worldObj.rand.nextFloat() * 0.05F;
+			rgbaColor[1] = world.rand.nextFloat() * 0.05F;
-			rgbaColor[2] = worldObj.rand.nextFloat() * 0.05F;
+			rgbaColor[2] = world.rand.nextFloat() * 0.05F;
 		} else {
-			rgbaColor[0] = worldObj.rand.nextFloat() * 0.5F + 0.1F;
+			rgbaColor[0] = world.rand.nextFloat() * 0.5F + 0.1F;
-			rgbaColor[1] = worldObj.rand.nextFloat() * 0.4F + 0.4F;
+			rgbaColor[1] = world.rand.nextFloat() * 0.4F + 0.4F;
-			rgbaColor[2] = worldObj.rand.nextFloat() * 0.6F + 0.5F;
+			rgbaColor[2] = world.rand.nextFloat() * 0.6F + 0.5F;
 		}
 		return rgbaColor;
 	}

src/main/resources/mcmod.info

@@ -7,10 +7,10 @@
 "name": "Dimensional Doors",
 "description": "Bend and twist reality itself, creating pocket dimensions, rifts, and much more",
 "version": "3.0.0-a1",
-"credits": "Created by StevenRS11, Coded by StevenRS11 and SenseiKiwi, Logo and Testing by Jaitsu, recent updates by Zixiken and Waterpicker",
+"credits": "Created by StevenRS11, Coded by StevenRS11 and SenseiKiwi, Logo and Testing by Jaitsu, Recent updates by Zixiken and Waterpicker",
 "logoFile": "/dimdoors_logo.png",
-"mcversion": "1.8.9",
+"mcversion": "1.10.2",
-"url": "http://www.minecraftforum.net/topic/1650007-147smpssplan-dimensional-doors-v110-physics-what-physics-updated-with-fancy-opengl/",
+"url": "http://www.minecraftforum.net/topic/1650007",
 "updateUrl": "",
 "authorList": [ "StevenRS11", "SenseiKiwi", "Zixiken", "WaterPicker" ],
 "parent":"",