Added gradle and README

README.md

@@ -0,0 +1 @@
+Thaumic Horizons Thaumcraft Addon

build.gradle

@@ -0,0 +1,79 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        maven {
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
+        }
+        maven {
+            name = "sonatype"
+            url = "https://oss.sonatype.org/content/repositories/snapshots/"
+        }
+    }
+    dependencies {
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+    }
+}
+
+
+apply plugin: 'java'
+
+apply plugin: 'forge'
+
+group= "com.kentington.thaumichorizons" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+
+targetCompatibility = "1.8"
+sourceCompatibility = "1.8"
+
+version = "1.1.9.7"
+archivesBaseName = "ThaumicHorizons-1.7.10"
+
+
+minecraft {
+    version = "1566"
+	replace '${version}', project.version
+    runDir = "eclipse"
+}
+
+dependencies {
+    // you may put jars on which you depend on in ./libs
+    // or you may define them like so..
+    //compile "some.group:artifact:version:classifier"
+    //compile "some.group:artifact:version"
+      
+    // real examples
+    //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
+    //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
+
+    // for more info...
+    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
+    // http://www.gradle.org/docs/current/userguide/dependency_management.html
+
+}
+
+processResources
+{
+    // this will ensure that this task is redone when the versions change.
+    inputs.property "version", project.version
+    inputs.property "mcversion", project.minecraft.version
+
+    // replace stuff in mcmod.info, nothing else
+    from(sourceSets.main.resources.srcDirs) {
+        include 'mcmod.info'
+                
+        // replace version and mcversion
+        expand 'version':project.version, 'mcversion':project.minecraft.version
+    }
+        
+    // copy everything else, thats not the mcmod.info
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+    }
+}
+
+jar {
+    //rename the default output, for some better... sanity with scipts
+    archiveName = "${baseName} ${version}.${extension}"
+}
+
+defaultTasks 'build', 'sort' //remove clean if you want faster builds, this will stop rare inconsistancies. 

gradlew

@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  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=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=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.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    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=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew.bat

@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@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 Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz 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.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+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
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

src/main/java/com/kentington/thaumichorizons/common/ThaumicHorizons.java

@@ -656,7 +656,7 @@ public class ThaumicHorizons {
             ConfigItems.itemGolemBell = itemGolemBellTH;
         } catch (ExistingSubstitutionException var7) {
             var7.printStackTrace();
-            System.out.println("WARNING: Unable to override golemancer\'s bell! Animated golems will behave unpredictably!");
+            //System.out.println("WARNING: Unable to override golemancer\'s bell! Animated golems will behave unpredictably!");
         }*/
 
         GameRegistry.registerItem(itemBoatGreatwood, "boatGreatwood");

src/main/java/com/kentington/thaumichorizons/common/lib/PocketPlaneData.java

@@ -72,7 +72,7 @@ public class PocketPlaneData
     }
     
     public static void generatePocketPlane(final AspectList aspects, final PocketPlaneData data, final World world, final int vortexX, final int vortexY, final int vortexZ) {
-        System.out.println("Starting pocket plane generation");
+        //System.out.println("Starting pocket plane generation");
         final int xCenter = 0;
         final int yCenter = 128;
         final int zCenter = 256 * PocketPlaneData.planes.size();
@@ -115,7 +115,7 @@ public class PocketPlaneData
         data.portalD = new int[3];
         PocketPlaneData.planes.add(data);
         PocketPlaneData.positions.add(Vec3.createVectorHelper((double)vortexX, (double)vortexY, (double)vortexZ));
-        System.out.println("Finished with pocket plane generation!");
+        //System.out.println("Finished with pocket plane generation!");
     }
     
     static int getColor(final AspectList aspects) {
@@ -129,7 +129,7 @@ public class PocketPlaneData
             b += (int)(aspColor.getBlue() * aspectFraction(asp, aspects));
         }
         final int color = r * 256 * 256 + g * 256 + b;
-        System.out.println("Plane color is " + color);
+        //System.out.println("Plane color is " + color);
         return color;
     }
     
@@ -984,7 +984,7 @@ public class PocketPlaneData
     }
     
     public static void drawAPocket(final int xCenter, final int yCenter, final int zCenter, final PocketPlaneData data, final World world, final AspectList aspects, final int noise, final Block block, final int md, final int xSize, final int zSize, final int xOffset, final int yOffset, final int zOffset) {
-        System.out.println("Drawing a pocket of " + block + " with width " + xSize + " and length " + zSize);
+        //System.out.println("Drawing a pocket of " + block + " with width " + xSize + " and length " + zSize);
         final NoiseGeneratorOctaves noiseGen = new NoiseGeneratorOctaves(world.rand, 10);
         double[] noiseDataTop = null;
         noiseDataTop = noiseGen.generateNoiseOctaves(noiseDataTop, xCenter - xSize + xOffset, yCenter + yOffset, zCenter - zSize + zOffset, xSize, 1, zSize, (double)(noise / 50.0f), (double)(noise / 25.0f), (double)(noise / 50.0f));
@@ -1234,7 +1234,7 @@ public class PocketPlaneData
     }
     
     public static void destroyPortal(final int id, final int which) {
-        System.out.println("Destroying portal " + which + " in plane " + id);
+        //System.out.println("Destroying portal " + which + " in plane " + id);
         final PocketPlaneData data = PocketPlaneData.planes.get(id);
         final World world = (World)MinecraftServer.getServer().worldServerForDimension(ThaumicHorizons.dimensionPocketId);
         if (which == 1) {
@@ -1280,7 +1280,7 @@ public class PocketPlaneData
     }
     
     public static void makePortal(final int id, final int which, final int xCoord, final int yCoord, final int zCoord) {
-        System.out.println("Creating portal " + which + " in plane " + id);
+        //System.out.println("Creating portal " + which + " in plane " + id);
         final PocketPlaneData data = PocketPlaneData.planes.get(id);
         final World world = (World)MinecraftServer.getServer().worldServerForDimension(ThaumicHorizons.dimensionPocketId);
         if (which == 1) {

src/main/java/com/kentington/thaumichorizons/common/lib/PocketPlaneThread.java

@@ -27,7 +27,7 @@ public class PocketPlaneThread implements Runnable
     
     @Override
     public void run() {
-        System.out.println("Starting pocket plane generation thread...");
+        //System.out.println("Starting pocket plane generation thread...");
         PocketPlaneData.generatePocketPlane(this.aspects, this.data, this.world, this.x, this.y, this.z);
     }
 }

src/main/java/com/kentington/thaumichorizons/common/tiles/TilePortalTH.java

@@ -70,7 +70,7 @@ public class TilePortalTH extends TileThaumcraft
                         final int oldDim = player.dimension;
                         /*player.mcServer.getConfigurationManager().transferPlayerToDimension(player, this.dimension, (Teleporter)new NightmareTeleporter(mServer.worldServerForDimension(this.dimension)));
                         if (oldDim == ThaumicHorizons.dimensionPocketId && PocketPlaneData.positions.containsKey(player.getCommandSenderName())) {
-                            System.out.println("Loading position " + PocketPlaneData.positions.get(player.getCommandSenderName()));
+                            //System.out.println("Loading position " + PocketPlaneData.positions.get(player.getCommandSenderName()));
                             player.setPositionAndUpdate(PocketPlaneData.positions.get(player.getCommandSenderName()).xCoord, PocketPlaneData.positions.get(player.getCommandSenderName()).yCoord, PocketPlaneData.positions.get(player.getCommandSenderName()).zCoord);
                         }
                         else {
@@ -78,7 +78,7 @@ public class TilePortalTH extends TileThaumcraft
                                 continue;
                             }
                             PocketPlaneData.positions.put(player.getCommandSenderName(), Vec3.createVectorHelper(this.xCoord + 0.5, this.yCoord + 0.5, this.zCoord + 0.5));
-                            System.out.println("Saving position " + PocketPlaneData.positions.get(player.getCommandSenderName()));
+                            //System.out.println("Saving position " + PocketPlaneData.positions.get(player.getCommandSenderName()));
                             player.setPositionAndUpdate(0.5, 129.0, (double)(128 * (this.pocket - 3) + 0.5f));
                             this.worldObj.setBlockToAir(this.xCoord, this.yCoord, this.zCoord);
                         */}

src/main/java/com/kentington/thaumichorizons/common/tiles/TileVat.java

@@ -201,26 +201,26 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
         this.setEntityContained(this.worldObj.getPlayerEntityByName(playerNBT.getString("playerName")));
     }*/
     private void loadContainedEntity(NBTTagCompound EntityNBT) {
-        System.out.println("loadContainedEntity() called, remote: " + worldObj.isRemote);
-        System.out.println("PREPARING TO SPAWN ENTITY IN VAT");
-        System.out.println(entityNBTObj);
+        //System.out.println("loadContainedEntity() called, remote: " + worldObj.isRemote);
+        //System.out.println("PREPARING TO SPAWN ENTITY IN VAT");
+        //System.out.println(entityNBTObj);
         if (EntityNBT.getString("id") != null) {
             if (EntityNBT.getString("id").equals("PLAYER")) {
                 this.setEntityContained(this.worldObj.getPlayerEntityByName(EntityNBT.getString("playerName")));
-                System.out.println("SPAWNED PLAYER IN VAT, WORLD:" + this.worldObj.isRemote);
+                //System.out.println("SPAWNED PLAYER IN VAT, WORLD:" + this.worldObj.isRemote);
             } else if (EntityNBT.hasKey("id")) {//&& !worldObj.isRemote){
 
                 this.setEntityContained((EntityLivingBase) EntityList.createEntityFromNBT(EntityNBT, this.worldObj));
-                System.out.println("SPAWNED ENTITY IN VAT, WORLD:" + this.worldObj.isRemote);
+                //System.out.println("SPAWNED ENTITY IN VAT, WORLD:" + this.worldObj.isRemote);
             } else {
-                System.out.println("VAT WAS EMPTY, AVOIDING NULL ENTITY, WORLD:" + this.worldObj.isRemote);
+                //System.out.println("VAT WAS EMPTY, AVOIDING NULL ENTITY, WORLD:" + this.worldObj.isRemote);
             }
         }
     }
     public void updateEntity() {
         super.updateEntity();
         if(this.firstTick && this.entityNBTObj != null) {
-            //System.out.println("Initialized vat");
+            ////System.out.println("Initialized vat");
             loadContainedEntity(entityNBTObj);
             this.firstTick=false;
         }
@@ -1156,7 +1156,7 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
     public void readCustomNBT(final NBTTagCompound nbttagcompound) {
         super.readCustomNBT(nbttagcompound);
         //entityNBTObj = nbttagcompound.getCompoundTag("entity");
-        //System.out.println("readCustomNBT() called");
+        ////System.out.println("readCustomNBT() called");
         this.mode = nbttagcompound.getInteger("mode");
         this.progress = nbttagcompound.getInteger("progress");
         this.instability = nbttagcompound.getShort("instability");
@@ -1188,7 +1188,7 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
             else if(nbttagcompound.getCompoundTag("entity").hasKey("id") ){//&& !worldObj.isRemote){
 
                 this.setEntityContained((EntityLivingBase)EntityList.createEntityFromNBT(nbttagcompound.getCompoundTag("entity"), this.worldObj));
-                System.out.println("VAT JUST SPAWNED ENTITY AFTER FIRSTTICK World:" + this.worldObj.isRemote);
+                //System.out.println("VAT JUST SPAWNED ENTITY AFTER FIRSTTICK World:" + this.worldObj.isRemote);
             }
         }
         this.sample = ItemStack.loadItemStackFromNBT(nbttagcompound.getCompoundTag("sample"));
@@ -1251,7 +1251,7 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
         }
         if (this.recipeOutput != null && this.recipeOutput instanceof Integer) {
 
-            //System.out.println("[HOBODEBUG]: " + this.recipeOutput.toString());
+            ////System.out.println("[HOBODEBUG]: " + this.recipeOutput.toString());
             nbtCompound.setTag("recipeout",new NBTTagInt((Integer)this.recipeOutput));
         }
         if (this.recipeOutput != null && this.recipeOutput instanceof NBTBase) {