mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-20 12:20:11 +00:00
Use vanilla's entrypoint for GameTest servers
This commit is contained in:
4 files changed
+22
-17
No files matched your search
+1
-1
@@ -84,7 +84,7 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService {
|
||||
protected static final LaunchType CLIENT_DATA = new LaunchType("client_data", "minecraft", "net.minecraft.client.data.Main", Dist.CLIENT, true);
|
||||
protected static final LaunchType DATA = new LaunchType("data", "minecraft", "net.minecraft.data.Main", Dist.CLIENT, true);
|
||||
protected static final LaunchType SERVER = new LaunchType("server", "minecraft", "net.minecraft.server.Main", Dist.DEDICATED_SERVER, false);
|
||||
protected static final LaunchType SERVER_GAMETEST = new LaunchType("server_gametest", "net.minecraftforge.forge", "net.minecraftforge.gametest.GameTestMain", Dist.DEDICATED_SERVER, false);
|
||||
protected static final LaunchType SERVER_GAMETEST = new LaunchType("server_gametest", "minecraft", "net.minecraft.gametest.Main", Dist.DEDICATED_SERVER, false);
|
||||
|
||||
protected void runTarget(String module, String target, final String[] arguments, final ModuleLayer layer) throws Throwable {
|
||||
var mod = layer.findModule(module).orElse(null);
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/net/minecraft/gametest/Main.java
|
||||
+++ b/net/minecraft/gametest/Main.java
|
||||
@@ -7,6 +_,8 @@
|
||||
public class Main {
|
||||
@DontObfuscate
|
||||
public static void main(String[] p_393417_) throws Exception {
|
||||
+ System.setProperty("forge.enableGameTest", "true");
|
||||
+ System.setProperty("forge.gameTestServer", "true");
|
||||
SharedConstants.tryDetectVersion();
|
||||
GameTestMainUtil.runGameTestServer(p_393417_, p_393535_ -> {});
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
--- a/net/minecraft/gametest/framework/GameTestMainUtil.java
|
||||
+++ b/net/minecraft/gametest/framework/GameTestMainUtil.java
|
||||
@@ -69,6 +_,7 @@
|
||||
|
||||
Bootstrap.bootStrap();
|
||||
Util.startTimerHackThread();
|
||||
+ net.minecraftforge.server.loading.ServerModLoader.load();
|
||||
String s = optionset.valueOf(universe);
|
||||
createOrResetDir(s);
|
||||
p_393652_.accept(s);
|
||||
@@ -1,16 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) Forge Development LLC and contributors
|
||||
* SPDX-License-Identifier: LGPL-2.1-only
|
||||
*/
|
||||
|
||||
package net.minecraftforge.gametest;
|
||||
|
||||
import net.minecraft.server.Main;
|
||||
|
||||
public class GameTestMain {
|
||||
public static void main(String[] args) {
|
||||
System.setProperty("forge.enableGameTest", "true");
|
||||
System.setProperty("forge.gameTestServer", "true");
|
||||
Main.main(args);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user