diff --git a/build.gradle b/build.gradle index 7edea44..6bbc14b 100644 --- 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 index 30d399d..758de96 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 44fbe68..2d80b69 100644 --- 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 index 91a7e26..cccdd3d 100644 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,20 +6,38 @@ ## ############################################################################## -# 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 index 8a0b282..f955316 100644 --- 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 index db6c53f..b6eddd9 100644 --- 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 index 5800945..b226a93 100644 --- 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 index 31b4339..4451c88 100644 --- 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 index b11d573..017ca27 100644 --- 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 index 955a9d7..6550c7c 100644 --- 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 index 297f7cf..aea065c 100644 --- 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 index 3e2a858..bf8a99c 100644 --- 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 index f05f0ba..6b6dfe2 100644 --- 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 index a645d96..609832e 100644 --- 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 index f9fc1e9..463e470 100644 --- 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 index 94f1b74..cf78862 100644 --- 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 zenCommandMap = new HashMap<>(); } diff --git a/src/main/java/youyihj/zenutils/command/ZenCommandTree.java b/src/main/java/youyihj/zenutils/command/ZenCommandTree.java index 771415c..6e3eae0 100644 --- 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 index 6688fe4..aac63ef 100644 --- 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 index 09a4aae..966930c 100644 --- 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 index 249f70b..aa44446 100644 --- 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 index 394ae02..d91fb2f 100644 --- 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 index 531bbba..9bf8252 100644 --- 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 index c4a8e19..acd9fbb 100644 --- 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 index dd06de8..3aa0e0b 100644 --- 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") diff --git a/src/main/java/youyihj/zenutils/cotx/function/IEntityWalk.java b/src/main/java/youyihj/zenutils/cotx/function/IEntityWalk.java index 2c41449..4fa72c5 100644 --- a/src/main/java/youyihj/zenutils/cotx/function/IEntityWalk.java +++ b/src/main/java/youyihj/zenutils/cotx/function/IEntityWalk.java @@ -7,6 +7,9 @@ import crafttweaker.api.entity.IEntity; import stanhebben.zenscript.annotations.ZenClass; +/** + * @author youyihj + */ @FunctionalInterface @ZenRegister @ZenClass("mods.zenutils.cotx.IEntityWalk") diff --git a/src/main/java/youyihj/zenutils/cotx/function/IGetEntityLifeSpan.java b/src/main/java/youyihj/zenutils/cotx/function/IGetEntityLifeSpan.java index cce498f..9dad9f1 100644 --- a/src/main/java/youyihj/zenutils/cotx/function/IGetEntityLifeSpan.java +++ b/src/main/java/youyihj/zenutils/cotx/function/IGetEntityLifeSpan.java @@ -6,6 +6,9 @@ import crafttweaker.api.item.IItemStack; import stanhebben.zenscript.annotations.ZenClass; +/** + * @author youyihj + */ @FunctionalInterface @ZenRegister @ZenClass("mods.zenutils.cotx.IGetEntityLifeSpan") diff --git a/src/main/java/youyihj/zenutils/cotx/item/EnergyItemContent.java b/src/main/java/youyihj/zenutils/cotx/item/EnergyItemContent.java index cf72b3d..64b5fcf 100644 --- a/src/main/java/youyihj/zenutils/cotx/item/EnergyItemContent.java +++ b/src/main/java/youyihj/zenutils/cotx/item/EnergyItemContent.java @@ -12,6 +12,9 @@ import javax.annotation.Nullable; import java.util.List; +/** + * @author youyihj + */ public class EnergyItemContent extends ExpandItemContent implements IEnergyContainerItem { private int capacity; diff --git a/src/main/java/youyihj/zenutils/cotx/item/EnergyItemRepresentation.java b/src/main/java/youyihj/zenutils/cotx/item/EnergyItemRepresentation.java index bd88a0d..7072f87 100644 --- a/src/main/java/youyihj/zenutils/cotx/item/EnergyItemRepresentation.java +++ b/src/main/java/youyihj/zenutils/cotx/item/EnergyItemRepresentation.java @@ -6,6 +6,9 @@ import crafttweaker.annotations.ZenRegister; import stanhebben.zenscript.annotations.ZenClass; +/** + * @author youyihj + */ @ZenRegister @ModOnly("contenttweaker") @ZenClass("mods.zenutils.cotx.EnergyItem") diff --git a/src/main/java/youyihj/zenutils/cotx/item/ExpandItemContent.java b/src/main/java/youyihj/zenutils/cotx/item/ExpandItemContent.java index b40d61c..1e4b3ab 100644 --- a/src/main/java/youyihj/zenutils/cotx/item/ExpandItemContent.java +++ b/src/main/java/youyihj/zenutils/cotx/item/ExpandItemContent.java @@ -9,6 +9,9 @@ import java.util.Objects; +/** + * @author youyihj + */ public class ExpandItemContent extends ItemContent { private ExpandItemRepresentation expandItemRepresentation; diff --git a/src/main/java/youyihj/zenutils/cotx/item/ExpandItemRepresentation.java b/src/main/java/youyihj/zenutils/cotx/item/ExpandItemRepresentation.java index 27205a1..b6b3631 100644 --- a/src/main/java/youyihj/zenutils/cotx/item/ExpandItemRepresentation.java +++ b/src/main/java/youyihj/zenutils/cotx/item/ExpandItemRepresentation.java @@ -10,6 +10,9 @@ import youyihj.zenutils.cotx.function.IEntityItemUpdate; import youyihj.zenutils.cotx.function.IGetEntityLifeSpan; +/** + * @author youyihj + */ @ZenRegister @ModOnly("contenttweaker") @ZenClass("mods.zenutils.cotx.Item") diff --git a/src/main/java/youyihj/zenutils/entity/ZenUtilsEntity.java b/src/main/java/youyihj/zenutils/entity/ZenUtilsEntity.java index 9b32d09..8c43efa 100644 --- a/src/main/java/youyihj/zenutils/entity/ZenUtilsEntity.java +++ b/src/main/java/youyihj/zenutils/entity/ZenUtilsEntity.java @@ -10,6 +10,9 @@ import stanhebben.zenscript.annotations.ZenMethod; import youyihj.zenutils.util.object.CrTUUID; +/** + * @author youyihj + */ @ZenRegister @ZenClass("mods.zenutils.ZenUtilsEntity") @ZenExpansion("crafttweaker.entity.IEntity") diff --git a/src/main/java/youyihj/zenutils/entity/ZenUtilsEntityItem.java b/src/main/java/youyihj/zenutils/entity/ZenUtilsEntityItem.java index 49d2688..f40741a 100644 --- a/src/main/java/youyihj/zenutils/entity/ZenUtilsEntityItem.java +++ b/src/main/java/youyihj/zenutils/entity/ZenUtilsEntityItem.java @@ -9,6 +9,9 @@ import stanhebben.zenscript.annotations.ZenExpansion; import stanhebben.zenscript.annotations.ZenMethod; +/** + * @author youyihj + */ @ZenRegister @ZenClass("mods.zenutils.ZenUtilsEntityItem") @ZenExpansion("crafttweaker.entity.IEntityItem") diff --git a/src/main/java/youyihj/zenutils/item/ZenUtilsMutableItemStack.java b/src/main/java/youyihj/zenutils/item/ZenUtilsMutableItemStack.java index 84c9d99..1c7b9f6 100644 --- a/src/main/java/youyihj/zenutils/item/ZenUtilsMutableItemStack.java +++ b/src/main/java/youyihj/zenutils/item/ZenUtilsMutableItemStack.java @@ -17,6 +17,9 @@ import java.lang.reflect.Field; +/** + * @author youyihj + */ @ZenRegister @ModOnly("contenttweaker") @ZenClass("mods.zenutils.ZenUtilsMutableItemStack") diff --git a/src/main/java/youyihj/zenutils/player/ZenUtilsPlayer.java b/src/main/java/youyihj/zenutils/player/ZenUtilsPlayer.java index bbe78a7..ea40b9a 100644 --- a/src/main/java/youyihj/zenutils/player/ZenUtilsPlayer.java +++ b/src/main/java/youyihj/zenutils/player/ZenUtilsPlayer.java @@ -8,6 +8,9 @@ import stanhebben.zenscript.annotations.ZenExpansion; import stanhebben.zenscript.annotations.ZenMethod; +/** + * @author youyihj + */ @ZenRegister @ZenClass("mods.zenutils.ZenUtilsPlayer") @ZenExpansion("crafttweaker.player.IPlayer") diff --git a/src/main/java/youyihj/zenutils/util/CommandUtils.java b/src/main/java/youyihj/zenutils/util/CommandUtils.java index 6b87dbb..20ac1ce 100644 --- a/src/main/java/youyihj/zenutils/util/CommandUtils.java +++ b/src/main/java/youyihj/zenutils/util/CommandUtils.java @@ -21,6 +21,9 @@ import java.util.List; import java.util.stream.Collectors; +/** + * @author youyihj + */ @ZenRegister @ZenClass("mods.zenutils.command.CommandUtils") @SuppressWarnings("unused") diff --git a/src/main/java/youyihj/zenutils/util/CrTI18n.java b/src/main/java/youyihj/zenutils/util/CrTI18n.java index e40104d..b9e6315 100644 --- a/src/main/java/youyihj/zenutils/util/CrTI18n.java +++ b/src/main/java/youyihj/zenutils/util/CrTI18n.java @@ -5,6 +5,9 @@ import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; +/** + * @author youyihj + */ @ZenRegister @ZenClass("mods.zenutils.I18n") @SuppressWarnings("unused") diff --git a/src/main/java/youyihj/zenutils/util/HexHelper.java b/src/main/java/youyihj/zenutils/util/HexHelper.java index ef47539..6761979 100644 --- a/src/main/java/youyihj/zenutils/util/HexHelper.java +++ b/src/main/java/youyihj/zenutils/util/HexHelper.java @@ -4,6 +4,9 @@ import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; +/** + * @author youyihj + */ @ZenRegister @ZenClass("mods.zenutils.HexHelper") @SuppressWarnings("unused") diff --git a/src/main/java/youyihj/zenutils/util/StaticString.java b/src/main/java/youyihj/zenutils/util/StaticString.java index 1a4ebe9..d57de27 100644 --- a/src/main/java/youyihj/zenutils/util/StaticString.java +++ b/src/main/java/youyihj/zenutils/util/StaticString.java @@ -4,6 +4,9 @@ import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; +/** + * @author youyihj + */ @ZenRegister @ZenClass("mods.zenutils.StaticString") @SuppressWarnings("unused") diff --git a/src/main/java/youyihj/zenutils/util/ZenUtilsGlobal.java b/src/main/java/youyihj/zenutils/util/ZenUtilsGlobal.java index 79857e6..bde9e04 100644 --- a/src/main/java/youyihj/zenutils/util/ZenUtilsGlobal.java +++ b/src/main/java/youyihj/zenutils/util/ZenUtilsGlobal.java @@ -4,6 +4,9 @@ import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; +/** + * @author youyihj + */ @ZenClass("mods.zenutils.ZenUtils") @ZenRegister @SuppressWarnings("unused") @@ -22,7 +25,7 @@ public static String toString(Object object) { return String.valueOf(object); } - // Actually, these below are not global + /** Actually, these below are not global */ @ZenMethod public static String typeof(int unused) { return "int"; diff --git a/src/main/java/youyihj/zenutils/world/ZenUtilsWorld.java b/src/main/java/youyihj/zenutils/world/ZenUtilsWorld.java index b45af35..8371e5f 100644 --- a/src/main/java/youyihj/zenutils/world/ZenUtilsWorld.java +++ b/src/main/java/youyihj/zenutils/world/ZenUtilsWorld.java @@ -7,7 +7,6 @@ import crafttweaker.api.minecraft.CraftTweakerMC; import crafttweaker.api.player.IPlayer; import crafttweaker.api.world.IWorld; -import crafttweaker.mc1120.entity.MCEntity; import crafttweaker.mc1120.entity.MCEntityItem; import crafttweaker.mc1120.player.MCPlayer; import net.minecraft.entity.item.EntityItem; @@ -21,6 +20,9 @@ import java.util.UUID; import java.util.stream.Collectors; +/** + * @author youyihj + */ @ZenRegister @ZenClass("mods.zenutils.ZenUtilsWorld") @ZenExpansion("crafttweaker.world.IWorld")