Flip a few `if`s so the modern code path comes before the legacy one

3 files changed, 18 insertions, 18 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 37e4902d..97a69127 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
@@ -103,7 +103,7 @@ public class ForgeUserdevProvider extends DependencyProvider {
 				Path configEntry = fs.getPath("config.json");
 
 				// If we cannot find a modern config json, try the legacy/FG2-era one
-				if (!Files.exists(configEntry)) {
+				if (Files.notExists(configEntry)) {
 					configEntry = fs.getPath("dev.json");
 				}
 
@@ -117,7 +117,11 @@ public class ForgeUserdevProvider extends DependencyProvider {
 
 		isLegacyForge = !json.has("mcp");
 
-		if (isLegacyForge) {
+		if (!isLegacyForge) {
+			addDependency(json.get("mcp").getAsString(), Constants.Configurations.MCP_CONFIG);
+			addDependency(json.get("mcp").getAsString(), Constants.Configurations.SRG);
+			addDependency(json.get("universal").getAsString(), Constants.Configurations.FORGE_UNIVERSAL);
+		} else {
 			Map<String, String> mcpDep = Map.of(
 					"group", "de.oceanlabs.mcp",
 					"name", "mcp",
@@ -128,10 +132,6 @@ public class ForgeUserdevProvider extends DependencyProvider {
 			addDependency(mcpDep, Constants.Configurations.MCP_CONFIG);
 			addDependency(mcpDep, Constants.Configurations.SRG);
 			addDependency(dependency.getDepString() + ":universal", Constants.Configurations.FORGE_UNIVERSAL);
-		} else {
-			addDependency(json.get("mcp").getAsString(), Constants.Configurations.MCP_CONFIG);
-			addDependency(json.get("mcp").getAsString(), Constants.Configurations.SRG);
-			addDependency(json.get("universal").getAsString(), Constants.Configurations.FORGE_UNIVERSAL);
 		}
 
 		for (JsonElement lib : json.get("libraries").getAsJsonArray()) {
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/PatchProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/PatchProvider.java
index ca55e8d7..bfd36d93 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/PatchProvider.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/PatchProvider.java
@@ -75,16 +75,16 @@ public class PatchProvider extends DependencyProvider {
 		if (Files.notExists(clientPatches) || Files.notExists(serverPatches) || isRefreshDeps()) {
 			getProject().getLogger().info(":extracting forge patches");
 
-			Path installerJar = getExtension().isLegacyForge()
-					? getExtension().getForgeUniversalProvider().getForge().toPath()
-					: dependency.resolveFile().orElseThrow(() -> new RuntimeException("Could not resolve Forge installer")).toPath();
+			Path installerJar = getExtension().isModernForge()
+					? dependency.resolveFile().orElseThrow(() -> new RuntimeException("Could not resolve Forge installer")).toPath()
+					: getExtension().getForgeUniversalProvider().getForge().toPath();
 
 			try (FileSystem fs = FileSystems.newFileSystem(new URI("jar:" + installerJar.toUri()), ImmutableMap.of("create", false))) {
-				if (getExtension().isLegacyForge()) {
-					splitAndConvertLegacyPatches(fs.getPath("binpatches.pack.lzma"));
-				} else {
+				if (getExtension().isModernForge()) {
 					Files.copy(fs.getPath("data", "client.lzma"), clientPatches, StandardCopyOption.REPLACE_EXISTING);
 					Files.copy(fs.getPath("data", "server.lzma"), serverPatches, StandardCopyOption.REPLACE_EXISTING);
+				} else {
+					splitAndConvertLegacyPatches(fs.getPath("binpatches.pack.lzma"));
 				}
 			}
 		}
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java
index 51cc4ef4..3be857bd 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java
@@ -152,10 +152,10 @@ public class MappingsProviderImpl extends DependencyProvider implements Mappings
 		}
 
 		if (getExtension().isForge()) {
-			if (getExtension().isLegacyForge()) {
-				patchedProvider = new MinecraftLegacyPatchedProvider(getProject());
-			} else {
+			if (getExtension().isModernForge()) {
 				patchedProvider = new MinecraftPatchedProvider(getProject());
+			} else {
+				patchedProvider = new MinecraftLegacyPatchedProvider(getProject());
 			}
 
 			patchedProvider.provide(dependency, postPopulationScheduler);
@@ -588,14 +588,14 @@ public class MappingsProviderImpl extends DependencyProvider implements Mappings
 				hasRefreshed = true;
 
 				// Download and extract intermediary
-				if (getExtension().isLegacyForge()) {
-					generateDummyIntermediary(getProject().getLogger(), intermediaryTiny);
-				} else {
+				if (!getExtension().isLegacyForge()) {
 					String encodedMinecraftVersion = UrlEscapers.urlFragmentEscaper().escape(getMinecraftProvider().minecraftVersion());
 					String intermediaryArtifactUrl = getExtension().getIntermediaryUrl(encodedMinecraftVersion);
 					File intermediaryJar = getMinecraftProvider().file("intermediary-v2.jar");
 					DownloadUtil.downloadIfChanged(new URL(intermediaryArtifactUrl), intermediaryJar, getProject().getLogger());
 					extractMappings(intermediaryJar.toPath(), intermediaryTiny);
+				} else {
+					generateDummyIntermediary(getProject().getLogger(), intermediaryTiny);
 				}
 			}
 		}