From 70dd556db69998460883a54ad5b794e9ab73a1ce Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 1 Jul 2025 23:56:59 -0700 Subject: [PATCH] Use vanilla's entrypoint for GameTest servers --- .../fml/loading/targets/CommonLaunchHandler.java | 2 +- .../net/minecraft/gametest/Main.java.patch | 11 +++++++++++ .../framework/GameTestMainUtil.java.patch | 10 ++++++++++ .../minecraftforge/gametest/GameTestMain.java | 16 ---------------- 4 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 patches/minecraft/net/minecraft/gametest/Main.java.patch create mode 100644 patches/minecraft/net/minecraft/gametest/framework/GameTestMainUtil.java.patch delete mode 100644 src/main/java/net/minecraftforge/gametest/GameTestMain.java diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonLaunchHandler.java index 7f29a5ab3e..37f7bb27e9 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonLaunchHandler.java @@ -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); diff --git a/patches/minecraft/net/minecraft/gametest/Main.java.patch b/patches/minecraft/net/minecraft/gametest/Main.java.patch new file mode 100644 index 0000000000..9be32b9872 --- /dev/null +++ b/patches/minecraft/net/minecraft/gametest/Main.java.patch @@ -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_ -> {}); + } diff --git a/patches/minecraft/net/minecraft/gametest/framework/GameTestMainUtil.java.patch b/patches/minecraft/net/minecraft/gametest/framework/GameTestMainUtil.java.patch new file mode 100644 index 0000000000..257439f08b --- /dev/null +++ b/patches/minecraft/net/minecraft/gametest/framework/GameTestMainUtil.java.patch @@ -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); diff --git a/src/main/java/net/minecraftforge/gametest/GameTestMain.java b/src/main/java/net/minecraftforge/gametest/GameTestMain.java deleted file mode 100644 index 2c7d5604ed..0000000000 --- a/src/main/java/net/minecraftforge/gametest/GameTestMain.java +++ /dev/null @@ -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); - } -}