From 060d4b527b25ff67a5ccd3c825126372157ab607 Mon Sep 17 00:00:00 2001
From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com>
Date: Sun, 4 Feb 2024 00:46:45 +0100
Subject: [PATCH] Cleaned build script by using mc_version for comparisons

---
 .github/workflows/main.yml       |  9 ---------
 build.gradle                     | 16 +++++++++++-----
 viaforge-mc112/gradle.properties |  1 -
 viaforge-mc116/gradle.properties |  1 -
 viaforge-mc117/gradle.properties |  1 -
 viaforge-mc118/gradle.properties |  1 -
 viaforge-mc119/gradle.properties |  1 -
 viaforge-mc120/gradle.properties |  1 -
 8 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c6656bb..93e79b5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,15 +15,6 @@ jobs:
           java-version: 8
           distribution: 'temurin'
           check-latest: true
-      - name: Cache Dependencies
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
       - name: Build with Gradle
         run: ./gradlew shadowJar
       - name: Upload Build Artifacts
diff --git a/build.gradle b/build.gradle
index 295f88f..70cb28b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -76,6 +76,9 @@ subprojects {
     version = maven_version + "-" + project.mc_version
     group = maven_group
 
+    // Used to execute code only for specific submodules
+    def versionId = Integer.parseInt(project.mc_version.replace(".", ""))
+
     compileJava.options.encoding = "UTF-8"
 
     minecraft {
@@ -107,7 +110,8 @@ subprojects {
     }
 
     dependencies {
-        if ((project.property("sub_module_increment") as Integer) >= 2) {
+        if (versionId >= 1171) {
+            // Minecraft 1.17+ already includes slf4j, so we don't need to include it
             compileOnly "org.slf4j:slf4j-api:${slf4j_version}"
         } else {
             library "org.slf4j:slf4j-api:${slf4j_version}"
@@ -143,7 +147,7 @@ subprojects {
     }
 
     java {
-        if ((project.property("sub_module_increment") as Integer) >= 2) {
+        if (versionId >= 1171) {
             // Minecraft 1.17+ required Java 16/17 to compile
             toolchain.languageVersion = JavaLanguageVersion.of(17)
         }
@@ -158,12 +162,14 @@ subprojects {
         exclude("META-INF/maven/**")
         exclude("META-INF/versions/**")
 
-        if ((project.property("sub_module_increment") as Integer) >= 1) {
+        if (versionId >= 1132) {
+            // We don't need to package mixins into Forge 1.13+ jars, since Forge already has it
+            exclude("org/spongepowered/**")
+        }
+        if (versionId >= 1165) {
             // Get rid of the services folder, since Forge 1.16+ would conflict with some of the ForgeDev Environment's services
             // And since we don't need them for Mixins anyway, we can just exclude them from the shadowJar
             exclude("META-INF/services/**")
-            // We don't need to package mixins into Forge 1.13+ jars, since Forge already has it
-            exclude("org/spongepowered/**")
         }
     }
 
diff --git a/viaforge-mc112/gradle.properties b/viaforge-mc112/gradle.properties
index 88abde9..1f4b32b 100644
--- a/viaforge-mc112/gradle.properties
+++ b/viaforge-mc112/gradle.properties
@@ -1,3 +1,2 @@
 maven_name=viaforge-mc112
 mc_version=1.12.2
-sub_module_increment=0
diff --git a/viaforge-mc116/gradle.properties b/viaforge-mc116/gradle.properties
index 089d8b7..229f7cb 100644
--- a/viaforge-mc116/gradle.properties
+++ b/viaforge-mc116/gradle.properties
@@ -1,3 +1,2 @@
 maven_name=viaforge-mc116
 mc_version=1.16.5
-sub_module_increment=1
diff --git a/viaforge-mc117/gradle.properties b/viaforge-mc117/gradle.properties
index ea1a7f9..9ca4f68 100644
--- a/viaforge-mc117/gradle.properties
+++ b/viaforge-mc117/gradle.properties
@@ -1,3 +1,2 @@
 maven_name=viaforge-mc117
 mc_version=1.17.1
-sub_module_increment=2
diff --git a/viaforge-mc118/gradle.properties b/viaforge-mc118/gradle.properties
index fe9f656..6b1d82e 100644
--- a/viaforge-mc118/gradle.properties
+++ b/viaforge-mc118/gradle.properties
@@ -1,3 +1,2 @@
 maven_name=viaforge-mc118
 mc_version=1.18.2
-sub_module_increment=3
diff --git a/viaforge-mc119/gradle.properties b/viaforge-mc119/gradle.properties
index b10ca2f..78b5a45 100644
--- a/viaforge-mc119/gradle.properties
+++ b/viaforge-mc119/gradle.properties
@@ -1,3 +1,2 @@
 maven_name=viaforge-mc119
 mc_version=1.19.4
-sub_module_increment=4
diff --git a/viaforge-mc120/gradle.properties b/viaforge-mc120/gradle.properties
index 11492a9..e9e4bb5 100644
--- a/viaforge-mc120/gradle.properties
+++ b/viaforge-mc120/gradle.properties
@@ -1,3 +1,2 @@
 maven_name=viaforge-mc120
 mc_version=1.20.4
-sub_module_increment=5