Update to Minecraft 1.21.8 (#22)

* Update several dependencies to their latest version

* Update constant usage

* Remove enforced usage of adventure

* Update aonyx bom

* Update SetupData access in the command part

* Update implementation to the new structure from Guira

* Update setup data access

* Update MapProvider import

* Migrate click handling

* Update builder integration

* Update SetupData handling

* Update component import

* Update method usage

* Update provider import

* Update key import

* Update data component import

* Update data component import

* Add dialogs for the setup

* Add listener to handle dialog inputs

* Add new tag

* Init new registry

* Fix compile issues

* Implement dialog trigger into the slots implementations and inventory

* Update used event and listeners

* Improve dialogs

* Add new method

* Register new listener

* Improve code structure

* Update author handling in the builder and map class

* Update method call

* Improve dialog part

* Update method call in the commands

* Improve click handling

* Update method call

* Improve dialog related listeners

* Add new listener

* Remove obsolete parts of the setup command

* Add a new dialog for the push input

* Add event call to open the dialog

* Update dialog handling

* Remove right click constant

* Remove debug message

* Remove tag after dialog close

* Comment out test case

* Fix test execution

---------

Co-authored-by: theEvilReaper <[email protected]>

Author: Joltras

build.gradle.kts

@@ -13,7 +13,6 @@ dependencies {
     implementation(project(":common"))
     implementation(platform(libs.mycelium.bom))
     implementation(platform(libs.aonyx.bom))
-    implementation(enforcedPlatform("net.kyori:adventure-bom:4.20.0"))
     implementation(libs.adventure)
     implementation(libs.pvp)
     implementation(libs.minestom)

common/build.gradle.kts

@@ -14,7 +14,6 @@ java {
 dependencies {
     implementation(platform(libs.mycelium.bom))
     implementation(platform(libs.aonyx.bom))
-    implementation(enforcedPlatform("net.kyori:adventure-bom:4.20.0"))
     compileOnly(libs.adventure)
     compileOnly(libs.minestom)
     compileOnly(libs.aves)

common/src/main/java/net/theevilreaper/bounce/common/ListenerHandling.java

@@ -7,9 +7,11 @@
 import net.minestom.server.event.player.PlayerBlockInteractEvent;
 import net.minestom.server.event.player.PlayerBlockPlaceEvent;
 import net.minestom.server.event.player.PlayerSwapItemEvent;
-import net.theevilreaper.aves.inventory.util.InventoryConstants;
+import net.minestom.server.event.trait.CancellableEvent;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.function.Consumer;
+
 /**
  * The interface provides a default method to register some listeners to cancel specific events.
  *
@@ -19,16 +21,18 @@
  */
 public interface ListenerHandling {
 
+    Consumer<CancellableEvent> CANCELLABLE_EVENT = event -> event.setCancelled(true);
+
     /**
      * Registers some {@link Event} listener to cancel specific default events.
      *
      * @param eventNode the event node to register the listeners
      */
     default void registerCancelListener(@NotNull EventNode<Event> eventNode) {
-        eventNode.addListener(PlayerBlockBreakEvent.class, InventoryConstants.CANCELLABLE_EVENT::accept);
-        eventNode.addListener(PlayerBlockPlaceEvent.class, InventoryConstants.CANCELLABLE_EVENT::accept);
-        eventNode.addListener(ItemDropEvent.class, InventoryConstants.CANCELLABLE_EVENT::accept);
-        eventNode.addListener(PlayerSwapItemEvent.class, InventoryConstants.CANCELLABLE_EVENT::accept);
-        eventNode.addListener(PlayerBlockInteractEvent.class, InventoryConstants.CANCELLABLE_EVENT::accept);
+        eventNode.addListener(PlayerBlockBreakEvent.class, CANCELLABLE_EVENT::accept);
+        eventNode.addListener(PlayerBlockPlaceEvent.class, CANCELLABLE_EVENT::accept);
+        eventNode.addListener(ItemDropEvent.class, CANCELLABLE_EVENT::accept);
+        eventNode.addListener(PlayerSwapItemEvent.class, CANCELLABLE_EVENT::accept);
+        eventNode.addListener(PlayerBlockInteractEvent.class, CANCELLABLE_EVENT::accept);
     }
 }

common/src/main/java/net/theevilreaper/bounce/common/map/GameMap.java

@@ -28,10 +28,11 @@ public final class GameMap extends BaseMap {
      * @param gameSpawn the spawn position during the game
      * @param pushData  the {@link PushData} which includes information about push values
      */
-    public GameMap(@NotNull String name, @NotNull Pos spawn, @NotNull Pos gameSpawn, @NotNull PushData pushData) {
-        super(name, spawn, "Team");
+    public GameMap(@NotNull String name, @NotNull Pos spawn, @NotNull Pos gameSpawn, @NotNull PushData pushData, @NotNull String... builders) {
+        super(name, spawn, builders);
         this.gameSpawn = gameSpawn;
         this.pushData = pushData;
+
     }
 
     /**

settings.gradle.kts

@@ -28,15 +28,15 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             version("shadow", "8.3.8")
-            version("bom", "1.2.4")
-            version("aonyx", "0.3.1")
-            version("pvp", "dfb8f0c342")
+            version("bom", "1.4.2")
+            version("aonyx", "0.5.1")
+            version("pvp", "56a831b41c")
 
             library("mycelium.bom", "net.onelitefeather", "mycelium-bom").versionRef("bom")
             library("aonyx.bom", "net.onelitefeather", "aonyx-bom").versionRef("aonyx")
 
             library("pvp", "com.github.TogAr2", "MinestomPvP").versionRef("pvp")
-            library("minestom", "net.minestom", "minestom-snapshots").withoutVersion()
+            library("minestom", "net.minestom", "minestom").withoutVersion()
             library("adventure", "net.kyori", "adventure-text-minimessage").withoutVersion()
             library("cyano", "net.onelitefeather", "cyano").withoutVersion()
             library("guira", "net.onelitefeather", "guira").withoutVersion()

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

@@ -5,33 +5,36 @@
 import net.minestom.server.event.EventNode;
 import net.minestom.server.event.GlobalEventHandler;
 import net.minestom.server.event.instance.AddEntityToInstanceEvent;
-import net.minestom.server.event.player.AsyncPlayerConfigurationEvent;
-import net.minestom.server.event.player.PlayerDisconnectEvent;
-import net.minestom.server.event.player.PlayerSpawnEvent;
-import net.minestom.server.event.player.PlayerUseItemEvent;
+import net.minestom.server.event.player.*;
 import net.minestom.server.instance.Instance;
 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.MapProvider;
+import net.theevilreaper.aves.map.provider.MapProvider;
 import net.theevilreaper.aves.util.functional.PlayerConsumer;
 import net.theevilreaper.bounce.common.ListenerHandling;
 import net.theevilreaper.bounce.common.util.GsonUtil;
 import net.theevilreaper.bounce.setup.command.GameModeCommand;
 import net.theevilreaper.bounce.setup.command.SetupCommand;
-import net.theevilreaper.bounce.setup.data.BounceData;
+import net.theevilreaper.bounce.setup.dialog.DialogRegistry;
+import net.theevilreaper.bounce.setup.dialog.SetupDialogRegistry;
+import net.theevilreaper.bounce.setup.dialog.event.PlayerDialogRequestEvent;
 import net.theevilreaper.bounce.setup.event.AbstractStateNotifyEvent;
 import net.theevilreaper.bounce.setup.event.map.MapSetupSelectEvent;
 import net.theevilreaper.bounce.setup.event.ground.PlayerGroundBlockSelectEvent;
 import net.theevilreaper.bounce.setup.event.SetupInventorySwitchEvent;
+import net.theevilreaper.bounce.setup.event.map.PlayerDeletePromptEvent;
 import net.theevilreaper.bounce.setup.event.push.PlayerPushBlockSelectEvent;
 import net.theevilreaper.bounce.setup.event.push.PlayerPushIndexChangeEvent;
 import net.theevilreaper.bounce.setup.inventory.InventoryService;
 import net.theevilreaper.bounce.setup.listener.PlayerConfigurationListener;
 import net.theevilreaper.bounce.setup.listener.PlayerDisconnectListener;
 import net.theevilreaper.bounce.setup.listener.PlayerItemListener;
 import net.theevilreaper.bounce.setup.listener.PlayerSpawnListener;
+import net.theevilreaper.bounce.setup.listener.dialog.PlayerCustomClickEventListener;
+import net.theevilreaper.bounce.setup.listener.dialog.PlayerDeletePromptListener;
+import net.theevilreaper.bounce.setup.listener.dialog.PlayerDialogRequestListener;
 import net.theevilreaper.bounce.setup.listener.entity.EntityAddToInstanceListener;
 import net.theevilreaper.bounce.setup.listener.ground.PlayerBlockSelectListener;
 import net.theevilreaper.bounce.setup.listener.inventory.SetupInventorySwitchListener;
@@ -53,10 +56,11 @@
 public final class BounceSetup implements ListenerHandling {
 
     private final MapProvider mapProvider;
-    private final SetupDataService<BounceData> setupDataService;
+    private final SetupDataService setupDataService;
     private final InventoryService inventoryService;
     private final SetupItems setupItems;
     private final FileHandler fileHandler;
+    private final DialogRegistry dialogRegistry;
 
     public BounceSetup() {
         Path path = Path.of("");
@@ -65,6 +69,7 @@ public BounceSetup() {
         this.inventoryService = new InventoryService(this.mapProvider::getEntries);
         this.setupItems = new SetupItems();
         this.fileHandler = new GsonFileHandler(GsonUtil.GSON);
+        this.dialogRegistry = new SetupDialogRegistry();
         MinecraftServer.getSchedulerManager().buildShutdownTask(this::onShutdown);
     }
 
@@ -97,19 +102,16 @@ private void registerListener(@NotNull EventNode<Event> node) {
             setupItems.setOverViewItem(player);
         };
 
-        node.addListener(
-                (Class<SetupFinishEvent<BounceData>>) (Class<?>) SetupFinishEvent.class,
-                new SetupFinishListener(instanceSwitcher)
-        );
-
+        node.addListener(SetupFinishEvent.class, new SetupFinishListener(instanceSwitcher));
         node.addListener(PlayerGroundBlockSelectEvent.class, new PlayerBlockSelectListener(this.setupDataService::get));
         node.addListener(SetupInventorySwitchEvent.class, new SetupInventorySwitchListener(this.inventoryService, this.setupDataService::get));
         node.addListener(GameMapBuilderStateNotifyEvent.class, new GameMapBuilderStateNotifyListener());
         node.addListener(AbstractStateNotifyEvent.PushDataStateNotifyEvent.class, new PushValueStateNotifierListener());
-
         node.addListener(PlayerPushBlockSelectEvent.class, new PlayerPushBlockSelectListener(this.setupDataService::get));
         node.addListener(PlayerPushIndexChangeEvent.class, new PlayerPushIndexChangeListener(this.setupDataService::get));
-
+        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));
         node.addListener(AddEntityToInstanceEvent.class, new EntityAddToInstanceListener(instanceSupplier, setupItems));
 
     }

setup/src/main/java/net/theevilreaper/bounce/setup/builder/GameMapBuilder.java

@@ -2,40 +2,29 @@
 
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.instance.block.Block;
+import net.theevilreaper.aves.map.BaseMapBuilder;
 import net.theevilreaper.bounce.common.map.GameMap;
 import net.theevilreaper.bounce.common.push.PushData;
 import net.theevilreaper.bounce.common.push.PushEntry;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.List;
+public final class GameMapBuilder extends BaseMapBuilder {
 
-public final class GameMapBuilder {
-
-    private final List<String> authors;
     private final PushData.Builder pushDataBuilder;
-    private String name;
-    private Pos spawn;
     private Pos gameSpawn;
 
     public GameMapBuilder() {
+        super();
         this.pushDataBuilder = PushData.builder();
         this.pushDataBuilder
                 .add(PushEntry.groundEntry(Block.GLASS, 1))
                 .add(PushEntry.pushEntry(Block.GOLD_BLOCK, 1))
                 .add(PushEntry.pushEntry(Block.DIAMOND_BLOCK, 1))
                 .add(PushEntry.pushEntry(Block.EMERALD_BLOCK, 1));
-        this.authors = new ArrayList<>();
     }
 
     public GameMapBuilder(@NotNull GameMap gameMap) {
-        this.name = gameMap.getName();
-        if (gameMap.getBuilders() != null) {
-            this.authors = new ArrayList<>(List.of(gameMap.getBuilders()));
-        } else {
-            this.authors = new ArrayList<>();
-        }
-        this.spawn = gameMap.getSpawn();
+        super(gameMap);
         this.gameSpawn = gameMap.getGameSpawn();
 
         if (gameMap.getPushData() == null) {
@@ -51,72 +40,43 @@ public GameMapBuilder(@NotNull GameMap gameMap) {
     }
 
     /**
-     * Sets the name of the map.
+     * Sets the ground block for the map.
      *
-     * @param name the name of the map
+     * @param groundBlock the block to set as the ground block
      * @return this builder instance for chaining
      */
-    public @NotNull GameMapBuilder setName(String name) {
-        this.name = name;
+    public @NotNull GameMapBuilder groundBlock(Block groundBlock) {
+        PushEntry pushEntry = this.pushDataBuilder.getPushValues().getFirst();
+        pushEntry.setBlock(groundBlock);
         return this;
     }
 
     /**
-     * Adds authors to the map.
+     * Sets the spawn position for the map.
      *
-     * @param authors the authors to add
+     * @param gameSpawn the spawn position
      * @return this builder instance for chaining
      */
-    public @NotNull GameMapBuilder addAuthors(String... authors) {
-        this.authors.addAll(List.of(authors));
+    public @NotNull GameMapBuilder gameSpawn(Pos gameSpawn) {
+        this.gameSpawn = gameSpawn;
         return this;
     }
 
     /**
-     * Sets the ground block for the map.
-     *
-     * @param groundBlock the block to set as the ground block
-     * @return this builder instance for chaining
+     * Clears all builders from the data structure.
      */
-    public @NotNull GameMapBuilder setGroundBlock(Block groundBlock) {
-        PushEntry pushEntry = this.pushDataBuilder.getPushValues().getFirst();
-        pushEntry.setBlock(groundBlock);
-        return this;
-    }
-
-    public @NotNull GameMapBuilder addAuthor(String author) {
-        if (!this.authors.contains(author)) {
-            this.authors.add(author);
-        }
-        return this;
-    }
-
-    public @NotNull GameMapBuilder setSpawn(Pos spawn) {
-        this.spawn = spawn;
-        return this;
-    }
-
-    public @NotNull GameMapBuilder setGameSpawn(Pos gameSpawn) {
-        this.gameSpawn = gameSpawn;
-        return this;
+    public void clearBuilders() {
+        this.builders.clear();
     }
 
     /**
      * Builds a new {@link GameMap} instance with the current properties.
      *
      * @return a new GameMap instance
      */
+    @Override
     public @NotNull GameMap build() {
-        return new GameMap(this.name, this.spawn, this.gameSpawn, pushDataBuilder.build());
-    }
-
-    /**
-     * Returns the name of the map.
-     *
-     * @return the name of the map
-     */
-    public String getName() {
-        return name;
+        return new GameMap(this.name, this.spawn, this.gameSpawn, pushDataBuilder.build(), this.builders.toArray(String[]::new));
     }
 
     /**
@@ -128,24 +88,6 @@ public Pos getGameSpawn() {
         return gameSpawn;
     }
 
-    /**
-     * Returns the spawn position of the map.
-     *
-     * @return the spawn position
-     */
-    public Pos getSpawn() {
-        return spawn;
-    }
-
-    /**
-     * Returns the list of authors for the map.
-     *
-     * @return the list of authors
-     */
-    public @NotNull List<String> getAuthors() {
-        return authors;
-    }
-
     /**
      * Returns the {@link PushData.Builder} instance used to build push data.
      *

setup/src/main/java/net/theevilreaper/bounce/setup/command/SetupCommand.java

@@ -3,19 +3,26 @@
 import net.minestom.server.command.builder.Command;
 import net.minestom.server.command.builder.condition.Conditions;
 import net.onelitefeather.guira.SetupDataService;
-import net.theevilreaper.bounce.setup.command.part.SetupBuildersCommand;
-import net.theevilreaper.bounce.setup.command.part.SetupNameCommand;
 import net.theevilreaper.bounce.setup.command.part.SetupPositionCommand;
-import net.theevilreaper.bounce.setup.data.BounceData;
 import org.jetbrains.annotations.NotNull;
 
+/**
+ * The {@link SetupCommand} is the root command for the setup process in the game.
+ *
+ * @author theEvilReaper
+ * @version 1.0.0
+ * @since 1.0.0
+ */
 public class SetupCommand extends Command {
 
-    public SetupCommand(@NotNull SetupDataService<BounceData> dataService) {
+    /**
+     * Creates the command to allow players to initialize different parts of the game.
+     *
+     * @param dataService the service to get the setup data
+     */
+    public SetupCommand(@NotNull 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));
     }
 }