Merge pull request #8 from GTNewHorizons/rfg-mapping-path

Add GradleStart-injected property for obf mapping discovery
GTNewHorizons · Jan 12, 2023 · fabf2af · fabf2af
2 parents 9b42fa7 + f6102d5
commit fabf2af
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/codechicken/lib/asm/ObfMapping.java b/src/main/java/codechicken/lib/asm/ObfMapping.java
@@ -110,7 +110,7 @@ public static File[] getConfFiles() {
             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 static File confDirectoryGuess(int i, ConfigTag tag) {
                             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);