chore(setup): overhaul position setup

setup/src/main/java/net/theevilreaper/bounce/setup/BounceSetup.java

@@ -13,7 +13,6 @@
 import net.theevilreaper.bounce.common.ListenerHandling;
 import net.theevilreaper.bounce.common.bootstrap.ServiceBootstrap;
 import net.theevilreaper.bounce.setup.command.GameModeCommand;
-import net.theevilreaper.bounce.setup.command.SetupCommand;
 import net.theevilreaper.bounce.setup.dialog.event.PlayerDialogRequestEvent;
 import net.theevilreaper.bounce.setup.event.map.MapSetupSelectEvent;
 import net.theevilreaper.bounce.setup.event.ground.PlayerGroundBlockSelectEvent;
@@ -71,7 +70,6 @@ public void initialize() {
         registerCancelListener(node);
         registerListener(node);
 
-        MinecraftServer.getCommandManager().register(new SetupCommand(this.setupDataService));
         MinecraftServer.getCommandManager().register(new GameModeCommand());
     }
 

setup/src/main/java/net/theevilreaper/bounce/setup/inventory/overview/MapOverviewInventory.java

@@ -64,11 +64,31 @@ public MapOverviewInventory(Player player, GameMapBuilder builder) {
      */
     private ISlot getOverViewItem(OverviewType type) {
         return switch (type) {
-            case SPAWN -> new PositionSlot<>(type, this.builder.getSpawn());
-            case GAME_SPAWN -> new PositionSlot<>(type, this.builder.getGameSpawn());
+            case SPAWN -> new PositionSlot<>(type, this.builder.getSpawn(), this::setSpawnToCurrentPosition);
+            case GAME_SPAWN -> new PositionSlot<>(type, this.builder.getGameSpawn(), this::setGameSpawnToCurrentPosition);
             case NAME -> new StringSlot(type, builder.getName());
             case BUILDER -> new MultiStringSlot(type, builder.getBuilders());
             case AREA -> new AreaOverviewSlot(type, builder.getArea());
         };
     }
+
+    /**
+     * Sets the spawn position on the {@link GameMapBuilder} to the player's current position and refreshes the layout.
+     *
+     * @param player the player whose position is captured
+     */
+    private void setSpawnToCurrentPosition(Player player) {
+        this.builder.spawn(player.getPosition());
+        this.invalidateDataLayout();
+    }
+
+    /**
+     * Sets the game spawn position on the {@link GameMapBuilder} to the player's current position and refreshes the layout.
+     *
+     * @param player the player whose position is captured
+     */
+    private void setGameSpawnToCurrentPosition(Player player) {
+        this.builder.gameSpawn(player.getPosition());
+        this.invalidateDataLayout();
+    }
 }

setup/src/main/java/net/theevilreaper/bounce/setup/inventory/slot/PositionSlot.java

@@ -23,6 +23,7 @@
 import java.util.function.Consumer;
 
 import static net.theevilreaper.bounce.setup.util.SetupMessages.DELETE_CLICK;
+import static net.theevilreaper.bounce.setup.util.SetupMessages.SET_CLICK;
 import static net.theevilreaper.bounce.setup.util.SetupMessages.TELEPORT_CLICK;
 
 public class PositionSlot<T extends DataType> extends AbstractDataSlot<T> {
@@ -36,17 +37,27 @@ public class PositionSlot<T extends DataType> extends AbstractDataSlot<T> {
     }
 
     private final @Nullable Pos position;
+    private final @Nullable Consumer<Player> onSet;
 
-    public PositionSlot(T type, @Nullable Pos position) {
+    public PositionSlot(T type, @Nullable Pos position, @Nullable Consumer<Player> onSet) {
         super(type);
         this.position = position;
+        this.onSet = onSet;
     }
 
     @Override
     public ItemStack getItem() {
         ItemStack overviewItem = this.type.getItem();
 
-        if (position == null) return overviewItem;
+        if (position == null) {
+            if (onSet == null) return overviewItem;
+
+            List<Component> lore = new ArrayList<>();
+            lore.add(Component.empty());
+            lore.add(SET_CLICK);
+            lore.add(Component.empty());
+            return asBuilder(overviewItem).lore(lore).build();
+        }
 
         List<Component> lore = new ArrayList<>();
         lore.add(Component.empty());
@@ -62,7 +73,13 @@ public ItemStack getItem() {
     @Override
     protected void click(Player player, int slot, Click click, ItemStack stack, Consumer<ClickHolder> result) {
         result.accept(ClickHolder.cancelClick());
-        if ((!(click instanceof Click.Left || click instanceof Click.Right)) || position == null) return;
+        if (!(click instanceof Click.Left || click instanceof Click.Right)) return;
+
+        if (position == null) {
+            if (click instanceof Click.Left && onSet != null) onSet.accept(player);
+            return;
+        }
+
         if (click instanceof Click.Left) {
             player.closeInventory();
             player.teleport(position);

setup/src/main/java/net/theevilreaper/bounce/setup/util/SetupMessages.java

@@ -12,6 +12,7 @@ public class SetupMessages extends Messages {
 
     public static final Component TELEPORT_CLICK;
     public static final Component DELETE_CLICK;
+    public static final Component SET_CLICK;
     public static final Component CLICK_TO_EDIT;
 
     static {
@@ -20,6 +21,16 @@ public class SetupMessages extends Messages {
         INVALID_NAME = withPrefix(Component.text("Invalid name for the map", NamedTextColor.RED));
         CLICK_TO_EDIT = Component.text("Click to edit", NamedTextColor.GRAY);
 
+        SET_CLICK = NO_SPACE_SEPARATOR
+                .append(Component.space())
+                .append(Component.text("Left", NamedTextColor.GREEN))
+                .append(Component.space())
+                .append(Component.text("click", NamedTextColor.GRAY))
+                .append(Component.space())
+                .append(Component.text("->", NamedTextColor.GRAY))
+                .append(Component.space())
+                .append(Component.text("set to your position", NamedTextColor.GREEN));
+
         TELEPORT_CLICK = NO_SPACE_SEPARATOR
                 .append(Component.space())
                 .append(Component.text("Left", NamedTextColor.GREEN))

setup/src/test/java/net/theevilreaper/bounce/setup/inventory/slot/PositionSlotTest.java

@@ -0,0 +1,100 @@
+package net.theevilreaper.bounce.setup.inventory.slot;
+
+import net.kyori.adventure.text.Component;
+import net.minestom.server.component.DataComponents;
+import net.minestom.server.coordinate.Pos;
+import net.minestom.server.entity.Player;
+import net.minestom.server.inventory.click.Click;
+import net.minestom.server.instance.Instance;
+import net.minestom.server.item.ItemStack;
+import net.minestom.testing.Env;
+import net.minestom.testing.extension.MicrotusExtension;
+import net.theevilreaper.aves.inventory.function.InventoryClick;
+import net.theevilreaper.bounce.setup.inventory.overview.OverviewType;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static net.theevilreaper.bounce.setup.util.SetupMessages.SET_CLICK;
+import static org.junit.jupiter.api.Assertions.*;
+
+@ExtendWith(MicrotusExtension.class)
+class PositionSlotTest {
+
+    private static final int SLOT_INDEX = 12;
+
+    @Test
+    void testUnsetPositionWithSetterShowsHint(@NotNull Env env) {
+        PositionSlot<OverviewType> slot = new PositionSlot<>(OverviewType.SPAWN, null, player -> {});
+        ItemStack item = slot.getItem();
+
+        assertTrue(item.has(DataComponents.LORE));
+        List<Component> lore = item.get(DataComponents.LORE);
+
+        assertNotNull(lore);
+        assertEquals(3, lore.size(), "Lore should contain 3 components");
+        assertAll(
+                "Unset position lore",
+                () -> assertEquals(Component.empty(), lore.getFirst(), "First lore component should be empty"),
+                () -> assertEquals(SET_CLICK, lore.get(1), "Middle lore component should hint at setting the position"),
+                () -> assertEquals(Component.empty(), lore.getLast(), "Last lore component should be empty")
+        );
+    }
+
+    @Test
+    void testUnsetPositionWithoutSetterHasNoLore(@NotNull Env env) {
+        PositionSlot<OverviewType> slot = new PositionSlot<>(OverviewType.SPAWN, null, null);
+        ItemStack item = slot.getItem();
+
+        assertEquals(OverviewType.SPAWN.getItem(), item, "Without a setter the raw overview item should be rendered");
+    }
+
+    @Test
+    void testLeftClickOnUnsetPositionInvokesSetter(@NotNull Env env) {
+        Instance instance = env.createFlatInstance();
+        Player player = env.createPlayer(instance);
+        AtomicReference<Player> captured = new AtomicReference<>();
+
+        PositionSlot<OverviewType> slot = new PositionSlot<>(OverviewType.SPAWN, null, captured::set);
+        InventoryClick click = slot.getClick();
+        click.onClick(player, SLOT_INDEX, new Click.Left(SLOT_INDEX), slot.getItem(), holder -> {});
+
+        assertEquals(player, captured.get(), "Left-clicking an unset position should capture the clicking player");
+
+        env.destroyInstance(instance, true);
+    }
+
+    @Test
+    void testRightClickOnUnsetPositionDoesNotInvokeSetter(@NotNull Env env) {
+        Instance instance = env.createFlatInstance();
+        Player player = env.createPlayer(instance);
+        AtomicReference<Player> captured = new AtomicReference<>();
+
+        PositionSlot<OverviewType> slot = new PositionSlot<>(OverviewType.SPAWN, null, captured::set);
+        InventoryClick click = slot.getClick();
+        click.onClick(player, SLOT_INDEX, new Click.Right(SLOT_INDEX), slot.getItem(), holder -> {});
+
+        assertNull(captured.get(), "Right-clicking an unset position must not invoke the setter");
+
+        env.destroyInstance(instance, true);
+    }
+
+    @Test
+    void testLeftClickOnAlreadySetPositionDoesNotInvokeSetter(@NotNull Env env) {
+        Instance instance = env.createFlatInstance();
+        Player player = env.createPlayer(instance);
+        AtomicReference<Player> captured = new AtomicReference<>();
+        Pos position = new Pos(1, 2, 3);
+
+        PositionSlot<OverviewType> slot = new PositionSlot<>(OverviewType.SPAWN, position, captured::set);
+        InventoryClick click = slot.getClick();
+        click.onClick(player, SLOT_INDEX, new Click.Left(SLOT_INDEX), slot.getItem(), holder -> {});
+
+        assertNull(captured.get(), "Clicking an already-set position must teleport instead of invoking the setter");
+
+        env.destroyInstance(instance, true);
+    }
+}