Merge branch '1.20.1' into 1.20.2

# Conflicts: # .github/workflows/release.yml # settings.gradle.kts
rfresh2 · Mar 23, 2024 · d0d5c5e · d0d5c5e
2 parents 1fce0aa + 6decfb8
commit d0d5c5e
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 50 deletions.
diff --git a/.github/workflows/1.20.2.yml b/.github/workflows/1.20.2.yml
@@ -32,25 +32,33 @@ jobs:
       with:
         arguments: build
 
-    - name: Get WorldMap Version
+    - name: Get WorldMap Version Fabric
       run: |
-        echo "WORLDMAP_VERSION=$(./gradlew -q printWorldMapVersion)" >> $GITHUB_ENV
+        echo "WORLDMAP_VERSION_FABRIC=$(./gradlew -q printWorldMapVersionFabric)" >> $GITHUB_ENV
 
-    - name: Get Minimap Version
+    - name: Get Minimap Version Fabric
       run: |
-        echo "MINIMAP_VERSION=$(./gradlew -q printMinimapVersion)" >> $GITHUB_ENV
+        echo "MINIMAP_VERSION_FABRIC=$(./gradlew -q printMinimapVersionFabric)" >> $GITHUB_ENV
+
+    - name: Get WorldMap Version Forge
+      run: |
+        echo "WORLDMAP_VERSION_FORGE=$(./gradlew -q printWorldMapVersionForge)" >> $GITHUB_ENV
+
+    - name: Get Minimap Version Forge
+      run: |
+        echo "MINIMAP_VERSION_FORGE=$(./gradlew -q printMinimapVersionForge)" >> $GITHUB_ENV
 
     - name: Get XaeroPlus Version
       run: |
         echo "XP_VERSION=$(./gradlew -q printXaeroPlusVersion)" >> $GITHUB_ENV
 
     - name: Get Fabric Jar Filename
       run: |
-        echo "XP_FABRIC=XaeroPlus-${{ env.XP_VERSION}}+fabric-${{ env.MINECRAFT_VERSION }}-WM${{ env.WORLDMAP_VERSION }}-MM${{ env.MINIMAP_VERSION }}" >> $GITHUB_ENV
+        echo "XP_FABRIC=XaeroPlus-${{ env.XP_VERSION}}+fabric-${{ env.MINECRAFT_VERSION }}-WM${{ env.WORLDMAP_VERSION_FABRIC }}-MM${{ env.MINIMAP_VERSION_FABRIC }}" >> $GITHUB_ENV
 
     - name: Get Forge Jar Filename
       run: |
-        echo "XP_FORGE=XaeroPlus-${{ env.XP_VERSION}}+forge-${{ env.MINECRAFT_VERSION }}-WM${{ env.WORLDMAP_VERSION }}-MM${{ env.MINIMAP_VERSION }}" >> $GITHUB_ENV
+        echo "XP_FORGE=XaeroPlus-${{ env.XP_VERSION}}+forge-${{ env.MINECRAFT_VERSION }}-WM${{ env.WORLDMAP_VERSION_FORGE }}-MM${{ env.MINIMAP_VERSION_FORGE }}" >> $GITHUB_ENV
 
     - name: Get Neo Jar Filename
       run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -51,29 +51,37 @@ jobs:
         with:
           arguments: build
 
-      - name: Get WorldMap Version
+      - name: Get WorldMap Version Fabric
         run: |
-          echo "WORLDMAP_VERSION=$(./gradlew -q printWorldMapVersion)" >> $GITHUB_ENV
+          echo "WORLDMAP_VERSION_FABRIC=$(./gradlew -q printWorldMapVersionFabric)" >> $GITHUB_ENV
 
-      - name: Get Minimap Version
+      - name: Get Minimap Version Fabric
         run: |
-          echo "MINIMAP_VERSION=$(./gradlew -q printMinimapVersion)" >> $GITHUB_ENV
+          echo "MINIMAP_VERSION_FABRIC=$(./gradlew -q printMinimapVersionFabric)" >> $GITHUB_ENV
+
+      - name: Get WorldMap Version Forge
+        run: |
+          echo "WORLDMAP_VERSION_FORGE=$(./gradlew -q printWorldMapVersionForge)" >> $GITHUB_ENV
+
+      - name: Get Minimap Version Forge
+        run: |
+          echo "MINIMAP_VERSION_FORGE=$(./gradlew -q printMinimapVersionForge)" >> $GITHUB_ENV
 
       - name: Get XaeroPlus Version
         run: |
           echo "XP_VERSION=$(./gradlew -q printXaeroPlusVersion)" >> $GITHUB_ENV
 
       - name: Get Fabric Jar Filename
         run: |
-          echo "XP_FABRIC=XaeroPlus-${{ env.XP_VERSION}}+fabric-${{ env.MINECRAFT_VERSION }}-WM${{ env.WORLDMAP_VERSION }}-MM${{ env.MINIMAP_VERSION }}" >> $GITHUB_ENV
+          echo "XP_FABRIC=XaeroPlus-${{ env.XP_VERSION}}+fabric-${{ env.MINECRAFT_VERSION }}-WM${{ env.WORLDMAP_VERSION_FABRIC }}-MM${{ env.MINIMAP_VERSION_FABRIC }}" >> $GITHUB_ENV
 
       - name: Get Forge Jar Filename
         run: |
-          echo "XP_FORGE=XaeroPlus-${{ env.XP_VERSION}}+forge-${{ env.MINECRAFT_VERSION }}-WM${{ env.WORLDMAP_VERSION }}-MM${{ env.MINIMAP_VERSION }}" >> $GITHUB_ENV
+          echo "XP_FORGE=XaeroPlus-${{ env.XP_VERSION}}+forge-${{ env.MINECRAFT_VERSION }}-WM${{ env.WORLDMAP_VERSION_FORGE }}-MM${{ env.MINIMAP_VERSION_FORGE }}" >> $GITHUB_ENV
 
       - name: Get Neo Jar Filename
         run: |
-          echo "XP_NEO=XaeroPlus-${{ env.XP_VERSION}}+neoforge-${{ env.MINECRAFT_VERSION }}-WM${{ env.WORLDMAP_VERSION }}-MM${{ env.MINIMAP_VERSION }}" >> $GITHUB_ENV
+          echo "XP_NEO=XaeroPlus-${{ env.XP_VERSION}}+neoforge-${{ env.MINECRAFT_VERSION }}-WM${{ env.WORLDMAP_VERSION_FORGE }}-MM${{ env.MINIMAP_VERSION_FORGE }}" >> $GITHUB_ENV
 
       - name: Upload Fabric Artifact
         if: ${{ inputs.fabric }}
@@ -113,8 +121,10 @@ jobs:
       xp_fabric: ${{ env.XP_FABRIC }}
       xp_forge: ${{ env.XP_FORGE }}
       xp_neo: ${{ env.XP_NEO }}
-      worldmap_version: ${{ env.WORLDMAP_VERSION }}
-      minimap_version: ${{ env.MINIMAP_VERSION }}
+      worldmap_version_fabric: ${{ env.WORLDMAP_VERSION_FABRIC }}
+      minimap_version_fabric: ${{ env.MINIMAP_VERSION_FABRIC }}
+      worldmap_version_forge: ${{ env.WORLDMAP_VERSION_FORGE }}
+      minimap_version_forge: ${{ env.MINIMAP_VERSION_FORGE }}
 
   release:
     needs:
@@ -152,8 +162,8 @@ jobs:
           game-versions: |
             ${{ env.MINECRAFT_VERSION }}
           dependencies: |
-            xaerominimap@${{ needs.build.outputs.minimap_version }}(required){modrinth:1bokaNcj}{curseforge:263420}
-            xaeroworldmap@${{ needs.build.outputs.worldmap_version }}(required){modrinth:NcUtCpym}{curseforge:317780}
+            xaerominimap@${{ needs.build.outputs.minimap_version_fabric }}(required){modrinth:1bokaNcj}{curseforge:263420}
+            xaeroworldmap@${{ needs.build.outputs.worldmap_version_fabric }}(required){modrinth:NcUtCpym}{curseforge:317780}
             fabric-api(required){modrinth:P7dR8mSH}{curseforge:306612}
             worldtools(optional){modrinth:FlFKBOIX}{curseforge:909868}
             waystones(optional){modrinth:LOpKHB2A}{curseforge:245755}
@@ -179,8 +189,8 @@ jobs:
           game-versions: |
             ${{ env.MINECRAFT_VERSION }}
           dependencies: |
-            xaerominimap@${{ needs.build.outputs.minimap_version }}(required){modrinth:1bokaNcj}{curseforge:263420}
-            xaeroworldmap@${{ needs.build.outputs.worldmap_version }}(required){modrinth:NcUtCpym}{curseforge:317780}
+            xaerominimap@${{ needs.build.outputs.minimap_version_forge }}(required){modrinth:1bokaNcj}{curseforge:263420}
+            xaeroworldmap@${{ needs.build.outputs.worldmap_version_forge }}(required){modrinth:NcUtCpym}{curseforge:317780}
             worldtools(optional){modrinth:FlFKBOIX}{curseforge:909868}
             waystones(optional){modrinth:LOpKHB2A}{curseforge:245755}
 
@@ -204,8 +214,8 @@ jobs:
           game-versions: |
             ${{ env.MINECRAFT_VERSION }}
           dependencies: |
-            xaerominimap@24.0.0(required){modrinth:1bokaNcj}{curseforge:263420}
-            xaeroworldmap@1.38.0(required){modrinth:NcUtCpym}{curseforge:317780}
+            xaerominimap@${{ needs.build.outputs.minimap_version_forge }}(required){modrinth:1bokaNcj}{curseforge:263420}
+            xaeroworldmap@${{ needs.build.outputs.worldmap_version_forge }}(required){modrinth:NcUtCpym}{curseforge:317780}
             worldtools(optional){modrinth:FlFKBOIX}{curseforge:909868}
             waystones(optional){modrinth:LOpKHB2A}{curseforge:245755}
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -106,11 +106,17 @@ allprojects {
 }
 
 tasks {
-    register("printWorldMapVersion") {
-        println(gradle.extra.get("worldmap_version"))
+    register("printWorldMapVersionFabric") {
+        println(gradle.extra.get("worldmap_version_fabric"))
     }
-    register("printMinimapVersion") {
-        println(gradle.extra.get("minimap_version"))
+    register("printMinimapVersionFabric") {
+        println(gradle.extra.get("minimap_version_fabric"))
+    }
+    register("printWorldMapVersionForge") {
+        println(gradle.extra.get("worldmap_version_forge"))
+    }
+    register("printMinimapVersionForge") {
+        println(gradle.extra.get("minimap_version_forge"))
     }
     register("printXaeroPlusVersion") {
         println(version)

diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -27,11 +27,11 @@ afterEvaluate {
 	}
 }
 
-val worldmap_version: String by gradle.extra
-val minimap_version: String by gradle.extra
+val worldmap_version_fabric: String by gradle.extra
+val minimap_version_fabric: String by gradle.extra
 val minecraft_version: String by gradle.extra
 val destArchiveVersion = "${project.version}+${loom.platform.get().id()}-${minecraft_version}"
-val destArchiveClassifier = "WM${worldmap_version}-MM${minimap_version}"
+val destArchiveClassifier = "WM${worldmap_version_fabric}-MM${minimap_version_fabric}"
 
 dependencies {
 	modImplementation(libs.fabric.loader)
@@ -62,8 +62,8 @@ tasks {
 		filesMatching("fabric.mod.json") {
 			expand(mapOf(
 				"version" to project.version,
-				"worldmap_version" to worldmap_version,
-				"minimap_version" to minimap_version
+				"worldmap_version" to worldmap_version_fabric,
+				"minimap_version" to minimap_version_fabric
 			))
 		}
 	}

diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
@@ -29,11 +29,11 @@ loom {
     }
 }
 
-val worldmap_version: String by gradle.extra
-val minimap_version: String by gradle.extra
+val worldmap_version_forge: String by gradle.extra
+val minimap_version_forge: String by gradle.extra
 val minecraft_version: String by gradle.extra
 val destArchiveVersion = "${project.version}+${loom.platform.get().id()}-${minecraft_version}"
-val destArchiveClassifier = "WM${worldmap_version}-MM${minimap_version}"
+val destArchiveClassifier = "WM${worldmap_version_forge}-MM${minimap_version_forge}"
 
 sourceSets.main.get().java.srcDir(common.layout.buildDirectory.get().asFile.path + "/remappedSources/forge/java")
 sourceSets.main.get().resources.srcDir(common.layout.buildDirectory.get().asFile.path + "/remappedSources/forge/resources")
@@ -60,8 +60,8 @@ tasks {
         filesMatching("META-INF/mods.toml") {
             expand(mapOf(
                 "version" to project.version,
-                "worldmap_version" to worldmap_version,
-                "minimap_version" to minimap_version
+                "worldmap_version" to worldmap_version_forge,
+                "minimap_version" to minimap_version_forge
             ))
         }
     }

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 #
 # Copyright © 2015-2021 the original authors.

diff --git a/neo/build.gradle.kts b/neo/build.gradle.kts
@@ -22,14 +22,14 @@ loom {
     }
 }
 
-val worldmap_version: String by gradle.extra
-val minimap_version: String by gradle.extra
+val worldmap_version_forge: String by gradle.extra
+val minimap_version_forge: String by gradle.extra
 val minecraft_version: String by gradle.extra
 val parchment_version: String by gradle.extra
 val loader_version: String by gradle.extra
 val neoforge_version: String by gradle.extra
 val destArchiveVersion = "${project.version}+${loom.platform.get().id()}-${minecraft_version}"
-val destArchiveClassifier = "WM${worldmap_version}-MM${minimap_version}"
+val destArchiveClassifier = "WM${worldmap_version_forge}-MM${minimap_version_forge}"
 
 sourceSets.main.get().java.srcDir(common.layout.buildDirectory.get().asFile.path + "/remappedSources/forge/java")
 sourceSets.main.get().resources.srcDir(common.layout.buildDirectory.get().asFile.path + "/remappedSources/forge/resources")
@@ -54,8 +54,8 @@ tasks {
         filesMatching("META-INF/mods.toml") {
             expand(mapOf(
                 "version" to project.version,
-                "worldmap_version" to worldmap_version,
-                "minimap_version" to minimap_version
+                "worldmap_version" to worldmap_version_forge,
+                "minimap_version" to minimap_version_forge
             ))
         }
     }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -16,8 +16,10 @@ gradle.extra.apply {
 	set("fabric_loader_version", "0.15.2")
 	set("fabric_api_version", "0.91.1+1.20.2")
 	set("forge_loader_version", "48.0.7")
-	set("worldmap_version", "1.38.1")
-    set("minimap_version", "24.0.2")
+    set("worldmap_version_fabric", "1.38.1")
+    set("minimap_version_fabric", "24.0.2")
+    set("worldmap_version_forge", "1.38.1")
+    set("minimap_version_forge", "24.0.1")
 	set("neoforge_version", "20.2.88")
 }
 
@@ -30,12 +32,12 @@ dependencyResolutionManagement {
 			library("fabric-api", "net.fabricmc.fabric-api:fabric-api:${gradle.extra.get("fabric_api_version")}")
 			library("parchment", "org.parchmentmc.data:parchment-${gradle.extra.get("minecraft_version")}:${gradle.extra.get("parchment_version")}")
 			library("neoforge", "net.neoforged:neoforge:${gradle.extra.get("neoforge_version")}")
-			library("worldmap-fabric", "maven.modrinth:xaeros-world-map:${gradle.extra.get("worldmap_version")}_Fabric_${gradle.extra.get("minecraft_version")}")
-			library("worldmap-forge", "maven.modrinth:xaeros-world-map:${gradle.extra.get("worldmap_version")}_Forge_${gradle.extra.get("minecraft_version")}")
-			library("worldmap-neo", "maven.modrinth:xaeros-world-map:${gradle.extra.get("worldmap_version")}_NeoForge_${gradle.extra.get("minecraft_version")}")
-			library("minimap-fabric", "maven.modrinth:xaeros-minimap:${gradle.extra.get("minimap_version")}_Fabric_${gradle.extra.get("minecraft_version")}")
-			library("minimap-forge", "maven.modrinth:xaeros-minimap:${"24.0.1"}_Forge_${gradle.extra.get("minecraft_version")}")
-			library("minimap-neo", "maven.modrinth:xaeros-minimap:${"24.0.1"}_NeoForge_${gradle.extra.get("minecraft_version")}")
+			library("worldmap-fabric", "maven.modrinth:xaeros-world-map:${gradle.extra.get("worldmap_version_fabric")}_Fabric_${gradle.extra.get("minecraft_version")}")
+			library("worldmap-forge", "maven.modrinth:xaeros-world-map:${gradle.extra.get("worldmap_version_forge")}_Forge_${gradle.extra.get("minecraft_version")}")
+			library("worldmap-neo", "maven.modrinth:xaeros-world-map:${gradle.extra.get("worldmap_version_forge")}_NeoForge_${gradle.extra.get("minecraft_version")}")
+			library("minimap-fabric", "maven.modrinth:xaeros-minimap:${gradle.extra.get("minimap_version_fabric")}_Fabric_${gradle.extra.get("minecraft_version")}")
+			library("minimap-forge", "maven.modrinth:xaeros-minimap:${gradle.extra.get("minimap_version_forge")}_Forge_${gradle.extra.get("minecraft_version")}")
+			library("minimap-neo", "maven.modrinth:xaeros-minimap:${gradle.extra.get("minimap_version_forge")}_NeoForge_${gradle.extra.get("minecraft_version")}")
 			library("mixinextras-common", "io.github.llamalad7:mixinextras-common:0.3.5")
 			library("mixinextras-forge", "io.github.llamalad7:mixinextras-forge:0.3.5")
 			library("caffeine", "com.github.ben-manes.caffeine:caffeine:3.1.8")