remove isForgeAndOfficial stuff from fg2 also remove extra fg2 flag

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

@@ -58,16 +58,10 @@ public class McpConfigProvider extends DependencyProvider {
 	private String mappingsPath;
 	private RemapAction remapAction;
 
-	private boolean isFG2 = false;
-
 	public McpConfigProvider(Project project) {
 		super(project);
 	}
 
-	public boolean isFG2() {
-		return isFG2;
-	}
-
 	@Override
 	public void provide(DependencyInfo dependency, Consumer<Runnable> postPopulationScheduler) throws Exception {
 		init(dependency.getDependency().getVersion());
@@ -77,7 +71,6 @@ public void provide(DependencyInfo dependency, Consumer<Runnable> postPopulation
 		if (getExtension().getForgeProvider().isFG2()) {
 			official = false;
 			mappingsPath = ZipUtils.contains(mcpZip, "joined.srg") ? "joined.srg" : "config/joined.tsrg";
-			isFG2 = mappingsPath.endsWith(".srg");
 			remapAction = null;
 
 			if (!Files.exists(mcp) || isRefreshDeps()) {

src/main/java/net/fabricmc/loom/configuration/providers/forge/fg2/MinecraftPatchedProviderFG2.java

@@ -92,11 +92,12 @@ public void initFiles() throws IOException {
 	@Override
 	protected File[] getGlobalCaches() {
 		File[] files = {
+				minecraftClientJar,
+				minecraftServerJar,
 				minecraftClientPatchedJar,
 				minecraftServerPatchedJar,
 				minecraftMergedPatchedJar,
-				minecraftMergedPatchedSrgJar,
-				minecraftClientExtra,
+				minecraftMergedPatchedSrgJar
 		};
 
 		if (forgeMergedJar != null) {
@@ -155,18 +156,10 @@ public void endTransform() throws Exception {
 		// Step 5: Remap Patched AT & Forge to Official (global or project)
 		if (dirty) {
 			remapPatchedJar(getProject().getLogger());
-
-			if (getExtension().isForgeAndOfficial()) {
-				fillClientExtraJar();
-			}
 		}
 
 		this.filesDirty = dirty;
 		this.dirty = false;
-
-		if (getExtension().isForgeAndOfficial()) {
-			addDependency(minecraftClientExtra, Constants.Configurations.FORGE_EXTRA);
-		}
 	}
 
 	public enum Environment {
@@ -214,9 +207,7 @@ private void patchJars(Logger logger) throws IOException {
 			copyMissingClasses(environment.srgJar.apply(this), environment.patchedSrgJar.apply(this));
 			deleteParameterNames(environment.patchedSrgJar.apply(this));
 
-			if (getExtension().isForgeAndNotOfficial()) {
-				fixParameterAnnotation(environment.patchedSrgJar.apply(this));
-			}
+			fixParameterAnnotation(environment.patchedSrgJar.apply(this));
 		});
 
 		logger.lifecycle(":patched jars in " + stopwatch.stop());
@@ -253,12 +244,9 @@ protected void mergeJars(Logger logger) throws Exception {
 		logger.lifecycle(":copying resources");
 
 		// Copy resources
-		if (getExtension().isForgeAndNotOfficial()) {
-			// Copy resources
-			MinecraftProviderImpl minecraftProvider = getExtension().getMinecraftProvider();
-			copyNonClassFiles(minecraftProvider.minecraftClientJar, minecraftMergedPatchedJar);
-			copyNonClassFiles(minecraftProvider.getMinecraftServerJar(), minecraftMergedPatchedJar);
-		}
+		MinecraftProviderImpl minecraftProvider = getExtension().getMinecraftProvider();
+		copyNonClassFiles(minecraftProvider.minecraftClientJar, minecraftMergedPatchedJar);
+		copyNonClassFiles(minecraftProvider.getMinecraftServerJar(), minecraftMergedPatchedJar);
 	}
 
 	protected void remapPatchedJarToSrg(Logger logger) throws Exception {

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

@@ -157,7 +157,7 @@ public void provide(DependencyInfo dependency, Consumer<Runnable> postPopulation
 		}
 
 		if (getExtension().isForge()) {
-			if (getExtension().getMcpConfigProvider().isFG2()) {
+			if (getExtension().getForgeProvider().isFG2()) {
 				patchedProvider = new MinecraftPatchedProviderFG2(getProject());
 				patchedProvider.provide(dependency, postPopulationScheduler);
 			} else {