WM1.37.1 MM23.9.1

rfresh2 · Nov 29, 2023 · ddee7d0 · ddee7d0
1 parent d02760d
commit ddee7d0
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 9 deletions.
diff --git a/.github/workflows/forge-1.20.1.yml b/.github/workflows/forge-1.20.1.yml
@@ -5,8 +5,6 @@ on:
     branches:
       - "forge-1.20.1"
 env:
-  WORLDMAP_VERSION: "1.37.0"
-  MINIMAP_VERSION: "23.9.0"
   MINECRAFT_VERSION: "1.20.1"
   MINECRAFT_VERSION_SHORT: "1.20"
   MOD_LOADER: "Forge"
@@ -32,6 +30,14 @@ jobs:
     - name: Elevate wrapper permissions
       run: chmod +x ./gradlew
 
+    - name: Get WorldMap Version
+      run: |
+        echo "WORLDMAP_VERSION=$(./gradlew -q printWorldMapVersion)" >> $GITHUB_ENV
+
+    - name: Get Minimap Version
+      run: |
+        echo "MINIMAP_VERSION=$(./gradlew -q printMinimapVersion)" >> $GITHUB_ENV
+
     - name: Build mod
       run: ./gradlew build
 
@@ -52,7 +58,7 @@ jobs:
 
     - name: Create modpack zip
       run: >
-        zip -j 
+        zip -j
         XaeroPlus-modpack-${{ env.MOD_LOADER }}-${{ env.MINECRAFT_VERSION }}-${{ github.run_number }}.zip
         XaeroPlus-${{ env.MOD_LOADER }}-${{ env.MINECRAFT_VERSION }}-${{ github.run_number }}-WM${{ env.WORLDMAP_VERSION }}-MM${{ env.MINIMAP_VERSION }}.jar
         XaerosWorldMap_${{ env.WORLDMAP_VERSION }}_${{ env.MOD_LOADER }}_${{ env.MINECRAFT_VERSION_SHORT }}.jar

diff --git a/build.gradle b/build.gradle
@@ -47,6 +47,11 @@ afterEvaluate {
 	}
 }
 
+ext {
+	worldmap_version = "1.37.1"
+	minimap_version = "23.9.1"
+}
+
 dependencies {
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
@@ -56,13 +61,30 @@ dependencies {
 	forgeRuntimeLibrary(jarLibs "com.github.collarmc:pounce:0e8492b68e")
     forgeRuntimeLibrary(jarLibs 'org.xerial:sqlite-jdbc:3.44.1.0')
 
-	modImplementation "maven.modrinth:xaeros-world-map:1.37.0_Forge_1.20"
-	modImplementation "maven.modrinth:xaeros-minimap:23.9.0_Forge_1.20"
+	modImplementation "maven.modrinth:xaeros-world-map:${worldmap_version}_Forge_1.20"
+	modImplementation "maven.modrinth:xaeros-minimap:${minimap_version}_Forge_1.20"
 	modImplementation files("libs/baritone-unoptimized-forge-1.10.1.jar")
 	modCompileOnly "maven.modrinth:waystones:14.0.2+forge-1.20"
 	modCompileOnly "maven.modrinth:balm:7.1.4+forge-1.20.1"
 }
 
+processResources {
+    filesMatching("META-INF/mods.toml") {
+        expand([
+                "version": project.version,
+                "worldmap_version": project.ext.worldmap_version,
+                "minimap_version": project.ext.minimap_version
+        ])
+    }
+}
+
+tasks.register('printWorldMapVersion') {
+    println project.ext.worldmap_version
+}
+tasks.register('printMinimapVersion') {
+    println project.ext.minimap_version
+}
+
 tasks.withType(JavaCompile).configureEach {
 	it.options.release = 17
 }

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -5,7 +5,7 @@ license = "MIT"
 
 [[mods]]
 modId = "xaeroplus"
-version = "1.20.1"
+version = "${version}"
 displayName = "XaeroPlus"
 authors = "rfresh2"
 description = '''
@@ -31,20 +31,20 @@ side = "CLIENT"
 [[dependencies.xaeroplus]]
 modId = "xaerominimap"
 mandatory = false
-versionRange = "[23.9.0]"
+versionRange = "[${minimap_version}]"
 ordering = "BEFORE"
 side = "CLIENT"
 
 [[dependencies.xaeroplus]]
 modId = "xaerobetterpvp"
 mandatory = false
-versionRange = "[23.9.0]"
+versionRange = "[${minimap_version}]"
 ordering = "BEFORE"
 side = "CLIENT"
 
 [[dependencies.xaeroplus]]
 modId = "xaeroworldmap"
 mandatory = true
-versionRange = "[1.37.0]"
+versionRange = "[${worldmap_version}]"
 ordering = "BEFORE"
 side = "CLIENT"