chore(codebase): migrate setup code to fix recent compile issues

Author: theEvilReaper

setup/src/main/java/net/onelitefeather/cygnus/setup/SetupExtension.java

@@ -63,11 +63,11 @@ private void registerSetupComponents() {
         manager.addListener(PlayerUseItemEvent.class, new SetupItemListener(setupData, mapSetupInventory, mapSaveFunction::saveMap, this::setMainInstance));
 
         manager.addListener(AsyncPlayerConfigurationEvent.class, event -> event.setSpawningInstance(instanceContainer));
-        manager.addListener(PlayerSpawnEvent.class, new PlayerSpawnListener(spawnPos, setupItems, instance -> this.instanceContainer.getUniqueId().equals(instance.getUniqueId())));
+        manager.addListener(PlayerSpawnEvent.class, new PlayerSpawnListener(spawnPos, setupItems, instance -> this.instanceContainer.getUuid().equals(instance.getUuid())));
 
         manager.addListener(PlayerBlockBreakEvent.class, new PageCreationListener(setupData));
-        manager.addListener(AddEntityToInstanceEvent.class, new InstanceAddListener(instanceContainer.getUniqueId(), setupItems));
-        manager.addListener(RemoveEntityFromInstanceEvent.class, new InstanceRemoveListener(instanceContainer.getUniqueId()));
+        manager.addListener(AddEntityToInstanceEvent.class, new InstanceAddListener(instanceContainer.getUuid(), setupItems));
+        manager.addListener(RemoveEntityFromInstanceEvent.class, new InstanceRemoveListener(instanceContainer.getUuid()));
         registerCancelListener(manager);
     }
 

setup/src/main/java/net/onelitefeather/cygnus/setup/command/parts/SetupBuildersCommand.java

@@ -16,7 +16,7 @@
 import java.util.List;
 
 /**
- * The command allows the set the creators of a map to a {@link de.icevizion.aves.map.BaseMap} reference.
+ * The command allows the set the creators of a map to a {@link net.theevilreaper.aves.map.BaseMap} reference.
  *
  * @author theEvilReaper
  * @version 1.0.0

setup/src/main/java/net/onelitefeather/cygnus/setup/command/parts/SetupSpawnCommand.java

@@ -1,6 +1,6 @@
 package net.onelitefeather.cygnus.setup.command.parts;
 
-import de.icevizion.aves.util.Components;
+import net.theevilreaper.aves.util.Components;
 import net.kyori.adventure.text.Component;
 import net.minestom.server.command.builder.Command;
 import net.minestom.server.coordinate.Pos;

setup/src/main/java/net/onelitefeather/cygnus/setup/functional/SaveMapFunction.java

@@ -1,6 +1,6 @@
 package net.onelitefeather.cygnus.setup.functional;
 
-import de.icevizion.aves.map.BaseMap;
+import net.theevilreaper.aves.map.BaseMap;
 import net.onelitefeather.cygnus.common.map.GameMap;
 import net.onelitefeather.cygnus.common.map.MapProvider;
 import net.onelitefeather.cygnus.setup.util.SetupData;

setup/src/main/java/net/onelitefeather/cygnus/setup/inventory/MapSetupInventory.java

@@ -1,15 +1,15 @@
 package net.onelitefeather.cygnus.setup.inventory;
 
-import de.icevizion.aves.inventory.GlobalInventoryBuilder;
-import de.icevizion.aves.inventory.InventoryLayout;
-import de.icevizion.aves.inventory.util.LayoutCalculator;
+import net.minestom.server.inventory.click.Click;
+import net.theevilreaper.aves.inventory.GlobalInventoryBuilder;
+import net.theevilreaper.aves.inventory.InventoryLayout;
+import net.theevilreaper.aves.inventory.click.ClickHolder;
+import net.theevilreaper.aves.inventory.util.LayoutCalculator;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.minestom.server.entity.Player;
 import net.minestom.server.event.EventDispatcher;
 import net.minestom.server.inventory.InventoryType;
-import net.minestom.server.inventory.click.ClickType;
-import net.minestom.server.inventory.condition.InventoryConditionResult;
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.item.Material;
 import net.onelitefeather.cygnus.common.map.MapEntry;
@@ -20,6 +20,7 @@
 
 import java.nio.file.Path;
 import java.util.List;
+import java.util.function.Consumer;
 
 /**
  * The {@link MapSetupInventory} is only used during the setup of the maps for the game.
@@ -63,8 +64,8 @@ public MapSetupInventory(@NotNull List<MapEntry> maps) {
 
             for (int i = 0; i < maps.size(); i++) {
                 var currentMap = maps.get(i);
-                dataLayout.setItem(MAP_SLOTS[i], getMapItem(currentMap.path()), (player, slot, clickType, result) ->
-                        this.handleClick(currentMap, player, slot, clickType, result));
+                dataLayout.setItem(MAP_SLOTS[i], getMapItem(currentMap.path()), (player, slot, clickType, stack, result) ->
+                        this.handleClick(currentMap, player, slot, clickType, stack, result));
             }
             return dataLayout;
         });
@@ -81,11 +82,14 @@ public MapSetupInventory(@NotNull List<MapEntry> maps) {
      * @param clickType  the type of click
      * @param result     the result of the inventory condition
      */
-    private void handleClick(@NotNull MapEntry currentMap, @NotNull Player player, int slot, @NotNull ClickType clickType, @NotNull InventoryConditionResult result) {
-        result.setCancel(true);
-        if (clickType != ClickType.LEFT_CLICK && clickType != ClickType.RIGHT_CLICK) return;
-        var mode = clickType == ClickType.LEFT_CLICK ? SetupMode.LOBBY : SetupMode.GAME;
-        EventDispatcher.callCancellable(new MapSetupSelectEvent(player, currentMap, mode), player::closeInventory);
+    private void handleClick(@NotNull MapEntry currentMap, @NotNull Player player, int slot, @NotNull Click clickType, @NotNull ItemStack stack, @NotNull Consumer<@NotNull ClickHolder> result) {
+        result.accept(ClickHolder.cancelClick());
+
+        if (clickType instanceof Click.Left || clickType instanceof Click.Right) {
+            var mode = clickType instanceof Click.Left ? SetupMode.LOBBY : SetupMode.GAME;
+            EventDispatcher.callCancellable(new MapSetupSelectEvent(player, currentMap, mode), player::closeInventory);
+
+        }
     }
 
     /**

setup/src/main/java/net/onelitefeather/cygnus/setup/listener/InstanceAddListener.java

@@ -24,7 +24,7 @@ public InstanceAddListener(@NotNull UUID mainInstanceID, @NotNull SetupItems set
     @Override
     public void accept(@NotNull AddEntityToInstanceEvent event) {
         if (!(event.getEntity() instanceof Player)) return;
-        if (event.getInstance().getUniqueId().equals(mainInstanceID)) return;
+        if (event.getInstance().getUuid().equals(mainInstanceID)) return;
         MinecraftServer.getSchedulerManager().buildTask(() -> this.setupItems.setSaveData((Player) event.getEntity()))
                 .delay(Duration.of(3, ChronoUnit.SECONDS))
                 .schedule();

setup/src/main/java/net/onelitefeather/cygnus/setup/listener/InstanceRemoveListener.java

@@ -17,7 +17,7 @@ public InstanceRemoveListener(@NotNull UUID mainInstanceID) {
 
     @Override
     public void accept(@NotNull RemoveEntityFromInstanceEvent event) {
-        if (!event.getInstance().getUniqueId().equals(mainInstanceID)) return;
+        if (!event.getInstance().getUuid().equals(mainInstanceID)) return;
 
         if (!event.getEntity().hasTag(SetupTags.SETUP_ID_TAG)) {
             event.getEntity().removeTag(SetupTags.SETUP_ID_TAG);

setup/src/main/java/net/onelitefeather/cygnus/setup/listener/PageCreationListener.java

@@ -1,6 +1,6 @@
 package net.onelitefeather.cygnus.setup.listener;
 
-import de.icevizion.aves.util.Components;
+import net.theevilreaper.aves.util.Components;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.Style;

setup/src/main/java/net/onelitefeather/cygnus/setup/listener/SetupItemListener.java

@@ -1,7 +1,7 @@
 package net.onelitefeather.cygnus.setup.listener;
 
-import de.icevizion.aves.map.BaseMap;
-import de.icevizion.aves.util.functional.PlayerConsumer;
+import net.theevilreaper.aves.map.BaseMap;
+import net.theevilreaper.aves.util.functional.PlayerConsumer;
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.event.player.PlayerUseItemEvent;
 import net.onelitefeather.cygnus.common.Tags;

setup/src/main/java/net/onelitefeather/cygnus/setup/util/SetupData.java

@@ -1,6 +1,6 @@
 package net.onelitefeather.cygnus.setup.util;
 
-import de.icevizion.aves.map.BaseMap;
+import net.theevilreaper.aves.map.BaseMap;
 import net.kyori.adventure.bossbar.BossBar;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;