NeoForge support

build.gradle

@@ -186,6 +186,7 @@ dependencies {
 	implementation libs.mcinjector
 	implementation libs.opencsv
 	implementation libs.forge.diffpatch
+	implementation libs.datafixerupper
 
 	// Forge mods.toml parsing
 	implementation libs.night.config.toml
@@ -254,8 +255,11 @@ spotless {
 		target 'src/**/*.gradle', '*.gradle'
 		greclipse()
 
-		// This file uses a @MAPPINGS@ token which is not valid Groovy
-		targetExclude('**/projects/forge/simple/build.gradle')
+		targetExclude(
+				// These files use a @MAPPINGS@ token which is not valid Groovy
+				'**/projects/forge/simple/build.gradle',
+				'**/projects/neoforge/simple/build.gradle'
+				)
 	}
 
 	kotlin {

gradle/libs.versions.toml

@@ -7,7 +7,7 @@ jackson = "2.15.2"
 guava = "32.1.2-jre"
 
 stitch = "0.6.2"
-tiny-remapper = "1.9.22"
+tiny-remapper = "1.10.23"
 access-widener = "2.1.0"
 mapping-io = "0.4.2"
 lorenz-tiny = "4.0.2"
@@ -28,6 +28,7 @@ mcinjector = "3.8.0"
 opencsv = "5.4"
 forge-diffpatch = "2.0.7"
 night-config = "3.6.6"
+datafixerupper = "6.0.8"
 
 [libraries]
 # Loom compile libraries
@@ -60,6 +61,7 @@ mcinjector = { module = "de.oceanlabs.mcp:mcinjector", version.ref = "mcinjector
 opencsv = { module = "com.opencsv:opencsv", version.ref = "opencsv" }
 forge-diffpatch = { module = "net.minecraftforge:DiffPatch", version.ref = "forge-diffpatch" }
 night-config-toml = { module = "com.electronwill.night-config:toml", version.ref = "night-config" }
+datafixerupper = { module = "com.mojang:datafixerupper", version.ref = "datafixerupper" }
 
 [plugins]
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

gradle/runtime.libs.versions.toml

@@ -13,7 +13,7 @@ native-support = "1.0.1"
 
 # Forge Runtime depedencies
 javax-annotations = "3.0.2"
-forge-runtime = "1.1.8"
+forge-runtime = "2.0.9"
 access-transformers = "3.0.1"
 access-transformers-new = "8.0.5"
 unprotect = "1.2.0"
@@ -34,7 +34,9 @@ native-support = { module = "net.fabricmc:fabric-loom-native-support", version.r
 
 # Forge Runtime depedencies
 javax-annotations = { module = "com.google.code.findbugs:jsr305", version.ref = "javax-annotations" }
-forge-runtime = { module = "dev.architectury:architectury-loom-runtime", version.ref = "forge-runtime" }
+mixin-remapper-service = { module = "dev.architectury:architectury-mixin-remapper-service", version.ref = "forge-runtime" }
+naming-service = { module = "dev.architectury:architectury-naming-service", version.ref = "forge-runtime" }
+mcp-annotations = { module = "dev.architectury:mcp-annotations", version.ref = "forge-runtime" }
 access-transformers = { module = "net.minecraftforge:accesstransformers", version.ref = "access-transformers" }
 access-transformers-new = { module = "net.minecraftforge:accesstransformers", version.ref = "access-transformers-new" }
 unprotect = { module = "io.github.juuxel:unprotect", version.ref = "unprotect" }

src/main/java/dev/architectury/loom/forge/UserdevConfig.java

@@ -0,0 +1,45 @@
+package dev.architectury.loom.forge;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+
+import net.fabricmc.loom.configuration.providers.forge.ForgeRunTemplate;
+
+public record UserdevConfig(
+		String mcp,
+		String universal,
+		String sources,
+		String patches,
+		Optional<String> patchesOriginalPrefix,
+		Optional<String> patchesModifiedPrefix,
+		String binpatches,
+		BinaryPatcherConfig binpatcher,
+		List<String> libraries,
+		Map<String, ForgeRunTemplate> runs,
+		List<String> sass
+) {
+	public static final Codec<UserdevConfig> CODEC = RecordCodecBuilder.create(instance -> instance.group(
+			Codec.STRING.fieldOf("mcp").forGetter(UserdevConfig::mcp),
+			Codec.STRING.fieldOf("universal").forGetter(UserdevConfig::universal),
+			Codec.STRING.fieldOf("sources").forGetter(UserdevConfig::sources),
+			Codec.STRING.fieldOf("patches").forGetter(UserdevConfig::patches),
+			Codec.STRING.optionalFieldOf("patchesOriginalPrefix").forGetter(UserdevConfig::patchesOriginalPrefix),
+			Codec.STRING.optionalFieldOf("patchesModifiedPrefix").forGetter(UserdevConfig::patchesModifiedPrefix),
+			Codec.STRING.fieldOf("binpatches").forGetter(UserdevConfig::binpatches),
+			BinaryPatcherConfig.CODEC.fieldOf("binpatcher").forGetter(UserdevConfig::binpatcher),
+			Codec.STRING.listOf().fieldOf("libraries").forGetter(UserdevConfig::libraries),
+			ForgeRunTemplate.MAP_CODEC.fieldOf("runs").forGetter(UserdevConfig::runs),
+			Codec.STRING.listOf().optionalFieldOf("sass", List.of()).forGetter(UserdevConfig::sass)
+	).apply(instance, UserdevConfig::new));
+
+	public record BinaryPatcherConfig(String dependency, List<String> args) {
+		public static final Codec<BinaryPatcherConfig> CODEC = RecordCodecBuilder.create(instance -> instance.group(
+				Codec.STRING.fieldOf("version").forGetter(BinaryPatcherConfig::dependency),
+				Codec.STRING.listOf().fieldOf("args").forGetter(BinaryPatcherConfig::args)
+		).apply(instance, BinaryPatcherConfig::new));
+	}
+}

src/main/java/dev/architectury/loom/util/ForgeLoggerConfig.java

@@ -8,8 +8,6 @@
 import java.util.List;
 import java.util.StringJoiner;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
 import org.gradle.api.Project;
 import org.jetbrains.annotations.Nullable;
 
@@ -31,18 +29,16 @@ public static void copyToPath(Project project, Path outputFile) {
 			throw new UncheckedIOException(e);
 		}
 
-		final JsonArray libraries = LoomGradleExtension.get(project)
+		final List<String> libraries = LoomGradleExtension.get(project)
 				.getForgeUserdevProvider()
-				.getJson()
-				.getAsJsonArray("libraries");
+				.getConfig()
+				.libraries();
 		boolean found = false;
 
-		for (JsonElement library : libraries) {
-			final String notation = library.getAsString();
-
-			if (LOGGER_CONFIG_ARTIFACTS.stream().anyMatch(artifact -> artifact.matches(notation))) {
+		for (String library : libraries) {
+			if (LOGGER_CONFIG_ARTIFACTS.stream().anyMatch(artifact -> artifact.matches(library))) {
 				final File libraryFile = project.getConfigurations()
-						.detachedConfiguration(project.getDependencies().create(notation))
+						.detachedConfiguration(project.getDependencies().create(library))
 						.setTransitive(false)
 						.getSingleFile();
 

src/main/java/dev/architectury/loom/util/MappingOption.java

@@ -0,0 +1,38 @@
+package dev.architectury.loom.util;
+
+import org.jetbrains.annotations.Nullable;
+
+import net.fabricmc.loom.api.LoomGradleExtensionAPI;
+import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
+
+public enum MappingOption {
+	DEFAULT(null),
+	WITH_SRG(MappingsNamespace.SRG.toString()),
+	WITH_MOJANG(MappingsNamespace.MOJANG.toString());
+
+	private final String extraNamespace;
+
+	MappingOption(@Nullable String extraNamespace) {
+		this.extraNamespace = extraNamespace;
+	}
+
+	public MappingOption forNamespaces(String... namespaces) {
+		if (extraNamespace == null) return this;
+
+		for (String namespace : namespaces) {
+			if (extraNamespace.equals(namespace)) {
+				return this;
+			}
+		}
+
+		return DEFAULT;
+	}
+
+	public static MappingOption forPlatform(LoomGradleExtensionAPI extension) {
+		return switch (extension.getPlatform().get()) {
+		case FORGE -> WITH_SRG;
+		case NEOFORGE -> WITH_MOJANG;
+		default -> DEFAULT;
+		};
+	}
+}

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

@@ -50,6 +50,7 @@
 import net.fabricmc.loom.configuration.providers.minecraft.MinecraftProvider;
 import net.fabricmc.loom.configuration.providers.minecraft.library.LibraryProcessorManager;
 import net.fabricmc.loom.configuration.providers.minecraft.mapped.IntermediaryMinecraftProvider;
+import net.fabricmc.loom.configuration.providers.minecraft.mapped.MojangMappedMinecraftProvider;
 import net.fabricmc.loom.configuration.providers.minecraft.mapped.NamedMinecraftProvider;
 import net.fabricmc.loom.configuration.providers.minecraft.mapped.SrgMinecraftProvider;
 import net.fabricmc.loom.extension.LoomFiles;
@@ -95,6 +96,10 @@ static LoomGradleExtension get(Project project) {
 
 	void setSrgMinecraftProvider(SrgMinecraftProvider<?> srgMinecraftProvider);
 
+	MojangMappedMinecraftProvider<?> getMojangMappedMinecraftProvider();
+
+	void setMojangMappedMinecraftProvider(MojangMappedMinecraftProvider<?> srgMinecraftProvider);
+
 	default List<Path> getMinecraftJars(MappingsNamespace mappingsNamespace) {
 		return switch (mappingsNamespace) {
 		case NAMED -> getNamedMinecraftProvider().getMinecraftJarPaths();
@@ -104,6 +109,10 @@ default List<Path> getMinecraftJars(MappingsNamespace mappingsNamespace) {
 			ModPlatform.assertPlatform(this, ModPlatform.FORGE, () -> "SRG jars are only available on Forge.");
 			yield getSrgMinecraftProvider().getMinecraftJarPaths();
 		}
+		case MOJANG -> {
+			ModPlatform.assertPlatform(this, ModPlatform.NEOFORGE, () -> "Mojang-mapped jars are only available on NeoForge.");
+			yield getMojangMappedMinecraftProvider().getMinecraftJarPaths();
+		}
 		};
 	}
 
@@ -149,12 +158,12 @@ default boolean isDataGenEnabled() {
 		return isForge() && !getForge().getDataGenMods().isEmpty();
 	}
 
-	default boolean isForgeAndOfficial() {
-		return isForge() && getMcpConfigProvider().isOfficial();
+	default boolean isForgeLikeAndOfficial() {
+		return isForgeLike() && getMcpConfigProvider().isOfficial();
 	}
 
-	default boolean isForgeAndNotOfficial() {
-		return isForge() && !getMcpConfigProvider().isOfficial();
+	default boolean isForgeLikeAndNotOfficial() {
+		return isForgeLike() && !getMcpConfigProvider().isOfficial();
 	}
 
 	DependencyProviders getDependencyProviders();
@@ -179,4 +188,14 @@ default ForgeProvider getForgeProvider() {
 
 	ForgeRunsProvider getForgeRunsProvider();
 	void setForgeRunsProvider(ForgeRunsProvider forgeRunsProvider);
+
+	/**
+	 * The mapping file that is specific to the platform settings.
+	 * It contains SRG (Forge/common) or Mojang mappings (NeoForge) as needed.
+	 *
+	 * @return the platform mapping file path
+	 */
+	default Path getPlatformMappingFile() {
+		return getMappingConfiguration().getPlatformMappingFile(this);
+	}
 }

src/main/java/net/fabricmc/loom/api/ForgeExtensionAPI.java

@@ -33,7 +33,7 @@
 import org.jetbrains.annotations.ApiStatus;
 
 /**
- * This is the forge extension api available exposed to build scripts.
+ * This is the Forge extension API available to build scripts.
  */
 @ApiStatus.NonExtendable
 public interface ForgeExtensionAPI {

src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java

@@ -235,10 +235,18 @@ default void splitMinecraftJar() {
 
 	Provider<ModPlatform> getPlatform();
 
+	default boolean isForgeLike() {
+		return getPlatform().get().isForgeLike();
+	}
+
 	default boolean isForge() {
 		return getPlatform().get() == ModPlatform.FORGE;
 	}
 
+	default boolean isNeoForge() {
+		return getPlatform().get() == ModPlatform.NEOFORGE;
+	}
+
 	default boolean isQuilt() {
 		return getPlatform().get() == ModPlatform.QUILT;
 	}
@@ -265,4 +273,15 @@ default void addTaskBeforeRun(String task) {
 	ForgeExtensionAPI getForge();
 
 	void forge(Action<ForgeExtensionAPI> action);
+
+	/**
+	 * Gets the NeoForge extension used to configure NeoForge details.
+	 *
+	 * @return the NeoForge extension
+	 * @throws UnsupportedOperationException if running on another platform
+	 * @see #isNeoForge()
+	 */
+	NeoForgeExtensionAPI getNeoForge();
+
+	void neoForge(Action<NeoForgeExtensionAPI> action);
 }

src/main/java/net/fabricmc/loom/api/NeoForgeExtensionAPI.java

@@ -0,0 +1,50 @@
+/*
+ * This file is part of fabric-loom, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) 2023 FabricMC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package net.fabricmc.loom.api;
+
+import org.gradle.api.file.ConfigurableFileCollection;
+
+/**
+ * This is the NeoForge extension API available to build scripts.
+ */
+public interface NeoForgeExtensionAPI {
+	/**
+	 * A collection of all project access transformers.
+	 * The collection should only contain AT files, and not directories or other files.
+	 *
+	 * <p>If this collection is empty, Loom tries to resolve the AT from the default path
+	 * ({@code META-INF/accesstransformer.cfg} in the {@code main} source set).
+	 *
+	 * @return the collection of AT files
+	 */
+	ConfigurableFileCollection getAccessTransformers();
+
+	/**
+	 * Adds a {@linkplain #getAccessTransformers() project access transformer}.
+	 *
+	 * @param file the file, evaluated as per {@link org.gradle.api.Project#file(Object)}
+	 */
+	void accessTransformer(Object file);
+}

src/main/java/net/fabricmc/loom/api/mappings/layered/MappingsNamespace.java

@@ -54,6 +54,14 @@ public enum MappingsNamespace {
 	 */
 	SRG,
 
+	/**
+	 * Mojang's official names from their deobfuscation maps.
+	 *
+	 * <p>They are used as the mapping set in a NeoForge production environment akin to Fabric's
+	 * {@linkplain #INTERMEDIARY intermediary mappings}.
+	 */
+	MOJANG,
+
 	/**
 	 * Named mappings are the developer friendly names used to develop mods against.
 	 */
@@ -70,6 +78,7 @@ public enum MappingsNamespace {
 		case "official" -> OFFICIAL;
 		case "intermediary" -> INTERMEDIARY;
 		case "srg" -> SRG;
+		case "mojang" -> MOJANG;
 		case "named" -> NAMED;
 		default -> null;
 		};

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

@@ -1,7 +1,7 @@
 /*
  * This file is part of fabric-loom, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2022 FabricMC
+ * Copyright (c) 2022-2023 FabricMC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -34,8 +34,19 @@ public final class IntermediaryNamespaces {
 	 * Returns the intermediary namespace of the project.
 	 */
 	public static String intermediary(Project project) {
+		return intermediaryNamespace(project).toString();
+	}
+
+	/**
+	 * Returns the intermediary namespace of the project.
+	 */
+	public static MappingsNamespace intermediaryNamespace(Project project) {
 		LoomGradleExtension extension = LoomGradleExtension.get(project);
-		return extension.isForge() ? "srg" : "intermediary";
+		return switch (extension.getPlatform().get()) {
+		case FABRIC, QUILT -> MappingsNamespace.INTERMEDIARY;
+		case FORGE -> MappingsNamespace.SRG;
+		case NEOFORGE -> MappingsNamespace.MOJANG;
+		};
 	}
 
 	/**