update parchment and forge

rfresh2 · Jan 3, 2025 · 1fc04b4 · 1fc04b4
1 parent 8d41488
commit 1fc04b4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/.github/workflows/1.21.yml b/.github/workflows/1.21.yml
@@ -6,7 +6,7 @@ on:
     branches:
       - "1.21"
 env:
-  MINECRAFT_VERSION: "1.21"
+  MINECRAFT_VERSION: "1.21.1"
 
 jobs:
   build:
@@ -120,8 +120,8 @@ jobs:
       - name: Setup Fabric Test Mods
         run: |
           mkdir -p run/mods && cp artifacts/${{ needs.build.outputs.xp_fabric }}.jar run/mods \
-          && wget https://api.modrinth.com/maven/maven/modrinth/xaeros-minimap/${{ needs.build.outputs.minimap_version_fabric }}_Fabric_${{ env.MINECRAFT_VERSION }}/xaeros-minimap-${{ needs.build.outputs.minimap_version_fabric }}_Fabric_${{ env.MINECRAFT_VERSION }}.jar -P run/mods/ \
-          && wget https://api.modrinth.com/maven/maven/modrinth/xaeros-world-map/${{ needs.build.outputs.worldmap_version_fabric }}_Fabric_${{ env.MINECRAFT_VERSION }}/xaeros-world-map-${{ needs.build.outputs.worldmap_version_fabric }}_Fabric_${{ env.MINECRAFT_VERSION }}.jar -P run/mods/
+          && wget https://api.modrinth.com/maven/maven/modrinth/xaeros-minimap/${{ needs.build.outputs.minimap_version_fabric }}_Fabric_1.21/xaeros-minimap-${{ needs.build.outputs.minimap_version_fabric }}_Fabric_1.21.jar -P run/mods/ \
+          && wget https://api.modrinth.com/maven/maven/modrinth/xaeros-world-map/${{ needs.build.outputs.worldmap_version_fabric }}_Fabric_1.21/xaeros-world-map-${{ needs.build.outputs.worldmap_version_fabric }}_Fabric_1.21.jar -P run/mods/
 
       - name: Fabric Test
         uses: headlesshq/[email protected]
@@ -159,8 +159,8 @@ jobs:
       - name: Setup Forge Test
         run: |
           mkdir -p run/mods && cp artifacts/${{ needs.build.outputs.xp_forge }}.jar run/mods \
-          && wget https://api.modrinth.com/maven/maven/modrinth/xaeros-minimap/${{ needs.build.outputs.minimap_version_forge }}_Forge_${{ env.MINECRAFT_VERSION }}/xaeros-minimap-${{ needs.build.outputs.minimap_version_forge }}_Forge_${{ env.MINECRAFT_VERSION }}.jar -P run/mods/ \
-          && wget https://api.modrinth.com/maven/maven/modrinth/xaeros-world-map/${{ needs.build.outputs.worldmap_version_forge }}_Forge_${{ env.MINECRAFT_VERSION }}/xaeros-world-map-${{ needs.build.outputs.worldmap_version_forge }}_Forge_${{ env.MINECRAFT_VERSION }}.jar -P run/mods/
+          && wget https://api.modrinth.com/maven/maven/modrinth/xaeros-minimap/${{ needs.build.outputs.minimap_version_forge }}_Forge_1.21/xaeros-minimap-${{ needs.build.outputs.minimap_version_forge }}_Forge_1.21.jar -P run/mods/ \
+          && wget https://api.modrinth.com/maven/maven/modrinth/xaeros-world-map/${{ needs.build.outputs.worldmap_version_forge }}_Forge_1.21/xaeros-world-map-${{ needs.build.outputs.worldmap_version_forge }}_Forge_1.21.jar -P run/mods/
 
       - name: Forge Test
         uses: headlesshq/[email protected]
@@ -197,8 +197,8 @@ jobs:
       - name: Setup Neo Test
         run: |
           mkdir -p run/mods && cp artifacts/${{ needs.build.outputs.xp_neo }}.jar run/mods \
-          && wget https://api.modrinth.com/maven/maven/modrinth/xaeros-minimap/${{ needs.build.outputs.minimap_version_neo}}_NeoForge_${{ env.MINECRAFT_VERSION }}/xaeros-minimap-${{ needs.build.outputs.minimap_version_neo }}_NeoForge_${{ env.MINECRAFT_VERSION }}.jar -P run/mods/ \
-          && wget https://api.modrinth.com/maven/maven/modrinth/xaeros-world-map/${{ needs.build.outputs.worldmap_version_neo }}_NeoForge_${{ env.MINECRAFT_VERSION }}/xaeros-world-map-${{ needs.build.outputs.worldmap_version_neo }}_NeoForge_${{ env.MINECRAFT_VERSION }}.jar -P run/mods/
+          && wget https://api.modrinth.com/maven/maven/modrinth/xaeros-minimap/${{ needs.build.outputs.minimap_version_neo}}_NeoForge_1.21/xaeros-minimap-${{ needs.build.outputs.minimap_version_neo }}_NeoForge_1.21.jar -P run/mods/ \
+          && wget https://api.modrinth.com/maven/maven/modrinth/xaeros-world-map/${{ needs.build.outputs.worldmap_version_neo }}_NeoForge_1.21/xaeros-world-map-${{ needs.build.outputs.worldmap_version_neo }}_NeoForge_1.21.jar -P run/mods/
 
       - name: Neo Test
         uses: headlesshq/[email protected]

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,7 +25,7 @@ on:
         type: string
 
 env:
-  MINECRAFT_VERSION: "1.21"
+  MINECRAFT_VERSION: "1.21.1"
 
 jobs:
   build:
@@ -166,7 +166,7 @@ jobs:
             quilt
           game-versions: |
             ${{ env.MINECRAFT_VERSION }}
-            1.21.1
+            1.21
           dependencies: |
             xaerominimap@${{ needs.build.outputs.minimap_version_fabric }}(required){modrinth:1bokaNcj}{curseforge:263420}
             xaeroworldmap@${{ needs.build.outputs.worldmap_version_fabric }}(required){modrinth:NcUtCpym}{curseforge:317780}
@@ -194,7 +194,7 @@ jobs:
             forge
           game-versions: |
             ${{ env.MINECRAFT_VERSION }}
-            1.21.1
+            1.21
           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}
@@ -220,7 +220,7 @@ jobs:
             neoforge
           game-versions: |
             ${{ env.MINECRAFT_VERSION }}
-            1.21.1
+            1.21
           dependencies: |
             xaerominimap@${{ needs.build.outputs.minimap_version_neo }}(required){modrinth:1bokaNcj}{curseforge:263420}
             xaeroworldmap@${{ needs.build.outputs.worldmap_version_neo }}(required){modrinth:NcUtCpym}{curseforge:317780}

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -10,8 +10,8 @@ pluginManagement {
 }
 gradle.extra.apply {
 	set("mod_version", "2.25.1")
-	set("minecraft_version", "1.21")
-	set("parchment_version", "2024.07.28")
+	set("minecraft_version", "1.21.1")
+	set("parchment_version", "2024.11.17")
     set("worldmap_version_fabric", "1.39.2")
 	set("minimap_version_fabric", "24.7.1")
 	set("worldmap_version_forge", "1.39.2")
@@ -24,15 +24,15 @@ dependencyResolutionManagement {
 	versionCatalogs {
 		create("libs") {
 			library("fabric-loader", "net.fabricmc:fabric-loader:0.15.11")
-			library("forge", "net.minecraftforge:forge:${gradle.extra.get("minecraft_version")}-51.0.29")
-			library("fabric-api", "net.fabricmc.fabric-api:fabric-api:0.105.0+1.21.1")
-			library("neoforge", "net.neoforged:neoforge:21.0.167")
-			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_neo")}_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_neo")}_NeoForge_${gradle.extra.get("minecraft_version")}")
+			library("forge", "net.minecraftforge:forge:${gradle.extra.get("minecraft_version")}-52.0.38")
+			library("fabric-api", "net.fabricmc.fabric-api:fabric-api:0.114.0+1.21.1")
+			library("neoforge", "net.neoforged:neoforge:21.1.92")
+			library("worldmap-fabric", "maven.modrinth:xaeros-world-map:${gradle.extra.get("worldmap_version_fabric")}_Fabric_1.21")
+			library("worldmap-forge", "maven.modrinth:xaeros-world-map:${gradle.extra.get("worldmap_version_forge")}_Forge_1.21")
+			library("worldmap-neo", "maven.modrinth:xaeros-world-map:${gradle.extra.get("worldmap_version_neo")}_NeoForge_1.21")
+			library("minimap-fabric", "maven.modrinth:xaeros-minimap:${gradle.extra.get("minimap_version_fabric")}_Fabric_1.21")
+			library("minimap-forge", "maven.modrinth:xaeros-minimap:${gradle.extra.get("minimap_version_forge")}_Forge_1.21")
+			library("minimap-neo", "maven.modrinth:xaeros-minimap:${gradle.extra.get("minimap_version_neo")}_NeoForge_1.21")
             library("mixinextras-common", "io.github.llamalad7:mixinextras-common:0.4.1")
             library("mixinextras-forge", "io.github.llamalad7:mixinextras-forge:0.4.1")
 			library("caffeine", "com.github.ben-manes.caffeine:caffeine:3.1.8")
@@ -54,9 +54,9 @@ dependencyResolutionManagement {
 //			library("fpsdisplay", "maven.modrinth:fpsdisplay:3.1.0+1.20.x")
 			library("cloth-config-fabric", "me.shedaniel.cloth:cloth-config-fabric:15.0.127")
             library("oldbiomes", "com.github.rfresh2:OldBiomes:1.0.0")
-            library("baritone-fabric", "com.github.rfresh2:baritone-fabric:${gradle.extra.get("minecraft_version")}")
-            library("baritone-forge", "com.github.rfresh2:baritone-forge:${gradle.extra.get("minecraft_version")}")
-            library("baritone-neoforge", "com.github.rfresh2:baritone-neoforge:${gradle.extra.get("minecraft_version")}")
+            library("baritone-fabric", "com.github.rfresh2:baritone-fabric:1.21")
+            library("baritone-forge", "com.github.rfresh2:baritone-forge:1.21")
+            library("baritone-neoforge", "com.github.rfresh2:baritone-neoforge:1.21")
         }
 	}
 }