From 48c39617c5f16335da6df2584247c6add75ebdcd Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 24 Oct 2023 11:22:38 +0800 Subject: [PATCH] Support newer versions of MinecraftForge 1.20.2. (#164) * Support newer versions of MinecraftForge 1.20.2. * Add directly to settings.getEnvironmentVariables() --- .../loom/configuration/providers/forge/ForgeRunTemplate.java | 3 +++ .../providers/forge/MinecraftPatchedProvider.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeRunTemplate.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeRunTemplate.java index 4b95c712..cf068cbf 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeRunTemplate.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeRunTemplate.java @@ -62,6 +62,9 @@ public record ForgeRunTemplate( String resolved = value.resolve(configValueResolver); settings.getEnvironmentVariables().putIfAbsent(key, resolved); }); + + // Add MOD_CLASSES, this is something that ForgeGradle does + settings.getEnvironmentVariables().computeIfAbsent("MOD_CLASSES", $ -> ConfigValue.of("{source_roots}").resolve(configValueResolver)); } public static ForgeRunTemplate fromJson(JsonObject json) { diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java index 02cc5803..98d3fa65 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java @@ -143,7 +143,7 @@ public class MinecraftPatchedProvider { minecraftPatchedSrgJar = forgeWorkingDir.resolve("minecraft-" + type.id + "-srg-patched.jar"); minecraftPatchedSrgAtJar = forgeWorkingDir.resolve("minecraft-" + type.id + "-srg-at-patched.jar"); minecraftPatchedJar = forgeWorkingDir.resolve("minecraft-" + type.id + "-patched.jar"); - minecraftClientExtra = forgeWorkingDir.resolve("forge-client-extra.jar"); + minecraftClientExtra = forgeWorkingDir.resolve("client-extra.jar"); } private void cleanAllCache() throws IOException {