Fix merge conflicts

Signed-off-by: shedaniel <daniel@shedaniel.me>

6 files changed, 30 insertions, 41 deletions

diff --git a/src/main/java/net/fabricmc/loom/configuration/MavenPublication.java b/src/main/java/net/fabricmc/loom/configuration/MavenPublication.java
index dbd37207..dcbc434a 100644
--- a/src/main/java/net/fabricmc/loom/configuration/MavenPublication.java
+++ b/src/main/java/net/fabricmc/loom/configuration/MavenPublication.java
@@ -69,7 +69,7 @@ public final class MavenPublication {
 				PublishingExtension mavenPublish = p.getExtensions().findByType(PublishingExtension.class);
 
 				if (mavenPublish != null) {
-					p.getLogger().info("Processing maven publication for project [" + p.getName() + "] of " + entry.sourceConfiguration());
+					p.getLogger().info("Processing maven publication for project [" + p.getName() + "] of " + configurationName);
 					processEntry(project, scope, config, mavenPublish, reportedDeprecation);
 				}
 			});
@@ -118,11 +118,11 @@ public final class MavenPublication {
 
 					for (Dependency dependency : config.getAllDependencies()) {
 						if (foundArtifacts.contains(dependency.getGroup() + ":" + dependency.getName())) {
-							logger.info("Found inserted artifact " + dependency.getGroup() + ":" + dependency.getName());
+							project.getLogger().info("Found inserted artifact " + dependency.getGroup() + ":" + dependency.getName());
 							continue;
 						}
 
-						logger.info("Inserting artifact " + dependency.getGroup() + ":" + dependency.getName());
+						project.getLogger().info("Inserting artifact " + dependency.getGroup() + ":" + dependency.getName());
 
 						Node depNode = dependencies.appendNode("dependency");
 						depNode.appendNode("groupId", dependency.getGroup());
diff --git a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
index 66836071..c42246bf 100644
--- a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
+++ b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
@@ -53,9 +53,6 @@ import net.fabricmc.loom.api.LoomGradleExtensionAPI;
 import net.fabricmc.loom.api.MixinExtensionAPI;
 import net.fabricmc.loom.api.decompilers.LoomDecompiler;
 import net.fabricmc.loom.api.ForgeExtensionAPI;
-import net.fabricmc.loom.api.LoomGradleExtensionAPI;
-import net.fabricmc.loom.api.MixinApExtensionAPI;
-import net.fabricmc.loom.api.decompilers.LoomDecompiler;
 import net.fabricmc.loom.configuration.ide.RunConfig;
 import net.fabricmc.loom.configuration.ide.RunConfigSettings;
 import net.fabricmc.loom.configuration.mods.ModVersionParser;
diff --git a/src/main/java/net/fabricmc/loom/extension/MixinExtensionApiImpl.java b/src/main/java/net/fabricmc/loom/extension/MixinExtensionApiImpl.java
index e99eef26..66f3dfa1 100644
--- a/src/main/java/net/fabricmc/loom/extension/MixinExtensionApiImpl.java
+++ b/src/main/java/net/fabricmc/loom/extension/MixinExtensionApiImpl.java
@@ -35,6 +35,8 @@ import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.util.PatternSet;
 
+import net.fabricmc.loom.LoomGradleExtension;
+import net.fabricmc.loom.api.LoomGradleExtensionAPI;
 import net.fabricmc.loom.api.MixinExtensionAPI;
 
 public abstract class MixinExtensionApiImpl implements MixinExtensionAPI {
@@ -44,7 +46,7 @@ public abstract class MixinExtensionApiImpl implements MixinExtensionAPI {
 	public MixinExtensionApiImpl(Project project) {
 		this.project = Objects.requireNonNull(project);
 		this.useMixinAp = project.getObjects().property(Boolean.class)
-				.convention(false);
+				.convention(project.provider(() -> LoomGradleExtension.get(project).isForge()));
 	}
 
 	protected final PatternSet add0(SourceSet sourceSet, String refmapName) {
diff --git a/src/main/java/net/fabricmc/loom/extension/MixinExtensionImpl.java b/src/main/java/net/fabricmc/loom/extension/MixinExtensionImpl.java
index 224a98b8..a96c911a 100644
--- a/src/main/java/net/fabricmc/loom/extension/MixinExtensionImpl.java
+++ b/src/main/java/net/fabricmc/loom/extension/MixinExtensionImpl.java
@@ -70,7 +70,7 @@ public class MixinExtensionImpl extends MixinExtensionApiImpl implements MixinEx
 		String defaultRefmapName = project.getConvention().getPlugin(BasePluginConvention.class).getArchivesBaseName() + "-refmap.json";
 
 		if (project.getRootProject() != project) {
-			defaultRefmapName = project.getConvention().getPlugin(BasePluginConvention.class).getArchivesBaseName() + "-" + getProject().getPath().replaceFirst(":", "").replace(':', '_') + "-refmap.json";
+			defaultRefmapName = project.getConvention().getPlugin(BasePluginConvention.class).getArchivesBaseName() + "-" + project.getPath().replaceFirst(":", "").replace(':', '_') + "-refmap.json";
 		}
 
 		project.getLogger().info("Could not find refmap definition, will be using default name: " + defaultRefmapName);
diff --git a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java
index 3a8db01c..48b9e9bd 100644
--- a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java
+++ b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java
@@ -64,6 +64,7 @@ import dev.architectury.refmapremapper.remapper.SimpleReferenceRemapper;
 import dev.architectury.tinyremapper.IMappingProvider;
 import dev.architectury.tinyremapper.TinyRemapper;
 import dev.architectury.tinyremapper.TinyUtils;
+import dev.architectury.tinyremapper.extension.mixin.MixinExtension;
 import org.cadixdev.at.AccessTransformSet;
 import org.cadixdev.at.io.AccessTransformFormats;
 import org.gradle.api.Action;
@@ -108,9 +109,6 @@ import net.fabricmc.mapping.tree.FieldDef;
 import net.fabricmc.mapping.tree.MethodDef;
 import net.fabricmc.mapping.tree.TinyTree;
 import net.fabricmc.stitch.util.Pair;
-import net.fabricmc.tinyremapper.TinyRemapper;
-import net.fabricmc.tinyremapper.TinyUtils;
-import net.fabricmc.tinyremapper.extension.mixin.MixinExtension;
 
 public class RemapJarTask extends Jar {
 	private static final String MANIFEST_PATH = "META-INF/MANIFEST.MF";
@@ -296,14 +294,16 @@ public class RemapJarTask extends Jar {
 						if (MixinRefmapHelper.addRefmapName(project, output)) {
 							project.getLogger().debug("Transformed mixin reference maps in output JAR!");
 						}
-					}
 
-					if (!toM.equals("intermediary")) {
-						try {
-							remapRefmap(extension, output, "intermediary", toM);
-						} catch (IOException e) {
-							throw new RuntimeException("Failed to remap refmap jar", e);
+						if (!toM.equals("intermediary")) {
+							try {
+								remapRefmap(extension, output, "intermediary", toM);
+							} catch (IOException e) {
+								throw new RuntimeException("Failed to remap refmap jar", e);
+							}
 						}
+					} else if (extension.isForge()) {
+						throw new RuntimeException("Forge must have useLegacyMixinAp enabled");
 					}
 
 					if (getAddNestedDependencies().getOrElse(false)) {
@@ -346,7 +346,7 @@ public class RemapJarTask extends Jar {
 
 	private void remapRefmap(LoomGradleExtension extension, Path output, String from, String to) throws IOException {
 		try (FileSystem fs = FileSystems.newFileSystem(URI.create("jar:" + output.toUri()), ImmutableMap.of("create", false))) {
-			Path refmapPath = fs.getPath(extension.getRefmapName());
+			Path refmapPath = fs.getPath(extension.getMixin().getDefaultRefmapName().get());
 
 			if (Files.exists(refmapPath)) {
 				try (Reader refmapReader = Files.newBufferedReader(refmapPath, StandardCharsets.UTF_8)) {
diff --git a/src/main/java/net/fabricmc/loom/util/SourceRemapper.java b/src/main/java/net/fabricmc/loom/util/SourceRemapper.java
index 9612a72a..2b2fa943 100644
--- a/src/main/java/net/fabricmc/loom/util/SourceRemapper.java
+++ b/src/main/java/net/fabricmc/loom/util/SourceRemapper.java
@@ -29,13 +29,10 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Deque;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.function.Consumer;
 
-import com.google.common.base.Stopwatch;
 import org.cadixdev.lorenz.MappingSet;
 import org.cadixdev.mercury.Mercury;
 import org.cadixdev.mercury.remapper.MercuryRemapper;
@@ -63,7 +60,7 @@ public class SourceRemapper {
 	}
 
 	public static String intermediary(Project project) {
-		LoomGradleExtension extension = LoomGradleExtension.get(project);;
+		LoomGradleExtension extension = LoomGradleExtension.get(project);
 		return extension.isForge() ? "srg" : "intermediary";
 	}
 
@@ -195,8 +192,8 @@ public class SourceRemapper {
 			}
 		});
 
-		Mercury mercury = extension.getOrCreateSrcMercuryCache(toNamed ? 1 : 0, () -> {
-			Mercury m = createMercuryWithClassPath(project, toNamed);
+		Mercury mercury = extension.getOrCreateSrcMercuryCache(id, () -> {
+			Mercury m = createMercuryWithClassPath(project, to.equals("named"));
 
 			for (File file : extension.getUnmappedModCollection()) {
 				Path path = file.toPath();
@@ -209,6 +206,16 @@ public class SourceRemapper {
 			m.getClassPath().add(extension.getMinecraftMappedProvider().getMappedJar().toPath());
 			m.getClassPath().add(extension.getMinecraftMappedProvider().getIntermediaryJar().toPath());
 
+			if (extension.isForge()) {
+				m.getClassPath().add(extension.getMinecraftMappedProvider().getSrgJar().toPath());
+
+				if (extension.isForgeAndNotOfficial()) {
+					m.getClassPath().add(extension.getMinecraftMappedProvider().getForgeMappedJar().toPath());
+					m.getClassPath().add(extension.getMinecraftMappedProvider().getForgeIntermediaryJar().toPath());
+					m.getClassPath().add(extension.getMinecraftMappedProvider().getForgeSrgJar().toPath());
+				}
+			}
+
 			Set<File> files = project.getConfigurations()
 					.detachedConfiguration(project.getDependencies().create(Constants.Dependencies.JETBRAINS_ANNOTATIONS + Constants.Dependencies.Versions.JETBRAINS_ANNOTATIONS))
 					.resolve();
@@ -258,23 +265,6 @@ public class SourceRemapper {
 					m.getClassPath().add(inputFile.toPath());
 				}
 			}
-
-		classpath.add(extension.getMinecraftMappedProvider().getMappedJar().toPath());
-		classpath.add(extension.getMinecraftMappedProvider().getIntermediaryJar().toPath());
-
-		if (extension.isForge()) {
-			classpath.add(extension.getMinecraftMappedProvider().getSrgJar().toPath());
-			classpath.add(extension.getMinecraftMappedProvider().getForgeMappedJar().toPath());
-			classpath.add(extension.getMinecraftMappedProvider().getForgeIntermediaryJar().toPath());
-			classpath.add(extension.getMinecraftMappedProvider().getForgeSrgJar().toPath());
-		}
-
-		Set<File> files = project.getConfigurations()
-				.detachedConfiguration(project.getDependencies().create(Constants.Dependencies.JETBRAINS_ANNOTATIONS + Constants.Dependencies.Versions.JETBRAINS_ANNOTATIONS))
-				.resolve();
-
-		for (File file : files) {
-			classpath.add(file.toPath());
 		}
 
 		return m;