author

friendlyhj · Nov 8, 2020 · 466d724 · 466d724
1 parent 537259f
commit 466d724
Show file tree

Hide file tree

Showing 40 changed files with 157 additions and 55 deletions.
diff --git a/build.gradle b/build.gradle
@@ -55,7 +55,7 @@ dependencies {
     // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
     // http://www.gradle.org/docs/current/userguide/dependency_management.html
 
-    deobfCompile "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.554"
+    deobfCompile "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.601"
     deobfCompile "com.teamacronymcoders.base:base:1.12.2-3.13.0-SNAPSHOT.+"
     deobfCompile "com.teamacronymcoders:ContentTweaker:1.12.2-4.9.1"
     deobfCompile "cofh:RedstoneFlux:1.12-2.1.0.+:universal"

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Sep 04 21:38:32 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
diff --git a/gradlew b/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" "$@"
diff --git a/gradlew.bat b/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

diff --git a/src/main/java/youyihj/zenutils/ZenUtils.java b/src/main/java/youyihj/zenutils/ZenUtils.java
@@ -7,6 +7,9 @@
 import youyihj.zenutils.command.ZenCommandRegistrar;
 import youyihj.zenutils.util.ZenUtilsGlobal;
 
+/**
+ * @author youyihj
+ */
 @Mod(modid = ZenUtils.MODID, name = ZenUtils.NAME, version = ZenUtils.VERSION, dependencies = ZenUtils.DEPENDENCIES)
 public class ZenUtils {
     public static final String MODID = "zenutils";

diff --git a/src/main/java/youyihj/zenutils/block/ZenUtilsBlock.java b/src/main/java/youyihj/zenutils/block/ZenUtilsBlock.java
@@ -10,6 +10,9 @@
 import stanhebben.zenscript.annotations.ZenExpansion;
 import stanhebben.zenscript.annotations.ZenMethod;
 
+/**
+ * @author youyihj
+ */
 @ZenRegister
 @ZenExpansion("crafttweaker.block.IBlock")
 @SuppressWarnings("unused")

diff --git a/src/main/java/youyihj/zenutils/command/DefaultGetTabCompletion.java b/src/main/java/youyihj/zenutils/command/DefaultGetTabCompletion.java
@@ -9,6 +9,9 @@
 import stanhebben.zenscript.annotations.ZenMethodStatic;
 import youyihj.zenutils.util.object.StringList;
 
+/**
+ * @author youyihj
+ */
 @ZenExpansion("mods.zenutils.command.IGetTabCompletion")
 @ZenRegister
 @SuppressWarnings("unused")

diff --git a/src/main/java/youyihj/zenutils/command/ICommandExecute.java b/src/main/java/youyihj/zenutils/command/ICommandExecute.java
@@ -6,6 +6,9 @@
 import stanhebben.zenscript.annotations.ZenClass;
 import youyihj.zenutils.util.object.ZenUtilsCommandSender;
 
+/**
+ * @author youyihj
+ */
 @ZenRegister
 @ZenClass("mods.zenutils.command.ICommandExecute")
 public interface ICommandExecute {

diff --git a/src/main/java/youyihj/zenutils/command/IGetCommandUsage.java b/src/main/java/youyihj/zenutils/command/IGetCommandUsage.java
@@ -4,6 +4,9 @@
 import stanhebben.zenscript.annotations.ZenClass;
 import youyihj.zenutils.util.object.ZenUtilsCommandSender;
 
+/**
+ * @author youyihj
+ */
 @FunctionalInterface
 @ZenRegister
 @ZenClass("mods.zenutils.command.IGetCommandUsage")

diff --git a/src/main/java/youyihj/zenutils/command/IGetTabCompletion.java b/src/main/java/youyihj/zenutils/command/IGetTabCompletion.java
@@ -10,6 +10,9 @@
 
 import javax.annotation.Nullable;
 
+/**
+ * @author youyihj
+ */
 @FunctionalInterface
 @ZenRegister
 @ZenClass("mods.zenutils.command.IGetTabCompletion")

diff --git a/src/main/java/youyihj/zenutils/command/IZenCommand.java b/src/main/java/youyihj/zenutils/command/IZenCommand.java
@@ -1,12 +1,11 @@
 package youyihj.zenutils.command;
 
 import net.minecraft.command.ICommand;
-import net.minecraft.command.ICommandSender;
 import stanhebben.zenscript.annotations.ZenMethod;
-import youyihj.zenutils.util.object.ZenUtilsCommandSender;
-
-import javax.annotation.Nonnull;
 
+/**
+ * @author youyihj
+ */
 @SuppressWarnings("unused")
 public interface IZenCommand extends ICommand {
     @ZenMethod

diff --git a/src/main/java/youyihj/zenutils/command/TabCompletion.java b/src/main/java/youyihj/zenutils/command/TabCompletion.java
@@ -4,6 +4,9 @@
 import stanhebben.zenscript.annotations.ZenClass;
 import stanhebben.zenscript.annotations.ZenMethod;
 
+/**
+ * @author youyihj
+ */
 @ZenRegister
 @ZenClass("mods.zenutils.command.TabCompletion")
 @Deprecated

diff --git a/src/main/java/youyihj/zenutils/command/TabCompletionCase.java b/src/main/java/youyihj/zenutils/command/TabCompletionCase.java
@@ -7,6 +7,9 @@
 import java.util.HashMap;
 import java.util.List;
 
+/**
+ * @author youyihj
+ */
 @ZenRegister
 @ZenClass("mods.zenutils.command.TabCompletionCase")
 @Deprecated

diff --git a/src/main/java/youyihj/zenutils/command/ZenCommand.java b/src/main/java/youyihj/zenutils/command/ZenCommand.java
@@ -22,6 +22,9 @@
 import java.util.Collections;
 import java.util.List;
 
+/**
+ * @author youyihj
+ */
 @ZenRegister
 @ZenClass("mods.zenutils.command.ZenCommand")
 @SuppressWarnings("unused")

diff --git a/src/main/java/youyihj/zenutils/command/ZenCommandRegistrar.java b/src/main/java/youyihj/zenutils/command/ZenCommandRegistrar.java
@@ -2,6 +2,9 @@
 
 import java.util.HashMap;
 
+/**
+ * @author youyihj
+ */
 public class ZenCommandRegistrar {
      public static HashMap<String, IZenCommand> zenCommandMap = new HashMap<>();
 }
diff --git a/src/main/java/youyihj/zenutils/command/ZenCommandTree.java b/src/main/java/youyihj/zenutils/command/ZenCommandTree.java
@@ -11,6 +11,9 @@
 
 import javax.annotation.Nonnull;
 
+/**
+ * @author youyihj
+ */
 @ZenRegister
 @ZenClass("mods.zenutils.command.ZenCommandTree")
 @SuppressWarnings("unused")

diff --git a/src/main/java/youyihj/zenutils/cotx/ExpandHand.java b/src/main/java/youyihj/zenutils/cotx/ExpandHand.java
@@ -10,6 +10,9 @@
 import stanhebben.zenscript.annotations.ZenExpansion;
 import stanhebben.zenscript.annotations.ZenMethod;
 
+/**
+ * @author youyihj
+ */
 @ZenRegister
 @ZenExpansion("mods.contenttweaker.Hand")
 @ModOnly("contenttweaker")
@@ -23,7 +26,8 @@ public static IEntityEquipmentSlot asEntityEquipmentSlot(Hand hand) {
                 return new MCEntityEquipmentSlot(EntityEquipmentSlot.MAINHAND);
             case OFF_HAND:
                 return new MCEntityEquipmentSlot(EntityEquipmentSlot.OFFHAND);
+            default:
+                return null;
         }
-        return null;
     }
 }
diff --git a/src/main/java/youyihj/zenutils/cotx/ExpandVanillaFactory.java b/src/main/java/youyihj/zenutils/cotx/ExpandVanillaFactory.java
@@ -9,6 +9,9 @@
 import youyihj.zenutils.cotx.item.EnergyItemRepresentation;
 import youyihj.zenutils.cotx.item.ExpandItemRepresentation;
 
+/**
+ * @author youyihj
+ */
 @ZenRegister
 @ModOnly("contenttweaker")
 @ZenExpansion("mods.contenttweaker.VanillaFactory")

diff --git a/src/main/java/youyihj/zenutils/cotx/block/ExpandBlockContent.java b/src/main/java/youyihj/zenutils/cotx/block/ExpandBlockContent.java
@@ -19,6 +19,9 @@
 
 import java.util.Objects;
 
+/**
+ * @author youyihj
+ */
 public class ExpandBlockContent extends BlockContent {
     private ExpandBlockRepresentation expandBlockRepresentation;
 

diff --git a/src/main/java/youyihj/zenutils/cotx/block/ExpandBlockRepresentation.java b/src/main/java/youyihj/zenutils/cotx/block/ExpandBlockRepresentation.java
@@ -12,6 +12,9 @@
 import youyihj.zenutils.cotx.function.IEntityCollided;
 import youyihj.zenutils.cotx.function.IEntityWalk;
 
+/**
+ * @author youyihj
+ */
 @ZenRegister
 @ModOnly("contenttweaker")
 @ZenClass("mods.zenutils.cotx.Block")

diff --git a/src/main/java/youyihj/zenutils/cotx/function/IBlockActivated.java b/src/main/java/youyihj/zenutils/cotx/function/IBlockActivated.java
@@ -11,6 +11,9 @@
 import crafttweaker.api.util.Position3f;
 import stanhebben.zenscript.annotations.ZenClass;
 
+/**
+ * @author youyihj
+ */
 @FunctionalInterface
 @ZenRegister
 @ModOnly("contenttweaker")

diff --git a/src/main/java/youyihj/zenutils/cotx/function/IEntityCollided.java b/src/main/java/youyihj/zenutils/cotx/function/IEntityCollided.java
@@ -7,6 +7,9 @@
 import crafttweaker.api.entity.IEntity;
 import stanhebben.zenscript.annotations.ZenClass;
 
+/**
+ * @author youyihj
+ */
 @FunctionalInterface
 @ZenRegister
 @ZenClass("mods.zenutils.cotx.IEntityCollided")

diff --git a/src/main/java/youyihj/zenutils/cotx/function/IEntityItemUpdate.java b/src/main/java/youyihj/zenutils/cotx/function/IEntityItemUpdate.java
@@ -5,6 +5,9 @@
 import crafttweaker.api.entity.IEntityItem;
 import stanhebben.zenscript.annotations.ZenClass;
 
+/**
+ * @author youyihj
+ */
 @FunctionalInterface
 @ZenRegister
 @ZenClass("mods.zenutils.cotx.IEntityItemUpdate")