teleport commands

Author: Andrei Hava

.idea/workspace.xml

@@ -1,3 +1,10 @@
+### 20.1.0-alpha7
+_Admin powers_
+- Code refactoring
+- Tweak the translations for the configuration entries
+- Add the `/buildersvoid` root command and its `/bv` short variant.
+- Add the `teleport` command and its `tp` short variant.
+
 ### 20.1.0-alpha6
 _Buttons and levers_
 - Add Cloth Config as a dependency

CHANGELOG.md

@@ -1,7 +1,7 @@
 {
-  "config.buildersvoid.cooldown": "Void Pearl Cooldown Length",
+  "config.buildersvoid.cooldown": "Cooldown Length",
   "config.buildersvoid.cooldown.tooltip": "Void Pearl usage cooldown length, in ticks",
-  "config.buildersvoid.enableCooldown": "Enable Void Pearl Cooldown",
+  "config.buildersvoid.enableCooldown": "Enable Cooldown",
   "config.buildersvoid.enableCooldown.tooltip": "Enables a cooldown when using any of the Void Pearl variants",
   "config.buildersvoid.title": "Builder's Void",
   "item.buildersvoid.linked_void_pearl": "Linked Void Pearl",

common/src/generated/resources/assets/buildersvoid/lang/en_us.json

@@ -2,6 +2,7 @@
 
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import dev.detpikachu.buildersvoid.logic.TeleportLogic;
 import net.blay09.mods.balm.api.command.BalmCommands;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
@@ -24,7 +25,7 @@ public static void initialize(BalmCommands commands) {
             final var teleport = Commands.literal("teleport")
                 .requires(BalmCommands.requirePermission(PERM_TELEPORT))
                 .then(Commands.argument("target", EntityArgument.player())
-                    .executes(ModCommands::onTeleportTarget)
+                    .executes(ModCommands::onTeleportTargetPlayer)
                 )
                 .then(Commands.argument("source", EntityArgument.player())
                     .then(Commands.argument("target", EntityArgument.player())
@@ -38,21 +39,22 @@ public static void initialize(BalmCommands commands) {
         });
     }
 
-    private static int onTeleportTarget(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
-        final EntitySelector target = context.getArgument("target", EntitySelector.class);
-
-        context.getSource().sendSystemMessage(target.findSinglePlayer(context.getSource()).getName());
+    private static int onTeleportTargetPlayer(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        final var target = context.getArgument("target", EntitySelector.class);
+        final var sourcePlayer = context.getSource().getPlayer();
+        final var targetPlayer = target.findSinglePlayer(context.getSource());
 
+        TeleportLogic.teleportIntoVoid(sourcePlayer, targetPlayer.getUUID(), false);
         return 0;
     }
 
-    private static int onTeleportSourceToTarget(CommandContext<CommandSourceStack> context) {
-        final EntitySelector source = context.getArgument("source", EntitySelector.class);
-        final EntitySelector target = context.getArgument("target", EntitySelector.class);
+    private static int onTeleportSourceToTarget(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        final var source = context.getArgument("source", EntitySelector.class);
+        final var sourcePlayer = source.findSinglePlayer(context.getSource());
+        final var target = context.getArgument("target", EntitySelector.class);
+        final var targetPlayer = target.findSinglePlayer(context.getSource());
 
+        TeleportLogic.teleportIntoVoid(sourcePlayer, targetPlayer.getUUID(), false);
         return 0;
     }
-
-    private static void teleportSourceToTarget() {
-    }
 }