From 2b0ba5ac07a9539814050018eb7fe30f750ab3cc Mon Sep 17 00:00:00 2001
From: Daniel Scalzi <d_scalzi@yahoo.com>
Date: Sun, 19 Jan 2020 12:36:06 -0500
Subject: [PATCH] Always tag client jar with forge artifact version.

This allows multiple versions of the same forge to be used.
Ex. Recommended 1.15 on prod, latest 1.15 on test.
Also fixed a bug with artifact classifier formatting.
---
 src/resolver/forge/adapter/forge113.resolver.ts | 10 +++++++---
 src/util/maven.ts                               |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/resolver/forge/adapter/forge113.resolver.ts b/src/resolver/forge/adapter/forge113.resolver.ts
index e1867d4..bf0ff3f 100644
--- a/src/resolver/forge/adapter/forge113.resolver.ts
+++ b/src/resolver/forge/adapter/forge113.resolver.ts
@@ -212,11 +212,15 @@ export class Forge113Adapter extends ForgeResolver {
             const exists = await pathExists(targetLocalPath)
             if (exists) {
 
+                // Always tag destination with artifact version.
+                // Allows different versions of forge to be installed at once.
+                // Ex. Recommended 1.15 on prod, latest 1.15 on test.
+
                 mdls.push({
                     id: MavenUtil.mavenComponentsToIdentifier(
                         entry.group,
                         entry.artifact,
-                        entry.version,
+                        this.artifactVersion,
                         entry.classifier
                     ),
                     name: `Minecraft Forge (${entry.name})`,
@@ -228,7 +232,7 @@ export class Forge113Adapter extends ForgeResolver {
                             this.baseUrl,
                             entry.group,
                             entry.artifact,
-                            entry.version,
+                            entry.version, // work dir version
                             entry.classifier
                         )
                     ),
@@ -238,7 +242,7 @@ export class Forge113Adapter extends ForgeResolver {
                 const destination = this.repoStructure.getLibRepoStruct().getArtifactByComponents(
                     entry.group,
                     entry.artifact,
-                    entry.version,
+                    this.artifactVersion,
                     entry.classifier
                 )
 
diff --git a/src/util/maven.ts b/src/util/maven.ts
index 06ad80f..8323275 100644
--- a/src/util/maven.ts
+++ b/src/util/maven.ts
@@ -8,7 +8,7 @@ export class MavenUtil {
 
     public static mavenComponentsToIdentifier(group: string, artifact: string, version: string,
                                               classifier?: string, extension?: string) {
-        return `${group}:${artifact}:${version}${classifier != null ? `-${classifier}` : ''}${extension != null ? `@${extension}` : ''}`
+        return `${group}:${artifact}:${version}${classifier != null ? `:${classifier}` : ''}${extension != null ? `@${extension}` : ''}`
     }
 
     public static isMavenIdentifier(id: string): boolean {