From 91d4a2dac35c049189a3d0608898ae0c3085a73d Mon Sep 17 00:00:00 2001 From: Lixfel Date: Wed, 15 Jan 2025 10:01:23 +0100 Subject: [PATCH] Changes for new Server --- VelocityCore/src/de/steamwar/velocitycore/Node.java | 6 +++--- .../src/de/steamwar/velocitycore/ServerStarter.java | 6 +++--- .../src/de/steamwar/velocitycore/ServerVersion.java | 7 +++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/VelocityCore/src/de/steamwar/velocitycore/Node.java b/VelocityCore/src/de/steamwar/velocitycore/Node.java index 23cf808a..9c717886 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/Node.java +++ b/VelocityCore/src/de/steamwar/velocitycore/Node.java @@ -97,9 +97,9 @@ public abstract class Node { protected void constructServerstart(File directory, List cmd, String serverJar, String worldDir, String levelName, int port, String... dParams) { if (JAVA_8.contains(serverJar)) - cmd.add("/usr/lib/jvm/java-8-openj9-amd64/bin/java"); + cmd.add("/usr/lib/jvm/openj9-8/bin/java"); else - cmd.add("/usr/lib/jvm/java-21-openj9-amd64/bin/java"); + cmd.add("/usr/lib/jvm/openj9-21/bin/java"); for(String param : dParams){ cmd.add("-D" + param); @@ -113,7 +113,7 @@ public abstract class Node { cmd.add("-XX:-CRIUSecProvider"); } cmd.add("-jar"); - cmd.add("/binarys/" + serverJar); + cmd.add("/jars/" + serverJar); cmd.add("--log-strip-color"); cmd.add("--world-dir"); cmd.add(worldDir); diff --git a/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java b/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java index 0fbdf696..ce3b5240 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java +++ b/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java @@ -49,10 +49,10 @@ public class ServerStarter { private static final String USER_HOME = System.getProperty("user.home") + "/"; private static final String EVENT_PATH = USER_HOME + "event/"; public static final String TEMP_WORLD_PATH = USER_HOME + "arenaserver/"; - public static final String TUTORIAL_PATH = USER_HOME + "tutorials/"; - public static final String WORLDS_BASE_PATH = USER_HOME + "userworlds"; - public static final String BUILDER_BASE_PATH = USER_HOME + "builder"; + public static final String TUTORIAL_PATH = "/worlds/tutorials/"; + public static final String WORLDS_BASE_PATH = "/worlds/userworlds"; + public static final String BUILDER_BASE_PATH = "/worlds/builder"; private File directory = null; private String worldDir = null; diff --git a/VelocityCore/src/de/steamwar/velocitycore/ServerVersion.java b/VelocityCore/src/de/steamwar/velocitycore/ServerVersion.java index fd505e77..093933bc 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/ServerVersion.java +++ b/VelocityCore/src/de/steamwar/velocitycore/ServerVersion.java @@ -41,11 +41,10 @@ public enum ServerVersion { PAPER_8("paper-1.8.8.jar", 8, ProtocolVersion.MINECRAFT_1_8), PAPER_10("paper-1.10.2.jar", 10, ProtocolVersion.MINECRAFT_1_10), PAPER_12("paper-1.12.2.jar", 12, ProtocolVersion.MINECRAFT_1_12_2), - PAPER_15("paper-1.15.2.jar", 15, ProtocolVersion.MINECRAFT_1_15_2), PAPER_18("paper-1.18.2.jar", 15, ProtocolVersion.MINECRAFT_1_18_2), PAPER_19("paper-1.19.3.jar", 19, ProtocolVersion.MINECRAFT_1_19_3), PAPER_20("paper-1.20.1.jar", 20, ProtocolVersion.MINECRAFT_1_20), - PAPER_21("paper-1.21.jar", 21, ProtocolVersion.MINECRAFT_1_21_2); + PAPER_21("paper-1.21.3.jar", 21, ProtocolVersion.MINECRAFT_1_21_2); private static final Map chatMap = new HashMap<>(); @@ -66,7 +65,7 @@ public enum ServerVersion { chatMap.put("mwg", ServerVersion.PAPER_20); chatMap.put("miniwargear", ServerVersion.PAPER_20); - chatMap.put("19", ServerVersion.PAPER_19); + /*chatMap.put("19", ServerVersion.PAPER_19); chatMap.put("1.19", ServerVersion.PAPER_19); chatMap.put("1.19.2", ServerVersion.PAPER_19); @@ -76,7 +75,7 @@ public enum ServerVersion { chatMap.put("12", ServerVersion.SPIGOT_12); chatMap.put("1.12", ServerVersion.SPIGOT_12); - chatMap.put("1.12.2", ServerVersion.SPIGOT_12); + chatMap.put("1.12.2", ServerVersion.SPIGOT_12);*/ } public static ServerVersion get(String chat) {