FG2 Support

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

@@ -33,6 +33,8 @@
 import org.gradle.api.provider.SetProperty;
 import org.jetbrains.annotations.ApiStatus;
 
+import net.fabricmc.loom.configuration.providers.forge.fg2.Pack200Provider;
+
 /**
  * This is the forge extension api available exposed to build scripts.
  */
@@ -148,4 +150,6 @@ interface DataGenConsumer {
 	 * @see ForgeLocalMod
 	 */
 	NamedDomainObjectContainer<ForgeLocalMod> getLocalMods();
+
+	Property<Pack200Provider> getPack200Provider();
 }

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

@@ -270,4 +270,6 @@ default void addTaskBeforeRun(String task) {
 	ForgeExtensionAPI getForge();
 
 	void forge(Action<ForgeExtensionAPI> action);
+
+	Property<Boolean> getStubIntermediaries();
 }

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

@@ -191,6 +191,7 @@ public static void configureCompile(Project p) {
 			if (extension.isForge()) {
 				dependencyManager.addProvider(new ForgeProvider(project));
 				dependencyManager.addProvider(new ForgeUserdevProvider(project));
+				dependencyManager.addProvider(new ForgeUniversalProvider(project));
 			}
 
 			if (extension.shouldGenerateSrgTiny()) {
@@ -200,7 +201,6 @@ public static void configureCompile(Project p) {
 			if (extension.isForge()) {
 				dependencyManager.addProvider(new McpConfigProvider(project));
 				dependencyManager.addProvider(new PatchProvider(project));
-				dependencyManager.addProvider(new ForgeUniversalProvider(project));
 			}
 
 			dependencyManager.addProvider(extension.isForge() ? new FieldMigratedMappingsProvider(project) : new MappingsProviderImpl(project));

src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java

@@ -104,7 +104,11 @@ public void provide(DependencyInfo dependency, Consumer<Runnable> postPopulation
 		}
 
 		addDependency(Constants.Dependencies.DEV_LAUNCH_INJECTOR + Constants.Dependencies.Versions.DEV_LAUNCH_INJECTOR, Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES);
-		addDependency(Constants.Dependencies.TERMINAL_CONSOLE_APPENDER + Constants.Dependencies.Versions.TERMINAL_CONSOLE_APPENDER, Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES);
+
+		if (!getExtension().isForge() || !getExtension().getForgeProvider().isFG2()) {
+			addDependency(Constants.Dependencies.TERMINAL_CONSOLE_APPENDER + Constants.Dependencies.Versions.TERMINAL_CONSOLE_APPENDER, Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES);
+		}
+
 		addDependency(Constants.Dependencies.JETBRAINS_ANNOTATIONS + Constants.Dependencies.Versions.JETBRAINS_ANNOTATIONS, JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME);
 
 		if (getExtension().isForge()) {

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

@@ -56,6 +56,7 @@
 import net.fabricmc.loom.LoomGradleExtension;
 import net.fabricmc.loom.LoomGradlePlugin;
 import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
+import net.fabricmc.loom.configuration.providers.forge.fg3.MinecraftPatchedProviderFG3;
 import net.fabricmc.loom.configuration.providers.mappings.MappingsProviderImpl;
 import net.fabricmc.loom.util.FileSystemUtil;
 import net.fabricmc.loom.util.ThreadingUtils;
@@ -116,7 +117,7 @@ public void manipulateMappings(Path mappingsJar) throws IOException {
 		if (getExtension().shouldGenerateSrgTiny()) {
 			if (Files.notExists(rawTinyMappingsWithSrg) || isRefreshDeps()) {
 				// Merge tiny mappings with srg
-				SrgMerger.mergeSrg(getProject().getLogger(), getExtension().getMappingsProvider()::getMojmapSrgFileIfPossible, getRawSrgFile(), rawTinyMappings, rawTinyMappingsWithSrg, true);
+				SrgMerger.mergeSrg(getProject().getLogger(), getExtension().getMappingsProvider()::getMojmapSrgFileIfPossible, getRawSrgFile(), rawTinyMappings, rawTinyMappingsWithSrg, true, extension.getSrgProvider().isLegacy());
 			}
 		}
 
@@ -203,20 +204,25 @@ public FieldVisitor visitField(int access, String name, String descriptor, Strin
 
 		Visitor visitor = new Visitor(Opcodes.ASM9);
 
-		for (MinecraftPatchedProvider.Environment environment : MinecraftPatchedProvider.Environment.values()) {
-			File patchedSrgJar = environment.patchedSrgJar.apply(extension.getMappingsProvider().patchedProvider);
-			FileSystemUtil.Delegate system = FileSystemUtil.getJarFileSystem(patchedSrgJar, false);
-			completer.onComplete(value -> system.close());
-
-			for (Path fsPath : (Iterable<? extends Path>) Files.walk(system.get().getPath("/"))::iterator) {
-				if (Files.isRegularFile(fsPath) && fsPath.toString().endsWith(".class")) {
-					completer.add(() -> {
-						byte[] bytes = Files.readAllBytes(fsPath);
-						new ClassReader(bytes).accept(visitor, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
-					});
+		if (extension.getMappingsProvider().patchedProvider instanceof MinecraftPatchedProviderFG3 pp3) {
+			for (MinecraftPatchedProviderFG3.Environment environment : MinecraftPatchedProviderFG3.Environment.values()) {
+				File patchedSrgJar = environment.patchedSrgJar.apply(pp3);
+				FileSystemUtil.Delegate system = FileSystemUtil.getJarFileSystem(patchedSrgJar, false);
+				completer.onComplete(value -> system.close());
+
+				for (Path fsPath : (Iterable<? extends Path>) Files.walk(system.get().getPath("/"))::iterator) {
+					if (Files.isRegularFile(fsPath) && fsPath.toString().endsWith(".class")) {
+						completer.add(() -> {
+							byte[] bytes = Files.readAllBytes(fsPath);
+							new ClassReader(bytes).accept(
+									visitor,
+									ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES
+							);
+						});
+					}
 				}
 			}
-		}
+		} //TODO: DOES FG2 NEED THIS????
 
 		completer.complete();
 		Map<FieldMember, String> migratedFields = new HashMap<>();

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

@@ -37,6 +37,8 @@ public class ForgeProvider extends DependencyProvider {
 	private File globalCache;
 	private File projectCache;
 
+	private boolean fg2 = false;
+
 	public ForgeProvider(Project project) {
 		super(project);
 	}
@@ -75,6 +77,14 @@ public String getTargetConfig() {
 		return Constants.Configurations.FORGE;
 	}
 
+	public boolean isFG2() {
+		return fg2;
+	}
+
+	public void setFg2(boolean fg2) {
+		this.fg2 = fg2;
+	}
+
 	public static final class ForgeVersion {
 		private final String combined;
 		private final String minecraftVersion;

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

@@ -35,6 +35,7 @@
 import java.nio.file.StandardCopyOption;
 import java.nio.file.StandardOpenOption;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -99,14 +100,73 @@ public void provide(DependencyInfo dependency, Consumer<Runnable> postPopulation
 			Files.copy(resolved.toPath(), userdevJar.toPath(), StandardCopyOption.REPLACE_EXISTING);
 
 			try (FileSystem fs = FileSystems.newFileSystem(new URI("jar:" + resolved.toURI()), ImmutableMap.of("create", false))) {
-				Files.copy(fs.getPath("config.json"), configJson, StandardCopyOption.REPLACE_EXISTING);
+				if (Files.exists(fs.getPath("config.json"))) {
+					//fg3+
+					Files.copy(fs.getPath("config.json"), configJson, StandardCopyOption.REPLACE_EXISTING);
+				} else {
+					//fg2
+					Files.copy(fs.getPath("dev.json"), configJson, StandardCopyOption.REPLACE_EXISTING);
+				}
 			}
 		}
 
 		try (Reader reader = Files.newBufferedReader(configJson)) {
 			json = new Gson().fromJson(reader, JsonObject.class);
 		}
 
+		boolean fg2 = !json.has("mcp");
+		getExtension().getForgeProvider().setFg2(fg2);
+
+		if (fg2) {
+			getProject().getLogger().info("FG2 Userdev, using default mcp_config/universal...");
+
+			String defaultMCPPath = "de.oceanlabs.mcp:mcp:" + getExtension().getMinecraftProvider().minecraftVersion() + ":srg@zip";
+			String defaultUniversalPath = "net.minecraftforge:forge:" + dependency.getResolvedVersion() + ":universal";
+
+			getProject().getLogger().info("Using default MCP path: " + defaultMCPPath);
+			getProject().getLogger().info("Using default Universal path: " + defaultUniversalPath);
+
+			addDependency(defaultMCPPath, Constants.Configurations.MCP_CONFIG);
+			addDependency(defaultMCPPath, Constants.Configurations.SRG);
+			addDependency(defaultUniversalPath, Constants.Configurations.FORGE_UNIVERSAL);
+
+			for (JsonElement lib : json.getAsJsonArray("libraries")) {
+				JsonObject libObj = lib.getAsJsonObject();
+
+				Dependency dep = addDependency(libObj.get("name").getAsString(), Constants.Configurations.FORGE_DEPENDENCIES);
+
+				if (libObj.get("name").getAsString().split(":").length < 4) {
+					((ModuleDependency) dep).attributes(attributes -> {
+						attributes.attribute(transformed, true);
+					});
+				}
+			}
+
+			for (String name : new String[] {"client", "server"}) {
+				LaunchProviderSettings launchSettings = getExtension().getLaunchConfigs().findByName(name);
+				RunConfigSettings settings = getExtension().getRunConfigs().findByName(name);
+
+				if (launchSettings != null) {
+					launchSettings.evaluateLater(() -> {
+						launchSettings.arg(Arrays.stream(json.get("minecraftArguments").getAsString().split(" ")).map(this::processTemplates).collect(Collectors.toList()));
+
+						// add missing args
+						launchSettings.arg("--accessToken", "FML");
+					});
+				}
+
+				if (settings != null) {
+					settings.evaluateLater(() -> {
+						settings.defaultMainClass("net.minecraft.launchwrapper.Launch");
+					});
+				}
+			}
+
+			return;
+		}
+
+		getProject().getLogger().info("FG3+ Userdev");
+
 		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);

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

@@ -68,6 +68,18 @@ public void provide(DependencyInfo dependency, Consumer<Runnable> postPopulation
 
 		Path mcpZip = dependency.resolveFile().orElseThrow(() -> new RuntimeException("Could not resolve MCPConfig")).toPath();
 
+		if (getExtension().getForgeProvider().isFG2()) {
+			official = false;
+			mappingsPath = ZipUtils.contains(mcpZip, "joined.srg") ? "joined.srg" : "config/joined.tsrg";
+			remapAction = null;
+
+			if (!Files.exists(mcp) || isRefreshDeps()) {
+				Files.copy(mcpZip, mcp, StandardCopyOption.REPLACE_EXISTING);
+			}
+
+			return;
+		}
+
 		if (!Files.exists(mcp) || !Files.exists(configJson) || isRefreshDeps()) {
 			Files.copy(mcpZip, mcp, StandardCopyOption.REPLACE_EXISTING);
 			Files.write(configJson, ZipUtils.unpack(mcp, "config.json"), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);