Command: /back

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
 

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

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" "$@"

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

src/main/java/me/gserv/fabrikommander/mixin/PlayerEntityMixin.java

@@ -0,0 +1,40 @@
+package me.gserv.fabrikommander.mixin;
+
+import me.gserv.fabrikommander.commands.BackCommand;
+import me.gserv.fabrikommander.data.PlayerDataManager;
+import me.gserv.fabrikommander.data.spec.Pos;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin({PlayerEntity.class, ServerPlayerEntity.class})
+public abstract class PlayerEntityMixin extends LivingEntity {
+    private PlayerEntityMixin(EntityType<? extends LivingEntity> entityType, World world) {
+        super(entityType, world);
+    }
+
+    @Inject(method = "onDeath(Lnet/minecraft/entity/damage/DamageSource;)V", at = @At("RETURN"))
+    private void setBackPos(DamageSource source, CallbackInfo ci) {
+        if (!world.isClient) {
+            // We need a config, as some people wouldn't want this
+            PlayerDataManager.INSTANCE.setBackPos(uuid, new Pos(
+                    getX(),
+                    getY(),
+                    getZ(),
+
+                    yaw,
+                    pitch,
+
+                    world.getRegistryKey().getValue()
+            ));
+            BackCommand.Utils.sendDeathMessage((PlayerEntity) (Object) this);
+        }
+    }
+}

src/main/kotlin/me/gserv/fabrikommander/Common.kt

@@ -27,6 +27,9 @@ object Common : ModInitializer {
         HomesCommand(dispatcher).register()
         SetHomeCommand(dispatcher).register()
 
+        // Teleport Commands
+        BackCommand(dispatcher).register()
+
         // Misc comands
         PingCommand(dispatcher).register()
     }

src/main/kotlin/me/gserv/fabrikommander/commands/BackCommand.kt

@@ -0,0 +1,77 @@
+package me.gserv.fabrikommander.commands
+
+import me.gserv.fabrikommander.data.PlayerDataManager
+import me.gserv.fabrikommander.data.spec.Pos
+import me.gserv.fabrikommander.utils.Context
+import me.gserv.fabrikommander.utils.Dispatcher
+import me.gserv.fabrikommander.utils.aqua
+import me.gserv.fabrikommander.utils.gold
+import me.gserv.fabrikommander.utils.green
+import me.gserv.fabrikommander.utils.identifierToWorldName
+import me.gserv.fabrikommander.utils.plus
+import me.gserv.fabrikommander.utils.red
+import me.gserv.fabrikommander.utils.yellow
+import net.minecraft.entity.player.PlayerEntity
+import net.minecraft.server.command.CommandManager.literal
+import net.minecraft.util.registry.Registry
+import net.minecraft.util.registry.RegistryKey
+
+class BackCommand(val dispatcher: Dispatcher) {
+    companion object Utils {
+        // Mixin had a problem with @Shadow-ing sendMessage so I'm doing it here
+        // Also, apparently functions inside companion objects are automatically static, neat!
+        fun sendDeathMessage(p: PlayerEntity) {
+            p.sendMessage(
+                gold("Oh no! Seems like you have died! ") + aqua("Use /back to get back to your death location."),
+                false
+            )
+        }
+    }
+
+    fun register() {
+        dispatcher.register(
+            literal("back").executes(::backCommand)
+        )
+    }
+
+    fun backCommand(context: Context): Int {
+        val player = context.source.player
+        if (PlayerDataManager.getBackPos(player.uuid) == null) {
+            context.source.sendError(
+                red("No last position defined - you will have to teleport.")
+            )
+            return 0
+        }
+        val pos: Pos = PlayerDataManager.getBackPos(player.uuid)!! // pos is not null, we can be sure of that
+        val world = player.server.getWorld(RegistryKey.of(Registry.DIMENSION, pos.world))
+        if (world == null) {
+            context.source.sendError(
+                red("Last position is in a world ") +
+                        yellow("(") +
+                        aqua(identifierToWorldName(pos.world)) +
+                        yellow(") ") +
+                        red("that no longer exists.")
+            )
+            return 0
+        }
+        PlayerDataManager.setBackPos(
+            player.uuid, Pos( // Thanks to @SpaceClouds42 for suggesting this
+                world = player.world.registryKey.value,
+
+                x = player.x,
+                y = player.y,
+                z = player.z,
+
+                yaw = player.yaw,
+                pitch = player.pitch
+            )
+        )
+        player.teleport(world, pos.x, pos.y, pos.z, pos.yaw, pos.pitch)
+        context.source.sendFeedback(
+            green("Successfully teleported back to ") + aqua("X = ${pos.x.toInt()}, Y = ${pos.y.toInt()}, Z = ${pos.z.toInt()}"),
+            false
+        )
+        // Should I set the last position back to null here? Please comment on this
+        return 1
+    }
+}

src/main/kotlin/me/gserv/fabrikommander/commands/GetHomeCommand.kt

@@ -36,12 +36,12 @@ class GetHomeCommand(val dispatcher: Dispatcher) {
         } else {
             context.source.sendFeedback(
                 yellow("Home ") + aqua(name) + yellow(": [") +
-                        green("World: ") + aqua(home.world.toString()) + yellow(", ") +
-                        green("X: ") + aqua(home.x.toString()) + yellow(", ") +
-                        green("Y: ") + aqua(home.y.toString()) + yellow(", ") +
-                        green("Z: ") + aqua(home.z.toString()) + yellow(", ") +
-                        green("Pitch: ") + aqua(home.pitch.toString()) + yellow(", ") +
-                        green("Yaw: ") + aqua(home.yaw.toString()) + yellow("]"),
+                        green("World: ") + aqua(home.pos.world.toString()) + yellow(", ") +
+                        green("X: ") + aqua(home.pos.x.toString()) + yellow(", ") +
+                        green("Y: ") + aqua(home.pos.y.toString()) + yellow(", ") +
+                        green("Z: ") + aqua(home.pos.z.toString()) + yellow(", ") +
+                        green("Pitch: ") + aqua(home.pos.pitch.toString()) + yellow(", ") +
+                        green("Yaw: ") + aqua(home.pos.yaw.toString()) + yellow("]"),
                 false
             )
         }