From f6102d56ec78e69efcbf434b83a6b904a31e46ea Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Wed, 11 Jan 2023 21:05:45 +0000 Subject: [PATCH] Add GradleStart-injected property for obf mapping discovery (for RFG compatibility) --- src/main/java/codechicken/lib/asm/ObfMapping.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/codechicken/lib/asm/ObfMapping.java b/src/main/java/codechicken/lib/asm/ObfMapping.java index 39d1167..d7fea04 100644 --- a/src/main/java/codechicken/lib/asm/ObfMapping.java +++ b/src/main/java/codechicken/lib/asm/ObfMapping.java @@ -110,7 +110,7 @@ public class ObfMapping { throw new RuntimeException("Failed to select mappings directory, set it manually in the config"); } - private static final int DIR_GUESSES = 5; + private static final int DIR_GUESSES = 6; private static final int DIR_ASKS = 3; public static File confDirectoryGuess(int i, ConfigTag tag) { @@ -132,6 +132,9 @@ public class ObfMapping { System.getProperty("user.home"), ".gradle/caches/minecraft/net/minecraftforge/forge/" + FMLInjectionData.data()[4] + "-" + ForgeVersion.getVersion() + "-" + FMLInjectionData.data()[4] + "/unpacked/conf"); + case 5: + final String gradleCsvDir = System.getProperty("net.minecraftforge.gradle.GradleStart.csvDir"); + return gradleCsvDir != null ? new File(gradleCsvDir) : null; default: JFileChooser fc = new JFileChooser(mcDir); fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);