diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..ac366a1 Binary files /dev/null and b/.DS_Store differ diff --git a/gradle.properties b/gradle.properties index d6530c9..cb73de4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,11 +4,11 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # Check these on https://modmuss50.me/fabric.html minecraft_version=1.16.4 - yarn_mappings=1.16.4+build.6 - loader_version=0.10.6+build.214 + yarn_mappings=1.16.4+build.7 + loader_version=0.10.8 #Fabric api - fabric_version=0.25.1+build.416-1.16 + fabric_version=0.28.3+1.16 loom_version=0.5-SNAPSHOT diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 490fda8..e708b1c 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 186b715..4d9ca16 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index cccdd3d..4f906e0 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,7 @@ 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="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -66,6 +82,7 @@ esac 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 @@ -109,10 +126,11 @@ 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 +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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 @@ -138,19 +156,19 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $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" ;; + 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 @@ -159,14 +177,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +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" "$@" diff --git a/gradlew.bat b/gradlew.bat index f955316..107acd3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @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 DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @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 +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_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=%* - :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% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/src/main/kotlin/me/gserv/fabrikommander/Common.kt b/src/main/kotlin/me/gserv/fabrikommander/Common.kt index 7fd641f..a41f336 100644 --- a/src/main/kotlin/me/gserv/fabrikommander/Common.kt +++ b/src/main/kotlin/me/gserv/fabrikommander/Common.kt @@ -27,6 +27,13 @@ object Common : ModInitializer { HomesCommand(dispatcher).register() SetHomeCommand(dispatcher).register() + // Teleport commands + TpaCommand(dispatcher).register() + TpaHereCommand(dispatcher).register() + TpAcceptCommand(dispatcher).register() + TpCancelCommand(dispatcher).register() + TpDenyCommand(dispatcher).register() + // Misc comands PingCommand(dispatcher).register() } diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/SetHomeCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/SetHomeCommand.kt index 1ff3252..846fbf0 100644 --- a/src/main/kotlin/me/gserv/fabrikommander/commands/SetHomeCommand.kt +++ b/src/main/kotlin/me/gserv/fabrikommander/commands/SetHomeCommand.kt @@ -5,7 +5,6 @@ import me.gserv.fabrikommander.data.PlayerDataManager import me.gserv.fabrikommander.data.spec.Home import me.gserv.fabrikommander.utils.* import net.minecraft.server.command.CommandManager -import net.minecraft.text.LiteralText class SetHomeCommand(val dispatcher: Dispatcher) { fun register() { diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpAcceptCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpAcceptCommand.kt new file mode 100644 index 0000000..bda4f5f --- /dev/null +++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpAcceptCommand.kt @@ -0,0 +1,36 @@ +package me.gserv.fabrikommander.commands + +import me.gserv.fabrikommander.data.TeleportRequest +import me.gserv.fabrikommander.utils.Context +import me.gserv.fabrikommander.utils.Dispatcher +import me.gserv.fabrikommander.utils.plus +import me.gserv.fabrikommander.utils.red +import net.minecraft.command.argument.EntityArgumentType +import net.minecraft.server.command.CommandManager.argument +import net.minecraft.server.command.CommandManager.literal + +// I'm not sure how I should capitalise this +class TpAcceptCommand(val dispatcher: Dispatcher) { + fun register() { + dispatcher.register( + literal("tpaccept").then( + argument("source", EntityArgumentType.player()).executes(this::tpAcceptCommand) + ) + ) + } + + fun tpAcceptCommand(context: Context): Int { + val source = EntityArgumentType.getPlayer(context, "source") + val request = TeleportRequest.ACTIVE_REQUESTS[source.uuidAsString + context.source.player.uuidAsString] + if (request == null) { + context.source.sendError( + red("No active teleport request from ") + source.displayName + ) + return 0 + } + request.apply() + request.notifySourceOfAccept() + TeleportRequest.ACTIVE_REQUESTS.remove(source.uuidAsString + context.source.player.uuidAsString) + return 1 + } +} diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpCancelCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpCancelCommand.kt new file mode 100644 index 0000000..6ec9be5 --- /dev/null +++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpCancelCommand.kt @@ -0,0 +1,37 @@ +package me.gserv.fabrikommander.commands + +import me.gserv.fabrikommander.data.TeleportRequest +import me.gserv.fabrikommander.utils.Context +import me.gserv.fabrikommander.utils.Dispatcher +import me.gserv.fabrikommander.utils.aqua +import me.gserv.fabrikommander.utils.plus +import me.gserv.fabrikommander.utils.red +import net.minecraft.command.argument.EntityArgumentType +import net.minecraft.server.command.CommandManager.argument +import net.minecraft.server.command.CommandManager.literal + +class TpCancelCommand(val dispatcher: Dispatcher) { + fun register() { + dispatcher.register( + literal("tpcancel").then( + argument("target", EntityArgumentType.player()).executes(this::tpCancelCommand) + ) + ) + } + + fun tpCancelCommand(context: Context): Int { + val target = EntityArgumentType.getPlayer(context, "target") + if (TeleportRequest.ACTIVE_REQUESTS[context.source.player.uuidAsString + target.uuidAsString] == null) { + context.source.sendError( + red("No active teleport request to ") + target.displayName + ) + return 0 + } + TeleportRequest.ACTIVE_REQUESTS[context.source.player.uuidAsString + target.uuidAsString]!!.notifyTargetOfCancel() + TeleportRequest.ACTIVE_REQUESTS.remove(context.source.player.uuidAsString + target.uuidAsString) + context.source.sendFeedback(aqua( + "Teleport request to " + ) + target.displayName + aqua(" was cancelled."), true) + return 1 + } +} diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpDenyCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpDenyCommand.kt new file mode 100644 index 0000000..6a0d07b --- /dev/null +++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpDenyCommand.kt @@ -0,0 +1,38 @@ +package me.gserv.fabrikommander.commands + +import me.gserv.fabrikommander.data.TeleportRequest +import me.gserv.fabrikommander.utils.Context +import me.gserv.fabrikommander.utils.Dispatcher +import me.gserv.fabrikommander.utils.aqua +import me.gserv.fabrikommander.utils.plus +import me.gserv.fabrikommander.utils.red +import net.minecraft.command.argument.EntityArgumentType +import net.minecraft.server.command.CommandManager.argument +import net.minecraft.server.command.CommandManager.literal + +class TpDenyCommand(val dispatcher: Dispatcher) { + fun register() { + dispatcher.register( + literal("tpdeny").then( + argument("source", EntityArgumentType.player()).executes(this::tpDenyCommand) + ) + ) + } + + fun tpDenyCommand(context: Context): Int { + val source = EntityArgumentType.getPlayer(context, "source") + if (TeleportRequest.ACTIVE_REQUESTS[source.uuidAsString + context.source.player.uuidAsString] == null) { + context.source.sendError( + red("No active teleport request from ") + source.displayName + ) + return 0 + } + TeleportRequest.ACTIVE_REQUESTS[source.uuidAsString + context.source.player.uuidAsString]!!.notifySourceOfDeny() + TeleportRequest.ACTIVE_REQUESTS.remove(source.uuidAsString + context.source.player.uuidAsString) + context.source.sendFeedback( + aqua("Teleport request from ") + source.displayName + aqua(" was denied"), + true + ) + return 1 + } +} diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt new file mode 100644 index 0000000..8aa5cc2 --- /dev/null +++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt @@ -0,0 +1,51 @@ +package me.gserv.fabrikommander.commands + +import me.gserv.fabrikommander.data.TeleportRequest +import me.gserv.fabrikommander.utils.Context +import me.gserv.fabrikommander.utils.Dispatcher +import me.gserv.fabrikommander.utils.aqua +import me.gserv.fabrikommander.utils.plus +import me.gserv.fabrikommander.utils.red +import me.gserv.fabrikommander.utils.hover +import me.gserv.fabrikommander.utils.click +import me.gserv.fabrikommander.utils.reset +import net.minecraft.command.argument.EntityArgumentType +import net.minecraft.server.command.CommandManager.argument +import net.minecraft.text.ClickEvent +import net.minecraft.text.HoverEvent +import net.minecraft.server.command.CommandManager.literal + +class TpaCommand(val dispatcher: Dispatcher) { + fun register() { + dispatcher.register( + literal("tpa").then( + argument("target", EntityArgumentType.player()).executes(this::tpaCommand) + ) + ) + } + + fun tpaCommand(context: Context): Int { + val target = EntityArgumentType.getPlayer(context, "target") + val source = context.source.player + val request = TeleportRequest(source = source, target = target, inverted = false) + request.notifyTargetOfRequest() + context.source.sendFeedback( + aqua("Teleport request sent to ") + target.displayName + + reset(" [") + hover( + click( + red("Cancel"), + ClickEvent( + ClickEvent.Action.RUN_COMMAND, + "/tpcancel " + target.entityName // There can be multiple active requests + ) + ), + HoverEvent( + HoverEvent.Action.SHOW_TEXT, + red("Click here to cancel the request.") + ) + ) + reset("]"), + true + ) + return 1 + } +} diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt new file mode 100644 index 0000000..121a99c --- /dev/null +++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt @@ -0,0 +1,51 @@ +package me.gserv.fabrikommander.commands + +import me.gserv.fabrikommander.data.TeleportRequest +import me.gserv.fabrikommander.utils.Context +import me.gserv.fabrikommander.utils.Dispatcher +import me.gserv.fabrikommander.utils.aqua +import me.gserv.fabrikommander.utils.plus +import me.gserv.fabrikommander.utils.red +import me.gserv.fabrikommander.utils.hover +import me.gserv.fabrikommander.utils.click +import me.gserv.fabrikommander.utils.reset +import net.minecraft.command.argument.EntityArgumentType +import net.minecraft.server.command.CommandManager.argument +import net.minecraft.text.ClickEvent +import net.minecraft.text.HoverEvent +import net.minecraft.server.command.CommandManager.literal + +class TpaHereCommand(val dispatcher: Dispatcher) { + fun register() { + dispatcher.register( + literal("tpahere").then( + argument("target", EntityArgumentType.player()).executes(this::tpaHereCommand) + ) + ) + } + + fun tpaHereCommand(context: Context): Int { + val target = EntityArgumentType.getPlayer(context, "target") + val source = context.source.player + val request = TeleportRequest(source = source, target = target, inverted = true) + request.notifyTargetOfRequest() + context.source.sendFeedback( + aqua("Teleport request sent to ") + target.displayName + + reset(" [") + hover( + click( + red("Cancel"), + ClickEvent( + ClickEvent.Action.RUN_COMMAND, + "/tpcancel " + target.entityName // There can be multiple active requests + ) + ), + HoverEvent( + HoverEvent.Action.SHOW_TEXT, + red("Click here to cancel the request.") + ) + ) + reset("]"), + true + ) + return 1 + } +} diff --git a/src/main/kotlin/me/gserv/fabrikommander/data/TeleportRequest.kt b/src/main/kotlin/me/gserv/fabrikommander/data/TeleportRequest.kt new file mode 100644 index 0000000..80b868d --- /dev/null +++ b/src/main/kotlin/me/gserv/fabrikommander/data/TeleportRequest.kt @@ -0,0 +1,90 @@ +package me.gserv.fabrikommander.data + +import me.gserv.fabrikommander.utils.aqua +import me.gserv.fabrikommander.utils.click +import me.gserv.fabrikommander.utils.green +import me.gserv.fabrikommander.utils.hover +import me.gserv.fabrikommander.utils.plus +import me.gserv.fabrikommander.utils.red +import me.gserv.fabrikommander.utils.reset +import me.gserv.fabrikommander.utils.yellow +import net.minecraft.server.network.ServerPlayerEntity +import net.minecraft.text.ClickEvent +import net.minecraft.text.HoverEvent +import net.minecraft.text.MutableText +import net.minecraft.util.Util + +class TeleportRequest( + val source: ServerPlayerEntity, + val target: ServerPlayerEntity, + val inverted: Boolean +) { + companion object { + @JvmStatic + val ACTIVE_REQUESTS = hashMapOf() + } + + init { + // I should come up with a better system but I want to make sure that there can't be two teleport requests with the same source and target. + val id = source.uuidAsString + target.uuidAsString + ACTIVE_REQUESTS[id] = this + } + + fun apply() { + if (inverted) target.teleport(source.serverWorld, source.x, source.y, source.z, source.yaw, source.pitch) + source.teleport(target.serverWorld, target.x, target.y, target.z, target.yaw, target.pitch) + } + + fun notifySourceOfAccept() { + val message = + reset("") + target.displayName + aqua(" has accepted your teleport request") + source.sendSystemMessage(message, Util.NIL_UUID) + } + + fun notifySourceOfDeny() { + val message = reset("") + target.displayName + aqua(" has denied your teleport request") + source.sendSystemMessage(message, Util.NIL_UUID) + } + + fun notifyTargetOfRequest() { + // Message will be configurable later + val message = + reset("") + source.displayName as MutableText + yellow( // reset("") used to make the vanilla click event for player names not apply to the whole message + " has requested " + when (inverted) { + true -> "you teleport to them" + false -> "to teleport to you" + } + ) + reset(". [") + click( + hover( + aqua("Accept"), + HoverEvent( + HoverEvent.Action.SHOW_TEXT, + green("Click here to accept the request.") + ) + ), + ClickEvent( + ClickEvent.Action.RUN_COMMAND, + "/tpaccept " + source.entityName // There can be multiple active requests + ) + ) + reset(" / ") + hover( + click( + aqua("Deny"), + ClickEvent( + ClickEvent.Action.RUN_COMMAND, + "/tpdeny " + source.entityName // There can be multiple active requests + ) + ), + HoverEvent( + HoverEvent.Action.SHOW_TEXT, + red("Click here to deny the request.") + ) + ) + reset("]") + + target.sendSystemMessage(message, Util.NIL_UUID) + } + + fun notifyTargetOfCancel() { + val message = reset("") + source.displayName + aqua(" has cancelled their teleport request.") + target.sendSystemMessage(message, Util.NIL_UUID) + } +} diff --git a/src/main/kotlin/me/gserv/fabrikommander/utils/Text.kt b/src/main/kotlin/me/gserv/fabrikommander/utils/Text.kt index b7839e8..ecaa1d6 100644 --- a/src/main/kotlin/me/gserv/fabrikommander/utils/Text.kt +++ b/src/main/kotlin/me/gserv/fabrikommander/utils/Text.kt @@ -60,5 +60,5 @@ fun hover(text: MutableText, event: HoverEvent) = text.setStyle(text.style.withH // endregion // region: Operators -operator fun MutableText.plus(other: MutableText): MutableText = this.append(other) +operator fun MutableText.plus(other: Text): MutableText = this.append(other) // endregion