From d3a06b8597270745c8fbf6cda4419d544b941d18 Mon Sep 17 00:00:00 2001
From: coolGi <sasanaps@hotmail.com>
Date: Fri, 2 Jun 2023 23:32:12 +0930
Subject: [PATCH] Fixed merged jars and added it to the ci

---
 .gitlab-ci.yml |  4 +++-
 build.gradle   | 24 +++++++++++++++---------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index daa189840..21bc26ccc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,15 +19,17 @@ build_1_18_2:
   script:
     # this both runs the unit tests and assembles the code
     - ./gradlew build -PmcVer="1.18.2" --gradle-user-home cache/;
+    - ./gradlew mergeJars -PmcVer="1.18.2" --gradle-user-home cache/;
   image: eclipse-temurin:17
   artifacts:
     name: "NightlyBuild_1_18_2-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
     paths:
+      - Merged/*.jar
       - fabric/build/libs/*.jar
       - forge/build/libs/*.jar
       - quilt/build/libs/*.jar
     exclude:
-      # TODO: There is a lot of duplicate stuff here, fix it later
+      # TODO: There is a lot of duplicate stuff here, fix it later to be smaller
       - fabric/build/libs/*-all.jar
       - fabric/build/libs/*-sources.jar
       - forge/build/libs/*-all.jar
diff --git a/build.gradle b/build.gradle
index 8470fb618..63c04c355 100644
--- a/build.gradle
+++ b/build.gradle
@@ -78,17 +78,23 @@ rootProject.versionStr = rootProject.mod_version + "-" + rootProject.minecraft_v
 forgix {
     group = "com.seibel.lod"
     mergedJarName = "DistantHorizons-${rootProject.versionStr}.jar"
-    
-    forge {
-        jarLocation = "build/libs/DistantHorizons-forge-${rootProject.versionStr}.jar"
-    }
 
-    fabric {
-        jarLocation = "build/libs/DistantHorizons-fabric-${rootProject.versionStr}.jar"
-    }
+    if (findProject(":forge"))
+        forge {
+            jarLocation = "build/libs/DistantHorizons-forge-${rootProject.versionStr}.jar"
+        }
 
-    removeDuplicate "com.seibel.lod.api"
-    removeDuplicate "com.seibel.lod.core"
+    findProject(":fabric")
+        fabric {
+            jarLocation = "build/libs/DistantHorizons-fabric-${rootProject.versionStr}.jar"
+        }
+
+    findProject(":quilt")
+        quilt {
+            jarLocation = "build/libs/DistantHorizons-quilt-${rootProject.versionStr}.jar"
+        }
+
+    removeDuplicate "com.seibel.lod"
 }
 
 subprojects { p ->