refactor: update setup to use modern features from Minecraft

setup/src/main/java/net/theevilreaper/tamias/setup/TamiasSetup.java

@@ -1,9 +1,8 @@
 package net.theevilreaper.tamias.setup;
 
+import net.minestom.server.event.player.PlayerCustomClickEvent;
 import net.onelitefeather.guira.SetupDataService;
 import net.onelitefeather.guira.event.SetupFinishEvent;
-import net.theevilreaper.aves.file.FileHandler;
-import net.theevilreaper.aves.file.GsonFileHandler;
 import net.theevilreaper.aves.map.provider.MapProvider;
 import net.theevilreaper.aves.util.functional.PlayerConsumer;
 import net.minestom.server.MinecraftServer;
@@ -17,16 +16,21 @@
 import net.minestom.server.event.player.PlayerSpawnEvent;
 import net.minestom.server.event.player.PlayerUseItemEvent;
 import net.minestom.server.instance.Instance;
-import net.minestom.server.tag.Tag;
 import net.theevilreaper.tamias.common.ListenerHandling;
-import net.theevilreaper.tamias.common.gson.GsonUtil;
 import net.theevilreaper.tamias.setup.commands.SetupCommand;
+import net.theevilreaper.tamias.setup.dialog.DialogRegistry;
+import net.theevilreaper.tamias.setup.dialog.SetupDialogRegistry;
+import net.theevilreaper.tamias.setup.dialog.event.PlayerDeletePromptEvent;
+import net.theevilreaper.tamias.setup.dialog.event.PlayerDialogRequestEvent;
 import net.theevilreaper.tamias.setup.event.MapSetupSelectEvent;
 import net.theevilreaper.tamias.setup.inventory.MapSetupInventory;
 import net.theevilreaper.tamias.setup.listener.PlayerChatListener;
 import net.theevilreaper.tamias.setup.listener.PlayerConfigurationListener;
 import net.theevilreaper.tamias.setup.listener.PlayerDisconnectListener;
 import net.theevilreaper.tamias.setup.listener.PlayerSpawnListener;
+import net.theevilreaper.tamias.setup.listener.dialog.PlayerCustomClickEventListener;
+import net.theevilreaper.tamias.setup.listener.dialog.PlayerDeletePromptListener;
+import net.theevilreaper.tamias.setup.listener.dialog.PlayerDialogRequestListener;
 import net.theevilreaper.tamias.setup.listener.item.PlayerUseItemListener;
 import net.theevilreaper.tamias.setup.listener.entity.EntityAddToInstanceListener;
 import net.theevilreaper.tamias.setup.listener.map.SetupFinishListener;
@@ -40,21 +44,18 @@
 
 public final class TamiasSetup implements ListenerHandling {
 
-    public static final Tag<Byte> SETUP_TAG = Tag.Transient("setup");
-    public static final Tag<Boolean> DELETE_TAG = Tag.Boolean("delete").defaultValue(false);
-
     private final SetupDataService setupDataService;
-    private final FileHandler fileHandler;
     private final MapProvider mapProvider;
     private final SetupItems setupItems;
     private final MapSetupInventory mapSetupInventory;
+    private final DialogRegistry dialogRegistry;
 
     public TamiasSetup() {
-        this.fileHandler = new GsonFileHandler(GsonUtil.GSON);
-        this.mapProvider = new SetupMapProvider(Paths.get(""), this.fileHandler);
+        this.mapProvider = new SetupMapProvider(Paths.get(""));
         this.setupDataService = SetupDataService.create();
         this.setupItems = new SetupItems();
         this.mapSetupInventory = new MapSetupInventory(this.mapProvider::getEntries);
+        this.dialogRegistry = new SetupDialogRegistry();
         MinecraftServer.getSchedulerManager().buildShutdownTask(this::terminate);
     }
 
@@ -69,7 +70,7 @@ public void terminate() {
     }
 
     private void registerListener() {
-        GlobalEventHandler manager = MinecraftServer.getGlobalEventHandler();
+        GlobalEventHandler node = MinecraftServer.getGlobalEventHandler();
         Supplier<Instance> instanceSupplier = mapProvider.getActiveInstance();
         SetupMapProvider setupMapProvider = (SetupMapProvider) mapProvider;
         PlayerConsumer initialSpawnSupplier = player -> {
@@ -80,16 +81,22 @@ private void registerListener() {
             setupMapProvider.teleportToSpawn(player, true);
             setupItems.setOverViewItem(player);
         };
-        manager.addListener(PlayerDisconnectEvent.class, new PlayerDisconnectListener(setupDataService::remove));
-        manager.addListener(AsyncPlayerConfigurationEvent.class, new PlayerConfigurationListener(instanceSupplier));
-        manager.addListener(PlayerSpawnEvent.class, new PlayerSpawnListener(initialSpawnSupplier));
-        manager.addListener(AddEntityToInstanceEvent.class, new EntityAddToInstanceListener(instanceSupplier, setupItems));
-        manager.addListener(MapSetupSelectEvent.class, new MapSetupSelectListener(this.fileHandler, this.setupDataService));
-        manager.addListener(SetupFinishEvent.class, new SetupFinishListener(instanceSwitcher));
-        manager.addListener(PlayerChatEvent.class, new PlayerChatListener(this.setupDataService));
+        node.addListener(PlayerDisconnectEvent.class, new PlayerDisconnectListener(setupDataService::remove));
+        node.addListener(AsyncPlayerConfigurationEvent.class, new PlayerConfigurationListener(instanceSupplier));
+        node.addListener(PlayerSpawnEvent.class, new PlayerSpawnListener(initialSpawnSupplier));
+        node.addListener(AddEntityToInstanceEvent.class, new EntityAddToInstanceListener(instanceSupplier, setupItems));
+        node.addListener(MapSetupSelectEvent.class, new MapSetupSelectListener(this.setupDataService));
+        node.addListener(SetupFinishEvent.class, new SetupFinishListener(instanceSwitcher));
+        node.addListener(PlayerChatEvent.class, new PlayerChatListener(this.setupDataService));
 
         // Item listener
-        manager.addListener(PlayerUseItemEvent.class, new PlayerUseItemListener(this::updateMapInventory, setupDataService::get));
+        node.addListener(PlayerUseItemEvent.class, new PlayerUseItemListener(this::updateMapInventory, setupDataService::get));
+
+        //Dialogs
+        node.addListener(PlayerDeletePromptEvent.class, new PlayerDeletePromptListener(dialogRegistry));
+        node.addListener(PlayerCustomClickEvent.class, new PlayerCustomClickEventListener(this.dialogRegistry, this.setupDataService::get));
+        node.addListener(PlayerDialogRequestEvent.class, new PlayerDialogRequestListener(this.dialogRegistry));
+
     }
 
     /**

setup/src/main/java/net/theevilreaper/tamias/setup/commands/SetupCommand.java

@@ -4,10 +4,7 @@
 import net.minestom.server.command.builder.condition.Conditions;
 import net.onelitefeather.guira.SetupDataService;
 import net.theevilreaper.tamias.setup.commands.parts.SetupAreaCommand;
-import net.theevilreaper.tamias.setup.commands.parts.SetupBuildersCommand;
-import net.theevilreaper.tamias.setup.commands.parts.SetupNameCommand;
 import net.theevilreaper.tamias.setup.commands.parts.SetupPositionCommand;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * The {@link SetupCommand} is the main command for the setup process.
@@ -19,11 +16,9 @@
  */
 public final class SetupCommand extends Command {
 
-    public SetupCommand(@NotNull SetupDataService dataService) {
+    public SetupCommand(SetupDataService dataService) {
         super("setup");
         this.setCondition(Conditions::playerOnly);
-        this.addSubcommand(new SetupNameCommand(dataService::get));
-        this.addSubcommand(new SetupBuildersCommand(dataService::get));
         this.addSubcommand(new SetupPositionCommand(dataService::get));
         this.addSubcommand(new SetupAreaCommand(dataService::get));
     }

setup/src/main/java/net/theevilreaper/tamias/setup/event/dialog/package-info.java → setup/src/main/java/net/theevilreaper/tamias/setup/commands/package-info.java

@@ -1,4 +1,4 @@
 @NotNullByDefault
-package net.theevilreaper.tamias.setup.event.dialog;
+package net.theevilreaper.tamias.setup.commands;
 
 import org.jetbrains.annotations.NotNullByDefault;

setup/src/main/java/net/theevilreaper/tamias/setup/commands/parts/SetupAreaCommand.java

@@ -14,11 +14,11 @@
 import net.minestom.server.utils.Direction;
 import net.onelitefeather.guira.data.SetupData;
 import net.theevilreaper.aves.util.Components;
+import net.theevilreaper.tamias.common.map.builder.GameMapBuilder;
 import net.theevilreaper.tamias.common.util.Messages;
-import net.theevilreaper.tamias.setup.TamiasSetup;
 import net.theevilreaper.tamias.setup.data.GameData;
 import net.theevilreaper.tamias.setup.util.DirectionUtil;
-import org.jetbrains.annotations.NotNull;
+import net.theevilreaper.tamias.setup.util.SetupTags;
 
 import java.util.Optional;
 import java.util.UUID;
@@ -36,7 +36,7 @@ public class SetupAreaCommand extends Command {
     private final Function<UUID, Optional<SetupData>> setupDataFunction;
     private final ArgumentWord argumentWord;
 
-    public SetupAreaCommand(@NotNull Function<UUID, Optional<SetupData>> setupDataFunction) {
+    public SetupAreaCommand(Function<UUID, Optional<SetupData>> setupDataFunction) {
         super("area");
         this.setCondition(Conditions::playerOnly);
         this.setupDataFunction = setupDataFunction;
@@ -48,8 +48,8 @@ public SetupAreaCommand(@NotNull Function<UUID, Optional<SetupData>> setupDataFu
         this.addSyntax(this::handleStateChange, stateChange);
     }
 
-    private void handleStateChange(@NotNull CommandSender sender, @NotNull CommandContext context) {
-        if (!sender.hasTag(TamiasSetup.SETUP_TAG)) {
+    private void handleStateChange(CommandSender sender, CommandContext context) {
+        if (!sender.hasTag(SetupTags.SETUP_TAG)) {
             sender.sendMessage(SELECT_MAP_FIRST);
             return;
         }
@@ -71,8 +71,8 @@ private void handleStateChange(@NotNull CommandSender sender, @NotNull CommandCo
         }
     }
 
-    private void handlePositionSet(@NotNull CommandSender sender, @NotNull CommandContext context) {
-        if (!sender.hasTag(TamiasSetup.SETUP_TAG)) {
+    private void handlePositionSet(CommandSender sender, CommandContext context) {
+        if (!sender.hasTag(SetupTags.SETUP_TAG)) {
             sender.sendMessage(SELECT_MAP_FIRST);
             return;
         }
@@ -107,15 +107,17 @@ private void handlePositionSet(@NotNull CommandSender sender, @NotNull CommandCo
      * @param player    the player who executed the command
      * @param setupData the game data containing the map builder
      */
-    private void setLeftCorner(@NotNull Player player, @NotNull GameData setupData) {
+    private void setLeftCorner(Player player, GameData setupData) {
         Optional<Direction> directionOptional = DirectionUtil.parseDirection(player);
         if (directionOptional.isEmpty()) return;
 
         Vec vec = player.getPosition().asVec().sub(0, -1, 0);
         Direction direction = directionOptional.get();
 
-        setupData.getGameMapBuilder().areaLowerCorner(vec);
-        setupData.getGameMapBuilder().areaFacing(direction);
+        GameMapBuilder mapBuilder = (GameMapBuilder) setupData.getMapBuilder();
+
+        mapBuilder.areaLowerCorner(vec);
+        mapBuilder.areaFacing(direction);
 
         Component component = Messages.withPrefix(Component.text("Left area corner is: ", NamedTextColor.GRAY)
                 .append(Components.convertPoint(vec).style(Style.style(NamedTextColor.GOLD)))
@@ -131,10 +133,12 @@ private void setLeftCorner(@NotNull Player player, @NotNull GameData setupData)
      * @param player    the player who executed the command
      * @param setupData the game data containing the map builder
      */
-    private void setRightCorner(@NotNull Player player, @NotNull GameData setupData) {
+    private void setRightCorner(Player player, GameData setupData) {
         Vec vec = player.getPosition().asVec();
 
-        setupData.getGameMapBuilder().areaUpperCorner(vec);
+        GameMapBuilder mapBuilder = (GameMapBuilder) setupData.getMapBuilder();
+
+        mapBuilder.areaUpperCorner(vec);
         Component component = Messages.withPrefix(Component.text("Right area corner is: ", NamedTextColor.GRAY)
                 .append(Components.convertPoint(vec).style(Style.style(NamedTextColor.GOLD))));
         player.sendMessage(component);