diff options
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java | 1 | ||||
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java index b30e78f2..37e4902d 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java @@ -102,6 +102,7 @@ public class ForgeUserdevProvider extends DependencyProvider { try (FileSystem fs = FileSystems.newFileSystem(new URI("jar:" + resolved.toURI()), ImmutableMap.of("create", false))) { Path configEntry = fs.getPath("config.json"); + // If we cannot find a modern config json, try the legacy/FG2-era one if (!Files.exists(configEntry)) { configEntry = fs.getPath("dev.json"); } diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java index 920d269e..9c24416c 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java @@ -94,6 +94,7 @@ public class SrgProvider extends DependencyProvider { Path srgPath = fs.getPath("joined.srg"); if (Files.exists(srgPath)) { + // FG2-era MCP uses the older SRG format, convert it on the fly try (Reader reader = Files.newBufferedReader(srgPath); Writer writer = Files.newBufferedWriter(srg)) { new TSrgWriter(writer).write(new SrgReader(reader).read()); } |