WM1.39.2

rfresh2 · Dec 13, 2024 · 832b009 · 832b009
1 parent 3f8e1ae
commit 832b009
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 9 deletions.
diff --git a/.github/workflows/1.12.2.yml b/.github/workflows/1.12.2.yml
@@ -7,7 +7,7 @@ on:
       - "mainline"
 
 env:
-  WORLDMAP_VERSION: "1.39.0"
+  WORLDMAP_VERSION: "1.39.2"
   MINIMAP_VERSION: "24.6.1"
   MINECRAFT_VERSION: "1.12.2"
   MINECRAFT_VERSION_SHORT: "1.12"
@@ -37,27 +37,49 @@ jobs:
       - name: Build mod
         run: ./gradlew build
 
+      - name: Get Forge Jar Filename
+        run: echo "XP_FORGE=XaeroPlus-${{ github.run_number }}+forge-${{ env.MINECRAFT_VERSION }}-WM${{ env.WORLDMAP_VERSION }}-MM${{ env.MINIMAP_VERSION }}" >> $GITHUB_ENV
+
       - name: Rename built mod
-        run: mv build/libs/xaeroplus-${{ env.MINECRAFT_VERSION }}.jar XaeroPlus-${{ env.MOD_LOADER }}-${{ env.MINECRAFT_VERSION }}-${{ github.run_number }}-WM${{ env.WORLDMAP_VERSION }}-MM${{ env.MINIMAP_VERSION }}.jar
+        run: mv build/libs/xaeroplus-${{ env.MINECRAFT_VERSION }}.jar ${{ env.XP_FORGE }} .jar
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.MOD_LOADER }}-${{ env.MINECRAFT_VERSION }}-${{ github.run_number }}-WM${{ env.WORLDMAP_VERSION }}-MM${{ env.MINIMAP_VERSION }}
-          path: XaeroPlus-${{ env.MOD_LOADER }}-${{ env.MINECRAFT_VERSION }}-${{ github.run_number }}-WM${{ env.WORLDMAP_VERSION }}-MM${{ env.MINIMAP_VERSION }}.jar
+          name: ${{ env.XP_FORGE }}
+          path: ${{ env.XP_FORGE }}.jar
+    outputs:
+      xp_forge: ${{ env.XP_FORGE }}
+
+  test-forge:
+    runs-on: ubuntu-latest
+    needs:
+      - build
+    steps:
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Download job artifacts
+        uses: actions/download-artifact@v4
+        with:
+          merge-multiple: true
+          path: artifacts/
 
       - name: Set CI Test Env Var
         run: echo "XP_CI_TEST=true" >> $GITHUB_ENV
 
       - name: Setup Forge Test
         run: |
-          mkdir -p run/mods && cp XaeroPlus-${{ env.MOD_LOADER }}-${{ env.MINECRAFT_VERSION }}-${{ github.run_number }}-WM${{ env.WORLDMAP_VERSION }}-MM${{ env.MINIMAP_VERSION }}.jar run/mods \
+          mkdir -p run/mods && cp artifacts/${{ needs.build.outputs.xp_forge }}.jar run/mods \
           && wget https://api.modrinth.com/maven/maven/modrinth/xaeros-minimap/${{ env.MINIMAP_VERSION }}_Forge_1.12/xaeros-minimap-${{ env.MINIMAP_VERSION }}_Forge_1.12.jar -P run/mods/ \
           && wget https://api.modrinth.com/maven/maven/modrinth/xaeros-world-map/${{ env.WORLDMAP_VERSION }}_Forge_1.12/xaeros-world-map-${{ env.WORLDMAP_VERSION }}_Forge_1.12.jar -P run/mods/ \
           && wget https://api.modrinth.com/maven/maven/modrinth/mixinbooter/9.4/!mixinbooter-9.4.jar -P run/mods/
 
       - name: Forge Test
-        uses: 3arthqu4ke/mc-runtime-test@2.4.0
+        uses: headlesshq/mc-runtime-test@3.0.0
         with:
           mc: ${{ env.MINECRAFT_VERSION }}
           modloader: forge
@@ -66,3 +88,4 @@ jobs:
           java: 8
           xvfb: false
           headlessmc-command: -lwjgl --jvm -Djava.awt.headless=true
+          cache-mc: true
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
 
 env:
-  WORLDMAP_VERSION: "1.39.0"
+  WORLDMAP_VERSION: "1.39.2"
   MINIMAP_VERSION: "24.6.1"
   MINECRAFT_VERSION: "1.12.2"
   MINECRAFT_VERSION_SHORT: "1.12"

diff --git a/build.gradle b/build.gradle
@@ -116,7 +116,7 @@ dependencies {
     jarLibs 'com.github.ben-manes.caffeine:caffeine:2.9.3'
     jarLibs 'org.xerial:sqlite-jdbc:3.45.0.0'
 
-    implementation(fg.deobf("maven.modrinth:xaeros-world-map:1.39.0_Forge_1.12"))
+    implementation(fg.deobf("maven.modrinth:xaeros-world-map:1.39.2_Forge_1.12"))
     implementation(fg.deobf("maven.modrinth:xaeros-minimap:24.6.1_Forge_1.12"))
     implementation(fg.deobf('cabaletta:baritone-deobf-unoptimized-mcp-dev:1.2')).setChanging(true)
     compileOnly(fg.deobf("curse.maven:waystones-245755:2859589"))

diff --git a/src/main/java/xaeroplus/XaeroPlus.java b/src/main/java/xaeroplus/XaeroPlus.java
@@ -19,7 +19,7 @@
         name = XaeroPlus.NAME,
         version = XaeroPlus.VERSION,
         clientSideOnly = true,
-        dependencies = "required:mixinbooter@[9.4,);after:xaerominimap@[24.6.1];required-after:xaeroworldmap@[1.39.0];"
+        dependencies = "required:mixinbooter@[9.4,);after:xaerominimap@[24.6.1];required-after:xaeroworldmap@[1.39.2];"
 )
 public class XaeroPlus {
     public static final String MODID = "xaeroplus";