Use safetyTeleporter and add i18n

Multiverse · Feb 24, 2024 · 39c533e · 39c533e
1 parent b1a5907
commit 39c533e
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 6 deletions.
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/SpawnCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/SpawnCommand.java
@@ -1,6 +1,7 @@
 package org.mvplugins.multiverse.core.commands;
 
 import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.MessageType;
 import co.aikar.commands.annotation.CommandAlias;
 import co.aikar.commands.annotation.CommandCompletion;
 import co.aikar.commands.annotation.CommandPermission;
@@ -14,6 +15,8 @@
 import org.jvnet.hk2.annotations.Service;
 import org.mvplugins.multiverse.core.commandtools.MVCommandManager;
 import org.mvplugins.multiverse.core.commandtools.MultiverseCommand;
+import org.mvplugins.multiverse.core.teleportation.AsyncSafetyTeleporter;
+import org.mvplugins.multiverse.core.utils.MVCorei18n;
 import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
 import org.mvplugins.multiverse.core.world.WorldManager;
 
@@ -22,11 +25,15 @@
 class SpawnCommand extends MultiverseCommand {
 
     private final WorldManager worldManager;
+    private final AsyncSafetyTeleporter safetyTeleporter;
 
     @Inject
-    SpawnCommand(@NotNull MVCommandManager commandManager, WorldManager worldManager) {
+    SpawnCommand(@NotNull MVCommandManager commandManager,
+                 WorldManager worldManager,
+                 @NotNull AsyncSafetyTeleporter safetyTeleporter) {
         super(commandManager);
         this.worldManager = worldManager;
+        this.safetyTeleporter = safetyTeleporter;
     }
 
     @Subcommand("spawn")
@@ -45,19 +52,27 @@ void onSpawnCommand(
         // The player is in the world, so it must be loaded
         LoadedMultiverseWorld world = worldManager.getLoadedWorld(player.getWorld().getName()).getOrNull();
 
-        player.teleport(world.getSpawnLocation()); // TODO: use safety teleporter
+        // Teleport the player
+        safetyTeleporter.teleportSafely(issuer.getIssuer(), player, world.getSpawnLocation());
 
-        // Make the message make sense
+        // Make the conformation message make sense
         String teleporterName;
         if (issuer.getIssuer().getName().equals("CONSOLE")) {
-            teleporterName = "The console";
+            teleporterName = commandManager.formatMessage(issuer, MessageType.INFO, MVCorei18n.SPAWN_CONSOLENAME);
         } else if (issuer.getIssuer().getName().equals(player.getName())) {
-            teleporterName = "You";
+            teleporterName = commandManager.formatMessage(issuer, MessageType.INFO, MVCorei18n.SPAWN_YOU);
         } else {
             teleporterName = issuer.getIssuer().getName();
         }
 
-        player.sendMessage(teleporterName + " just sent you to spawn!"); // TODO: i18n
+        // Send the conformation message
+        player.sendMessage(commandManager.formatMessage(
+                issuer,
+                MessageType.INFO,
+                MVCorei18n.SPAWN_MESSAGE,
+                "{teleporter}",
+                teleporterName
+        ));
 
 
     }

diff --git a/src/main/java/org/mvplugins/multiverse/core/utils/MVCorei18n.java b/src/main/java/org/mvplugins/multiverse/core/utils/MVCorei18n.java
@@ -94,6 +94,13 @@ public enum MVCorei18n implements MessageKeyProvider {
     ROOT_TITLE,
     ROOT_HELP,
 
+    // spawn command
+    SPAWN_DESCRIPTION,
+    SPAWN_PLAYER_DESCRIPTION,
+    SPAWN_MESSAGE,
+    SPAWN_CONSOLENAME,
+    SPAWN_YOU,
+
     // teleport command
     TELEPORT_SUCCESS,
 

diff --git a/src/main/resources/multiverse-core_en.properties b/src/main/resources/multiverse-core_en.properties
@@ -124,6 +124,13 @@ mv-core.remove.success=&aWorld '{world}' removed!
 mv-core.root.title=&a{name} version {version}
 mv-core.root.help=&aSee &f/mv help&a for commands available.
 
+# /mv spawn
+mv-core.spawn.description=Teleports the specified player to the spawn of the world they are in
+mv-core.spawn.player.description=The player
+mv-core.spawn.message={teleporter} just sent you to spawn!
+mv-core.spawn.consolename=The console
+mv-core.spawn.you=You
+
 # /mv tp
 mv-core.teleport.description=Allows you to teleport to a location on your server!
 mv-core.teleport.player.description=Target player to teleport.