Merge pull request #26 from LotuxPunk/new_methods

New methods

.gitignore

@@ -20,3 +20,4 @@ build
 # other
 eclipse
 run
+libs

build.gradle

@@ -10,7 +10,7 @@ buildscript {
 apply plugin: 'net.minecraftforge.gradle.forge'
 //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
-version = "1.12.2-1.5.1.4"
+version = "1.12.2-1.6.0.0"
 group = "com.vandendaelen.handles" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "handles"
 
@@ -20,7 +20,7 @@ compileJava {
 }
 
 minecraft {
-    version = "1.12.2-14.23.5.2768"
+    version = "1.12.2-14.23.5.2847"
     runDir = "run"
 
     // the mappings can be changed at any time, and must be in the following format.
@@ -63,8 +63,6 @@ dependencies {
     compile "li.cil.oc:OpenComputers:MC1.12.2-1.7.+"
     //CC
     compile "com.github.SquidDev-CC:CC-Tweaked:${project.cc_version}"
-    //TARDIS Mod
-    deobfCompile "com.github.Spectre0987:TardisMod:${project.tardis_version}"
     //IC²
     compileOnly "net.industrial-craft:industrialcraft-2:${project.ic2ex_version}:api"
 }

gradle.properties

@@ -1,6 +1,5 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
-tardis_version=0.1.0C
-cc_version=1.12.2-1.82.3
+cc_version=1.12.2-1.86.2
 ic2ex_version = 2.8.98-ex112

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Nov 03 19:37:19 CET 2018
+#Sun Sep 15 16:55:30 CEST 2019
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
+zipStoreBase=GRADLE_USER_HOME

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/com/vandendaelen/handles/object/tileentity/TileHandles.java

@@ -15,5 +15,4 @@ public NBTTagCompound writeToNBT(NBTTagCompound compound) {
         super.writeToNBT(compound);
         return compound;
     }
-
 }

src/main/java/com/vandendaelen/handles/object/tileentity/TileTardisInterfaceBase.java

@@ -5,7 +5,9 @@
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.WorldServer;
 import net.minecraftforge.common.DimensionManager;
+import net.tardis.mod.common.tileentity.TileEntityDoor;
 import net.tardis.mod.common.tileentity.TileEntityTardis;
 import net.tardis.mod.util.SpaceTimeCoord;
 import net.tardis.mod.util.common.helpers.TardisHelper;
@@ -17,7 +19,7 @@
 public class TileTardisInterfaceBase extends TileEntity {
     private UUID ownerID = null;
     public static final String peripheralName = "tardisinterface";
-    public static final List<String> METHODS = Arrays.asList("getTardisPos", "setTardisDestination","startFlight", "setDoors", "isInFlight","setFueling", "getFuel","isDoorsOpened","canFly","getTravelTime", "getWaypoint","setWaypoint","getHealthComponent","getDimensionsID","getDimensionName","setRelativePos", "setDimensionPos", "getTardisDestination", "getDimension", "getTargetDimension", "setRepairing", "getHull");
+    public static final List<String> METHODS = Arrays.asList("getTardisPos", "setTardisDestination","startFlight", "setDoors", "isInFlight","setFueling", "getArtron","isDoorsOpened","canFly","getTravelTime", "getWaypoint","setWaypoint","getHealthComponent","getDimensionsID","getDimensionName","setRelativePos", "setDimensionPos", "getTardisDestination", "getDimension", "getTargetDimension", "setField", "getField", "getSystemName", "setStealth", "getStealh", "setHADS", "getHADS");
 
     @Override
     public void readFromNBT(NBTTagCompound compound) {
@@ -49,6 +51,19 @@ public TileEntityTardis getTardis() {
         return te;
     }
 
+    public TileEntityDoor getTardisDoor(TileEntityTardis tardis){
+        if(!world.isRemote){
+            WorldServer ser = world.getMinecraftServer().getWorld(tardis.dimension);
+            if(ser != null){
+                TileEntity te = ser.getTileEntity(tardis.getLocation());
+                if (te instanceof TileEntityDoor){
+                    return (TileEntityDoor) te;
+                }
+            }
+        }
+        return null;
+    }
+
     public void damageAprioritron(){
         getTardis().getSystem(SystemAprioritron.class).damage();
     }
@@ -114,7 +129,7 @@ public Object[] isInFlight(TileEntityTardis te){
     }
 
     public Object[] getFuel(TileEntityTardis te){
-        return new Object[]{Float.valueOf(te.fuel).doubleValue()};
+        return new Object[]{Float.valueOf(te.getArtron()).doubleValue()};
     }
 
     public Object[] setFueling(Object[] arguments, TileEntityTardis te){
@@ -196,14 +211,47 @@ public Object[] getTargetDimension(TileEntityTardis te){
         return new Object[]{te.getTargetDim()};
     }
 
-    public Object[] setRepairing(Object[] arguments, TileEntityTardis te){
+    public Object[] setField(Object[] arguments, TileEntityTardis te){
         if (!canRun())
             return new Object[]{"Aprioritron broken"};
-        te.setRepairing((boolean)arguments[0]);
-        return new Object[0];
+        te.setForceFieldEnabled((boolean)arguments[0]);
+        TileEntityDoor td = getTardisDoor(te);
+        if(td != null){
+            td.setForcefield((boolean)arguments[0]);
+        }
+        return new Object[] {null};
+    }
+
+    public Object[] getField(TileEntityTardis te){
+        return new Object[] {te.isForceFieldEnabled()};
+    }
+
+    public Object[] getSystemName(Object[] arguments, TileEntityTardis te){
+        if ((double)arguments[0] < te.systems.length){
+            return new Object[]{te.systems[(int)Math.round((double)arguments[0])].getNameKey()};
+        }
+        return new Object[]{null};
+    }
+
+    public Object[] setStealth(Object[] arguments, TileEntityTardis te){
+        if (!canRun())
+            return new Object[]{"Aprioritron broken"};
+        te.setStealthMode((boolean)arguments[0]);
+        return new Object[] {null};
+    }
+
+    public Object[] getStealth(TileEntityTardis te){
+        return new Object[] {te.isStealthMode()};
+    }
+
+    public Object[] setHADS(Object[] arguments, TileEntityTardis te){
+        if (!canRun())
+            return new Object[]{"Aprioritron broken"};
+        te.setHADS((boolean)arguments[0]);
+        return new Object[] {null};
     }
 
-    public Object[] getHull(TileEntityTardis te){
-        return new Object[] {Float.valueOf(te.getHealth()).doubleValue()};
+    public Object[] getHADS(TileEntityTardis te){
+        return new Object[] {te.isHADSEnabled()};
     }
 }