Update dependencies and improve various functionalities

- Bump Gradle to 8.5 and adjust related configs. - Upgrade from JDK 17 to JDK 21. - Replace deprecated methods with modern equivalents (`withDisplayName` -> `withCustomName`). - Refactor and simplify event handling (e.g., PlayerLoginEvent -> AsyncPlayerConfigurationEvent). - Fix minor issues with player and inventory handling. - Improve Gradle startup scripts for better compatibility. - Transition plugin handling from deprecated to current class references. - General cleanup and code modernization.
2025-12-21 17:31:48 +01:00
parent 533df11984
commit d80b7deb53
15 changed files with 97 additions and 88 deletions
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" project-jdk-name="corretto-17" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/out" />
  </component>
 </project>
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ repositories {
 }

 dependencies {
-    implementation 'com.github.waxeria:Minestom:e0427a36f3'
+    implementation 'net.minestom:minestom-snapshots:fd51c8d17a'
    implementation 'org.jctools:jctools-core:4.0.1'
    implementation 'com.google.guava:guava:31.0.1-jre'
 }
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Fri Apr 14 00:18:38 CEST 2023
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
--- a/41
+++ b/41
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
    esac
 done

-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
    fi
 else
    JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi

 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
    case $MAX_FD in #(
      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
        MAX_FD=$( ulimit -H -n ) ||
            warn "Could not query maximum file descriptor limit"
    esac
    case $MAX_FD in  #(
      '' | soft) :;; #(
      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
        ulimit -n "$MAX_FD" ||
            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
    done
 fi

-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.

 set -- \
        "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -205,6 +214,12 @@ set -- \
        org.gradle.wrapper.GradleWrapperMain \
        "$@"

+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal

 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute

 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

 :end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd

 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%

 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
--- a/src/main/java/eu/mhsl/craftattack/worldmuseum/Main.java
+++ b/src/main/java/eu/mhsl/craftattack/worldmuseum/Main.java
@@ -72,7 +72,7 @@ public class Main {
        MinecraftServer.getCommandManager().register(new GamemodeCommand());
        MinecraftServer.getCommandManager().register(new SpawnCommand());

-        globalEventHandler.addListener(PlayerLoginEvent.class, event -> {
+        globalEventHandler.addListener(AsyncPlayerConfigurationEvent.class, event -> {
            final MuseumPlayer player = (MuseumPlayer) event.getPlayer();
            final VoidWorld voidWorld = new VoidWorld();

--- a/src/main/java/eu/mhsl/craftattack/worldmuseum/inventory/WorldSelector.java
+++ b/src/main/java/eu/mhsl/craftattack/worldmuseum/inventory/WorldSelector.java
@@ -38,7 +38,7 @@ public class WorldSelector extends Inventory {

        worldIndex.forEach((integer, world) -> setItemStack(integer, world.getItem()));

-        setItemStack(8, ItemStack.of(Material.IRON_DOOR).withDisplayName(Component.text("Zurück zum Server").color(NamedTextColor.GOLD)));
+        setItemStack(8, ItemStack.of(Material.IRON_DOOR).withCustomName(Component.text("Zurück zum Server").color(NamedTextColor.GOLD)));

        addInventoryCondition((p, slot, clickType, inventoryConditionResult) -> {
            MuseumPlayer player = (MuseumPlayer) p;
--- a/src/main/java/eu/mhsl/craftattack/worldmuseum/items/Items.java
+++ b/src/main/java/eu/mhsl/craftattack/worldmuseum/items/Items.java
@@ -12,47 +12,47 @@ import java.util.function.Consumer;

 public enum Items {
    HUB(
-            ItemStack
-                    .of(Material.IRON_DOOR)
-                    .withDisplayName(
-                            Component
-                                    .text("Zurück zur Überischt")
-                                    .color(NamedTextColor.GOLD)
-                    ),
-            player -> new VoidWorld().movePlayer(player)
+        ItemStack
+            .of(Material.IRON_DOOR)
+            .withCustomName(
+                Component
+                    .text("Zurück zur Überischt")
+                    .color(NamedTextColor.GOLD)
+            ),
+        player -> new VoidWorld().movePlayer(player)
    ),

    SPAWN(
-            ItemStack
-                    .of(Material.TARGET)
-                    .withDisplayName(
-                            Component
-                                    .text("Zum Spawn")
-                                    .color(NamedTextColor.GOLD)
-                    ),
-            SpawnCommand::teleportToSpawn
+        ItemStack
+            .of(Material.TARGET)
+            .withCustomName(
+                Component
+                    .text("Zum Spawn")
+                    .color(NamedTextColor.GOLD)
+            ),
+        SpawnCommand::teleportToSpawn
    ),

    MORE_SPEED(
-            ItemStack
-                    .of(Material.FEATHER)
-                    .withDisplayName(
-                            Component
-                                    .text("Schneller fliegen")
-                                    .color(NamedTextColor.AQUA)
-                    ),
-            player -> player.updateFlyingSpeed(0.05f)
+        ItemStack
+            .of(Material.FEATHER)
+            .withCustomName(
+                Component
+                    .text("Schneller fliegen")
+                    .color(NamedTextColor.AQUA)
+            ),
+    player -> player.updateFlyingSpeed(0.05f)
    ),

    LESS_SPEED(
-            ItemStack
-                    .of(Material.ANVIL)
-                    .withDisplayName(
-                            Component
-                                    .text("Langsamer fliegen")
-                                    .color(NamedTextColor.AQUA)
-                    ),
-            player -> player.updateFlyingSpeed(-0.05f)
+        ItemStack
+            .of(Material.ANVIL)
+            .withCustomName(
+                Component
+                    .text("Langsamer fliegen")
+                    .color(NamedTextColor.AQUA)
+            ),
+    player -> player.updateFlyingSpeed(-0.05f)
    );


--- a/src/main/java/eu/mhsl/craftattack/worldmuseum/listener/BlockPlaceListener.java
+++ b/src/main/java/eu/mhsl/craftattack/worldmuseum/listener/BlockPlaceListener.java
@@ -13,11 +13,12 @@ public class BlockPlaceListener implements Consumer<PlayerBlockPlaceEvent> {

        // Fire ItemUseListener for possible missed block-clicks
        new ItemUseListener().accept(
-                new PlayerUseItemEvent(
-                        p,
-                        playerBlockPlaceEvent.getHand(),
-                        p.getInventory().getItemStack(p.getHeldSlot())
-                )
+            new PlayerUseItemEvent(
+                p,
+                playerBlockPlaceEvent.getHand(),
+                p.getInventory().getItemStack(p.getHeldSlot()),
+                0
+            )
        );

        playerBlockPlaceEvent.setCancelled(true);
--- a/src/main/java/eu/mhsl/craftattack/worldmuseum/skins/SkinCache.java
+++ b/src/main/java/eu/mhsl/craftattack/worldmuseum/skins/SkinCache.java
@@ -3,7 +3,6 @@ package eu.mhsl.craftattack.worldmuseum.skins;
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.entity.Player;
 import net.minestom.server.entity.PlayerSkin;
-import net.minestom.server.timer.ExecutionType;
 import net.minestom.server.timer.TaskSchedule;
 import java.util.HashMap;
 import java.util.Map;
@@ -15,6 +14,6 @@ public class SkinCache {
        MinecraftServer.getSchedulerManager().scheduleTask(() -> {
            p.setSkin(skins.computeIfAbsent(p.getUsername(), PlayerSkin::fromUsername));
            System.out.println("Es sind jetzt " + skins.size() + " Skins im Cache.");
-        }, TaskSchedule.immediate(), TaskSchedule.stop(), ExecutionType.ASYNC);
+        }, TaskSchedule.immediate(), TaskSchedule.stop());
    }
 }
--- a/src/main/java/eu/mhsl/craftattack/worldmuseum/util/BunggeCordComunicator.java
+++ b/src/main/java/eu/mhsl/craftattack/worldmuseum/util/BunggeCordComunicator.java
@@ -3,7 +3,7 @@ package eu.mhsl.craftattack.worldmuseum.util;
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
 import net.minestom.server.entity.Player;
-import net.minestom.server.network.packet.server.play.PluginMessagePacket;
+import net.minestom.server.network.packet.server.common.PluginMessagePacket;

 public class BunggeCordComunicator {
    private static final String bungeeTargetSelector = "bungeecord:main";
--- a/src/main/java/eu/mhsl/craftattack/worldmuseum/util/MuseumPlayer.java
+++ b/src/main/java/eu/mhsl/craftattack/worldmuseum/util/MuseumPlayer.java
@@ -6,23 +6,21 @@ import net.kyori.adventure.title.Title;
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.entity.Player;
 import net.minestom.server.event.player.PlayerMoveEvent;
+import net.minestom.server.network.player.GameProfile;
 import net.minestom.server.network.player.PlayerConnection;
 import net.minestom.server.potion.Potion;
 import net.minestom.server.potion.PotionEffect;
-import net.minestom.server.timer.ExecutionType;
 import net.minestom.server.timer.TaskSchedule;
 import net.minestom.server.utils.MathUtils;
 import org.jetbrains.annotations.NotNull;

 import java.time.Duration;
-import java.util.UUID;

 public class MuseumPlayer extends Player {
    private boolean isLoading = false;

-    public MuseumPlayer(@NotNull UUID uuid, @NotNull String username, @NotNull PlayerConnection playerConnection) {
-        super(uuid, username, playerConnection);
-
+    public MuseumPlayer(@NotNull PlayerConnection playerConnection, @NotNull GameProfile gameProfile) {
+        super(playerConnection, gameProfile);
        eventNode().addListener(PlayerMoveEvent.class, playerMoveEvent -> playerMoveEvent.setCancelled(isLoading));
    }

@@ -42,7 +40,7 @@ public class MuseumPlayer extends Player {
                return TaskSchedule.stop();
            }
            return TaskSchedule.millis(100);
-        }, ExecutionType.ASYNC);
+        });
    }

    public void stopLoading() {
--- a/src/main/java/eu/mhsl/craftattack/worldmuseum/worlds/VoidWorld.java
+++ b/src/main/java/eu/mhsl/craftattack/worldmuseum/worlds/VoidWorld.java
@@ -9,6 +9,7 @@ import net.minestom.server.event.inventory.InventoryCloseEvent;
 import net.minestom.server.event.player.PlayerMoveEvent;
 import net.minestom.server.instance.InstanceContainer;
 import net.minestom.server.instance.block.Block;
+import net.minestom.server.inventory.Inventory;
 import net.minestom.server.world.DimensionType;

 import java.util.UUID;
@@ -21,7 +22,7 @@ public class VoidWorld extends InstanceContainer implements PlayerMovable {

        eventNode().addListener(InventoryCloseEvent.class, inventoryCloseEvent -> {
            if(inventoryCloseEvent.getPlayer().getInstance() != this) return;
-            inventoryCloseEvent.setNewInventory(inventoryCloseEvent.getInventory());
+            inventoryCloseEvent.setNewInventory((Inventory) inventoryCloseEvent.getInventory());
        });

        eventNode().addListener(PlayerMoveEvent.class, playerMoveEvent -> playerMoveEvent.setCancelled(true));
--- a/src/main/java/eu/mhsl/craftattack/worldmuseum/worlds/World.java
+++ b/src/main/java/eu/mhsl/craftattack/worldmuseum/worlds/World.java
@@ -10,11 +10,10 @@ import net.minestom.server.MinecraftServer;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.entity.GameMode;
 import net.minestom.server.entity.Player;
-import net.minestom.server.instance.AnvilLoader;
 import net.minestom.server.instance.InstanceContainer;
+import net.minestom.server.instance.anvil.AnvilLoader;
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.item.Material;
-import net.minestom.server.utils.NamespaceID;
 import net.minestom.server.world.DimensionType;

 import java.io.*;
@@ -23,23 +22,18 @@ import java.util.List;
 import java.util.UUID;

 public class World extends InstanceContainer implements PlayerMovable {
-    private final static DimensionType dimension = DimensionType.builder(NamespaceID.from("mhsl.eu:worldview_by_olischma")).height(400).ambientLight(2.0f).build();
-
    private final boolean enabled;
    private final String name;
    private final Material material;
    private final Pos spawn;
    private final List<String> tags = new ArrayList<>();

-
-    static {
-        MinecraftServer.getDimensionTypeManager().addDimension(dimension);
-    }
-
    public World(File file) throws IOException {
-        super(UUID.randomUUID(), dimension, new AnvilLoader(file.getPath()));
+        super(UUID.randomUUID(), DimensionType.OVERWORLD);
        MinecraftServer.getInstanceManager().registerInstance(this);

+        setChunkLoader(new AnvilLoader(file.getPath()));
+
        File configFile = new File(file.getPath() + "/config.json");
        if (configFile.createNewFile()) {
            writeDefaultConfig(file);
@@ -102,11 +96,7 @@ public class World extends InstanceContainer implements PlayerMovable {
    }

    public ItemStack getItem() {
-        return ItemStack.builder(material).displayName(Component.text(name)).build();
-    }
-
-    public String getName() {
-        return name;
+        return ItemStack.builder(material).customName(Component.text(name)).build();
    }

    public Pos getSpawn() {