Fix support for Forge 50+ (#227)

* Remap Forge dependency from mojang instead of srg

* Replace Union Relauncher with Bootstrap Dev

* Add mixins to forge 1206 test

* This should be forgelike
Why didn't this break unit tests?

* Replace with EnumMap

* Add version check for source roots separator

* Fix possible NPE

* Fix checkstyle in javadocs
such fun

* Fix codenarc styling

* fix usage

* remove hashcode and equals

* format code better

gradle/runtime.libs.versions.toml

@@ -19,7 +19,6 @@ access-transformers-new = "8.0.5"
 access-transformers-neo = "10.0.2"
 unprotect = "1.2.0"
 asm = "9.7"
-union-relauncher = "1.1.1"
 access-transformers-log4j = "2.17.1"
 
 [libraries]
@@ -45,5 +44,4 @@ access-transformers-new = { module = "net.minecraftforge:accesstransformers", ve
 access-transformers-neo = { module = "net.neoforged.accesstransformers:at-cli", version.ref = "access-transformers-neo" }
 unprotect = { module = "io.github.juuxel:unprotect", version.ref = "unprotect" }
 asm = { module = "org.ow2.asm:asm", version.ref = "asm" }
-union-relauncher = { module = "io.github.juuxel:union-relauncher", version.ref = "union-relauncher" }
 access-transformers-log4j-bom = { module = "org.apache.logging.log4j:log4j-bom", version.ref = "access-transformers-log4j" }

src/main/java/net/fabricmc/loom/LoomGradleExtension.java

@@ -28,6 +28,7 @@
 import java.util.Collection;
 import java.util.List;
 
+import org.gradle.api.GradleException;
 import org.gradle.api.Project;
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.FileCollection;
@@ -114,7 +115,10 @@ default List<Path> getMinecraftJars(MappingsNamespace mappingsNamespace) {
 			yield getSrgMinecraftProvider().getMinecraftJarPaths();
 		}
 		case MOJANG -> {
-			ModPlatform.assertPlatform(this, ModPlatform.NEOFORGE, () -> "Mojang-mapped jars are only available on NeoForge.");
+			if (!this.isForgeLike() || !this.getForgeProvider().usesMojangAtRuntime()) {
+				throw new GradleException("Mojang-mapped jars are only available on NeoForge / Forge 50+.");
+			}
+
 			yield getMojangMappedMinecraftProvider().getMinecraftJarPaths();
 		}
 		};

src/main/java/net/fabricmc/loom/build/IntermediaryNamespaces.java

@@ -76,7 +76,7 @@ public static MappingsNamespace runtimeIntermediaryNamespace(Project project) {
 	/**
 	 * Potentially replaces the remapping target namespace for mixin refmaps.
 	 *
-	 * <p>All {@linkplain #intermediary(Project) intermediary-like namespaces} are replaced
+	 * <p>All {@linkplain #runtimeIntermediary(Project) intermediary-like namespaces} are replaced
 	 * by {@code intermediary} since fabric-mixin-compile-extensions only supports intermediary.
 	 * We transform the namespaces in the input mappings, e.g. {@code intermediary} -> {@code yraidemretni} and
 	 * {@code srg} -> {@code intermediary}.

src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java

@@ -268,7 +268,9 @@ private synchronized void setupMinecraft(ConfigContext configContext) throws Exc
 			final SrgMinecraftProvider<?> srgMinecraftProvider = jarConfiguration.createSrgMinecraftProvider(project);
 			extension.setSrgMinecraftProvider(srgMinecraftProvider);
 			srgMinecraftProvider.provide(provideContext);
-		} else if (extension.isNeoForge()) {
+		}
+
+		if (extension.isForgeLike() && extension.getForgeProvider().usesMojangAtRuntime()) {
 			final MojangMappedMinecraftProvider<?> mojangMappedMinecraftProvider = jarConfiguration.createMojangMappedMinecraftProvider(project);
 			extension.setMojangMappedMinecraftProvider(mojangMappedMinecraftProvider);
 			mojangMappedMinecraftProvider.provide(provideContext);

src/main/java/net/fabricmc/loom/configuration/mods/ArtifactMetadata.java

@@ -55,10 +55,10 @@ public record ArtifactMetadata(boolean isFabricMod, RemapRequirements remapRequi
 	private static final String QUILT_INSTALLER_PATH = "quilt_installer.json";
 
 	public static ArtifactMetadata create(ArtifactRef artifact, String currentLoomVersion) throws IOException {
-		return create(artifact, currentLoomVersion, ModPlatform.FABRIC);
+		return create(artifact, currentLoomVersion, ModPlatform.FABRIC, null);
 	}
 
-	public static ArtifactMetadata create(ArtifactRef artifact, String currentLoomVersion, ModPlatform platform) throws IOException {
+	public static ArtifactMetadata create(ArtifactRef artifact, String currentLoomVersion, ModPlatform platform, @Nullable Boolean forcesStaticMixinRemap) throws IOException {
 		boolean isFabricMod;
 		RemapRequirements remapRequirements = RemapRequirements.DEFAULT;
 		InstallerData installerData = null;
@@ -93,11 +93,10 @@ public static ArtifactMetadata create(ArtifactRef artifact, String currentLoomVe
 					} catch (IllegalArgumentException e) {
 						throw new IllegalStateException("Unknown mixin remap type: " + mixinRemapType);
 					}
-				} else if (platform == ModPlatform.FORGE) {
-					// Use certain refmap remap types by the current platform
-					refmapRemapType = MixinRemapType.MIXIN;
-				} else if (platform == ModPlatform.NEOFORGE) {
-					refmapRemapType = MixinRemapType.STATIC;
+				} else if (forcesStaticMixinRemap != null) {
+					// The mixin remap type is not specified in the manifest, but we have a forced value
+					// This is forced to be static on NeoForge or Forge 50+.
+					refmapRemapType = forcesStaticMixinRemap ? MixinRemapType.STATIC : MixinRemapType.MIXIN;
 				}
 
 				if (loomVersion != null && refmapRemapType != MixinRemapType.STATIC) {

src/main/java/net/fabricmc/loom/configuration/mods/ModConfigurationRemapper.java

@@ -151,7 +151,8 @@ public static void supplyModConfigurations(Project project, SharedServiceManager
 
 				artifactMetadata = metaCache.computeIfAbsent(artifact, a -> {
 					try {
-						return ArtifactMetadata.create(a, LoomGradlePlugin.LOOM_VERSION, extension.getPlatform().get());
+						return ArtifactMetadata.create(a, LoomGradlePlugin.LOOM_VERSION, extension.getPlatform().get(),
+								extension.isForgeLike() && extension.getForgeProvider().usesMojangAtRuntime() ? true : null);
 					} catch (IOException e) {
 						throw ExceptionUtil.createDescriptiveWrapper(UncheckedIOException::new, "Failed to read metadata from " + a.path(), e);
 					}

src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java

@@ -206,7 +206,7 @@ private void remapJars(List<ModDependency> remapList) throws IOException {
 
 		final TinyRemapper remapper = builder.build();
 
-		remapper.readClassPath(extension.getMinecraftJars(IntermediaryNamespaces.intermediaryNamespace(project)).toArray(Path[]::new));
+		remapper.readClassPath(extension.getMinecraftJars(IntermediaryNamespaces.runtimeIntermediaryNamespace(project)).toArray(Path[]::new));
 
 		final Map<ModDependency, InputTag> tagMap = new HashMap<>();
 		final Map<ModDependency, OutputConsumerPath> outputConsumerMap = new HashMap<>();

src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeLibrariesProvider.java

@@ -96,6 +96,13 @@ public static void provide(MappingConfiguration mappingConfiguration, Project pr
 				}
 			}
 
+			if (lib.startsWith("net.minecraftforge:bootstrap:")) {
+				if (extension.isForge() && extension.getForgeProvider().getVersion().getMajorVersion() >= Constants.Forge.MIN_BOOTSTRAP_DEV_VERSION) {
+					String version = lib.substring(lib.lastIndexOf(":"));
+					dependencies.add(project.getDependencies().create("net.minecraftforge:bootstrap-dev" + version));
+				}
+			}
+
 			if (dep == null) {
 				dep = lib;
 			}

src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeProvider.java

@@ -32,7 +32,6 @@
 import net.fabricmc.loom.LoomGradleExtension;
 import net.fabricmc.loom.configuration.DependencyInfo;
 import net.fabricmc.loom.util.Constants;
-import net.fabricmc.loom.util.LoomVersions;
 import net.fabricmc.loom.util.ModPlatform;
 
 public class ForgeProvider extends DependencyProvider {
@@ -50,10 +49,6 @@ public void provide(DependencyInfo dependency) throws Exception {
 		version = new ForgeVersion(dependency.getResolvedVersion());
 		addDependency(dependency.getDepString() + ":userdev", Constants.Configurations.FORGE_USERDEV);
 		addDependency(dependency.getDepString() + ":installer", Constants.Configurations.FORGE_INSTALLER);
-
-		if (getExtension().isForge() && version.getMajorVersion() >= Constants.Forge.MIN_UNION_RELAUNCHER_VERSION) {
-			addDependency(LoomVersions.UNION_RELAUNCHER.mavenNotation(), Constants.Configurations.FORGE_EXTRA);
-		}
 	}
 
 	public ForgeVersion getVersion() {

src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeRunTemplate.java

@@ -112,13 +112,6 @@ public void applyTo(RunConfigSettings settings, ConfigValue.Resolver configValue
 
 		// Add MOD_CLASSES, this is something that ForgeGradle does
 		settings.getEnvironmentVariables().computeIfAbsent("MOD_CLASSES", $ -> ConfigValue.of("{source_roots}").resolve(configValueResolver));
-
-		final ForgeProvider forgeProvider = settings.getExtension().getForgeProvider();
-
-		if (settings.getExtension().isForge() && forgeProvider.getVersion().getMajorVersion() >= Constants.Forge.MIN_UNION_RELAUNCHER_VERSION) {
-			settings.defaultMainClass(Constants.Forge.UNION_RELAUNCHER_MAIN_CLASS);
-			settings.property(Constants.Forge.UNION_RELAUNCHER_MAIN_CLASS_PROPERTY, main);
-		}
 	}
 
 	public Resolved resolve(ConfigValue.Resolver configValueResolver) {

src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeRunsProvider.java

@@ -42,13 +42,15 @@
 import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.NamedDomainObjectSet;
 import org.gradle.api.Project;
+import org.gradle.api.artifacts.Dependency;
 import org.jetbrains.annotations.Nullable;
 
 import net.fabricmc.loom.LoomGradleExtension;
 import net.fabricmc.loom.api.ModSettings;
 import net.fabricmc.loom.configuration.ide.RunConfigSettings;
 import net.fabricmc.loom.util.Constants;
 import net.fabricmc.loom.util.DependencyDownloader;
+import net.fabricmc.loom.util.Version;
 import net.fabricmc.loom.util.gradle.SourceSetHelper;
 import net.fabricmc.loom.util.gradle.SourceSetReference;
 
@@ -128,6 +130,7 @@ private String resolve(@Nullable RunConfigSettings runConfig, ConfigValue.Variab
 			// Use a set-valued multimap for deduplicating paths.
 			Multimap<String, String> modClasses = MultimapBuilder.hashKeys().linkedHashSetValues().build();
 			NamedDomainObjectContainer<ModSettings> mods = extension.getMods();
+			String separator = getSourceRootsSeparator();
 
 			if (runConfig != null && !runConfig.getMods().isEmpty()) {
 				mods = runConfig.getMods();
@@ -147,7 +150,7 @@ private String resolve(@Nullable RunConfigSettings runConfig, ConfigValue.Variab
 
 			string = modClasses.entries().stream()
 					.map(entry -> entry.getKey() + "%%" + entry.getValue())
-					.collect(Collectors.joining(File.pathSeparator));
+					.collect(Collectors.joining(separator));
 		} else if (key.equals("mcp_mappings")) {
 			string = "loom.stub";
 		} else if (json.has(key)) {
@@ -184,4 +187,21 @@ private Set<File> runtimeClasspath() {
 	private Set<File> minecraftClasspath() {
 		return DependencyDownloader.resolveFiles(project, project.getConfigurations().getByName(Constants.Configurations.FORGE_RUNTIME_LIBRARY), true);
 	}
+
+	private String getSourceRootsSeparator() {
+		// Some versions of Forge 49+ requires a different separator
+		if (!extension.isForge() || extension.getForgeProvider().getVersion().getMajorVersion() < Constants.Forge.MIN_BOOTSTRAP_DEV_VERSION) {
+			return File.pathSeparator;
+		}
+
+		for (Dependency dependency : project.getConfigurations().getByName(Constants.Configurations.FORGE_DEPENDENCIES).getDependencies()) {
+			if (dependency.getGroup().equals("net.minecraftforge") && dependency.getName().equals("bootstrap-dev")) {
+				Version version = Version.parse(dependency.getVersion());
+				return version.compareTo(Version.parse("2.1.4")) >= 0 ? File.pathSeparator : ";";
+			}
+		}
+
+		project.getLogger().warn("Failed to find bootstrap-dev in forge dependencies, using File.pathSeparator as separator");
+		return File.pathSeparator;
+	}
 }

src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingConfiguration.java

@@ -37,12 +37,14 @@
 import java.nio.file.StandardCopyOption;
 import java.nio.file.StandardOpenOption;
 import java.util.ArrayList;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
 import com.google.common.base.Stopwatch;
+import com.google.common.base.Supplier;
 import com.google.gson.JsonObject;
 import dev.architectury.loom.util.MappingOption;
 import org.apache.tools.ant.util.StringUtils;
@@ -94,6 +96,7 @@ public class MappingConfiguration {
 	public Path tinyMappingsWithSrg;
 	public final Map<String, Path> mixinTinyMappings; // The mixin mappings have other names in intermediary.
 	public final Path srgToNamedSrg; // FORGE: srg to named in srg file format
+	private final Map<MappingOption, Supplier<Path>> mappingOptions;
 	private final Path unpickDefinitions;
 
 	private boolean hasUnpickDefinitions;
@@ -112,6 +115,8 @@ protected MappingConfiguration(String mappingsIdentifier, Path mappingsWorkingDi
 		this.tinyMappingsWithMojang = mappingsWorkingDir.resolve("mappings-mojang.tiny");
 		this.mixinTinyMappings = new HashMap<>();
 		this.srgToNamedSrg = mappingsWorkingDir.resolve("mappings-srg-named.srg");
+		this.mappingOptions = new EnumMap<>(MappingOption.class);
+		this.mappingOptions.put(MappingOption.DEFAULT, () -> this.tinyMappings);
 	}
 
 	public static MappingConfiguration create(Project project, SharedServiceManager serviceManager, DependencyInfo dependency, MinecraftProvider minecraftProvider) {
@@ -164,25 +169,15 @@ public TinyMappingsService getMappingsService(SharedServiceManager serviceManage
 	}
 
 	public TinyMappingsService getMappingsService(SharedServiceManager serviceManager, MappingOption mappingOption) {
-		final Path tinyMappings = switch (mappingOption) {
-		case WITH_SRG -> {
-			if (Files.notExists(this.tinyMappingsWithSrg)) {
-				throw new UnsupportedOperationException("Cannot get mappings service with SRG mappings without SRG enabled!");
-			}
+		Supplier<Path> mappingsSupplier = this.mappingOptions.get(mappingOption);
 
-			yield this.tinyMappingsWithSrg;
+		if (mappingsSupplier == null) {
+			throw new UnsupportedOperationException("Unsupported mapping option: " + mappingOption + ", it is possible that this option is not supported by this project / platform!");
+		} else if (Files.notExists(mappingsSupplier.get())) {
+			throw new UnsupportedOperationException("Mapping option " + mappingOption + " found but file does not exist!");
 		}
-		case WITH_MOJANG -> {
-			if (Files.notExists(this.tinyMappingsWithMojang)) {
-				throw new UnsupportedOperationException("Cannot get mappings service with Mojang mappings without Mojang merging enabled!");
-			}
-
-			yield this.tinyMappingsWithMojang;
-		}
-		default -> this.tinyMappings;
-		};
 
-		return TinyMappingsService.create(serviceManager, Objects.requireNonNull(tinyMappings));
+		return TinyMappingsService.create(serviceManager, Objects.requireNonNull(mappingsSupplier.get()));
 	}
 
 	protected void setup(Project project, SharedServiceManager serviceManager, MinecraftProvider minecraftProvider, Path inputJar) throws IOException {
@@ -208,6 +203,8 @@ public void setupPost(Project project) throws IOException {
 		LoomGradleExtension extension = LoomGradleExtension.get(project);
 
 		if (extension.isNeoForge()) {
+			this.mappingOptions.put(MappingOption.WITH_MOJANG, () -> this.tinyMappingsWithMojang);
+
 			// Generate the Mojmap-merged mappings if needed.
 			// Note that this needs to happen before manipulateMappings for FieldMigratedMappingConfiguration.
 			if (Files.notExists(tinyMappingsWithMojang) || extension.refreshDeps()) {
@@ -216,6 +213,12 @@ public void setupPost(Project project) throws IOException {
 		}
 
 		if (extension.shouldGenerateSrgTiny()) {
+			this.mappingOptions.put(MappingOption.WITH_SRG, () -> this.tinyMappingsWithSrg);
+
+			if (extension.isForge() && extension.getForgeProvider().usesMojangAtRuntime()) {
+				this.mappingOptions.put(MappingOption.WITH_MOJANG, () -> this.tinyMappingsWithSrg);
+			}
+
 			if (Files.notExists(tinyMappingsWithSrg) || extension.refreshDeps()) {
 				if (extension.isForge() && extension.getForgeProvider().usesMojangAtRuntime()) {
 					Path tmp = Files.createTempFile("mappings", ".tiny");

src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java

@@ -245,7 +245,7 @@ private void remapJar(RemappedJars remappedJars, ConfigContext configContext) th
 					className = "net.minecraftforge.registries.ObjectHolderRegistry";
 				}
 
-				final String sourceNamespace = IntermediaryNamespaces.intermediary(project);
+				final String sourceNamespace = IntermediaryNamespaces.runtimeIntermediary(project);
 				final MemoryMappingTree mappings = mappingsService.getMappingTree();
 				RemapObjectHolderVisitor.remapObjectHolder(remappedJars.outputJar().getPath(), className, mappings, sourceNamespace, "named");
 			}

src/main/java/net/fabricmc/loom/extension/MixinExtensionApiImpl.java

@@ -50,7 +50,7 @@ public abstract class MixinExtensionApiImpl implements MixinExtensionAPI {
 	public MixinExtensionApiImpl(Project project) {
 		this.project = Objects.requireNonNull(project);
 		this.useMixinAp = project.getObjects().property(Boolean.class)
-				.convention(project.provider(() -> !LoomGradleExtension.get(project).isNeoForge()));
+				.convention(project.provider(() -> !LoomGradleExtension.get(project).isNeoForge() && (!LoomGradleExtension.get(project).isForge() || !LoomGradleExtension.get(project).getForgeProvider().usesMojangAtRuntime())));
 
 		this.refmapTargetNamespace = project.getObjects().property(String.class)
 				.convention(project.provider(() -> IntermediaryNamespaces.runtimeIntermediary(project)));

src/main/java/net/fabricmc/loom/util/Constants.java

@@ -192,11 +192,9 @@ public static final class Forge {
 		public static final String MIXIN_CONFIGS_MANIFEST_KEY = "MixinConfigs";
 
 		/**
-		 * The minimum Forge version that needs Union Relauncher to use {@code MOD_CLASSES}.
+		 * The minimum Forge version that needs bootstrap-dev to use {@code MOD_CLASSES}.
 		 */
-		public static final int MIN_UNION_RELAUNCHER_VERSION = 49;
-		public static final String UNION_RELAUNCHER_MAIN_CLASS = "juuxel.unionrelauncher.UnionRelauncher";
-		public static final String UNION_RELAUNCHER_MAIN_CLASS_PROPERTY = "unionRelauncher.mainClass";
+		public static final int MIN_BOOTSTRAP_DEV_VERSION = 49;
 
 		/**
 		 * The minimum version of Forge that uses "mojang" as the namespace in production.

src/main/java/net/fabricmc/loom/util/SourceRemapper.java

@@ -98,7 +98,7 @@ public void remapAll() {
 			return;
 		}
 
-		project.getLogger().lifecycle(":remapping sources");
+		project.getLogger().lifecycle(":remapping sources (Mercury, {} -> {})", from, to);
 
 		ProgressLoggerFactory progressLoggerFactory = ((ProjectInternal) project).getServices().get(ProgressLoggerFactory.class);
 		ProgressLogger progressLogger = progressLoggerFactory.newOperation(SourceRemapper.class.getName());
@@ -199,13 +199,9 @@ private Mercury getMercuryInstance() {
 			mercury.getClassPath().add(intermediaryJar);
 		}
 
-		if (extension.isForge()) {
-			for (Path srgJar : extension.getMinecraftJars(MappingsNamespace.SRG)) {
-				mercury.getClassPath().add(srgJar);
-			}
-		} else if (extension.isNeoForge()) {
-			for (Path mojangJar : extension.getMinecraftJars(MappingsNamespace.MOJANG)) {
-				mercury.getClassPath().add(mojangJar);
+		if (extension.isForgeLike()) {
+			for (Path jar : extension.getMinecraftJars(IntermediaryNamespaces.runtimeIntermediaryNamespace(project))) {
+				mercury.getClassPath().add(jar);
 			}
 		}