Merge branch '1.20.2' into 1.20.4

# Conflicts: # settings.gradle.kts
rfresh2 · Mar 27, 2024 · c50e9c6 · c50e9c6
2 parents 5501639 + ef54231
commit c50e9c6
Show file tree

Hide file tree

Showing 6 changed files with 195 additions and 13 deletions.
diff --git a/.github/workflows/1.20.4.yml b/.github/workflows/1.20.4.yml
@@ -48,6 +48,14 @@ jobs:
       run: |
         echo "MINIMAP_VERSION_FORGE=$(./gradlew -q printMinimapVersionForge)" >> $GITHUB_ENV
 
+    - name: Get WorldMap Version NeoForge
+      run: |
+        echo "WORLDMAP_VERSION_NEO=$(./gradlew -q printWorldMapVersionNeo)" >> $GITHUB_ENV
+
+    - name: Get Minimap Version NeoForge
+      run: |
+        echo "MINIMAP_VERSION_NEO=$(./gradlew -q printMinimapVersionNeo)" >> $GITHUB_ENV
+
     - name: Get XaeroPlus Version
       run: |
         echo "XP_VERSION=$(./gradlew -q printXaeroPlusVersion)" >> $GITHUB_ENV
@@ -62,7 +70,7 @@ jobs:
 
     - name: Get Neo Jar Filename
       run: |
-        echo "XP_NEO=XaeroPlus-${{ env.XP_VERSION}}+neoforge-${{ env.MINECRAFT_VERSION }}-WM${{ env.WORLDMAP_VERSION_FORGE }}-MM${{ env.MINIMAP_VERSION_FORGE }}" >> $GITHUB_ENV
+        echo "XP_NEO=XaeroPlus-${{ env.XP_VERSION}}+neoforge-${{ env.MINECRAFT_VERSION }}-WM${{ env.WORLDMAP_VERSION_NEO }}-MM${{ env.MINIMAP_VERSION_NEO }}" >> $GITHUB_ENV
 
     - name: Upload Fabric Artifact
       uses: actions/upload-artifact@v4

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -67,6 +67,15 @@ jobs:
         run: |
           echo "MINIMAP_VERSION_FORGE=$(./gradlew -q printMinimapVersionForge)" >> $GITHUB_ENV
 
+      - name: Get WorldMap Version NeoForge
+        run: |
+          echo "WORLDMAP_VERSION_NEO=$(./gradlew -q printWorldMapVersionNeo)" >> $GITHUB_ENV
+
+      - name: Get Minimap Version NeoForge
+        run: |
+          echo "MINIMAP_VERSION_NEO=$(./gradlew -q printMinimapVersionNeo)" >> $GITHUB_ENV
+
+
       - name: Get XaeroPlus Version
         run: |
           echo "XP_VERSION=$(./gradlew -q printXaeroPlusVersion)" >> $GITHUB_ENV
@@ -81,7 +90,7 @@ jobs:
 
       - name: Get Neo Jar Filename
         run: |
-          echo "XP_NEO=XaeroPlus-${{ env.XP_VERSION}}+neoforge-${{ env.MINECRAFT_VERSION }}-WM${{ env.WORLDMAP_VERSION_FORGE }}-MM${{ env.MINIMAP_VERSION_FORGE }}" >> $GITHUB_ENV
+          echo "XP_NEO=XaeroPlus-${{ env.XP_VERSION}}+neoforge-${{ env.MINECRAFT_VERSION }}-WM${{ env.WORLDMAP_VERSION_NEO }}-MM${{ env.MINIMAP_VERSION_NEO }}" >> $GITHUB_ENV
 
       - name: Upload Fabric Artifact
         if: ${{ inputs.fabric }}
@@ -125,6 +134,8 @@ jobs:
       minimap_version_fabric: ${{ env.MINIMAP_VERSION_FABRIC }}
       worldmap_version_forge: ${{ env.WORLDMAP_VERSION_FORGE }}
       minimap_version_forge: ${{ env.MINIMAP_VERSION_FORGE }}
+      worldmap_version_neo: ${{ env.WORLDMAP_VERSION_NEO }}
+      minimap_version_neo: ${{ env.MINIMAP_VERSION_NEO }}
 
   release:
     needs:
@@ -214,8 +225,8 @@ jobs:
           game-versions: |
             ${{ env.MINECRAFT_VERSION }}
           dependencies: |
-            xaerominimap@${{ needs.build.outputs.minimap_version_forge }}(required){modrinth:1bokaNcj}{curseforge:263420}
-            xaeroworldmap@${{ needs.build.outputs.worldmap_version_forge }}(required){modrinth:NcUtCpym}{curseforge:317780}
+            xaerominimap@${{ needs.build.outputs.minimap_version_neo }}(required){modrinth:1bokaNcj}{curseforge:263420}
+            xaeroworldmap@${{ needs.build.outputs.worldmap_version_neo }}(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
@@ -118,6 +118,12 @@ tasks {
     register("printMinimapVersionForge") {
         println(gradle.extra.get("minimap_version_forge"))
     }
+    register("printWorldMapVersionNeo") {
+        println(gradle.extra.get("worldmap_version_neo"))
+    }
+    register("printMinimapVersionNeo") {
+        println(gradle.extra.get("minimap_version_neo"))
+    }
     register("printXaeroPlusVersion") {
         println(version)
     }