updated dependencies and updated all usages accordingly, replaced deprecated methods, and updated project to JDK 25
This commit is contained in:
@@ -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(String[] args) throws ConfigurateException {
|
||||
//noinspection ResultOfMethodCallIgnored
|
||||
Resource.values(); // This initializes and preloads the enum and extracts the resources
|
||||
Languages.getInstance(); //Preload languages into the jvm
|
||||
@@ -38,14 +38,31 @@ public class Main {
|
||||
|
||||
ConfigurationNode serverConfig = globalConfig.node("server");
|
||||
|
||||
// muss vor MinecraftServer.init() gesetzt werden: ServerFlag liest die Properties statisch beim Klassenladen;
|
||||
// bei fehlendem/ungueltigem Config-Wert den Minestom-Default behalten (0 wuerde keine Chunks senden)
|
||||
int viewDistance = serverConfig.node("view-distance").getInt(0);
|
||||
if(viewDistance > 0) {
|
||||
System.setProperty("minestom.chunk-view-distance", String.valueOf(viewDistance));
|
||||
}
|
||||
|
||||
logger.info("Initialize Minecraft server...");
|
||||
|
||||
MinecraftServer server = MinecraftServer.init();
|
||||
Auth auth = new Auth.Offline();
|
||||
if(globalConfig.node("bungeecord", "enabled").getBoolean()) {
|
||||
auth = new Auth.Bungee();
|
||||
} else if(globalConfig.node("velocity", "enabled").getBoolean()) {
|
||||
auth = new Auth.Velocity(Objects.requireNonNull(globalConfig.node("velocity", "secret").getString()));
|
||||
}
|
||||
|
||||
MinecraftServer server = MinecraftServer.init(auth);
|
||||
// MinestomPvP.init();
|
||||
|
||||
// Dimensionen muessen vor server.start() registriert werden:
|
||||
// seit Minestom 26.x sind die dynamischen Registries nach dem Start eingefroren
|
||||
Dimension.values();
|
||||
|
||||
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()));
|
||||
|
||||
Commands.values();
|
||||
Listeners.values();
|
||||
@@ -57,12 +74,6 @@ public class Main {
|
||||
|
||||
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();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user