build: general dependency bump

Bumps commons-io:commons-io from 2.17.0 to 2.18.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/ci_master.yml

@@ -14,7 +14,7 @@ permissions:
 
 jobs:
   build:
-    name: 'Build - 1.21.3'
+    name: 'Build - 1.21.4'
     runs-on: ubuntu-latest
     steps:
       - name: 'Setup JDK 21 📦'
@@ -28,7 +28,7 @@ jobs:
           gradle-version: '8.8'
       - name: 'Checkout for CI 🛎️'
         uses: actions/checkout@v4
-      - name: '[Current - 1.21.3] Build 🛎️'
+      - name: '[Current - 1.21.4] Build 🛎️'
         run: |
           ./gradlew clean build publish
         env:
@@ -55,14 +55,14 @@ jobs:
           version: ${{ env.version_name }}
           changelog: ${{ github.event.head_commit.message }}
           distro-names: |
-            paper-1.21.3
-            fabric-1.21.3
+            paper-1.21.4
+            fabric-1.21.4
           distro-groups: |
             paper
             fabric
           distro-descriptions: |
-            Paper 1.21.3
-            Fabric 1.21.3
+            Paper 1.21.4
+            Fabric 1.21.4
           files: |
-            target/HuskSync-Paper-${{ env.version_name }}+mc.1.21.3.jar
-            target/HuskSync-Fabric-${{ env.version_name }}+mc.1.21.3.jar
+            target/HuskSync-Paper-${{ env.version_name }}+mc.1.21.4.jar
+            target/HuskSync-Fabric-${{ env.version_name }}+mc.1.21.4.jar

.github/workflows/release.yml

@@ -23,10 +23,10 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: '8.8'
-      - name: '[Current - 1.21.3] Checkout for CI 🛎️'
+      - name: '[Current - 1.21.4] Checkout for CI 🛎️'
         uses: actions/checkout@v4
         with:
-          path: '1_21_3'
+          path: '1_21_4'
       - name: '[Non-LTS - 1.21.1] Checkout for CI 🛎️'
         uses: actions/checkout@v4
         with:
@@ -37,10 +37,10 @@ jobs:
         with:
           ref: 'minecraft/1.20.1'
           path: '1_20_1'
-      - name: '[Current - 1.21.3] Build 🛎️'
+      - name: '[Current - 1.21.4] Build 🛎️'
         run: |
           mkdir target
-          cd 1_21_3
+          cd 1_21_4
           ./gradlew clean build publish -Dforce-hide-version-meta=1
           cp -rf target/* ../target/
           cd ..
@@ -79,8 +79,8 @@ jobs:
           version: ${{ github.event.release.tag_name }}
           changelog: ${{ github.event.release.body }}
           distro-names: |
-            paper-1.21.3
-            fabric-1.21.3
+            paper-1.21.4
+            fabric-1.21.4
             paper-1.21.1
             fabric-1.21.1
             paper-1.20.1
@@ -93,15 +93,15 @@ jobs:
             paper
             fabric
           distro-descriptions: |
-            Paper 1.21.3
-            Fabric 1.21.3
+            Paper 1.21.4
+            Fabric 1.21.4
             Paper 1.21.1
             Fabric 1.21.1
             Paper 1.20.1
             Fabric 1.20.1
           files: |
-            target/HuskSync-Paper-${{ github.event.release.tag_name }}+mc.1.21.3.jar
-            target/HuskSync-Fabric-${{ github.event.release.tag_name }}+mc.1.21.3.jar
+            target/HuskSync-Paper-${{ github.event.release.tag_name }}+mc.1.21.4.jar
+            target/HuskSync-Fabric-${{ github.event.release.tag_name }}+mc.1.21.4.jar
             target/HuskSync-Paper-${{ github.event.release.tag_name }}+mc.1.21.1.jar
             target/HuskSync-Fabric-${{ github.event.release.tag_name }}+mc.1.21.1.jar
             target/HuskSync-Paper-${{ github.event.release.tag_name }}+mc.1.20.1.jar

README.md

@@ -46,15 +46,16 @@
 ## Compatibility
 HuskSync supports the following [compatible versions](https://william278.net/docs/husksync/compatibility) of Minecraft. Since v3.7, you must download the correct version of HuskSync for your server:
 
-|    Minecraft    | Latest HuskSync | Java Version | Platforms     | Support Ends                  |
-|:---------------:|:---------------:|:------------:|:--------------|:------------------------------|
-|     1.21.3      |    _latest_     |      21      | Paper, Fabric | ✅ **Active Release**          |
-|     1.21.1      |    _latest_     |      21      | Paper, Fabric | ✅ **December 2024** (Non-LTS) |
-|     1.20.6      |      3.6.8      |      17      | Paper         | ❌ _October 2024_              |
-|     1.20.4      |      3.6.8      |      17      | Paper         | ❌ _July 2024_                 |
-|     1.20.1      |    _latest_     |      17      | Paper, Fabric | ✅ **November 2025** (LTS)     |
-| 1.17.1 - 1.19.4 |      3.6.8      |      17      | Paper         | ❌ _Support ended_             |
-|     1.16.5      |      3.2.1      |      16      | Paper         | ❌ _Support ended_             |
+|    Minecraft    | Latest HuskSync | Java Version | Platforms     | Support Status               |
+|:---------------:|:---------------:|:------------:|:--------------|:-----------------------------|
+|     1.21.4      |    _latest_     |      21      | Paper, Fabric | ✅ **Active Release**         |
+|     1.21.3      |      3.7.1      |      21      | Paper, Fabric | 🗃️ Archived (December 2024) |
+|     1.21.1      |    _latest_     |      21      | Paper, Fabric | ✅ **November 2024** (LTS)    |
+|     1.20.6      |      3.6.8      |      17      | Paper         | 🗃️ Archived (October 2024)  |
+|     1.20.4      |      3.6.8      |      17      | Paper         | 🗃️ Archived (July 2024)     |
+|     1.20.1      |    _latest_     |      17      | Paper, Fabric | ✅ **November 2025** (LTS)    |
+| 1.17.1 - 1.19.4 |      3.6.8      |      17      | Paper         | 🗃️ Archived                 |
+|     1.16.5      |      3.2.1      |      16      | Paper         | 🗃️ Archived                 |
 
 HuskSync is primarily developed against the latest release. Old Minecraft versions are allocated a support channel based on popularity, mod support, etc:
 

build.gradle

@@ -1,7 +1,7 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
-    id 'com.gradleup.shadow' version '8.3.4'
+    id 'com.gradleup.shadow' version '8.3.5'
     id 'org.cadixdev.licenser' version '0.6.1' apply false
     id 'fabric-loom' version "$fabric_loom_version" apply false
     id 'org.ajoberstar.grgit' version '5.3.0'

bukkit/build.gradle

@@ -1,7 +1,7 @@
 dependencies {
     implementation project(path: ':common')
 
-    implementation 'net.william278.uniform:uniform-bukkit:1.2.2'
+    implementation 'net.william278.uniform:uniform-bukkit:1.2.3'
     implementation 'net.william278:mpdbdataconverter:1.0.1'
     implementation 'net.william278:hsldataconverter:1.0'
     implementation 'net.william278:mapdataapi:2.0'
@@ -9,22 +9,22 @@ dependencies {
     implementation 'net.kyori:adventure-platform-bukkit:4.3.4'
     implementation 'dev.triumphteam:triumph-gui:3.1.10'
     implementation 'space.arim.morepaperlib:morepaperlib:0.4.4'
-    implementation 'de.tr7zw:item-nbt-api:2.14.0'
+    implementation 'de.tr7zw:item-nbt-api:2.14.1-SNAPSHOT'
 
     compileOnly "org.spigotmc:spigot-api:${bukkit_spigot_api}"
     compileOnly 'com.github.retrooper.packetevents:spigot:2.3.0'
-    compileOnly 'com.comphenix.protocol:ProtocolLib:5.1.0'
-    compileOnly 'org.projectlombok:lombok:1.18.34'
-    compileOnly 'commons-io:commons-io:2.17.0'
+    compileOnly 'com.comphenix.protocol:ProtocolLib:5.3.0'
+    compileOnly 'org.projectlombok:lombok:1.18.36'
+    compileOnly 'commons-io:commons-io:2.18.0'
     compileOnly 'org.json:json:20240303'
     compileOnly 'net.william278:minedown:1.8.2'
     compileOnly 'de.exlll:configlib-yaml:4.5.0'
-    compileOnly 'com.zaxxer:HikariCP:6.1.0'
+    compileOnly 'com.zaxxer:HikariCP:6.2.1'
     compileOnly 'net.william278:DesertWell:2.0.4'
     compileOnly 'net.william278:AdvancementAPI:97a9583413'
     compileOnly "redis.clients:jedis:$jedis_version"
 
-    annotationProcessor 'org.projectlombok:lombok:1.18.34'
+    annotationProcessor 'org.projectlombok:lombok:1.18.36'
 }
 
 shadowJar {

bukkit/src/main/java/net/william278/husksync/BukkitHuskSync.java

@@ -344,6 +344,7 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
             case "1.20.5", "1.20.6" -> DataFixerUtil.VERSION1_20_5;
             case "1.21", "1.21.1" -> DataFixerUtil.VERSION1_21;
             case "1.21.2", "1.21.3" -> DataFixerUtil.VERSION1_21_2;
+            case "1.21.4" -> 4189/*DataFixerUtil.VERSION1_21_4*/;
             default -> DataFixerUtil.getCurrentVersion();
         };
     }

common/build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    api 'commons-io:commons-io:2.17.0'
+    api 'commons-io:commons-io:2.18.0'
     api 'org.apache.commons:commons-text:1.12.0'
     api 'net.william278:minedown:1.8.2'
     api 'org.json:json:20240303'
@@ -12,13 +12,13 @@ dependencies {
     api 'de.exlll:configlib-yaml:4.5.0'
     api 'net.william278:paginedown:1.1.2'
     api 'net.william278:DesertWell:2.0.4'
-    api('com.zaxxer:HikariCP:6.1.0') {
+    api('com.zaxxer:HikariCP:6.2.1') {
         exclude module: 'slf4j-api'
     }
 
-    compileOnly 'net.william278.uniform:uniform-common:1.2.2'
+    compileOnly 'net.william278.uniform:uniform-common:1.2.3'
     compileOnly 'com.mojang:brigadier:1.1.8'
-    compileOnly 'org.projectlombok:lombok:1.18.34'
+    compileOnly 'org.projectlombok:lombok:1.18.36'
     compileOnly 'org.jetbrains:annotations:26.0.1'
     compileOnly 'net.kyori:adventure-api:4.17.0'
     compileOnly 'net.kyori:adventure-platform-api:4.3.4'
@@ -38,5 +38,5 @@ dependencies {
     testCompileOnly 'de.exlll:configlib-yaml:4.5.0'
     testCompileOnly 'org.jetbrains:annotations:26.0.1'
 
-    annotationProcessor 'org.projectlombok:lombok:1.18.34'
+    annotationProcessor 'org.projectlombok:lombok:1.18.36'
 }

common/src/main/java/net/william278/husksync/api/HuskSyncAPI.java

@@ -99,6 +99,18 @@ public class HuskSyncAPI {
         return plugin.supplyAsync(() -> plugin.getDatabase().getUser(uuid));
     }
 
+    /**
+     * Get an {@link OnlineUser} by their UUID
+     *
+     * @param uuid the UUID of the user to get
+     * @return The {@link OnlineUser} wrapped in an optional, if they are online on <i>this</i> server.
+     * @since 3.7.2
+     */
+    @NotNull
+    public Optional<OnlineUser> getOnlineUser(@NotNull UUID uuid) {
+        return plugin.getOnlineUser(uuid);
+    }
+
     /**
      * Get a {@link User} by their username
      *

common/src/main/java/net/william278/husksync/data/Identifier.java

@@ -25,6 +25,7 @@ import net.kyori.adventure.key.Key;
 import org.intellij.lang.annotations.Subst;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Collections;
 import java.util.Comparator;
@@ -229,11 +230,8 @@ public class Identifier {
      * @return {@code true} if the given object is an identifier with the same key as this identifier
      */
     @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof Identifier other) {
-            return key.equals(other.key);
-        }
-        return false;
+    public boolean equals(@Nullable Object obj) {
+        return obj instanceof Identifier other ? toString().equals(other.toString()) : super.equals(obj);
     }
 
     // Get the config entry for the identifier

docs/API.md

@@ -20,7 +20,6 @@ The HuskSync API is available for the following platforms:
 * `fabric` - Fabric API for Minecraft. Provides Fabric API event listeners and adapters to `net.minecraft` objects.
 * `common` - Common API for all platforms.
 
-
 <details>
 <summary>Targeting older versions</summary>
 

docs/Compatibility.md

@@ -1,14 +1,15 @@
 HuskSync supports the following versions of Minecraft. Since v3.7, you must download the correct version of HuskSync for your server:
 
-|    Minecraft    | Latest HuskSync | Java Version | Platforms     | Support Ends                  |
-|:---------------:|:---------------:|:------------:|:--------------|:------------------------------|
-|     1.21.3      |    _latest_     |      21      | Paper, Fabric | ✅ **Active Release**          |
-|     1.21.1      |    _latest_     |      21      | Paper, Fabric | ✅ **December 2024** (Non-LTS) |
-|     1.20.6      |      3.6.8      |      17      | Paper         | ❌ _October 2024_              |
-|     1.20.4      |      3.6.8      |      17      | Paper         | ❌ _July 2024_                 |
-|     1.20.1      |    _latest_     |      17      | Paper, Fabric | ✅ **November 2025** (LTS)     |
-| 1.17.1 - 1.19.4 |      3.6.8      |      17      | Paper         | ❌ _Support ended_             |
-|     1.16.5      |      3.2.1      |      16      | Paper         | ❌ _Support ended_             |
+|    Minecraft    | Latest HuskSync | Java Version | Platforms     | Support Status               |
+|:---------------:|:---------------:|:------------:|:--------------|:-----------------------------|
+|     1.21.4      |    _latest_     |      21      | Paper, Fabric | ✅ **Active Release**         |
+|     1.21.3      |      3.7.1      |      21      | Paper, Fabric | 🗃️ Archived (December 2024) |
+|     1.21.1      |    _latest_     |      21      | Paper, Fabric | ✅ **November 2024** (LTS)    |
+|     1.20.6      |      3.6.8      |      17      | Paper         | 🗃️ Archived (October 2024)  |
+|     1.20.4      |      3.6.8      |      17      | Paper         | 🗃️ Archived (July 2024)     |
+|     1.20.1      |    _latest_     |      17      | Paper, Fabric | ✅ **November 2025** (LTS)    |
+| 1.17.1 - 1.19.4 |      3.6.8      |      17      | Paper         | 🗃️ Archived                 |
+|     1.16.5      |      3.2.1      |      16      | Paper         | 🗃️ Archived                 |
 
 HuskSync is primarily developed against the latest release. Old Minecraft versions are allocated a support channel based on popularity, mod support, etc:
 

docs/Data-Snapshot-API.md

@@ -43,6 +43,7 @@ huskSyncAPI.getUser(uuid).thenAccept(optionalUser -> {
 </details>
 
 * If you have an online `org.bukkit.Player` object, you can use `BukkitPlayer#adapt(player)` to get an `OnlineUser` (extends `User`), representing a logged-in user.
+* You can also use `#getOnlineUser(UUID)` to get an OnlineUser by their UUID - note this only works for players online on the server the logic is called from, however.
 
 <details>
 <summary>Code Example &mdash; Getting an online user</summary>

fabric/build.gradle

@@ -18,7 +18,7 @@ dependencies {
     modImplementation include("net.kyori:adventure-platform-fabric:${fabric_adventure_platform_version}")
     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.2.2+1.21.3')
+    modImplementation include("net.william278.uniform:uniform-fabric:1.2.3+${minecraft_version}")
     modCompileOnly "net.fabricmc.fabric-api:fabric-api:${fabric_api_version}"
 
     implementation include('org.apache.commons:commons-pool2:2.12.0')
@@ -30,9 +30,9 @@ dependencies {
 
     compileOnly 'org.jetbrains:annotations:26.0.1'
     compileOnly 'net.william278:DesertWell:2.0.4'
-    compileOnly 'org.projectlombok:lombok:1.18.34'
+    compileOnly 'org.projectlombok:lombok:1.18.36'
 
-    annotationProcessor 'org.projectlombok:lombok:1.18.34'
+    annotationProcessor 'org.projectlombok:lombok:1.18.36'
 
     shadow project(path: ":common")
 }

fabric/src/main/java/net/william278/husksync/FabricHuskSync.java

@@ -94,7 +94,8 @@ public class FabricHuskSync implements DedicatedServerModInitializer, HuskSync,
     private static final int VERSION1_20_4 = 3700;
     private static final int VERSION1_20_5 = 3837;
     private static final int VERSION1_21_1 = 3955;
-    private static final int VERSION1_21_3 = 4082; // Current
+    private static final int VERSION1_21_3 = 4082;
+    private static final int VERSION1_21_4 = 4189; // Current
 
     private final TreeMap<Identifier, Serializer<? extends Data>> serializers = Maps.newTreeMap(
             SerializerRegistry.DEPENDENCY_ORDER_COMPARATOR
@@ -373,7 +374,8 @@ public class FabricHuskSync implements DedicatedServerModInitializer, HuskSync,
             case "1.20.5", "1.20.6" -> VERSION1_20_5;
             case "1.21", "1.21.1" -> VERSION1_21_1;
             case "1.21.2", "1.21.3" -> VERSION1_21_3;
-            default -> VERSION1_21_3; // Current supported ver
+            case "1.21.4" -> VERSION1_21_4;
+            default -> VERSION1_21_4; // Current supported ver
         };
     }
 

gradle.properties

@@ -4,28 +4,28 @@ org.gradle.daemon=true
 javaVersion=21
 
 # Plugin settings
-plugin_version=3.7.1
-minecraft_version=1.21.3
+plugin_version=3.7.2
+minecraft_version=1.21.4
 plugin_archive=husksync
 plugin_description=A modern, cross-server player data synchronization system
 
 # Drivers
 jedis_version=5.2.0
 mysql_driver_version=9.1.0
-mariadb_driver_version=3.5.0
-postgres_driver_version=42.7.3
-mongodb_driver_version=5.1.2
-snappy_version=1.1.10.6
+mariadb_driver_version=3.5.1
+postgres_driver_version=42.7.4
+mongodb_driver_version=5.2.1
+snappy_version=1.1.10.7
 
 # Spigot/Paper build settings
-bukkit_spigot_api=1.21.3-R0.1-SNAPSHOT
-bukkit_paper_api=1.21.3-R0.1-SNAPSHOT
+bukkit_spigot_api=1.21.4-R0.1-SNAPSHOT
+bukkit_paper_api=1.21.4-R0.1-SNAPSHOT
 
 # Fabric build settings
 fabric_loom_version=1.8-SNAPSHOT
 fabric_loader_version=0.16.9
-fabric_yarn_mappings=1.21.3+build.2
-fabric_api_version=0.107.0+1.21.3
+fabric_yarn_mappings=1.21.4+build.1
+fabric_api_version=0.111.0+1.21.4
 fabric_adventure_platform_version=6.1.0
 fabric_permissions_api_version=0.3.3
-fabric_sgui_version=1.7.2+1.21.2
+fabric_sgui_version=1.8.1+1.21.4

paper/build.gradle

@@ -10,9 +10,9 @@ dependencies {
 
     compileOnly "io.papermc.paper:paper-api:${bukkit_paper_api}"
     compileOnly 'org.jetbrains:annotations:26.0.1'
-    compileOnly 'org.projectlombok:lombok:1.18.34'
+    compileOnly 'org.projectlombok:lombok:1.18.36'
 
-    annotationProcessor 'org.projectlombok:lombok:1.18.34'
+    annotationProcessor 'org.projectlombok:lombok:1.18.36'
 }
 
 shadowJar {
@@ -49,6 +49,6 @@ shadowJar {
 
 tasks {
     runServer {
-        minecraftVersion('1.21.3')
+        minecraftVersion('1.21.4')
     }
 }

test/spin_network.py

@@ -13,7 +13,7 @@ from tqdm import tqdm
 class Parameters:
     root_dir = './servers/'
     proxy_version = "1.21"
-    minecraft_version = '1.21.3'
+    minecraft_version = '1.21.4'
     eula_agreement = 'true'
 
     backend_names = ['alpha', 'beta']