Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-11-15 03:31:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] Start Forge 1.18+ server

Browse source
This commit is contained in:
Gravita 2023-12-14 01:19:36 +07:00
parent 967b81cc85
commit 240e36aab6
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
LauncherAPI/src/main/java/pro/gravit/launcher/api/AuthService.java
View file

@ -7,6 +7,7 @@
import java.util.UUID; import java.util.UUID;
public class AuthService { public class AuthService {
public static String projectName;
public static String username; public static String username;
public static ClientPermissions permissions = new ClientPermissions(); public static ClientPermissions permissions = new ClientPermissions();
public static UUID uuid; public static UUID uuid;

1
LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java
View file

@ -177,6 +177,7 @@ private static void realMain(String[] args) throws Throwable {
String glfwPath = ClientService.findLibrary("glfw_wayland"); String glfwPath = ClientService.findLibrary("glfw_wayland");
System.setProperty("org.lwjgl.glfw.libname", glfwPath); System.setProperty("org.lwjgl.glfw.libname", glfwPath);
} }
AuthService.projectName = Launcher.getConfig().projectName;
AuthService.username = params.playerProfile.username; AuthService.username = params.playerProfile.username;
AuthService.uuid = params.playerProfile.uuid; AuthService.uuid = params.playerProfile.uuid;
KeyService.serverRsaPublicKey = Launcher.getConfig().rsaPublicKey; KeyService.serverRsaPublicKey = Launcher.getConfig().rsaPublicKey;

5
ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java
View file

@ -27,6 +27,7 @@
import pro.gravit.utils.helper.SecurityHelper; import pro.gravit.utils.helper.SecurityHelper;
import pro.gravit.utils.launch.*; import pro.gravit.utils.launch.*;
import java.io.File;
import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType; import java.lang.invoke.MethodType;
@ -186,9 +187,11 @@ public void run(String... args) throws Throwable {
switch (config.classLoaderConfig) { switch (config.classLoaderConfig) {
case LAUNCHER: case LAUNCHER:
launch = new LegacyLaunch(); launch = new LegacyLaunch();
System.setProperty("java.class.path", String.join(File.pathSeparator, config.classpath));
break; break;
case MODULE: case MODULE:
launch = new ModuleLaunch(); launch = new ModuleLaunch();
System.setProperty("java.class.path", String.join(File.pathSeparator, config.classpath));
break; break;
default: default:
if(ServerAgent.isAgentStarted()) { if(ServerAgent.isAgentStarted()) {
@ -213,7 +216,6 @@ public void run(String... args) throws Throwable {
config.configServiceSettings.apply(); config.configServiceSettings.apply();
} }
LogHelper.info("Start Minecraft Server"); LogHelper.info("Start Minecraft Server");
LogHelper.debug("Invoke main method %s with %s", classname, launch.getClass().getName());
try { try {
if(config.compatClasses != null) { if(config.compatClasses != null) {
for (String e : config.compatClasses) { for (String e : config.compatClasses) {
@ -222,6 +224,7 @@ public void run(String... args) throws Throwable {
runMethod.invoke(classLoaderControl); runMethod.invoke(classLoaderControl);
} }
} }
LogHelper.debug("Invoke main method %s with %s", classname, launch.getClass().getName());
launch.launch(config.mainclass, config.mainmodule, Arrays.asList(real_args)); launch.launch(config.mainclass, config.mainmodule, Arrays.asList(real_args));
} catch (Throwable e) { } catch (Throwable e) {
LogHelper.error(e); LogHelper.error(e);