updated to 1.21.10

.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Minigames" />
   </state>
 </component>

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="21" />
+    <bytecodeTargetLevel target="25" />
   </component>
 </project>

.idea/misc.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_25" default="true" project-jdk-name="openjdk-25" project-jdk-type="JavaSDK" />
 </project>

.idea/modules.xml

@@ -4,7 +4,6 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/Minigames.main.iml" filepath="$PROJECT_DIR$/.idea/modules/Minigames.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/Minigames.test.iml" filepath="$PROJECT_DIR$/.idea/modules/Minigames.test.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/eu.mhsl.minenet.Minigames.main.iml" filepath="$PROJECT_DIR$/.idea/modules/eu.mhsl.minenet.Minigames.main.iml" />
     </modules>
   </component>
 </project>

.idea/modules/Minigames.main.iml

@@ -10,8 +10,4 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
 </module>

build.gradle

@@ -3,7 +3,7 @@
 
 plugins {
     id 'java'
-    id "com.github.johnrengelman.shadow" version "7.1.0"
+    id "com.github.johnrengelman.shadow" version "8.1.1"
 }
 
 group 'eu.mhsl.minenet'
@@ -35,7 +35,7 @@ allprojects {
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of(25)
     }
 }
 
@@ -44,7 +44,7 @@ dependencies {
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
 
     //https://jitpack.io/#Minestom/Minestom
-    implementation 'net.minestom:minestom-snapshots:fd51c8d17a'
+    implementation 'net.minestom:minestom:2025.10.11-1.21.10'
 
     //Tools
     implementation 'de.articdive:jnoise:3.0.2'
@@ -87,5 +87,5 @@ tasks.register('copyJarToServer', Exec) {
     dependsOn shadowJar
     mustRunAfter shadowJar
 
-    commandLine 'scp', 'build/libs/Minigames-1.0-SNAPSHOT.jar', 'root@10.20.6.5:/root/minigames'
+    commandLine 'scp', 'build/libs/Minigames-1.0-SNAPSHOT.jar', '/home/lars/Documents/Minecraft/Server/Minestom/Minigames.jar'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/eu/mhsl/minenet/minigames/Main.java

@@ -3,12 +3,12 @@ package eu.mhsl.minenet.minigames;
 import eu.mhsl.minenet.minigames.api.HttpServer;
 import eu.mhsl.minenet.minigames.command.Commands;
 import eu.mhsl.minenet.minigames.handler.Listeners;
+import eu.mhsl.minenet.minigames.instance.Dimension;
 import eu.mhsl.minenet.minigames.lang.Languages;
 import eu.mhsl.minenet.minigames.server.tasks.TablistUpdateTask;
+import net.minestom.server.Auth;
 import net.minestom.server.MinecraftServer;
-import net.minestom.server.extras.bungee.BungeeCordProxy;
 import net.minestom.server.extras.lan.OpenToLAN;
-import net.minestom.server.extras.velocity.VelocityProxy;
 import net.minestom.server.timer.TaskSchedule;
 import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.ConfigurationNode;
@@ -25,7 +25,7 @@ public class Main {
     public static ConfigurationNode globalConfig;
 
     @SuppressWarnings("ResultOfMethodCallIgnored")
-    public static void main(String[] args) throws ConfigurateException {
+    static void main() throws ConfigurateException {
         //noinspection ResultOfMethodCallIgnored
         Resource.values(); // This initializes and preloads the enum and extracts the resources
         Languages.getInstance(); //Preload languages into the jvm
@@ -40,29 +40,35 @@ public class Main {
 
         logger.info("Initialize Minecraft server...");
 
-        MinecraftServer server = MinecraftServer.init();
+        MinecraftServer server = null;
+        if(serverConfig.node("open-to-lan").getBoolean()) OpenToLAN.open();
+
+        if(globalConfig.node("bungeecord", "enabled").getBoolean()) {
+            server = MinecraftServer.init(new Auth.Bungee());
+        }
+
+        if(globalConfig.node("velocity", "enabled").getBoolean()) {
+            server = MinecraftServer.init(new Auth.Velocity(Objects.requireNonNull(globalConfig.node("velocity", "secret").getString())));
+        }
+
+        if(server == null) server = MinecraftServer.init();
+
 //        MinestomPvP.init();
 
         MinecraftServer.setBrandName("mhsl.eu - minenet - credits to minestom");
         MinecraftServer.setCompressionThreshold(serverConfig.node("compression-threshold").getInt(0));
         System.setProperty("minestom.chunk-view-distance", String.valueOf(serverConfig.node("view-distance").getInt()));
+        System.setProperty("minestom.registry.unsafe-ops", "true");
 
         Commands.values();
         Listeners.values();
+        Dimension.values();
         new HttpServer();
 
         MinecraftServer.getSchedulerManager().scheduleTask(new TablistUpdateTask(), TaskSchedule.tick(20), TaskSchedule.tick(20));
 
         logger.info("Starting Minecraft server ... ");
 
-        if(serverConfig.node("open-to-lan").getBoolean()) OpenToLAN.open();
-
-        if(globalConfig.node("bungeecord", "enabled").getBoolean()) BungeeCordProxy.enable();
-
-        if(globalConfig.node("velocity", "enabled").getBoolean()) {
-            VelocityProxy.enable(Objects.requireNonNull(globalConfig.node("velocity", "secret").getString()));
-        }
-
         server.start("0.0.0.0", serverConfig.node("port").getInt(25565));
         System.gc();
 

src/main/java/eu/mhsl/minenet/minigames/command/privileged/SetMemorialCommand.java

@@ -21,7 +21,7 @@ public class SetMemorialCommand extends PrivilegedCommand {
         ArgumentString loreArgument = ArgumentType.String("lore");
 
         materialArgument.setSuggestionCallback(
-            (sender, context, suggestion) -> Material
+            (_, _, suggestion) -> Material
                 .values()
                 .stream()
                 .map(material -> new SuggestionEntry(material.name(), Component.text(material.name())))
@@ -35,7 +35,7 @@ public class SetMemorialCommand extends PrivilegedCommand {
                 .getTournament()
                 .setMemorialConfiguration(
                     new MemorialConfiguration(
-                        Material.fromNamespaceId(context.get(materialArgument)),
+                        Material.fromKey(context.get(materialArgument)),
                         context.get(titleArgument),
                         context.get(loreArgument)
                     )

src/main/java/eu/mhsl/minenet/minigames/command/privileged/SetRewardCommand.java

@@ -23,7 +23,7 @@ public class SetRewardCommand extends PrivilegedCommand {
         ArgumentStringArray amountsArgument = ArgumentType.StringArray("amount");
 
         materialArgument.setSuggestionCallback(
-            (sender, context, suggestion) -> Material
+            (_, _, suggestion) -> Material
                 .values()
                 .stream()
                 .map(material -> new SuggestionEntry(material.name(), Component.text(material.name())))
@@ -37,7 +37,7 @@ public class SetRewardCommand extends PrivilegedCommand {
                 .getTournament()
                 .setRewardConfiguration(
                     new RewardConfiguration(
-                        Material.fromNamespaceId(context.get(materialArgument)),
+                        Material.fromKey(context.get(materialArgument)),
                         Arrays.stream(context.get(amountsArgument)).map(Integer::valueOf).collect(Collectors.toList())
                     )
                 );

src/main/java/eu/mhsl/minenet/minigames/instance/Dimension.java

@@ -1,49 +1,50 @@
 package eu.mhsl.minenet.minigames.instance;
 
+import net.kyori.adventure.key.Key;
 import net.minestom.server.MinecraftServer;
-import net.minestom.server.registry.DynamicRegistry;
+import net.minestom.server.registry.RegistryKey;
-import net.minestom.server.utils.NamespaceID;
 import net.minestom.server.world.DimensionType;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Prebuilt dimensions
  */
 public enum Dimension {
     OVERWORLD(
-        NamespaceID.from("minenet:fullbright_overworld"),
+        Key.key("minenet:fullbright_overworld"),
         DimensionType
             .builder()
-            .ambientLight(2.0f)
+            .ambientLight(1.0f)
             .build()
     ),
 
     NETHER(
-        NamespaceID.from("minenet:fullbright_nether"),
+        Key.key("minenet:fullbright_nether"),
         DimensionType
             .builder()
-            .ambientLight(2.0f)
+            .ambientLight(1.0f)
             .effects("minecraft:the_nether")
             .build()
     ),
 
     THE_END(
-        NamespaceID.from("minenet:fullbright_end"),
+        Key.key("minenet:fullbright_end"),
         DimensionType
             .builder()
-            .ambientLight(2.0f)
+            .ambientLight(1.0f)
             .effects("minecraft:the_end")
             .build()
     );
 
     public final DimensionType DIMENSION;
-    public final NamespaceID namespaceID;
+    public final Key namespaceID;
-    public final DynamicRegistry.Key<DimensionType> key;
+    public final RegistryKey<@NotNull DimensionType> key;
 
-    Dimension(NamespaceID namespaceID, DimensionType dimType) {
+    Dimension(Key namespaceID, DimensionType dimType) {
         this.DIMENSION = dimType;
         this.namespaceID = namespaceID;
 
-        this.key = MinecraftServer.getDimensionTypeRegistry().register(namespaceID, this.DIMENSION);
+        this.key = MinecraftServer.getDimensionTypeRegistry().register(this.namespaceID, this.DIMENSION);
     }
 
 }

src/main/java/eu/mhsl/minenet/minigames/instance/MineNetInstance.java

@@ -7,14 +7,15 @@ import net.minestom.server.event.instance.AddEntityToInstanceEvent;
 import net.minestom.server.event.instance.RemoveEntityFromInstanceEvent;
 import net.minestom.server.instance.Instance;
 import net.minestom.server.instance.InstanceContainer;
-import net.minestom.server.registry.DynamicRegistry;
+import net.minestom.server.registry.RegistryKey;
 import net.minestom.server.timer.TaskSchedule;
 import net.minestom.server.world.DimensionType;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.UUID;
 
 public class MineNetInstance extends InstanceContainer {
-    public MineNetInstance(DynamicRegistry.Key<DimensionType> type) {
+    public MineNetInstance(RegistryKey<@NotNull DimensionType> type) {
         super(UUID.randomUUID(), type);
         MinecraftServer.getInstanceManager().registerInstance(this);
 

src/main/java/eu/mhsl/minenet/minigames/instance/game/Game.java

@@ -16,7 +16,7 @@ import net.minestom.server.event.item.ItemDropEvent;
 import net.minestom.server.event.player.PlayerBlockBreakEvent;
 import net.minestom.server.event.player.PlayerBlockPlaceEvent;
 import net.minestom.server.event.player.PlayerMoveEvent;
-import net.minestom.server.registry.DynamicRegistry;
+import net.minestom.server.registry.RegistryKey;
 import net.minestom.server.timer.ExecutionType;
 import net.minestom.server.timer.TaskSchedule;
 import net.minestom.server.world.DimensionType;
@@ -34,7 +34,7 @@ public abstract class Game extends MineNetInstance implements Spawnable {
     protected boolean isRunning = false;
     protected boolean isBeforeBeginning = true;
 
-    public Game(DynamicRegistry.Key<DimensionType> dimensionType) {
+    public Game(RegistryKey<@NotNull DimensionType> dimensionType) {
         super(dimensionType);
 
         MinecraftServer.getInstanceManager().registerInstance(this);

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/StatelessGame.java

@@ -9,11 +9,12 @@ import eu.mhsl.minenet.minigames.score.Score;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
-import net.minestom.server.registry.DynamicRegistry;
+import net.minestom.server.registry.RegistryKey;
 import net.minestom.server.timer.ExecutionType;
 import net.minestom.server.timer.Task;
 import net.minestom.server.timer.TaskSchedule;
 import net.minestom.server.world.DimensionType;
+import org.jetbrains.annotations.NotNull;
 
 import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
@@ -26,7 +27,7 @@ public class StatelessGame extends Game {
     private int timeLimit = 0;
     private int timePlayed = 0;
 
-    public StatelessGame(DynamicRegistry.Key<DimensionType> dimensionType, String gameName, Score score) {
+    public StatelessGame(RegistryKey<@NotNull DimensionType> dimensionType, String gameName, Score score) {
         super(dimensionType);
         this.score = score;
         this.name = gameName;

src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/config/GameConfigurationInventory.java

@@ -15,8 +15,7 @@ import net.minestom.server.entity.Player;
 import net.minestom.server.event.instance.AddEntityToInstanceEvent;
 import net.minestom.server.event.instance.RemoveEntityFromInstanceEvent;
 import net.minestom.server.inventory.InventoryType;
-import net.minestom.server.inventory.click.ClickType;
+import net.minestom.server.inventory.click.Click;
-import net.minestom.server.inventory.condition.InventoryConditionResult;
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.item.Material;
 import net.minestom.server.sound.SoundEvent;
@@ -34,13 +33,14 @@ public class GameConfigurationInventory extends InteractableInventory {
 
     public GameConfigurationInventory(Room room, Player p, GameFactory factory) {
         super(InventoryType.CHEST_5_ROW, factory.name().getAssembled(p));
+        System.out.println("GameConfigurationInventory");
         this.room = room;
         this.p = p;
         this.factory = factory;
 
         room.eventNode()
-            .addListener(AddEntityToInstanceEvent.class, addEntityToInstanceEvent -> MinecraftServer.getSchedulerManager().scheduleNextTick(this::updatePlayButton))
+            .addListener(AddEntityToInstanceEvent.class, _ -> MinecraftServer.getSchedulerManager().scheduleNextTick(this::updatePlayButton))
-            .addListener(RemoveEntityFromInstanceEvent.class, removeEntityFromInstanceEvent -> MinecraftServer.getSchedulerManager().scheduleNextTick(this::updatePlayButton));
+            .addListener(RemoveEntityFromInstanceEvent.class, _ -> MinecraftServer.getSchedulerManager().scheduleNextTick(this::updatePlayButton));
 
         ConfigManager config = factory.configuration();
 
@@ -53,7 +53,10 @@ public class GameConfigurationInventory extends InteractableInventory {
                 )
                 .build(),
             0,
-            itemClick -> itemClick.getPlayer().closeInventory(),
+            itemClick -> {
+                System.out.println("Booot callback ist da!");
+                itemClick.player().closeInventory();
+            },
             true
         );
 
@@ -106,8 +109,7 @@ public class GameConfigurationInventory extends InteractableInventory {
     }
 
     @Override
-    protected void onClick(Player player, int slot, ClickType clickType, InventoryConditionResult inventoryConditionResult) {
+    protected void onClick(Player player, int slot, Click clickType) {
-        inventoryConditionResult.setCancel(true);
 
         if(!this.map.containsKey(slot)) return;
 
@@ -133,7 +135,7 @@ public class GameConfigurationInventory extends InteractableInventory {
                     .lore(restrictionHandler.getWarnings(restrictionData).stream().map(translatedComponent -> translatedComponent.getAssembled(this.p)).collect(Collectors.toList()))
                     .build(),
                 8,
-                itemClick -> Game.initialize(this.factory, this.map.values().stream().toList(), itemClick.getPlayer()),
+                itemClick -> Game.initialize(this.factory, this.map.values().stream().toList(), itemClick.player()),
                 true
             );
 
@@ -155,7 +157,7 @@ public class GameConfigurationInventory extends InteractableInventory {
                         this.updatePlayButton();
                         return;
                     }
-                    itemClick.getPlayer().playSound(Sound.sound(SoundEvent.ENTITY_SILVERFISH_DEATH, Sound.Source.AMBIENT, 1f, 1f));
+                    itemClick.player().playSound(Sound.sound(SoundEvent.ENTITY_SILVERFISH_DEATH, Sound.Source.AMBIENT, 1f, 1f));
                 },
                 false
             );

src/main/java/eu/mhsl/minenet/minigames/instance/hub/inventory/HubInventory.java

@@ -19,7 +19,7 @@ public class HubInventory extends InteractableInventory {
                 .lore(TranslatedComponent.assemble("hub#create_description", p))
                 .build(),
             12,
-            itemClick -> Room.createRoom(itemClick.getPlayer()),
+            itemClick -> Room.createRoom(itemClick.player()),
             true
         );
 
@@ -30,7 +30,7 @@ public class HubInventory extends InteractableInventory {
                 .lore(TranslatedComponent.assemble("hub#join_description", p))
                 .build(),
             14,
-            itemClick -> itemClick.getPlayer().openInventory(new JoinInventory(itemClick.getPlayer()))
+            itemClick -> itemClick.player().openInventory(new JoinInventory(itemClick.player()))
         );
     }
 }

src/main/java/eu/mhsl/minenet/minigames/instance/hub/inventory/JoinInventory.java

@@ -11,8 +11,7 @@ import net.minestom.server.MinecraftServer;
 import net.minestom.server.entity.Player;
 import net.minestom.server.event.player.PlayerPacketEvent;
 import net.minestom.server.inventory.InventoryType;
-import net.minestom.server.inventory.click.ClickType;
+import net.minestom.server.inventory.click.Click;
-import net.minestom.server.inventory.condition.InventoryConditionResult;
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.item.Material;
 import net.minestom.server.network.packet.client.play.ClientNameItemPacket;
@@ -32,7 +31,7 @@ public class JoinInventory extends InteractableInventory {
                 .customName(Component.text(this.prefix))
                 .build(),
             0,
-            itemClick -> {
+            _ -> {
             }
         );
 
@@ -45,9 +44,8 @@ public class JoinInventory extends InteractableInventory {
     }
 
     @Override
-    protected void onClick(Player player, int slot, ClickType clickType, InventoryConditionResult inventoryConditionResult) {
+    protected void onClick(Player player, int slot, Click clickType) {
         if(slot != 2) return;
-        inventoryConditionResult.setCancel(true);
         player.closeInventory();
 
         this.typedText = this.formatInput(this.typedText);

src/main/java/eu/mhsl/minenet/minigames/instance/room/inventory/MinigameSelectInventory.java

@@ -33,7 +33,7 @@ public class MinigameSelectInventory extends InteractableInventory {
                     .lore(type.getDescription().addWrap().getWrappedAssembled(p))
                     .build(),
                 itemAlignment.next().get(),
-                itemClick -> this.drawGames(type)
+                _ -> this.drawGames(type)
             );
         }
 
@@ -62,7 +62,8 @@ public class MinigameSelectInventory extends InteractableInventory {
                     .lore(gameFactory.description().addWrap().getWrappedAssembled(this.p))
                     .build(),
                 offset + itemAlignment.next().get(),
-                itemClick -> itemClick.getPlayer().openInventory(new GameConfigurationInventory(this.room, itemClick.getPlayer(), gameFactory))
+                itemClick -> itemClick.player().openInventory(new GameConfigurationInventory(this.room, itemClick.player(), gameFactory)),
+                true
             );
         }
     }

src/main/java/eu/mhsl/minenet/minigames/score/tournament/Tournament.java

@@ -24,8 +24,8 @@ public class Tournament {
                 for(Player player : players) {
                     int points = (game.getScores().size() - count) + this.boost(count, game.getScores().size());
 
-                    data.computeIfPresent(player, (existingPlayer, existingPoints) -> existingPoints + points);
+                    data.computeIfPresent(player, (_, existingPoints) -> existingPoints + points);
-                    data.computeIfAbsent(player, newPlayer -> points);
+                    data.computeIfAbsent(player, _ -> points);
                 }
             }
         });
@@ -44,11 +44,11 @@ public class Tournament {
         }
 
         return new Rewards(
-            this.memorialConfiguration.memorialMaterial().namespace().value(),
+            this.memorialConfiguration.memorialMaterial().key().value(),
             this.memorialConfiguration.memorialTitle(),
             this.memorialConfiguration.memorialLore(),
             this.getGameScores().keySet().stream().map(Player::getUuid).toList(),
-            this.rewardConfiguration.item().namespace().value(),
+            this.rewardConfiguration.item().key().value(),
             itemCount
         );
     }

src/main/java/eu/mhsl/minenet/minigames/shared/inventory/InteractableInventory.java

@@ -2,38 +2,64 @@ package eu.mhsl.minenet.minigames.shared.inventory;
 
 import net.kyori.adventure.text.Component;
 import net.minestom.server.entity.Player;
+import net.minestom.server.event.inventory.InventoryPreClickEvent;
 import net.minestom.server.inventory.Inventory;
 import net.minestom.server.inventory.InventoryType;
-import net.minestom.server.inventory.click.ClickType;
+import net.minestom.server.inventory.click.Click;
-import net.minestom.server.inventory.condition.InventoryConditionResult;
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.item.Material;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.function.Consumer;
 
 public class InteractableInventory extends Inventory {
+    private final Map<Integer, ClickableItem> clickableItems = new HashMap<>();
+
+    public record ItemClick(Player player, InteractableInventory inventory, int clickedSlot, ItemStack item, Click clickType) { }
+    public record ClickableItem(ItemStack item, int slot, Consumer<ItemClick> callback, boolean closeAfterClick) { }
+
     /**
      * Defines an Inventory with direct callbacks for ItemSlots
      */
     protected InteractableInventory(@NotNull InventoryType inventoryType, @NotNull Component title) {
         super(inventoryType, title);
 
-        this.addInventoryCondition(this::onClick);
+        this.eventNode().addListener(
+            InventoryPreClickEvent.class,
+            inventoryPreClickEvent -> this.onClick(
+                inventoryPreClickEvent.getPlayer(),
+                inventoryPreClickEvent.getSlot(),
+                inventoryPreClickEvent.getClick()
+            )
+        );
+
+        this.eventNode().addListener(InventoryPreClickEvent.class, inventoryPreClickEvent -> {
+            @Nullable ClickableItem selectedItem = this.clickableItems.values().stream()
+                .filter(clickableItem -> clickableItem.slot() == inventoryPreClickEvent.getSlot())
+                .findFirst()
+                .orElse(null);
+            if(selectedItem == null) {
+                inventoryPreClickEvent.setCancelled(true);
+                return;
+            }
+            if(selectedItem.closeAfterClick()) inventoryPreClickEvent.getPlayer().closeInventory();
+            selectedItem.callback().accept(
+                new ItemClick(inventoryPreClickEvent.getPlayer(), this, inventoryPreClickEvent.getSlot(), selectedItem.item(), inventoryPreClickEvent.getClick())
+            );
+            inventoryPreClickEvent.setCancelled(true);
+        });
     }
 
     /**
      * Set Item with Callback
      */
     protected void setClickableItem(ItemStack item, int slot, Consumer<ItemClick> callback, boolean closeAfter) {
-        this.setItemStack(slot, item);
+        ClickableItem clickableItem = new ClickableItem(item, slot, callback, closeAfter);
-        this.addInventoryCondition((player, clickedSlot, clickType, inventoryConditionResult) -> {
+        this.setItemStack(clickableItem.slot(), clickableItem.item());
-            if(clickedSlot == slot) {
+        this.clickableItems.put(clickableItem.slot(), clickableItem);
-                if(closeAfter) player.closeInventory();
-                callback.accept(new ItemClick(player, this, clickedSlot, item, clickType));
-            }
-            inventoryConditionResult.setCancel(true);
-        });
     }
 
     protected void setClickableItem(ItemStack item, int slot, Consumer<ItemClick> callback) {
@@ -47,7 +73,7 @@ public class InteractableInventory extends Inventory {
         this.setClickableItem(
             item,
             slot,
-            itemClick -> {
+            _ -> {
             }
         );
     }
@@ -62,7 +88,7 @@ public class InteractableInventory extends Inventory {
     /**
      * You may want to Override this method to get more generic click events
      */
-    protected void onClick(Player player, int slot, ClickType clickType, InventoryConditionResult inventoryConditionResult) {
+    protected void onClick(Player player, int slot, Click clickType) {
 
     }
 }

src/main/java/eu/mhsl/minenet/minigames/shared/inventory/ItemClick.java

@@ -1,45 +0,0 @@
-package eu.mhsl.minenet.minigames.shared.inventory;
-
-import net.minestom.server.entity.Player;
-import net.minestom.server.inventory.Inventory;
-import net.minestom.server.inventory.click.ClickType;
-import net.minestom.server.item.ItemStack;
-
-public class ItemClick {
-    private final Player player;
-    private final InteractableInventory inventory;
-    private final int clickedSlot;
-    private final ItemStack item;
-    private final ClickType clickType;
-
-    /**
-     * Describes a click on an Item from an IntractableInventory
-     */
-    public ItemClick(Player player, InteractableInventory inventory, int clickedSlot, ItemStack item, ClickType clickType) {
-        this.player = player;
-        this.inventory = inventory;
-        this.clickedSlot = clickedSlot;
-        this.item = item;
-        this.clickType = clickType;
-    }
-
-    public Player getPlayer() {
-        return this.player;
-    }
-
-    public Inventory getInventory() {
-        return this.inventory;
-    }
-
-    public int getClickedSlot() {
-        return this.clickedSlot;
-    }
-
-    public ItemStack getItem() {
-        return this.item;
-    }
-
-    public ClickType getClickType() {
-        return this.clickType;
-    }
-}

src/main/java/eu/mhsl/minenet/minigames/util/BatchUtil.java

@@ -1,12 +1,12 @@
 package eu.mhsl.minenet.minigames.util;
 
-import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 import net.minestom.server.instance.InstanceContainer;
 import net.minestom.server.instance.batch.Batch;
 import net.minestom.server.instance.batch.ChunkBatch;
 import net.minestom.server.utils.chunk.ChunkUtils;
 
 import java.lang.reflect.Field;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
 public class BatchUtil {
@@ -16,9 +16,12 @@ public class BatchUtil {
             field.setAccessible(true);
 
             @SuppressWarnings("unchecked")
-            Long2ObjectMap<ChunkBatch> chunkBatchesMap = (Long2ObjectMap<ChunkBatch>) field.get(batch);
+            Map<Long, ChunkBatch> chunkBatchesMap = (Map<Long, ChunkBatch>) field.get(batch);
 
-            return chunkBatchesMap.keySet().toLongArray();
+            long[] out = new long[chunkBatchesMap.size()];
+            int i = 0;
+            for (Long k : chunkBatchesMap.keySet()) out[i++] = k;
+            return out;
         } catch (NoSuchFieldException | IllegalAccessException e) {
             throw new RuntimeException(e);
         }