From b027a92dd287d6810a9fdae4d4b1e1432d7dc9cc Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Thu, 22 Jul 2021 14:52:17 -0700
Subject: [PATCH] Bump SecureJarHandler to fix package meta issue. Closes #7881
 Fix version.json having duplicate libraries.

---
 build.gradle                                        |  2 +-
 .../minecraftforge/forge/tasks/LauncherJson.groovy  | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8f203194b3..2ae172a862 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,7 +51,7 @@ ext {
     COREMODS_VERSION = '5.0.1'
     EVENTBUS_VERSION = '5.0.3'
     MODLAUNCHER_VERSION = '9.0.7'
-    SECUREJARHANDLER_VERSION = '0.9.44'
+    SECUREJARHANDLER_VERSION = '0.9.45'
     BOOTSTRAPLAUNCHER_VERSION = '0.1.15'
     ASM_VERSION = '9.1'
     INSTALLER_VERSION = '2.1.4'
diff --git a/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/LauncherJson.groovy b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/LauncherJson.groovy
index 20e684fd8b..4f730daf23 100644
--- a/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/LauncherJson.groovy
+++ b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/LauncherJson.groovy
@@ -48,14 +48,16 @@ abstract class LauncherJson extends DefaultTask {
     protected void exec() {
         if (!json.libraries)
             json.libraries = []
-        getArtifacts(project, project.configurations.installer, false).each { key, lib -> json.libraries.add(lib) }
-        getArtifacts(project, project.configurations.moduleonly, false).each { key, lib -> json.libraries.add(lib) }
+        def libs = [:]
+        getArtifacts(project, project.configurations.installer, false).each { key, lib -> libs[key] = lib }
+        getArtifacts(project, project.configurations.moduleonly, false).each { key, lib -> libs[key] = lib }
 
         packedDependencies.get().collect{ project.rootProject.tasks.findByPath(it) }.forEach {
             def path = Util.getMavenPath(it)
+            def key = Util.getMavenDep(it)
             
-            json.libraries.add([
-                name: Util.getMavenDep(it),
+            libs[key] = [
+                name: key,
                 downloads: [
                     artifact: [
                         path: path,
@@ -64,8 +66,9 @@ abstract class LauncherJson extends DefaultTask {
                         size: it.archiveFile.get().asFile.length()
                     ]
                 ]
-            ])
+            ]
         }
+        libs.each { key, lib -> json.libraries.add(lib) }
         Files.writeString(output.get().asFile.toPath(), new JsonBuilder(json).toPrettyString())
     }
 }