build: support Fabric 1.21.5

.github/workflows/ci.yml

@@ -58,6 +58,7 @@ jobs:
             fabric-1.20.1
             fabric-1.21.1
             fabric-1.21.4
+            fabric-1.21.5
           distro-groups: |
             paper
             paper
@@ -66,6 +67,7 @@ jobs:
             fabric
             fabric
             fabric
+            fabric
           distro-descriptions: |
             Paper 1.20.1
             Paper 1.21.1
@@ -74,6 +76,7 @@ jobs:
             Fabric 1.20.1
             Fabric 1.21.1
             Fabric 1.21.4
+            Fabric 1.21.5
           files: |
             target/HuskSync-Bukkit-${{ env.version_name }}+mc.1.20.1.jar
             target/HuskSync-Bukkit-${{ env.version_name }}+mc.1.21.1.jar
@@ -82,3 +85,4 @@ jobs:
             target/HuskSync-Fabric-${{ env.version_name }}+mc.1.20.1.jar
             target/HuskSync-Fabric-${{ env.version_name }}+mc.1.21.1.jar
             target/HuskSync-Fabric-${{ env.version_name }}+mc.1.21.4.jar
+            target/HuskSync-Fabric-${{ env.version_name }}+mc.1.21.5.jar

.github/workflows/release.yml

@@ -47,6 +47,7 @@ jobs:
             fabric-1.20.1
             fabric-1.21.1
             fabric-1.21.4
+            fabric-1.21.5
           distro-groups: |
             paper
             paper
@@ -55,6 +56,7 @@ jobs:
             fabric
             fabric
             fabric
+            fabric
           distro-descriptions: |
             Paper 1.20.1
             Paper 1.21.1
@@ -63,6 +65,7 @@ jobs:
             Fabric 1.20.1
             Fabric 1.21.1
             Fabric 1.21.4
+            Fabric 1.21.5
           files: |
             target/HuskSync-Bukkit-${{ github.event.release.tag_name }}+mc.1.20.1.jar
             target/HuskSync-Bukkit-${{ github.event.release.tag_name }}+mc.1.21.1.jar
@@ -71,3 +74,4 @@ jobs:
             target/HuskSync-Fabric-${{ github.event.release.tag_name }}+mc.1.20.1.jar
             target/HuskSync-Fabric-${{ github.event.release.tag_name }}+mc.1.21.1.jar
             target/HuskSync-Fabric-${{ github.event.release.tag_name }}+mc.1.21.4.jar
+            target/HuskSync-Fabric-${{ github.event.release.tag_name }}+mc.1.21.5.jar

build.gradle

@@ -3,7 +3,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 plugins {
     id 'com.gradleup.shadow' version '8.3.6'
     id 'org.cadixdev.licenser' version '0.6.1' apply false
-    id 'fabric-loom' version "$fabric_loom_version" apply false
+    id 'dev.architectury.loom' version '1.9-SNAPSHOT' apply false
     id 'gg.essential.multi-version.root' apply false
     id 'org.ajoberstar.grgit' version '5.3.0'
     id 'maven-publish'
@@ -137,7 +137,7 @@ subprojects {
         version += "+mc.${project.name}"
 
         if (project.parent?.name?.equals('fabric')) {
-            apply plugin: 'fabric-loom'
+            apply plugin: 'dev.architectury.loom'
         }
     }
 

bukkit/build.gradle

@@ -10,7 +10,7 @@ dependencies {
 
     implementation 'net.william278.uniform:uniform-bukkit:1.3.3'
     implementation 'net.william278.uniform:uniform-paper:1.3.4'
-    implementation 'net.william278.toilet:toilet-bukkit:1.0.12'
+    implementation 'net.william278.toilet:toilet-bukkit:1.0.13'
     implementation 'net.william278:mpdbdataconverter:1.0.1'
     implementation 'net.william278:hsldataconverter:1.0'
     implementation 'net.william278:mapdataapi:2.0'

common/build.gradle

@@ -17,7 +17,7 @@ dependencies {
         exclude module: 'slf4j-api'
     }
 
-    compileOnlyApi 'net.william278.toilet:toilet-common:1.0.12'
+    compileOnlyApi 'net.william278.toilet:toilet-common:1.0.13'
 
     compileOnly 'net.william278.uniform:uniform-common:1.3.3'
     compileOnly 'com.mojang:brigadier:1.1.8'

fabric/1.21.4/gradle.properties

@@ -1,7 +1,7 @@
 essential.defaults.loom.mappings=net.fabricmc:yarn:1.21.4+build.4:v2
 
 fabric_loader_version=0.16.10
-fabric_api_version=0.115.0+1.21.4
+fabric_api_version=0.116.1+1.21.4
 fabric_permissions_api_version=0.3.3
-fabric_adventure_platform_version=6.2.0
+fabric_adventure_platform_version=6.3.0
 fabric_sgui_version=1.8.2+1.21.4

fabric/1.21.5/gradle.properties

@@ -0,0 +1,7 @@
+essential.defaults.loom.mappings=net.fabricmc:yarn:1.21.5+build.1:v2
+
+fabric_loader_version=0.16.14
+fabric_api_version=0.122.0+1.21.5
+fabric_permissions_api_version=0.3.3
+fabric_adventure_platform_version=6.4.0-SNAPSHOT
+fabric_sgui_version=1.9.0+1.21.5

fabric/build.gradle

@@ -15,7 +15,7 @@ dependencies {
     modImplementation include("me.lucko:fabric-permissions-api:${fabric_permissions_api_version}")
     modImplementation include("eu.pb4:sgui:${fabric_sgui_version}")
     modImplementation include("net.william278.uniform:uniform-fabric:1.3.3+${project.name}")
-    modImplementation include("net.william278.toilet:toilet-fabric:1.0.12+${project.name}")
+    modImplementation include("net.william278.toilet:toilet-fabric:1.0.13+${project.name}")
     modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_api_version}"
 
     // Manually include config deps due to the way including api deps works

fabric/mainProject

@@ -1 +1 @@
-1.21.4
+1.21.5

fabric/root.gradle

@@ -3,11 +3,13 @@ plugins {
 }
 
 preprocess {
+    def fabric12105 = createNode("1.21.5", 12105, "yarn")
     def fabric12104 = createNode("1.21.4", 12104, "yarn")
     def fabric12101 = createNode("1.21.1", 12101, "yarn")
     def fabric12001 = createNode("1.20.1", 12001, "yarn")
 
     strictExtraMappings.set(true)
-    fabric12101.link(fabric12104, null)
+    fabric12104.link(fabric12105, null)
-    fabric12001.link(fabric12104, null)
+    fabric12101.link(fabric12105, null)
+    fabric12001.link(fabric12105, null)
 }

gradle.properties

@@ -17,4 +17,4 @@ mongodb_driver_version=5.5.0
 snappy_version=1.1.10.7
 
 # Fabric settings
-fabric_loom_version=1.9-SNAPSHOT
+loom.ignoreDependencyLoomVersionValidation=true