rename hasIntermediary to usesMojmapAsIntermediate

architectury · Apr 28, 2024 · 287b34e · 287b34e
1 parent be248c6
commit 287b34e
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java
@@ -147,7 +147,7 @@ private void initPatchedFiles() {
 		minecraftProvider.setJarPrefix(patchId);
 
 		String intermediateId = getExtension().isNeoForge() ? "mojang" : "srg";
-		if (!hasIntermediary()) intermediateId += "-no-intermediary";
+		if (usesMojmapAsIntermediate()) intermediateId += "-no-intermediary";
 		minecraftIntermediateJar = forgeWorkingDir.resolve("minecraft-" + type.id + "-" + intermediateId + ".jar");
 		minecraftPatchedIntermediateJar = forgeWorkingDir.resolve("minecraft-" + type.id + "-" + intermediateId + "-patched.jar");
 		minecraftPatchedIntermediateAtJar = forgeWorkingDir.resolve("minecraft-" + type.id + "-" + intermediateId + "-at-patched.jar");
@@ -233,8 +233,8 @@ private TinyRemapper buildRemapper(SharedServiceManager serviceManager, Path inp
 		MemoryMappingTree mappings = mappingsService.getMappingTree();
 
 		TinyRemapper remapper = TinyRemapper.newRemapper()
-				.withMappings(TinyRemapperHelper.create(mappings, sourceNamespace, hasIntermediary() ? "official" : sourceNamespace, true))
-				.withMappings(InnerClassRemapper.of(InnerClassRemapper.readClassNames(input), mappings, sourceNamespace, hasIntermediary() ? "official" : sourceNamespace))
+				.withMappings(TinyRemapperHelper.create(mappings, sourceNamespace, !usesMojmapAsIntermediate() ? "official" : sourceNamespace, true))
+				.withMappings(InnerClassRemapper.of(InnerClassRemapper.readClassNames(input), mappings, sourceNamespace, !usesMojmapAsIntermediate() ? "official" : sourceNamespace))
 				.renameInvalidLocals(true)
 				.rebuildSourceFilenames(true)
 				.build();
@@ -573,8 +573,8 @@ public void applyLoomPatchVersion(Path target) throws IOException {
 		}
 	}
 
-	public boolean hasIntermediary() {
-		return !getExtension().isNeoForge();
+	public boolean usesMojmapAsIntermediate() {
+		return getExtension().isNeoForge();
 	}
 
 	public McpExecutor createMcpExecutor(Path cache) {