From dcef406df8ec17ad61810c7a371d9afb09192e9a Mon Sep 17 00:00:00 2001 From: matyrobbrt <65940752+Matyrobbrt@users.noreply.github.com> Date: Tue, 18 Apr 2023 18:46:04 +0300 Subject: [PATCH] [1.19.4] Fix FMLOnly (#9415) --- .../fmlonlyclient/ClientModLoader.java | 2 +- .../fmlonlyserver/ServerModLoader.java | 56 +++++++++++++++++++ .../src/main/resources/META-INF/coremods.json | 3 +- .../resources/coremods/load_fml_client.js | 7 +-- .../resources/coremods/load_fml_server.js | 35 ++++++++++++ 5 files changed, 96 insertions(+), 7 deletions(-) create mode 100644 fmlonly/src/main/java/net/minecraftforge/fmlonlyserver/ServerModLoader.java create mode 100644 fmlonly/src/main/resources/coremods/load_fml_server.js diff --git a/fmlonly/src/main/java/net/minecraftforge/fmlonlyclient/ClientModLoader.java b/fmlonly/src/main/java/net/minecraftforge/fmlonlyclient/ClientModLoader.java index 3d733aa63d..0cdc872f48 100644 --- a/fmlonly/src/main/java/net/minecraftforge/fmlonlyclient/ClientModLoader.java +++ b/fmlonly/src/main/java/net/minecraftforge/fmlonlyclient/ClientModLoader.java @@ -52,7 +52,7 @@ public class ClientModLoader } } } - public static void begin(final Minecraft minecraft, final PackRepository defaultResourcePacks, final ReloadableResourceManager mcResourceManager, ClientPackSource metadataSerializer) + public static void begin(final Minecraft minecraft, final PackRepository defaultResourcePacks, final ReloadableResourceManager mcResourceManager) { // force log4j to shutdown logging in a shutdown hook. This is because we disable default shutdown hook so the server properly logs it's shutdown Runtime.getRuntime().addShutdownHook(new Thread(LogManager::shutdown)); diff --git a/fmlonly/src/main/java/net/minecraftforge/fmlonlyserver/ServerModLoader.java b/fmlonly/src/main/java/net/minecraftforge/fmlonlyserver/ServerModLoader.java new file mode 100644 index 0000000000..5c4d0648aa --- /dev/null +++ b/fmlonly/src/main/java/net/minecraftforge/fmlonlyserver/ServerModLoader.java @@ -0,0 +1,56 @@ +/* + * Minecraft Forge - Forge Development LLC + * SPDX-License-Identifier: LGPL-2.1-only + */ + +package net.minecraftforge.fmlonlyserver; + +import joptsimple.OptionParser; +import net.minecraftforge.fml.LoadingFailedException; +import net.minecraftforge.fml.ModLoader; +import net.minecraftforge.fml.ModLoadingWarning; +import net.minecraftforge.fml.ModWorkManager; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.io.File; +import java.util.List; + +import static net.minecraftforge.fml.Logging.LOADING; + +public class ServerModLoader +{ + private static final Logger LOGGER = LogManager.getLogger(); + private static boolean hasErrors = false; + + public static void addOptions(OptionParser parser) + { + // We consume this argument as we use it in the launcher and the client side. + parser.accepts("gameDir").withRequiredArg().ofType(File.class).defaultsTo(new File(".")); + } + + public static void load() + { + try + { + ModLoader.get().gatherAndInitializeMods(ModWorkManager.syncExecutor(), ModWorkManager.parallelExecutor(), () -> {}); + ModLoader.get().loadMods(ModWorkManager.syncExecutor(), ModWorkManager.parallelExecutor(), () -> {}); + ModLoader.get().finishMods(ModWorkManager.syncExecutor(), ModWorkManager.parallelExecutor(), () -> {}); + } catch (LoadingFailedException error) + { + ServerModLoader.hasErrors = true; + throw error; + } + List warnings = ModLoader.get().getWarnings(); + if (!warnings.isEmpty()) + { + LOGGER.warn(LOADING, "Mods loaded with {} warnings", warnings.size()); + warnings.forEach(warning -> LOGGER.warn(LOADING, warning.formatToString())); + } + } + + public static boolean hasErrors() + { + return ServerModLoader.hasErrors; + } +} diff --git a/fmlonly/src/main/resources/META-INF/coremods.json b/fmlonly/src/main/resources/META-INF/coremods.json index e0343aa992..c970162923 100644 --- a/fmlonly/src/main/resources/META-INF/coremods.json +++ b/fmlonly/src/main/resources/META-INF/coremods.json @@ -1,3 +1,4 @@ { - "load_fml_client": "coremods/load_fml_client.js" + "load_fml_client": "coremods/load_fml_client.js", + "load_fml_server": "coremods/load_fml_server.js" } \ No newline at end of file diff --git a/fmlonly/src/main/resources/coremods/load_fml_client.js b/fmlonly/src/main/resources/coremods/load_fml_client.js index 4f807a39b1..8f4ba409c4 100644 --- a/fmlonly/src/main/resources/coremods/load_fml_client.js +++ b/fmlonly/src/main/resources/coremods/load_fml_client.js @@ -15,16 +15,13 @@ function initializeCoreMod() { var meth = ASMAPI.getMethodNode(); var resourcePackRepository = ASMAPI.mapField("f_91038_") var resourceManager = ASMAPI.mapField("f_91036_") - var clientPackSource = ASMAPI.mapField("f_91037_") - + meth.visitVarInsn(Opcodes.ALOAD, 0); meth.visitVarInsn(Opcodes.ALOAD, 0); meth.visitFieldInsn(Opcodes.GETFIELD, "net/minecraft/client/Minecraft", resourcePackRepository, "Lnet/minecraft/server/packs/repository/PackRepository;"); meth.visitVarInsn(Opcodes.ALOAD, 0); meth.visitFieldInsn(Opcodes.GETFIELD, "net/minecraft/client/Minecraft", resourceManager, "Lnet/minecraft/server/packs/resources/ReloadableResourceManager;"); - meth.visitVarInsn(Opcodes.ALOAD, 0); - meth.visitFieldInsn(Opcodes.GETFIELD, "net/minecraft/client/Minecraft", clientPackSource, "Lnet/minecraft/client/resources/ClientPackSource;"); - meth.visitMethodInsn(Opcodes.INVOKESTATIC, "net/minecraftforge/fmlonlyclient/ClientModLoader", "begin", "(Lnet/minecraft/client/Minecraft;Lnet/minecraft/server/packs/repository/PackRepository;Lnet/minecraft/server/packs/resources/ReloadableResourceManager;Lnet/minecraft/client/resources/ClientPackSource;)V", false) + meth.visitMethodInsn(Opcodes.INVOKESTATIC, "net/minecraftforge/fmlonlyclient/ClientModLoader", "begin", "(Lnet/minecraft/client/Minecraft;Lnet/minecraft/server/packs/repository/PackRepository;Lnet/minecraft/server/packs/resources/ReloadableResourceManager;)V", false) for (var i=0; i' && ain.desc == '()V') { + // Inject after the STORE + methodNode.instructions.insert(methodNode.instructions.get(i + 1), methOptions.instructions); + } else if (ain.getOpcode() == Opcodes.INVOKESTATIC && ain.owner == 'net/minecraft/Util' && ain.name == ASMAPI.mapMethod('m_137584_') /* startTimerHackThread */ && ain.desc == '()V') { + methodNode.instructions.insert(ain, meth.instructions); + break; // By this point we've already reached the first injection point so break + } + } + return methodNode; + } + }, + } +}