From c470c22f14fd73a7849408dfcd00d2cd5790789e Mon Sep 17 00:00:00 2001
From: Daniel Scalzi <d_scalzi@yahoo.com>
Date: Mon, 29 Jun 2020 10:17:05 -0400
Subject: [PATCH] Update FG3 resolver for latest 1.16.1 changes.

---
 .../forge/adapter/ForgeGradle3.resolver.ts    | 79 ++++++++++++++-----
 1 file changed, 58 insertions(+), 21 deletions(-)

diff --git a/src/resolver/forge/adapter/ForgeGradle3.resolver.ts b/src/resolver/forge/adapter/ForgeGradle3.resolver.ts
index e7583d4..01f66e1 100644
--- a/src/resolver/forge/adapter/ForgeGradle3.resolver.ts
+++ b/src/resolver/forge/adapter/ForgeGradle3.resolver.ts
@@ -51,6 +51,10 @@ export class ForgeGradle3Adapter extends ForgeResolver {
     private configure(): void {
         // Configure for 13, 14, 15, 16
         if(VersionUtil.isVersionAcceptable(this.minecraftVersion, [13, 14, 15, 16])) {
+
+            // https://github.com/MinecraftForge/MinecraftForge/commit/97d4652f5fe15931b980117efabdff332f9f6428
+            const mcpUnifiedVersion = `${this.minecraftVersion}-${ForgeGradle3Adapter.WILDCARD_MCP_VERSION}`
+
             this.generatedFiles = [
                 {
                     name: 'base jar',
@@ -73,16 +77,6 @@ export class ForgeGradle3Adapter extends ForgeResolver {
                     version: this.artifactVersion,
                     classifiers: ['client']
                 },
-                {
-                    name: 'client slim',
-                    group: LibRepoStructure.MINECRAFT_GROUP,
-                    artifact: LibRepoStructure.MINECRAFT_CLIENT_ARTIFACT,
-                    version: this.minecraftVersion.toString(),
-                    classifiers: [
-                        'slim',
-                        'slim-stable'
-                    ]
-                },
                 {
                     name: 'client data',
                     group: LibRepoStructure.MINECRAFT_GROUP,
@@ -91,27 +85,70 @@ export class ForgeGradle3Adapter extends ForgeResolver {
                     classifiers: ['data'],
                     skipIfNotPresent: true
                 },
-                {
-                    name: 'client extra',
-                    group: LibRepoStructure.MINECRAFT_GROUP,
-                    artifact: LibRepoStructure.MINECRAFT_CLIENT_ARTIFACT,
-                    version: this.minecraftVersion.toString(),
-                    classifiers: [
-                        'extra',
-                        'extra-stable'
-                    ]
-                },
                 {
                     name: 'client srg',
                     group: LibRepoStructure.MINECRAFT_GROUP,
                     artifact: LibRepoStructure.MINECRAFT_CLIENT_ARTIFACT,
-                    version: `${this.minecraftVersion}-${ForgeGradle3Adapter.WILDCARD_MCP_VERSION}`,
+                    version: mcpUnifiedVersion,
                     classifiers: ['srg']
                 }
             ]
             this.wildcardsInUse = [
                 ForgeGradle3Adapter.WILDCARD_MCP_VERSION
             ]
+
+            if(VersionUtil.isVersionAcceptable(this.minecraftVersion, [13, 14, 15])) {
+
+                this.generatedFiles.push(
+                    {
+                        name: 'client slim',
+                        group: LibRepoStructure.MINECRAFT_GROUP,
+                        artifact: LibRepoStructure.MINECRAFT_CLIENT_ARTIFACT,
+                        version: this.minecraftVersion.toString(),
+                        classifiers: [
+                            'slim',
+                            'slim-stable'
+                        ]
+                    },
+                    {
+                        name: 'client extra',
+                        group: LibRepoStructure.MINECRAFT_GROUP,
+                        artifact: LibRepoStructure.MINECRAFT_CLIENT_ARTIFACT,
+                        version: this.minecraftVersion.toString(),
+                        classifiers: [
+                            'extra',
+                            'extra-stable'
+                        ]
+                    }
+                )
+            } else {
+
+                this.generatedFiles.push(
+                    {
+                        name: 'client slim',
+                        group: LibRepoStructure.MINECRAFT_GROUP,
+                        artifact: LibRepoStructure.MINECRAFT_CLIENT_ARTIFACT,
+                        version: mcpUnifiedVersion,
+                        classifiers: [
+                            'slim',
+                            'slim-stable'
+                        ]
+                    },
+                    {
+                        name: 'client extra',
+                        group: LibRepoStructure.MINECRAFT_GROUP,
+                        artifact: LibRepoStructure.MINECRAFT_CLIENT_ARTIFACT,
+                        version: mcpUnifiedVersion,
+                        classifiers: [
+                            'extra',
+                            'extra-stable'
+                        ]
+                    }
+                )
+
+            }
+
+
             return
         }