Update to 1.21.6 (#200)

* Port to 1.21.3

* Use modApi instead

* Fix NPC skins not updating

* Update to 1.21.4
Bumped minor version due to change that will break resource packs and such

* Update to 1.21.6

* Add back old GUI item model data

* Add back the model data ID

* Comment out Parchment for now

* Bump all workflow versions

* Bump wrapper validation action

Author: BluSpring

.github/workflows/fabric-build.yml

@@ -10,7 +10,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/loom-cache
@@ -20,19 +20,20 @@ jobs:
           restore-keys: |
             gradle-
       - name: checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: validate gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@v3
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           java-version: 21
+          distribution: 'temurin'
       - name: make gradle wrapper executable
         run: chmod +x ./gradlew
       - name: build
         run: ./gradlew build
       - name: capture build artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Artifacts
           path: build/libs/

.github/workflows/fabric-release.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/loom-cache
@@ -22,11 +22,12 @@ jobs:
           key: gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             gradle-
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           java-version: 21
+          distribution: 'temurin'
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
@@ -35,7 +36,7 @@ jobs:
         run: ./gradlew :build --stacktrace
 
       - name: Upload GitHub release
-        uses: AButler/upload-release-assets@v2.0
+        uses: AButler/upload-release-assets@v3.0
         with:
           files: 'build/libs/*.jar'
           repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/javadoc-snapshot.yml

@@ -10,18 +10,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           java-version: 21
+          distribution: 'temurin'
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
         run: ./gradlew javadoc
       - name: GitHub Pages Javadoc
         if: success()
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           enable_jekyll: true

.github/workflows/javadoc.yml

@@ -14,18 +14,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           java-version: 21
+          distribution: 'temurin'
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
         run: ./gradlew javadoc
       - name: GitHub Pages Javadoc
         if: success()
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           enable_jekyll: true

.github/workflows/maven-publish.yml

@@ -8,11 +8,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           java-version: 21
+          distribution: 'temurin'
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle

.github/workflows/mkdocs.yml

@@ -7,11 +7,11 @@ jobs:
   upload:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.x
     - run: pip install mkdocs-material

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.7-SNAPSHOT'
+    id 'fabric-loom' version '1.10-SNAPSHOT'
     id 'maven-publish'
 
     id 'com.matthewprenger.cursegradle' version '1.4.0'
@@ -19,6 +19,7 @@ repositories {
         url 'https://masa.dy.fi/maven'
     }
     maven { url 'https://jitpack.io' }
+    maven { url 'https://maven.parchmentmc.org' }
 }
 
 loom {
@@ -38,7 +39,8 @@ dependencies {
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings loom.layered {
         //mappings("net.fabricmc:yarn:$project.yarn_mappings:v2")
-        it.officialMojangMappings()
+        officialMojangMappings()
+        //parchment(file(project.layout.buildDirectory.file("parchment-1.21.6-pre1-BLEEDING-20250609.171144-1.zip")))
     }
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
@@ -56,20 +58,21 @@ dependencies {
     //modImplementation(include('com.github.NucleoidMC:DisguiseLib:90bf223196'))
 
     // Permission API
-    modImplementation(include('me.lucko:fabric-permissions-api:0.1-SNAPSHOT'))
+    modApi(include('me.lucko:fabric-permissions-api:0.4.0'))
 
     // Server translations
-    // Commented out for now until we can confirm the 1.21 supported version.  Does not impact general mod function
-    //modImplementation(include("xyz.nucleoid:server-translations-api:${project.translations_api}"))
+    modApi(include("xyz.nucleoid:server-translations-api:${project.translations_api}"))
 
     // SGUI
-    modImplementation(include("eu.pb4:sgui:${project.sgui_version}"))
+    modApi(include("eu.pb4:sgui:${project.sgui_version}"))
 
     // C2B
-    modImplementation(include("com.github.samolego.Config2Brigadier:config2brigadier-fabric:${project.c2b_version}"))
+    modApi(include("com.github.samolego:Config2Brigadier:${project.c2b_version}")) {
+        exclude(group: "net.fabricmc.fabric-api")
+    }
 
     // Polymer
-    modImplementation(include("eu.pb4:polymer-core:${project.polymer_version}"))
+    modApi(include("eu.pb4:polymer-core:${project.polymer_version}"))
 
 }
 

gradle.properties

@@ -4,21 +4,21 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21
-yarn_mappings=1.21+build.7
-loader_version=0.15.11
-fabric_version=0.100.4+1.21
+minecraft_version=1.21.6
+yarn_mappings=1.21.6+build.1
+loader_version=0.16.13
+fabric_version=0.127.0+1.21.6
 
 # Mod Properties
 # Updated mod_version to ensure FabricTailor compat retained
-mod_version=1.15.5
+mod_version=1.16.2
 maven_group=org.samo_lego
 archives_base_name=taterzens
 
 # Dependencies
 disguiselib_version=1.3.5
-c2b_version=10b43346ec
-carpet_core_version=1.4.128
-polymer_version=0.9.7+1.21
-sgui_version=1.6.0+1.21
-translations_api=2.2.0+1.20.3-rc1
+c2b_version=2.0.1
+carpet_core_version=1.4.176
+polymer_version=0.13.1+1.21.6
+sgui_version=1.10.0+1.21.6
+translations_api=2.5.1+1.21.5

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

jitpack.yml

@@ -1,8 +1,8 @@
 jdk:
-  - openjdk17
+  - openjdk21
 before_install:
   - export SDKMAN_DIR="/home/jitpack/.sdkman/"
   - source "/home/jitpack/.sdkman/bin/sdkman-init.sh"
-  - sdk install java 17.0.1-open
-  - sdk use java 17.0.1-open
+  - sdk install java 21.0.1-open
+  - sdk use java 21.0.1-open