diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7e14f31465..2491a4d481 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -61,7 +61,7 @@ sponge = "9.0.0" velocity = "3.4.0-SNAPSHOT" waterdogpe = "1.2.4" nukkitX = "1.0-SNAPSHOT" -minestom = "2025.10.31-1.21.10" +minestom = "2025.12.20-1.21.11" minestomExtensions = "1.2.0" spigot = "1.8.8-R0.1-SNAPSHOT" bungeecord = "1.21-R0.5-SNAPSHOT" diff --git a/modules/bridge/impl/src/main/java/eu/cloudnetservice/modules/bridge/impl/platform/minestom/MinestomBridgeExtension.java b/modules/bridge/impl/src/main/java/eu/cloudnetservice/modules/bridge/impl/platform/minestom/MinestomBridgeExtension.java index c1fcad1c7f..c6ba3f9525 100644 --- a/modules/bridge/impl/src/main/java/eu/cloudnetservice/modules/bridge/impl/platform/minestom/MinestomBridgeExtension.java +++ b/modules/bridge/impl/src/main/java/eu/cloudnetservice/modules/bridge/impl/platform/minestom/MinestomBridgeExtension.java @@ -25,12 +25,7 @@ import jakarta.inject.Inject; import jakarta.inject.Singleton; import lombok.NonNull; -import net.kyori.adventure.text.logger.slf4j.ComponentLogger; -import net.minestom.server.extras.MojangAuth; -import net.minestom.server.extras.bungee.BungeeCordProxy; -import net.minestom.server.extras.velocity.VelocityProxy; import net.minestom.server.timer.SchedulerManager; -import org.slf4j.Logger; @Singleton @PlatformPlugin( @@ -46,7 +41,6 @@ repository = @Repository(id = "Central", url = "https://repo1.maven.org/maven2/"))) public final class MinestomBridgeExtension implements PlatformEntrypoint { - private final Logger logger; private final ModuleHelper moduleHelper; private final ServiceRegistry serviceRegistry; private final SchedulerManager schedulerManager; @@ -54,14 +48,12 @@ public final class MinestomBridgeExtension implements PlatformEntrypoint { @Inject public MinestomBridgeExtension( - @NonNull ComponentLogger logger, @NonNull ModuleHelper moduleHelper, @NonNull ServiceRegistry serviceRegistry, @NonNull SchedulerManager schedulerManager, @NonNull MinestomBridgeManagement bridgeManagement, @NonNull MinestomPlayerManagementListener playerListener ) { - this.logger = logger; this.moduleHelper = moduleHelper; this.serviceRegistry = serviceRegistry; this.schedulerManager = schedulerManager; @@ -74,17 +66,6 @@ public MinestomBridgeExtension( public void onLoad() { this.bridgeManagement.registerServices(this.serviceRegistry); this.schedulerManager.scheduleNextTick(this.bridgeManagement::postInit); - - // force initialize the bungeecord proxy forwarding - if (!VelocityProxy.isEnabled()) { - BungeeCordProxy.enable(); - } - - // using bungeecord and mojang auth will not work, we can't do anything about it. Just send a warning - if (!VelocityProxy.isEnabled() && MojangAuth.isEnabled()) { - this.logger.warn( - "Be aware that using BungeeCord player info forwarding in combination with Mojang authentication will not work!"); - } } @Override diff --git a/modules/signs/impl/src/main/java/eu/cloudnetservice/modules/signs/impl/platform/minestom/MinestomPlatformSign.java b/modules/signs/impl/src/main/java/eu/cloudnetservice/modules/signs/impl/platform/minestom/MinestomPlatformSign.java index e788645d82..3bce5edee3 100644 --- a/modules/signs/impl/src/main/java/eu/cloudnetservice/modules/signs/impl/platform/minestom/MinestomPlatformSign.java +++ b/modules/signs/impl/src/main/java/eu/cloudnetservice/modules/signs/impl/platform/minestom/MinestomPlatformSign.java @@ -106,7 +106,7 @@ public void updateSign(@NonNull SignLayout layout) { textCompound.put("color", serializedColor); // set the sign lines - they are provided as legacy text components and need to be converted to JSON - var linesCompound = ListBinaryTag.builder(); + var linesCompound = ListBinaryTag.heterogeneousListBinaryTag(); this.changeSignLines(layout, (_, line) -> linesCompound.add(line)); textCompound.put("messages", linesCompound.build());