From 39d95d29bb9c6708665a176bff4a747609734bcd Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Tue, 24 May 2022 20:42:38 +0300 Subject: [PATCH] Update Unprotect to 1.2.0 to fix hot swap issues --- .../loom/task/launch/GenerateDLIConfigTask.java | 11 +++++++++++ src/main/java/net/fabricmc/loom/util/Constants.java | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java b/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java index 51f66a1a..147d122a 100644 --- a/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java +++ b/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java @@ -42,6 +42,7 @@ import org.gradle.api.tasks.TaskAction; import net.fabricmc.loom.configuration.launch.LaunchProviderSettings; import net.fabricmc.loom.task.AbstractLoomTask; +import net.fabricmc.loom.util.Constants; import net.fabricmc.loom.util.PropertyUtil; public abstract class GenerateDLIConfigTask extends AbstractLoomTask { @@ -73,9 +74,19 @@ public abstract class GenerateDLIConfigTask extends AbstractLoomTask { } if (getExtension().isForge()) { + // Find the mapping files for Unprotect to use for figuring out + // which classes are from Minecraft. + String unprotectMappings = getProject().getConfigurations() + .getByName(Constants.Configurations.MAPPINGS_FINAL) + .resolve() + .stream() + .map(File::getAbsolutePath) + .collect(Collectors.joining(File.pathSeparator)); + launchConfig // Should match YarnNamingService.PATH_TO_MAPPINGS in forge-runtime .property("fabric.yarnWithSrg.path", getExtension().getMappingsProvider().tinyMappingsWithSrg.toAbsolutePath().toString()) + .property("unprotect.mappings", unprotectMappings) .argument("data", "--all") .argument("data", "--mod") diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java index b36089a4..f4987b9a 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -144,7 +144,7 @@ public class Constants { public static final String FORGE_RUNTIME = "1.1.3"; public static final String ACCESS_TRANSFORMERS = "3.0.1"; public static final String ACCESS_TRANSFORMERS_NEW = "8.0.5"; - public static final String UNPROTECT = "1.0.0"; + public static final String UNPROTECT = "1.2.0"; private Versions() { }