fix: hardcode map scale to CLOSEST instead of NORMAL (#632)

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.4.8-jre to 33.5.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-version: 33.5.0-jre
  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/dependabot.yml

@@ -1,7 +1,22 @@
 # Dependabot configuration file for GitHub
+
 version: 2
 updates:
-  - package-ecosystem: "gradle" # See documentation for possible values
-    directory: "/" # Location of package manifests
+  # CI workflow action updates
+  - package-ecosystem: "github-actions"
+    directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
+    commit-message:
+      prefix: "ci"
+
+  # Gradle package updates
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "deps"
+    ignore:
+      - dependency-name: 'org.spigotmc:spigot-api'
+      - dependency-name: 'org.papermc:paper-api'

.github/funding.yml

@@ -1,3 +1,4 @@
 # Funding metadata for GitHub
+
 github: WiIIiam278
 custom: https://buymeacoff.ee/william278

.github/workflows/ci.yml

@@ -1,5 +1,4 @@
-# Builds, tests the project with Gradle
-name: CI Tests
+name: CI Tests & Publish
 
 on:
   push:
@@ -17,21 +16,81 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: 'Checkout for CI 🛎️'
+        uses: actions/checkout@v6
+      - name: 'Set up JDK 21 📦'
+        uses: actions/setup-java@v5
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
-      - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
+      - name: 'Build with Gradle 🏗️'
+        uses: gradle/gradle-build-action@v3
         with:
           arguments: build test publish
         env:
-            SNAPSHOTS_MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-            SNAPSHOTS_MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-      - name: Publish Test Report
-        uses: mikepenz/action-junit-report@v3
-        if: success() || failure() # always run even if the previous step fails
+          SNAPSHOTS_MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          SNAPSHOTS_MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+      - name: 'Publish Test Report 📊'
+        uses: mikepenz/action-junit-report@v6
+        if: success() || failure() # Continue on failure
         with:
-          report_paths: '**/build/test-results/test/TEST-*.xml'
+          report_paths: '**/build/test-results/test/TEST-*.xml'
+      - name: 'Fetch Version Name 📝'
+        run: |
+          echo "::set-output name=VERSION_NAME::$(${{github.workspace}}/gradlew properties --no-daemon --console=plain -q | grep "^version:" | awk '{printf $2}')"
+        id: fetch-version
+      - name: Get Version
+        run: |
+          echo "version_name=${{steps.fetch-version.outputs.VERSION_NAME}}" >> $GITHUB_ENV
+      - name: 'Publish to William278.net 🚀'
+        uses: WiIIiam278/bones-publish-action@v1
+        with:
+          api-key: ${{ secrets.BONES_API_KEY }}
+          project: 'husksync'
+          channel: 'alpha'
+          version: ${{ env.version_name }}
+          changelog: ${{ github.event.head_commit.message }}
+          distro-names: |
+            paper-1.21.1
+            paper-1.21.4
+            paper-1.21.5
+            paper-1.21.8
+            paper-1.21.10
+            paper-1.21.11
+            fabric-1.21.1
+            fabric-1.21.4
+            fabric-1.21.5
+            fabric-1.21.8
+          distro-groups: |
+            paper
+            paper
+            paper
+            paper
+            paper
+            paper
+            fabric
+            fabric
+            fabric
+            fabric
+          distro-descriptions: |
+            Paper 1.21.1
+            Paper 1.21.4
+            Paper 1.21.5
+            Paper 1.21.8
+            Paper 1.21.10
+            Paper 1.21.11
+            Fabric 1.21.1
+            Fabric 1.21.4
+            Fabric 1.21.5
+            Fabric 1.21.8
+          files: |
+            target/HuskSync-Bukkit-${{ env.version_name }}+mc.1.21.1.jar
+            target/HuskSync-Bukkit-${{ env.version_name }}+mc.1.21.4.jar
+            target/HuskSync-Bukkit-${{ env.version_name }}+mc.1.21.5.jar
+            target/HuskSync-Bukkit-${{ env.version_name }}+mc.1.21.8.jar
+            target/HuskSync-Bukkit-${{ env.version_name }}+mc.1.21.10.jar
+            target/HuskSync-Bukkit-${{ env.version_name }}+mc.1.21.11.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
+            target/HuskSync-Fabric-${{ env.version_name }}+mc.1.21.8.jar

.github/workflows/pr_tests.yml

@@ -1,4 +1,3 @@
-# Carry out tests on pull requests
 name: PR Tests
 
 on:
@@ -7,18 +6,25 @@ on:
 
 permissions:
   contents: read
+  checks: write
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: 'Checkout for CI 🛎'
+        uses: actions/checkout@v6
+      - name: 'Set up JDK 21 📦'
+        uses: actions/setup-java@v5
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
-      - name: Test Pull Request
-        uses: gradle/gradle-build-action@v2
+      - name: 'Build with Gradle 🏗️'
+        uses: gradle/gradle-build-action@v3
         with:
-          arguments: test
+          arguments: test
+      - name: 'Publish Test Report 📊'
+        uses: mikepenz/action-junit-report@v6
+        if: success() || failure() # Continue on failure
+        with:
+          report_paths: '**/build/test-results/test/TEST-*.xml'

.github/workflows/release.yml

@@ -1,9 +1,8 @@
-# Builds, tests and publishes to maven when a release is published
-name: Release Tests
+name: Release Tests & Publish
 
 on:
   release:
-    types: [ published ]
+    types: [ 'published' ]
 
 permissions:
   contents: read
@@ -13,21 +12,70 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: 'Checkout for CI 🛎️'
+        uses: actions/checkout@v6
+      - name: 'Set up JDK 21 📦'
+        uses: actions/setup-java@v5
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
-      - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
+      - name: 'Build with Gradle 🏗️'
+        uses: gradle/gradle-build-action@v3
         with:
           arguments: build test publish
         env:
           RELEASES_MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           RELEASES_MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-      - name: Publish Test Report
-        uses: mikepenz/action-junit-report@v3
-        if: success() || failure() # always run even if the previous step fails
+      - name: 'Publish Test Report 📊'
+        uses: mikepenz/action-junit-report@v6
+        if: success() || failure() # Continue on failure
         with:
-          report_paths: '**/build/test-results/test/TEST-*.xml'
+          report_paths: '**/build/test-results/test/TEST-*.xml'
+      - name: 'Publish to William278.net 🚀'
+        uses: WiIIiam278/bones-publish-action@v1
+        with:
+          api-key: ${{ secrets.BONES_API_KEY }}
+          project: 'husksync'
+          channel: 'release'
+          version: ${{ github.event.release.tag_name }}
+          changelog: ${{ github.event.release.body }}
+          distro-names: |
+            paper-1.21.1
+            paper-1.21.4
+            paper-1.21.5
+            paper-1.21.8
+            paper-1.21.10
+            fabric-1.21.1
+            fabric-1.21.4
+            fabric-1.21.5
+            fabric-1.21.8
+          distro-groups: |
+            paper
+            paper
+            paper
+            paper
+            paper
+            fabric
+            fabric
+            fabric
+            fabric
+          distro-descriptions: |
+            Paper 1.21.1
+            Paper 1.21.4
+            Paper 1.21.5
+            Paper 1.21.8
+            Paper 1.21.10
+            Fabric 1.21.1
+            Fabric 1.21.4
+            Fabric 1.21.5
+            Fabric 1.21.8
+          files: |
+            target/HuskSync-Bukkit-${{ github.event.release.tag_name }}+mc.1.21.1.jar
+            target/HuskSync-Bukkit-${{ github.event.release.tag_name }}+mc.1.21.4.jar
+            target/HuskSync-Bukkit-${{ github.event.release.tag_name }}+mc.1.21.5.jar
+            target/HuskSync-Bukkit-${{ github.event.release.tag_name }}+mc.1.21.8.jar
+            target/HuskSync-Bukkit-${{ github.event.release.tag_name }}+mc.1.21.10.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
+            target/HuskSync-Fabric-${{ github.event.release.tag_name }}+mc.1.21.8.jar

.github/workflows/update_docs.yml

@@ -1,4 +1,3 @@
-# Update the GitHub Wiki documentation when a push is made to docs/
 name: Update Docs
 
 on:
@@ -14,15 +13,13 @@ permissions:
   contents: write
 
 jobs:
-  deploy-wiki:
+  update-docs:
+    name: 'Update Docs'
     runs-on: ubuntu-latest
     steps:
-      - name: 'Checkout Code'
-        uses: actions/checkout@v3
-      - name: 'Push Changes to Wiki'
-        uses: Andrew-Chen-Wang/github-wiki-action@v3
-        env:
-          WIKI_DIR: 'docs/'
-          GH_TOKEN: ${{ github.token }}
-          GH_MAIL: 'actions@github.com'
-          GH_NAME: 'github-actions[bot]'
+      - name: 'Checkout for CI 🛎️'
+        uses: actions/checkout@v6
+      - name: 'Push Docs to Github Wiki 📄️'
+        uses: Andrew-Chen-Wang/github-wiki-action@v5
+        with:
+          path: 'docs'

.gitignore

@@ -121,5 +121,4 @@ run/
 
 # Don't include generated test suite files
 /test/servers/
-/test/HuskSync
-/test/config.yml
+/test/HuskSync

.scripts/ensure-java-16

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-JV=$(java -version 2>&1 >/dev/null | head -1)
-echo "$JV" | sed -E 's/^.*version "([^".]*)\.[^"]*".*$/\1/'
-
-if [ "$JV" != 16 ]; then
-	case "$1" in
-	install)
-		echo "installing sdkman..."
-		curl -s "https://get.sdkman.io" | bash
-		source ~/.sdkman/bin/sdkman-init.sh
-		sdk install java 16.0.1-open
-		;;
-	use)
-		echo "must source ~/.sdkman/bin/sdkman-init.sh"
-		exit 1
-		;;
-	esac
-fi

README.md

@@ -3,10 +3,10 @@
     <img src="images/banner.png" alt="HuskSync" />
     <a href="https://github.com/WiIIiam278/HuskSync/actions/workflows/ci.yml">
         <img src="https://img.shields.io/github/actions/workflow/status/WiIIiam278/HuskSync/ci.yml?branch=master&logo=github"/>
-    </a> 
-    <a href="https://jitpack.io/#net.william278/HuskSync">
-        <img src="https://img.shields.io/jitpack/version/net.william278/HuskSync?color=%2300fb9a&label=api&logo=gradle" />
-    </a> 
+    </a>
+    <a href="https://repo.william278.net/#/releases/net/william278/husksync/">
+        <img src="https://repo.william278.net/api/badge/latest/releases/net/william278/husksync/husksync-common?color=00fb9a&name=Maven&prefix=v" />
+    </a>
     <a href="https://discord.gg/tVYhJfyDWG">
         <img src="https://img.shields.io/discord/818135932103557162.svg?label=&logo=discord&logoColor=fff&color=7389D8&labelColor=6A7EC2" />
     </a> 
@@ -26,7 +26,7 @@
 </p>
 <br/>
 
-**HuskSync** is a modern, cross-server player data synchronization system that enables the comprehensive synchronization of your user's data across multiple proxied servers. It does this by making use of Redis and MySQL to optimally cache data while players change servers.
+**HuskSync** is a modern, cross-server player data synchronization system that enables the comprehensive synchronization of your user's data across multiple proxied servers. It does this by making use of Redis and a MySQL/Mongo/PostgreSQL to optimally cache data while players change servers.
 
 ## Features
 **⭐ Seamless synchronization** &mdash; Utilises optimised Redis caching when players change server to sync player data super quickly for a seamless experience.
@@ -43,21 +43,48 @@
 
 **Ready?** [It's syncing time!](https://william278.net/docs/husksync/setup)
 
-## Setup
-Requires a MySQL (v8.0+) database, a Redis (v5.0+) server and any number of Spigot-based 1.16.5+ Minecraft servers, running Java 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:
 
-1. Place the plugin jar file in the /plugins/ directory of each Spigot server. You do not need to install HuskSync as a proxy plugin.
+|    Minecraft    | Latest HuskSync | Java Version | Platforms     | Support Status                |
+|:---------------:|:---------------:|:------------:|:--------------|:------------------------------|
+|     1.21.10     |    _latest_     |      21      | Paper         | ✅ **Active Release**          |
+|    1.21.7/8     |    _latest_     |      21      | Paper, Fabric | ✅ **August 2026**             |
+|     1.21.6      |      3.8.5      |      21      | Paper         | 🗃️ Archived (July 2025)      |
+|     1.21.5      |    _latest_     |      21      | Paper         | ✅ **February 2026** (Non-LTS) |
+|     1.21.4      |    _latest_     |      21      | Paper, Fabric | ✅ **February 2026** (Non-LTS) |
+|     1.21.3      |      3.7.1      |      21      | Paper, Fabric | 🗃️ Archived (December 2024)  |
+|     1.21.1      |    _latest_     |      21      | Paper, Fabric | ✅ **May 2026** (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      |      3.8.7      |      17      | Paper, Fabric | 🗃️ Archived (November 2024)  |
+| 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:
+
+* Long Term Support (LTS) &ndash; Supported for up to 12-18 months
+* Non-Long Term Support (Non-LTS) &ndash; Supported for 3-6 months
+
+Verify your purchase on Discord and [Download HuskSync](https://william278.net/project/husksync/download) for your server.
+
+## Setup
+Requires a [MySQL/MariaDB/Mongo/PostgreSQL database](https://william278.net/docs/husksync/database), a [Redis (v5.0+) server]((https://william278.net/docs/husksync/redis)) and a network of [compatible Spigot or Fabric Minecraft servers](https://william278.net/docs/husksync/compatibility).
+
+1. Place the plugin jar file in the `/plugins` or `/mods` directory of each Spigot/Fabric server. You do not need to install HuskSync as a proxy plugin.
 2. Start, then stop every server to let HuskSync generate the config file.
-3. Navigate to the HuskSync config file on each server (~/plugins/HuskSync/config.yml) and fill in both the MySQL and Redis database credentials.
+3. Navigate to the HuskSync config file on each server and fill in both your database and Redis server credentials.
 4. Start every server again and synchronization will begin.
 
 ## Development
-To build HuskSync, simply run the following in the root of the repository:
+To build HuskSync, simply run the following in the root of the repository (building requires Java 21). Builds will be output in `/target`:
 
 ```bash
 ./gradlew clean build
 ```
 
+HuskSync uses `essential-multi-version` (Fabric) and `preprocessor` (Bukkit) to target multiple versions of Minecraft in one codebase - [check here](https://github.com/WiIIiam278/PreProcessor?tab=readme-ov-file#code-example) for a preprocessor comment logic reference.
+
 ### License
 HuskSync is licensed under the Apache 2.0 license.
 
@@ -66,20 +93,20 @@ HuskSync is licensed under the Apache 2.0 license.
 Contributions to the project are welcome&mdash;feel free to open a pull request with new features, improvements and/or fixes!
 
 ### Support
-Due to its complexity, official support for HuskSync is provided through a paid model. This means that support is only available to users who have purchased a license to the plugin from Spigot, Polymart, or Craftaro and have provided proof of purchase. Please join our Discord server if you have done so and need help!
+Due to its complexity, official binaries and customer support for HuskSync is provided through a paid model. This means that support is only available to users who have purchased a license to the plugin from Spigot, Polymart, or BuiltByBit and have provided proof of purchase. Please join our Discord server if you have done so and need help!
 
 ### Translations
 Translations of the plugin locales are welcome to help make the plugin more accessible. Please submit a pull request with your translations as a `.yml` file.
 
-- [Locales Directory](https://github.com/WiIIiam278/HuskSync/tree/master/common/src/main/resources/languages)
-- [English Locales](https://github.com/WiIIiam278/HuskSync/tree/master/common/src/main/resources/languages/en-gb.yml)
+- [Locales Directory](https://github.com/WiIIiam278/HuskSync/tree/master/common/src/main/resources/locales)
+- [English Locales](https://github.com/WiIIiam278/HuskSync/tree/master/common/src/main/resources/locales/en-gb.yml)
 
 ## Links
 - [Docs](https://william278.net/docs/husksync/) &mdash; Read the plugin documentation!
-- [Spigot](https://www.spigotmc.org/resources/husksync.97144/) &mdash; View the Spigot resource page (Also: [Polymart](https://polymart.org/resource/husksync.1634), [Craftaro](https://craftaro.com/marketplace/product/husksync.758))
+- [Spigot](https://www.spigotmc.org/resources/husksync.97144/) &mdash; View the Spigot resource page (Also: [Polymart](https://polymart.org/resource/husksync.1634), [Craftaro](https://craftaro.com/marketplace/product/husksync.758), [BuiltByBit](https://builtbybit.com/resources/husksync.34956/))
 - [Issues](https://github.com/WiIIiam278/HuskSync/issues) &mdash; File a bug report or feature request
 - [Discord](https://discord.gg/tVYhJfyDWG) &mdash; Get help, ask questions (Purchase required)
 - [bStats](https://bstats.org/plugin/bukkit/HuskSync%20-%20Bukkit/13140) &mdash; View plugin metrics
 
 ---
-&copy; [William278](https://william278.net/), 2023. Licensed under the Apache-2.0 License.
+&copy; [William278](https://william278.net/), 2025. Licensed under the Apache-2.0 License.

build.gradle

@@ -1,7 +1,11 @@
+import org.apache.tools.ant.filters.ReplaceTokens
+
 plugins {
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'com.gradleup.shadow' version '9.2.2'
     id 'org.cadixdev.licenser' version '0.6.1' apply false
-    id 'org.ajoberstar.grgit' version '5.2.0'
+    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.2'
     id 'maven-publish'
     id 'java'
 }
@@ -18,43 +22,77 @@ ext {
     set 'jedis_version', jedis_version.toString()
     set 'mysql_driver_version', mysql_driver_version.toString()
     set 'mariadb_driver_version', mariadb_driver_version.toString()
+    set 'postgres_driver_version', postgres_driver_version.toString()
+    set 'mongodb_driver_version', mongodb_driver_version.toString()
     set 'snappy_version', snappy_version.toString()
 }
 
-import org.apache.tools.ant.filters.ReplaceTokens
+publishing {
+    repositories {
+        if (System.getenv("RELEASES_MAVEN_USERNAME") != null) {
+            maven {
+                name = "william278-releases"
+                url = "https://repo.william278.net/releases"
+                credentials {
+                    username = System.getenv("RELEASES_MAVEN_USERNAME")
+                    password = System.getenv("RELEASES_MAVEN_PASSWORD")
+                }
+                authentication {
+                    basic(BasicAuthentication)
+                }
+            }
+        }
+        if (System.getenv("SNAPSHOTS_MAVEN_USERNAME") != null) {
+            maven {
+                name = "william278-snapshots"
+                url = "https://repo.william278.net/snapshots"
+                credentials {
+                    username = System.getenv("SNAPSHOTS_MAVEN_USERNAME")
+                    password = System.getenv("SNAPSHOTS_MAVEN_PASSWORD")
+                }
+                authentication {
+                    basic(BasicAuthentication)
+                }
+            }
+        }
+    }
+}
 
 allprojects {
-    apply plugin: 'com.github.johnrengelman.shadow'
+    // Ignore parent projects (no jars)
+    if (project.name == 'fabric' || project.name == 'bukkit') {
+        return
+    }
+    
+    apply plugin: 'com.gradleup.shadow'
     apply plugin: 'org.cadixdev.licenser'
     apply plugin: 'java'
 
     compileJava.options.encoding = 'UTF-8'
+    compileJava.options.release.set 17
     javadoc.options.encoding = 'UTF-8'
     javadoc.options.addStringOption('Xdoclint:none', '-quiet')
 
-    compileJava.options.release.set 16
-
     repositories {
         mavenLocal()
         mavenCentral()
+        maven { url 'https://repo.william278.net/releases/' }
+        maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
         maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
+        maven { url 'https://repo.papermc.io/repository/maven-public/' }
         maven { url 'https://repo.codemc.io/repository/maven-public/' }
         maven { url 'https://repo.minebench.de/' }
         maven { url 'https://repo.alessiodp.com/releases/' }
         maven { url 'https://jitpack.io' }
         maven { url 'https://mvn-repo.arim.space/lesser-gpl3/' }
         maven { url 'https://libraries.minecraft.net/' }
-        maven { url 'https://repo.william278.net/releases/' }
     }
 
     dependencies {
-        testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0'
-        testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.0'
-        testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.0'
-    }
-
-    test {
-        useJUnitPlatform()
+        testImplementation(platform("org.junit:junit-bom:6.0.1"))
+        testImplementation 'org.junit.jupiter:junit-jupiter'
+        testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+        testCompileOnly 'org.jetbrains:annotations:26.0.2-1'
     }
 
     license {
@@ -63,101 +101,133 @@ allprojects {
         newLine = true
     }
 
+    test {
+        useJUnitPlatform()
+    }
+
     processResources {
-        filter ReplaceTokens as Class, beginToken: '${', endToken: '}',
-                tokens: rootProject.ext.properties
+        def tokenMap = rootProject.ext.properties
+        tokenMap.merge("grgit", '', (s, s2) -> s)
+        filesMatching(['**/*.json', '**/*.yml']) {
+            filter ReplaceTokens as Class, beginToken: '${', endToken: '}',
+                    tokens: tokenMap
+        }
     }
 }
 
 subprojects {
+    // Ignore parent projects (no jars)
+    if (['fabric', 'bukkit'].contains(project.name)) {
+        return
+    }
+
+    // Project naming
     version rootProject.version
-    archivesBaseName = "${rootProject.name}-${project.name.capitalize()}"
+    def name = "$rootProject.name"
+    if (rootProject != project.parent) {
+        name += "-${project.parent.name.capitalize()}"
+    } else {
+        name += "-${project.name.capitalize()}"
+    }
+    archivesBaseName = name
+
+    // Version-specific configuration
+    if (['fabric', 'bukkit'].contains(project.parent?.name)) {
+        compileJava.options.release.set 21
+        version += "+mc.${project.name}"
+
+        if (project.parent?.name?.equals('fabric')) {
+            apply plugin: 'dev.architectury.loom'
+        }
+    }
 
     jar {
         from '../LICENSE'
     }
 
-    if (['bukkit', 'plugin'].contains(project.name)) {
-        shadowJar {
-            destinationDirectory.set(file("$rootDir/target"))
-            archiveClassifier.set('')
+    shadowJar {
+        destinationDirectory.set(file("$rootDir/target"))
+        archiveClassifier.set('')
+    }
+
+    // API publishing
+    if (project.name == 'common' || ['fabric', 'bukkit'].contains(project.parent?.name)) {
+        java {
+            withSourcesJar()
+            withJavadocJar()
         }
+        sourcesJar {
+            destinationDirectory.set(file("$rootDir/target"))
+        }
+        javadocJar {
+            destinationDirectory.set(file("$rootDir/target"))
+        }
+        shadowJar.dependsOn(sourcesJar, javadocJar)
 
-        // API publishing
-        if ('bukkit'.contains(project.name)) {
-            java {
-                withSourcesJar()
-                withJavadocJar()
-            }
-            sourcesJar {
-                destinationDirectory.set(file("$rootDir/target"))
-            }
-            javadocJar {
-                destinationDirectory.set(file("$rootDir/target"))
-            }
-            shadowJar.dependsOn(sourcesJar, javadocJar)
-
-            publishing {
-                repositories {
-                    if (System.getenv("RELEASES_MAVEN_USERNAME") != null) {
-                        maven {
-                            name = "william278-releases"
-                            url = "https://repo.william278.net/releases"
-                            credentials {
-                                username = System.getenv("RELEASES_MAVEN_USERNAME")
-                                password = System.getenv("RELEASES_MAVEN_PASSWORD")
-                            }
-                            authentication {
-                                basic(BasicAuthentication)
-                            }
-                        }
-                    }
-                    if (System.getenv("SNAPSHOTS_MAVEN_USERNAME") != null) {
-                        maven {
-                            name = "william278-snapshots"
-                            url = "https://repo.william278.net/snapshots"
-                            credentials {
-                                username = System.getenv("SNAPSHOTS_MAVEN_USERNAME")
-                                password = System.getenv("SNAPSHOTS_MAVEN_PASSWORD")
-                            }
-                            authentication {
-                                basic(BasicAuthentication)
-                            }
-                        }
-                    }
-                }
-
+        publishing {
+            if (['common'].contains(project.name)) {
                 publications {
-                    mavenJava(MavenPublication) {
-                        groupId = 'net.william278'
-                        artifactId = 'husksync'
+                    mavenJavaCommon(MavenPublication) {
+                        groupId = 'net.william278.husksync'
+                        artifactId = 'husksync-common'
                         version = "$rootProject.version"
                         artifact shadowJar
-                        artifact javadocJar
                         artifact sourcesJar
+                        artifact javadocJar
+                    }
+                }
+            }
+
+            if (project.parent?.name?.equals('bukkit')) {
+                publications {
+                    "mavenJavaBukkit_${project.name.replace('.', '_')}"(MavenPublication) {
+                        groupId = 'net.william278.husksync'
+                        artifactId = 'husksync-bukkit'
+                        version = "$rootProject.version+$project.name"
+                        artifact shadowJar
+                        artifact sourcesJar
+                        artifact javadocJar
+                    }
+                }
+            }
+
+            if (project.parent?.name?.equals('fabric')) {
+                publications {
+                    "mavenJavaFabric_${project.name.replace('.', '_')}"(MavenPublication) {
+                        groupId = 'net.william278.husksync'
+                        artifactId = 'husksync-fabric'
+                        version = "$rootProject.version+$project.name"
+                        artifact remapJar
+                        artifact sourcesJar
+                        artifact javadocJar
                     }
                 }
             }
         }
-
-        jar.dependsOn(shadowJar)
-        clean.delete "$rootDir/target"
     }
+
+    jar.dependsOn shadowJar
+    clean.delete "$rootDir/target"
 }
 
 logger.lifecycle("Building HuskSync ${version} by William278")
 
 @SuppressWarnings('GrMethodMayBeStatic')
 def versionMetadata() {
-    // Get if there is a tag for this commit
+    // Require grgit
+    if (grgit == null) {
+        return '-unknown'
+    }
+
+    // If unclean, return the last commit hash with -indev
+    if (!grgit.status().clean) {
+        return '-' + grgit.head().abbreviatedId + '-indev'
+    }
+
+    // Otherwise if this matches a tag, return nothing
     def tag = grgit.tag.list().find { it.commit.id == grgit.head().id }
     if (tag != null) {
         return ''
     }
-
-    // Otherwise, get the last commit hash and if it's a clean head
-    if (grgit == null) {
-        return '-' + System.getenv("GITHUB_RUN_NUMBER") ? 'build.' + System.getenv("GITHUB_RUN_NUMBER") : 'unknown'
-    }
-    return '-' + grgit.head().abbreviatedId + (grgit.status().clean ? '' : '-indev')
-}
+    return '-' + grgit.head().abbreviatedId
+}

bukkit/1.21.1/gradle.properties

@@ -0,0 +1,4 @@
+minecraft_version_range=1.21.1
+minecraft_version_numeric=12101
+minecraft_api_version=1.21
+paper_api_version=1.21.1-R0.1-SNAPSHOT

bukkit/1.21.10/gradle.properties

@@ -0,0 +1,4 @@
+minecraft_version_range=>=1.21.9 <=1.21.10
+minecraft_version_numeric=12110
+minecraft_api_version=1.21
+paper_api_version=1.21.10-R0.1-SNAPSHOT

bukkit/1.21.11/gradle.properties

@@ -0,0 +1,4 @@
+minecraft_version_range=>=1.21.11 <=1.21.11
+minecraft_version_numeric=12111
+minecraft_api_version=1.21
+paper_api_version=1.21.11-R0.1-SNAPSHOT

bukkit/1.21.4/gradle.properties

@@ -0,0 +1,4 @@
+minecraft_version_range=1.21.4
+minecraft_version_numeric=12104
+minecraft_api_version=1.21
+paper_api_version=1.21.4-R0.1-SNAPSHOT

bukkit/1.21.5/gradle.properties

@@ -0,0 +1,4 @@
+minecraft_version_range=1.21.5
+minecraft_version_numeric=12105
+minecraft_api_version=1.21
+paper_api_version=1.21.5-R0.1-SNAPSHOT

bukkit/1.21.8/gradle.properties

@@ -0,0 +1,4 @@
+minecraft_version_range=>=1.21.7 <=1.21.8
+minecraft_version_numeric=12108
+minecraft_api_version=1.21
+paper_api_version=1.21.8-R0.1-SNAPSHOT

bukkit/build.gradle

@@ -1,27 +1,61 @@
+plugins {
+    id 'java'
+    id 'net.william278.preprocessor' version '1.0'
+    id 'xyz.jpenilla.run-paper' version '2.3.1'
+    id 'maven-publish'
+}
+
 dependencies {
     implementation project(path: ':common')
 
-    implementation 'org.bstats:bstats-bukkit:3.0.2'
+    implementation 'net.william278.uniform:uniform-bukkit:1.3.9'
+    implementation 'net.william278.uniform:uniform-paper:1.3.9'
+    implementation 'net.william278.toilet:toilet-bukkit:1.0.16'
     implementation 'net.william278:mpdbdataconverter:1.0.1'
     implementation 'net.william278:hsldataconverter:1.0'
-    implementation 'net.william278:mapdataapi:1.0.3'
-    implementation 'net.william278:andjam:1.0.2'
-    implementation 'me.lucko:commodore:2.2'
-    implementation 'net.kyori:adventure-platform-bukkit:4.3.0'
-    implementation 'dev.triumphteam:triumph-gui:3.1.5'
-    implementation 'space.arim.morepaperlib:morepaperlib:0.4.3'
-    implementation 'de.tr7zw:item-nbt-api:2.12.0'
+    implementation 'net.william278:mapdataapi:2.0'
+    implementation 'org.bstats:bstats-bukkit:3.1.0'
+    implementation 'net.kyori:adventure-platform-bukkit:4.4.1'
+    implementation 'dev.triumphteam:triumph-gui:3.1.12'
+    implementation 'space.arim.morepaperlib:morepaperlib:0.4.4'
+    implementation 'de.tr7zw:item-nbt-api:2.15.5'
 
-    compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT'
-    compileOnly 'commons-io:commons-io:2.13.0'
-    compileOnly 'org.json:json:20230618'
-    compileOnly 'de.themoep:minedown-adventure:1.7.2-SNAPSHOT'
-    compileOnly 'dev.dejvokep:boosted-yaml:1.3.1'
-    compileOnly 'com.zaxxer:HikariCP:5.0.1'
+    compileOnly "io.papermc.paper:paper-api:${paper_api_version}"
+    compileOnly 'com.github.retrooper:packetevents-spigot:2.10.1'
+    compileOnly 'com.github.dmulloy2:ProtocolLib:5.3.0'
+    compileOnly 'org.projectlombok:lombok:1.18.42'
+    compileOnly 'commons-io:commons-io:2.21.0'
+    compileOnly 'org.json:json:20250517'
+    compileOnly 'net.william278:minedown:1.8.2'
+    compileOnly 'de.exlll:configlib-yaml:4.6.4'
+    compileOnly 'com.zaxxer:HikariCP:7.0.2'
     compileOnly 'net.william278:DesertWell:2.0.4'
-    compileOnly 'net.william278:annotaml:2.0.7'
     compileOnly 'net.william278:AdvancementAPI:97a9583413'
     compileOnly "redis.clients:jedis:$jedis_version"
+
+    annotationProcessor 'org.projectlombok:lombok:1.18.42'
+}
+
+processResources {
+    filesMatching(['**/*.json', '**/*.yml']) {
+        expand([
+                version: version,
+                paper_api_version: paper_api_version,
+                minecraft_version: project.name,
+                minecraft_version_range: minecraft_version_range,
+                minecraft_api_version: minecraft_api_version
+        ])
+    }
+}
+
+sourceSets.main {
+    java.srcDirs '../src/main/java'
+    resources.srcDirs '../src/main/resources'
+}
+javadoc.setSource('./build/generated/preprocessed/main/java')
+
+preprocess {
+    vars.put('MC', minecraft_version_numeric)
 }
 
 shadowJar {
@@ -33,28 +67,36 @@ shadowJar {
     relocate 'org.apache.commons.text', 'net.william278.husksync.libraries.commons.text'
     relocate 'org.apache.commons.lang3', 'net.william278.husksync.libraries.commons.lang3'
     relocate 'com.google.gson', 'net.william278.husksync.libraries.gson'
-    relocate 'org.json', 'net.william278.husksync.libraries.json'
-    relocate 'com.fatboyindustrial', 'net.william278.husktowns.libraries'
+    relocate 'com.fatboyindustrial', 'net.william278.husksync.libraries'
     relocate 'de.themoep', 'net.william278.husksync.libraries'
-    relocate 'net.kyori', 'net.william278.husksync.libraries'
     relocate 'org.jetbrains', 'net.william278.husksync.libraries'
     relocate 'org.intellij', 'net.william278.husksync.libraries'
     relocate 'com.zaxxer', 'net.william278.husksync.libraries'
-    relocate 'dev.dejvokep', 'net.william278.husksync.libraries'
+    relocate 'de.exlll', 'net.william278.husksync.libraries'
+    relocate 'net.william278.uniform', 'net.william278.husksync.libraries.uniform'
+    relocate 'net.william278.toilet', 'net.william278.husksync.libraries.toilet'
     relocate 'net.william278.desertwell', 'net.william278.husksync.libraries.desertwell'
     relocate 'net.william278.paginedown', 'net.william278.husksync.libraries.paginedown'
     relocate 'net.william278.mapdataapi', 'net.william278.husksync.libraries.mapdataapi'
-    relocate 'net.william278.andjam', 'net.william278.husksync.libraries.andjam'
-    relocate 'net.querz', 'net.william278.husksync.libraries.nbtparser'
-    relocate 'net.roxeez', 'net.william278.husksync.libraries'
-
-    relocate 'me.lucko.commodore', 'net.william278.husksync.libraries.commodore'
-    relocate 'net.byteflux.libby', 'net.william278.husksync.libraries.libby'
-    relocate 'org.bstats', 'net.william278.husksync.libraries.bstats'
-    relocate 'dev.triumphteam.gui', 'net.william278.husksync.libraries.triumphgui'
     relocate 'net.william278.mpdbconverter', 'net.william278.husksync.libraries.mpdbconverter'
     relocate 'net.william278.hslmigrator', 'net.william278.husksync.libraries.hslconverter'
-    relocate 'net.william278.annotaml', 'net.william278.husksync.libraries.annotaml'
+    relocate 'org.json', 'net.william278.husksync.libraries.json'
+    relocate 'net.querz', 'net.william278.husksync.libraries.nbtparser'
+    relocate 'net.roxeez', 'net.william278.husksync.libraries'
+    relocate 'org.bstats', 'net.william278.husksync.libraries.bstats'
+    relocate 'dev.triumphteam.gui', 'net.william278.husksync.libraries.triumphgui'
     relocate 'space.arim.morepaperlib', 'net.william278.husksync.libraries.paperlib'
     relocate 'de.tr7zw.changeme.nbtapi', 'net.william278.husksync.libraries.nbtapi'
+
+    minimize()
+}
+
+tasks {
+    runServer {
+        minecraftVersion(project.name)
+
+        downloadPlugins {
+            github("plan-player-analytics", "Plan", "5.6.2965", "Plan-5.6-build-2965.jar")
+        }
+    }
 }

bukkit/gradle.properties

@@ -0,0 +1,5 @@
+org.gradle.daemon=false
+org.gradle.parallel=true
+org.gradle.configureoncommand=true
+org.gradle.parallel.threads=4
+org.gradle.jvmargs=-Xmx8G

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

@@ -19,56 +19,72 @@
 
 package net.william278.husksync;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 import com.google.gson.Gson;
+import de.tr7zw.changeme.nbtapi.NBT;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import net.kyori.adventure.platform.AudienceProvider;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import net.william278.desertwell.util.Version;
 import net.william278.husksync.adapter.DataAdapter;
 import net.william278.husksync.adapter.GsonAdapter;
 import net.william278.husksync.adapter.SnappyGsonAdapter;
 import net.william278.husksync.api.BukkitHuskSyncAPI;
-import net.william278.husksync.command.BukkitCommand;
+import net.william278.husksync.command.PluginCommand;
 import net.william278.husksync.config.Locales;
+import net.william278.husksync.config.Server;
 import net.william278.husksync.config.Settings;
-import net.william278.husksync.data.BukkitSerializer;
-import net.william278.husksync.data.Data;
-import net.william278.husksync.data.Identifier;
-import net.william278.husksync.data.Serializer;
+import net.william278.husksync.data.*;
 import net.william278.husksync.database.Database;
+import net.william278.husksync.database.MongoDbDatabase;
 import net.william278.husksync.database.MySqlDatabase;
+import net.william278.husksync.database.PostgresDatabase;
 import net.william278.husksync.event.BukkitEventDispatcher;
 import net.william278.husksync.hook.PlanHook;
 import net.william278.husksync.listener.BukkitEventListener;
-import net.william278.husksync.listener.EventListener;
+import net.william278.husksync.listener.LockedHandler;
+import net.william278.husksync.maps.BukkitMapHandler;
 import net.william278.husksync.migrator.LegacyMigrator;
 import net.william278.husksync.migrator.Migrator;
 import net.william278.husksync.migrator.MpdbMigrator;
 import net.william278.husksync.redis.RedisManager;
+import net.william278.husksync.sync.DataSyncer;
 import net.william278.husksync.user.BukkitUser;
-import net.william278.husksync.user.ConsoleUser;
 import net.william278.husksync.user.OnlineUser;
 import net.william278.husksync.util.BukkitLegacyConverter;
-import net.william278.husksync.util.BukkitMapPersister;
 import net.william278.husksync.util.BukkitTask;
 import net.william278.husksync.util.LegacyConverter;
+import net.william278.toilet.BukkitToilet;
+import net.william278.toilet.Toilet;
+import net.william278.uniform.Uniform;
+import net.william278.uniform.bukkit.BukkitUniform;
 import org.bstats.bukkit.Metrics;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.map.MapView;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import space.arim.morepaperlib.MorePaperLib;
-import space.arim.morepaperlib.commands.CommandRegistration;
 import space.arim.morepaperlib.scheduling.AsynchronousScheduler;
+import space.arim.morepaperlib.scheduling.AttachedScheduler;
 import space.arim.morepaperlib.scheduling.GracefulScheduling;
 import space.arim.morepaperlib.scheduling.RegionalScheduler;
 
+import java.nio.file.Path;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
-public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.Supplier, BukkitEventDispatcher,
-        BukkitMapPersister {
+@Getter
+@NoArgsConstructor
+@SuppressWarnings("unchecked")
+public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.Supplier,
+        BukkitEventDispatcher, BukkitMapHandler {
 
     /**
      * Metrics ID for <a href="https://bstats.org/plugin/bukkit/HuskSync%20-%20Bukkit/13140">HuskSync on Bukkit</a>.
@@ -76,40 +92,73 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
     private static final int METRICS_ID = 13140;
     private static final String PLATFORM_TYPE_ID = "bukkit";
 
+    private final HashMap<Identifier, Serializer<? extends Data>> serializers = Maps.newHashMap();
+    private final Map<UUID, Map<Identifier, Data>> playerCustomDataStore = Maps.newConcurrentMap();
+    private final Map<Integer, MapView> mapViews = Maps.newConcurrentMap();
+    private final List<Migrator> availableMigrators = Lists.newArrayList();
+    private final Set<UUID> lockedPlayers = Sets.newConcurrentHashSet();
+    private final Set<UUID> disconnectingPlayers = Sets.newConcurrentHashSet();
+
+    private boolean disabling;
+    private Gson gson;
+    private AudienceProvider audiences;
+    private Toilet toilet;
+    private MorePaperLib paperLib;
     private Database database;
     private RedisManager redisManager;
-    private EventListener eventListener;
+    private BukkitEventListener eventListener;
     private DataAdapter dataAdapter;
-    private Map<Identifier, Serializer<? extends Data>> serializers;
-    private Map<UUID, Map<Identifier, Data>> playerCustomDataStore;
-    private Settings settings;
-    private Locales locales;
-    private List<Migrator> availableMigrators;
+    private DataSyncer dataSyncer;
     private LegacyConverter legacyConverter;
-    private Map<Integer, MapView> mapViews;
-    private BukkitAudiences audiences;
-    private MorePaperLib paperLib;
     private AsynchronousScheduler asyncScheduler;
     private RegionalScheduler regionalScheduler;
-    private Gson gson;
+    @Setter
+    private Settings settings;
+    @Setter
+    private Locales locales;
+    @Setter
+    @Getter(AccessLevel.NONE)
+    private Server serverName;
+
+    @Override
+    public void onLoad() {
+        // Initial plugin setup
+        this.disabling = false;
+        this.gson = createGson();
+        this.paperLib = new MorePaperLib(this);
+
+        // Load settings and locales
+        initialize("plugin config & locale files", (plugin) -> {
+            loadSettings();
+            loadLocales();
+            loadServer();
+            validateConfigFiles();
+        });
+
+        this.eventListener = createEventListener();
+        eventListener.onLoad();
+    }
 
     @Override
     public void onEnable() {
-        // Initial plugin setup
-        this.gson = createGson();
         this.audiences = BukkitAudiences.create(this);
-        this.paperLib = new MorePaperLib(this);
-        this.availableMigrators = new ArrayList<>();
-        this.serializers = new LinkedHashMap<>();
-        this.playerCustomDataStore = new ConcurrentHashMap<>();
-        this.mapViews = new ConcurrentHashMap<>();
+        this.toilet = BukkitToilet.create(getDumpOptions());
 
-        // Load settings and locales
-        initialize("plugin config & locale files", (plugin) -> this.loadConfigs());
+        // Check compatibility
+        checkCompatibility();
+
+        // Preload NBT-API
+        if (!NBT.preloadApi()) {
+            log(Level.SEVERE, "Failed to load NBT API. HuskSync will not be initialized!");
+            return;
+        }
+
+        // Register commands
+        initialize("commands", (plugin) -> getUniform().register(PluginCommand.Type.create(this)));
 
         // Prepare data adapter
         initialize("data adapter", (plugin) -> {
-            if (settings.doCompressData()) {
+            if (settings.getSynchronization().isCompressData()) {
                 dataAdapter = new SnappyGsonAdapter(this);
             } else {
                 dataAdapter = new GsonAdapter(this);
@@ -118,17 +167,20 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
 
         // Prepare serializers
         initialize("data serializers", (plugin) -> {
+            registerSerializer(Identifier.PERSISTENT_DATA, new BukkitSerializer.PersistentData(this));
             registerSerializer(Identifier.INVENTORY, new BukkitSerializer.Inventory(this));
             registerSerializer(Identifier.ENDER_CHEST, new BukkitSerializer.EnderChest(this));
             registerSerializer(Identifier.ADVANCEMENTS, new BukkitSerializer.Advancements(this));
-            registerSerializer(Identifier.LOCATION, new BukkitSerializer.Location(this));
-            registerSerializer(Identifier.HEALTH, new BukkitSerializer.Health(this));
-            registerSerializer(Identifier.HUNGER, new BukkitSerializer.Hunger(this));
-            registerSerializer(Identifier.GAME_MODE, new BukkitSerializer.GameMode(this));
+            registerSerializer(Identifier.STATISTICS, new Serializer.Json<>(this, BukkitData.Statistics.class));
             registerSerializer(Identifier.POTION_EFFECTS, new BukkitSerializer.PotionEffects(this));
-            registerSerializer(Identifier.STATISTICS, new BukkitSerializer.Statistics(this));
-            registerSerializer(Identifier.EXPERIENCE, new BukkitSerializer.Experience(this));
-            registerSerializer(Identifier.PERSISTENT_DATA, new BukkitSerializer.PersistentData(this));
+            registerSerializer(Identifier.GAME_MODE, new Serializer.Json<>(this, BukkitData.GameMode.class));
+            registerSerializer(Identifier.FLIGHT_STATUS, new Serializer.Json<>(this, BukkitData.FlightStatus.class));
+            registerSerializer(Identifier.ATTRIBUTES, new Serializer.Json<>(this, BukkitData.Attributes.class));
+            registerSerializer(Identifier.HEALTH, new Serializer.Json<>(this, BukkitData.Health.class));
+            registerSerializer(Identifier.HUNGER, new Serializer.Json<>(this, BukkitData.Hunger.class));
+            registerSerializer(Identifier.EXPERIENCE, new Serializer.Json<>(this, BukkitData.Experience.class));
+            registerSerializer(Identifier.LOCATION, new Serializer.Json<>(this, BukkitData.Location.class));
+            validateDependencies();
         });
 
         // Setup available migrators
@@ -141,8 +193,12 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
         });
 
         // Initialize the database
-        initialize(getSettings().getDatabaseType().getDisplayName() + " database connection", (plugin) -> {
-            this.database = new MySqlDatabase(this);
+        initialize(getSettings().getDatabase().getType().getDisplayName() + " database connection", (plugin) -> {
+            this.database = switch (settings.getDatabase().getType()) {
+                case MYSQL, MARIADB -> new MySqlDatabase(this);
+                case POSTGRES -> new PostgresDatabase(this);
+                case MONGO -> new MongoDbDatabase(this);
+            };
             this.database.initialize();
         });
 
@@ -152,15 +208,18 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
             this.redisManager.initialize();
         });
 
-        // Register events
-        initialize("events", (plugin) -> this.eventListener = new BukkitEventListener(this));
+        // Prepare data syncer
+        initialize("data syncer", (plugin) -> {
+            dataSyncer = getSettings().getSynchronization().getMode().create(this);
+            dataSyncer.initialize();
+        });
 
-        // Register commands
-        initialize("commands", (plugin) -> BukkitCommand.Type.registerCommands(this));
+        // Register events
+        initialize("events", (plugin) -> eventListener.onEnable());
 
         // Register plugin hooks
         initialize("hooks", (plugin) -> {
-            if (isDependencyLoaded("Plan") && getSettings().usePlanHook()) {
+            if (isDependencyLoaded("Plan") && getSettings().isEnablePlanHook()) {
                 new PlanHook(this).hookIntoPlan();
             }
         });
@@ -176,6 +235,12 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
     @Override
     public void onDisable() {
         // Handle shutdown
+        this.disabling = true;
+
+        // Close the event listener / data syncer
+        if (this.dataSyncer != null) {
+            this.dataSyncer.terminate();
+        }
         if (this.eventListener != null) {
             this.eventListener.handlePluginDisable();
         }
@@ -188,10 +253,15 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
         log(Level.INFO, "Successfully disabled HuskSync v" + getPluginVersion());
     }
 
+    @NotNull
+    protected BukkitEventListener createEventListener() {
+        return new BukkitEventListener(this);
+    }
+
     @Override
     @NotNull
     public Set<OnlineUser> getOnlineUsers() {
-        return Bukkit.getOnlinePlayers().stream()
+        return getServer().getOnlinePlayers().stream()
                 .map(player -> BukkitUser.adapt(player, this))
                 .collect(Collectors.toSet());
     }
@@ -199,7 +269,7 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
     @Override
     @NotNull
     public Optional<OnlineUser> getOnlineUser(@NotNull UUID uuid) {
-        final Player player = Bukkit.getPlayer(uuid);
+        final Player player = getServer().getPlayer(uuid);
         if (player == null) {
             return Optional.empty();
         }
@@ -207,71 +277,36 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
     }
 
     @Override
-    @NotNull
-    public Database getDatabase() {
-        return database;
+    public void setDataSyncer(@NotNull DataSyncer dataSyncer) {
+        log(Level.INFO, String.format("Switching data syncer to %s", dataSyncer.getClass().getSimpleName()));
+        this.dataSyncer = dataSyncer;
     }
 
     @Override
     @NotNull
-    public RedisManager getRedisManager() {
-        return redisManager;
-    }
-
-    @NotNull
-    @Override
-    public DataAdapter getDataAdapter() {
-        return dataAdapter;
-    }
-
-    @NotNull
-    @Override
-    public Map<Identifier, Serializer<? extends Data>> getSerializers() {
-        return serializers;
-    }
-
-    @NotNull
-    @Override
-    public List<Migrator> getAvailableMigrators() {
-        return availableMigrators;
+    public Uniform getUniform() {
+        return BukkitUniform.getInstance(this);
     }
 
     @NotNull
     @Override
     public Map<Identifier, Data> getPlayerCustomDataStore(@NotNull OnlineUser user) {
-        if (playerCustomDataStore.containsKey(user.getUuid())) {
-            return playerCustomDataStore.get(user.getUuid());
-        }
-        final Map<Identifier, Data> data = new HashMap<>();
-        playerCustomDataStore.put(user.getUuid(), data);
-        return data;
+        return playerCustomDataStore.compute(
+                user.getUuid(),
+                (uuid, data) -> data == null ? Maps.newHashMap() : data
+        );
     }
 
     @Override
     @NotNull
-    public Settings getSettings() {
-        return settings;
-    }
-
-    @Override
-    public void setSettings(@NotNull Settings settings) {
-        this.settings = settings;
-    }
-
-    @Override
-    @NotNull
-    public Locales getLocales() {
-        return locales;
-    }
-
-    @Override
-    public void setLocales(@NotNull Locales locales) {
-        this.locales = locales;
+    public String getServerName() {
+        return serverName == null ? "server" : serverName.getName();
     }
 
     @Override
     public boolean isDependencyLoaded(@NotNull String name) {
-        return Bukkit.getPluginManager().getPlugin(name) != null;
+        final Plugin plugin = getServer().getPluginManager().getPlugin(name);
+        return plugin != null;
     }
 
     // Register bStats metrics
@@ -283,7 +318,7 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
         try {
             new Metrics(this, metricsId);
         } catch (Throwable e) {
-            log(Level.WARNING, "Failed to register bStats metrics (" + e.getMessage() + ")");
+            log(Level.WARNING, "Failed to register bStats metrics (%s)".formatted(e.getMessage()));
         }
     }
 
@@ -296,12 +331,6 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
         }
     }
 
-    @NotNull
-    @Override
-    public ConsoleUser getConsole() {
-        return new ConsoleUser(audiences.console());
-    }
-
     @NotNull
     @Override
     public Version getPluginVersion() {
@@ -311,7 +340,7 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
     @NotNull
     @Override
     public Version getMinecraftVersion() {
-        return Version.fromString(Bukkit.getBukkitVersion());
+        return Version.fromString(getServer().getBukkitVersion());
     }
 
     @NotNull
@@ -320,26 +349,21 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
         return PLATFORM_TYPE_ID;
     }
 
+    @Override
+    @NotNull
+    public String getServerVersion() {
+        return String.format("%s/%s", getServer().getName(), getServer().getVersion());
+    }
+
     @Override
     public Optional<LegacyConverter> getLegacyConverter() {
         return Optional.of(legacyConverter);
     }
 
-    @NotNull
     @Override
-    public Set<UUID> getLockedPlayers() {
-        return this.eventListener.getLockedPlayers();
-    }
-
     @NotNull
-    @Override
-    public Gson getGson() {
-        return gson;
-    }
-
-    @NotNull
-    public Map<Integer, MapView> getMapViews() {
-        return mapViews;
+    public LockedHandler getLockedHandler() {
+        return eventListener.getLockedHandler();
     }
 
     @NotNull
@@ -354,24 +378,25 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
     }
 
     @NotNull
-    public RegionalScheduler getRegionalScheduler() {
+    public RegionalScheduler getSyncScheduler() {
         return regionalScheduler == null
                 ? regionalScheduler = getScheduler().globalRegionalScheduler() : regionalScheduler;
     }
 
     @NotNull
-    public BukkitAudiences getAudiences() {
-        return audiences;
-    }
-
-    @NotNull
-    public CommandRegistration getCommandRegistrar() {
-        return paperLib.commandRegistration();
+    public AttachedScheduler getUserSyncScheduler(@NotNull UserDataHolder user) {
+        return getScheduler().entitySpecificScheduler(((BukkitUser) user).getPlayer());
     }
 
     @Override
     @NotNull
-    public HuskSync getPlugin() {
+    public Path getConfigDirectory() {
+        return getDataFolder().toPath();
+    }
+
+    @Override
+    @NotNull
+    public BukkitHuskSync getPlugin() {
         return this;
     }
 

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

@@ -0,0 +1,60 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync;
+
+import net.kyori.adventure.audience.Audience;
+import net.william278.desertwell.util.Version;
+import net.william278.husksync.listener.BukkitEventListener;
+import net.william278.husksync.listener.PaperEventListener;
+import net.william278.uniform.Uniform;
+import net.william278.uniform.paper.PaperUniform;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+@SuppressWarnings({"unused"})
+public class PaperHuskSync extends BukkitHuskSync {
+
+    @NotNull
+    @Override
+    protected BukkitEventListener createEventListener() {
+        return new PaperEventListener(this);
+    }
+
+    @NotNull
+    @Override
+    public Audience getAudience(@NotNull UUID user) {
+        final Player player = getServer().getPlayer(user);
+        return player == null || !player.isOnline() ? Audience.empty() : player;
+    }
+
+    @NotNull
+    @Override
+    public Version getMinecraftVersion() {
+        return Version.fromString(getServer().getMinecraftVersion());
+    }
+
+    @Override
+    @NotNull
+    public Uniform getUniform() {
+        return PaperUniform.getInstance(this);
+    }
+}

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

@@ -0,0 +1,90 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync;
+
+import de.exlll.configlib.Configuration;
+import de.exlll.configlib.YamlConfigurations;
+import io.papermc.paper.plugin.loader.PluginClasspathBuilder;
+import io.papermc.paper.plugin.loader.PluginLoader;
+import io.papermc.paper.plugin.loader.library.impl.MavenLibraryResolver;
+import lombok.NoArgsConstructor;
+import org.eclipse.aether.artifact.DefaultArtifact;
+import org.eclipse.aether.graph.Dependency;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.InputStream;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Stream;
+
+@NoArgsConstructor
+@SuppressWarnings("UnstableApiUsage")
+public class PaperHuskSyncLoader implements PluginLoader {
+
+    @Override
+    public void classloader(@NotNull PluginClasspathBuilder classpathBuilder) {
+        final MavenLibraryResolver resolver = new MavenLibraryResolver();
+
+        resolveLibraries(classpathBuilder).stream()
+                .map(DefaultArtifact::new)
+                .forEach(artifact -> resolver.addDependency(new Dependency(artifact, null)));
+        resolver.addRepository(new RemoteRepository.Builder("maven", "default", getMavenUrl()).build());
+
+        classpathBuilder.addLibrary(resolver);
+    }
+
+    @NotNull
+    private static String getMavenUrl() {
+        return Stream.of(
+                System.getenv("PAPER_DEFAULT_CENTRAL_REPOSITORY"),
+                System.getProperty("org.bukkit.plugin.java.LibraryLoader.centralURL"),
+                "https://maven-central.storage-download.googleapis.com/maven2"
+        ).filter(Objects::nonNull).findFirst().orElseThrow(IllegalStateException::new);
+    }
+
+    @NotNull
+    private static List<String> resolveLibraries(@NotNull PluginClasspathBuilder classpathBuilder) {
+        try (InputStream input = getLibraryListFile()) {
+            return YamlConfigurations.read(
+                    Objects.requireNonNull(input, "Failed to read libraries file"),
+                    PaperLibraries.class
+            ).libraries;
+        } catch (Throwable e) {
+            classpathBuilder.getContext().getLogger().error("Failed to resolve libraries", e);
+        }
+        return List.of();
+    }
+
+    @Nullable
+    private static InputStream getLibraryListFile() {
+        return PaperHuskSyncLoader.class.getClassLoader().getResourceAsStream("paper-libraries.yml");
+    }
+
+    @Configuration
+    @NoArgsConstructor
+    public static class PaperLibraries {
+
+        private List<String> libraries;
+
+    }
+
+}

bukkit/src/main/java/net/william278/husksync/api/BukkitHuskSyncAPI.java

@@ -28,6 +28,7 @@ import net.william278.husksync.user.OnlineUser;
 import net.william278.husksync.user.User;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
@@ -43,9 +44,6 @@ import java.util.function.Consumer;
 @SuppressWarnings("unused")
 public class BukkitHuskSyncAPI extends HuskSyncAPI {
 
-    // Instance of the plugin
-    private static BukkitHuskSyncAPI instance;
-
     /**
      * <b>(Internal use only)</b> - Constructor, instantiating the API.
      */
@@ -55,17 +53,21 @@ public class BukkitHuskSyncAPI extends HuskSyncAPI {
     }
 
     /**
-     * Entrypoint to the HuskSync API - returns an instance of the API
+     * Entrypoint to the HuskSync API on the bukkit platform - returns an instance of the API
      *
      * @return instance of the HuskSync API
      * @since 3.0
      */
     @NotNull
     public static BukkitHuskSyncAPI getInstance() {
+        if (!JavaPlugin.getProvidingPlugin(BukkitHuskSyncAPI.class).getName().equals("HuskSync")) {
+            throw new NotRegisteredException("This is likely because you have shaded HuskSync into your plugin JAR " +
+                                             "and need to fix your maven/gradle/build script so that it *compiles against* HuskSync instead.");
+        }
         if (instance == null) {
             throw new NotRegisteredException();
         }
-        return instance;
+        return (BukkitHuskSyncAPI) instance;
     }
 
     /**
@@ -79,14 +81,6 @@ public class BukkitHuskSyncAPI extends HuskSyncAPI {
         instance = new BukkitHuskSyncAPI(plugin);
     }
 
-    /**
-     * <b>(Internal use only)</b> - Unregister the API for this platform.
-     */
-    @ApiStatus.Internal
-    public static void unregister() {
-        instance = null;
-    }
-
     /**
      * Returns a {@link OnlineUser} instance for the given bukkit {@link Player}.
      *

bukkit/src/main/java/net/william278/husksync/command/BrigadierUtil.java

@@ -1,60 +0,0 @@
-/*
- * This file is part of HuskSync, licensed under the Apache License 2.0.
- *
- *  Copyright (c) William278 <will27528@gmail.com>
- *  Copyright (c) contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package net.william278.husksync.command;
-
-import me.lucko.commodore.CommodoreProvider;
-import me.lucko.commodore.file.CommodoreFileReader;
-import net.william278.husksync.BukkitHuskSync;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.logging.Level;
-
-public class BrigadierUtil {
-
-    /**
-     * Uses commodore to register command completions.
-     *
-     * @param plugin        instance of the registering Bukkit plugin
-     * @param bukkitCommand the Bukkit PluginCommand to register completions for
-     * @param command       the {@link Command} to register completions for
-     */
-    protected static void registerCommodore(@NotNull BukkitHuskSync plugin,
-                                            @NotNull org.bukkit.command.Command bukkitCommand,
-                                            @NotNull Command command) {
-        final InputStream commodoreFile = plugin.getResource(
-                "commodore/" + bukkitCommand.getName() + ".commodore"
-        );
-        if (commodoreFile == null) {
-            return;
-        }
-        try {
-            CommodoreProvider.getCommodore(plugin).register(bukkitCommand,
-                    CommodoreFileReader.INSTANCE.parse(commodoreFile),
-                    player -> player.hasPermission(command.getPermission()));
-        } catch (IOException e) {
-            plugin.log(Level.SEVERE, String.format(
-                    "Failed to read command commodore completions for %s", bukkitCommand.getName()), e
-            );
-        }
-    }
-
-}

bukkit/src/main/java/net/william278/husksync/command/BukkitCommand.java

@@ -1,164 +0,0 @@
-/*
- * This file is part of HuskSync, licensed under the Apache License 2.0.
- *
- *  Copyright (c) William278 <will27528@gmail.com>
- *  Copyright (c) contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package net.william278.husksync.command;
-
-
-import me.lucko.commodore.CommodoreProvider;
-import net.william278.husksync.BukkitHuskSync;
-import net.william278.husksync.user.BukkitUser;
-import net.william278.husksync.user.CommandUser;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionDefault;
-import org.bukkit.plugin.PluginManager;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.*;
-import java.util.function.Function;
-
-public class BukkitCommand extends org.bukkit.command.Command {
-
-    private final BukkitHuskSync plugin;
-    private final Command command;
-
-    public BukkitCommand(@NotNull Command command, @NotNull BukkitHuskSync plugin) {
-        super(command.getName(), command.getDescription(), command.getUsage(), command.getAliases());
-        this.command = command;
-        this.plugin = plugin;
-    }
-
-    @Override
-    public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] args) {
-        this.command.onExecuted(sender instanceof Player p ? BukkitUser.adapt(p, plugin) : plugin.getConsole(), args);
-        return true;
-    }
-
-    @NotNull
-    @Override
-    public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias,
-                                    @NotNull String[] args) throws IllegalArgumentException {
-        if (!(this.command instanceof TabProvider provider)) {
-            return List.of();
-        }
-        final CommandUser user = sender instanceof Player p ? BukkitUser.adapt(p, plugin) : plugin.getConsole();
-        if (getPermission() == null || user.hasPermission(getPermission())) {
-            return provider.getSuggestions(user, args);
-        }
-        return List.of();
-    }
-
-    public void register() {
-        // Register with bukkit
-        plugin.getCommandRegistrar().getServerCommandMap().register("husksync", this);
-
-        // Register permissions
-        BukkitCommand.addPermission(
-                plugin,
-                command.getPermission(),
-                command.getUsage(),
-                BukkitCommand.getPermissionDefault(command.isOperatorCommand())
-        );
-        final List<Permission> childNodes = command.getAdditionalPermissions()
-                .entrySet().stream()
-                .map((entry) -> BukkitCommand.addPermission(
-                        plugin,
-                        entry.getKey(),
-                        "",
-                        BukkitCommand.getPermissionDefault(entry.getValue()))
-                )
-                .filter(Objects::nonNull)
-                .toList();
-        if (!childNodes.isEmpty()) {
-            BukkitCommand.addPermission(
-                    plugin,
-                    command.getPermission("*"),
-                    command.getUsage(),
-                    PermissionDefault.FALSE,
-                    childNodes.toArray(new Permission[0])
-            );
-        }
-
-        // Register commodore TAB completion
-        if (CommodoreProvider.isSupported() && plugin.getSettings().doBrigadierTabCompletion()) {
-            BrigadierUtil.registerCommodore(plugin, this, command);
-        }
-    }
-
-    @Nullable
-    protected static Permission addPermission(@NotNull BukkitHuskSync plugin, @NotNull String node,
-                                              @NotNull String description, @NotNull PermissionDefault permissionDefault,
-                                              @NotNull Permission... children) {
-        final Map<String, Boolean> childNodes = Arrays.stream(children)
-                .map(Permission::getName)
-                .collect(HashMap::new, (map, child) -> map.put(child, true), HashMap::putAll);
-
-        final PluginManager manager = plugin.getServer().getPluginManager();
-        if (manager.getPermission(node) != null) {
-            return null;
-        }
-
-        Permission permission;
-        if (description.isEmpty()) {
-            permission = new Permission(node, permissionDefault, childNodes);
-        } else {
-            permission = new Permission(node, description, permissionDefault, childNodes);
-        }
-        manager.addPermission(permission);
-
-        return permission;
-    }
-
-    @NotNull
-    protected static PermissionDefault getPermissionDefault(boolean isOperatorCommand) {
-        return isOperatorCommand ? PermissionDefault.OP : PermissionDefault.TRUE;
-    }
-
-    /**
-     * Commands available on the Bukkit HuskSync implementation
-     */
-    public enum Type {
-
-        HUSKSYNC_COMMAND(HuskSyncCommand::new),
-        USERDATA_COMMAND(UserDataCommand::new),
-        INVENTORY_COMMAND(InventoryCommand::new),
-        ENDER_CHEST_COMMAND(EnderChestCommand::new);
-
-        public final Function<BukkitHuskSync, Command> commandSupplier;
-
-        Type(@NotNull Function<BukkitHuskSync, Command> supplier) {
-            this.commandSupplier = supplier;
-        }
-
-        @NotNull
-        public Command createCommand(@NotNull BukkitHuskSync plugin) {
-            return commandSupplier.apply(plugin);
-        }
-
-        public static void registerCommands(@NotNull BukkitHuskSync plugin) {
-            Arrays.stream(values())
-                    .map((type) -> type.createCommand(plugin))
-                    .forEach((command) -> new BukkitCommand(command, plugin).register());
-        }
-
-
-    }
-}

bukkit/src/main/java/net/william278/husksync/data/BukkitSerializer.java

@@ -21,27 +21,35 @@ package net.william278.husksync.data;
 
 import com.google.gson.reflect.TypeToken;
 import de.tr7zw.changeme.nbtapi.NBT;
+import de.tr7zw.changeme.nbtapi.NBTCompound;
 import de.tr7zw.changeme.nbtapi.NBTContainer;
 import de.tr7zw.changeme.nbtapi.iface.ReadWriteNBT;
+import de.tr7zw.changeme.nbtapi.iface.ReadWriteNBTCompoundList;
+import de.tr7zw.changeme.nbtapi.utils.DataFixerUtil;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import net.william278.desertwell.util.Version;
+import net.william278.husksync.BukkitHuskSync;
 import net.william278.husksync.HuskSync;
 import net.william278.husksync.adapter.Adaptable;
 import net.william278.husksync.api.HuskSyncAPI;
+import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
 import static net.william278.husksync.data.BukkitData.Items.Inventory.INVENTORY_SLOT_COUNT;
+import static net.william278.husksync.data.Data.Items.Inventory.HELD_ITEM_SLOT_TAG;
+import static net.william278.husksync.data.Data.Items.Inventory.ITEMS_TAG;
 
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
 public class BukkitSerializer {
 
     protected final HuskSync plugin;
 
-    private BukkitSerializer(@NotNull HuskSync plugin) {
-        this.plugin = plugin;
-    }
-
     @SuppressWarnings("unused")
     public BukkitSerializer(@NotNull HuskSyncAPI api) {
         this.plugin = api.getPlugin();
@@ -53,25 +61,29 @@ public class BukkitSerializer {
         return plugin;
     }
 
-    public static class Inventory extends BukkitSerializer implements Serializer<BukkitData.Items.Inventory> {
-        private static final String ITEMS_TAG = "items";
-        private static final String HELD_ITEM_SLOT_TAG = "held_item_slot";
+    public static class Inventory extends BukkitSerializer implements Serializer<BukkitData.Items.Inventory>,
+            ItemDeserializer {
 
         public Inventory(@NotNull HuskSync plugin) {
             super(plugin);
         }
 
         @Override
-        public BukkitData.Items.Inventory deserialize(@NotNull String serialized) throws DeserializationException {
+        public BukkitData.Items.Inventory deserialize(@NotNull String serialized, @NotNull Version dataMcVersion)
+                throws DeserializationException {
             final ReadWriteNBT root = NBT.parseNBT(serialized);
-            final ItemStack[] items = root.getItemStackArray(ITEMS_TAG);
-            final int heldItemSlot = root.getInteger(HELD_ITEM_SLOT_TAG);
+            final ReadWriteNBT items = root.hasTag(ITEMS_TAG) ? root.getCompound(ITEMS_TAG) : null;
             return BukkitData.Items.Inventory.from(
-                    items == null ? new ItemStack[INVENTORY_SLOT_COUNT] : items,
-                    heldItemSlot
+                    items != null ? getItems(items, dataMcVersion) : new ItemStack[INVENTORY_SLOT_COUNT],
+                    root.hasTag(HELD_ITEM_SLOT_TAG) ? root.getInteger(HELD_ITEM_SLOT_TAG) : 0
             );
         }
 
+        @Override
+        public BukkitData.Items.Inventory deserialize(@NotNull String serialized) {
+            return deserialize(serialized, plugin.getMinecraftVersion());
+        }
+
         @NotNull
         @Override
         public String serialize(@NotNull BukkitData.Items.Inventory data) throws SerializationException {
@@ -83,18 +95,25 @@ public class BukkitSerializer {
 
     }
 
-    public static class EnderChest extends BukkitSerializer implements Serializer<BukkitData.Items.EnderChest> {
+    public static class EnderChest extends BukkitSerializer implements Serializer<BukkitData.Items.EnderChest>,
+            ItemDeserializer {
 
         public EnderChest(@NotNull HuskSync plugin) {
             super(plugin);
         }
 
         @Override
-        public BukkitData.Items.EnderChest deserialize(@NotNull String serialized) throws DeserializationException {
-            final ItemStack[] items = NBT.itemStackArrayFromNBT(NBT.parseNBT(serialized));
+        public BukkitData.Items.EnderChest deserialize(@NotNull String serialized, @NotNull Version dataMcVersion)
+                throws DeserializationException {
+            final ItemStack[] items = getItems(NBT.parseNBT(serialized), dataMcVersion);
             return items == null ? BukkitData.Items.EnderChest.empty() : BukkitData.Items.EnderChest.adapt(items);
         }
 
+        @Override
+        public BukkitData.Items.EnderChest deserialize(@NotNull String serialized) {
+            return deserialize(serialized, plugin.getMinecraftVersion());
+        }
+
         @NotNull
         @Override
         public String serialize(@NotNull BukkitData.Items.EnderChest data) throws SerializationException {
@@ -102,6 +121,49 @@ public class BukkitSerializer {
         }
     }
 
+    // Utility interface for deserializing and upgrading item stacks from legacy versions
+    private interface ItemDeserializer {
+
+        @Nullable
+        default ItemStack[] getItems(@NotNull ReadWriteNBT tag, @NotNull Version mcVersion) {
+            if (mcVersion.compareTo(getPlugin().getMinecraftVersion()) < 0) {
+                return upgradeItemStacks((NBTCompound) tag, mcVersion);
+            }
+            return NBT.itemStackArrayFromNBT(tag);
+        }
+
+        @NotNull
+        private ItemStack @NotNull [] upgradeItemStacks(@NotNull NBTCompound itemsNbt, @NotNull Version mcVersion) {
+            final ReadWriteNBTCompoundList items = itemsNbt.getCompoundList("items");
+            final ItemStack[] itemStacks = new ItemStack[itemsNbt.getInteger("size")];
+            for (int i = 0; i < items.size(); i++) {
+                if (items.get(i) == null) {
+                    itemStacks[i] = new ItemStack(Material.AIR);
+                    continue;
+                }
+                try {
+                    itemStacks[i] = NBT.itemStackFromNBT(upgradeItemData(items.get(i), mcVersion));
+                } catch (Throwable e) {
+                    itemStacks[i] = new ItemStack(Material.AIR);
+                }
+            }
+            return itemStacks;
+        }
+
+        @NotNull
+        private ReadWriteNBT upgradeItemData(@NotNull ReadWriteNBT tag, @NotNull Version mcVersion)
+                throws NoSuchFieldException, IllegalAccessException {
+            return DataFixerUtil.fixUpItemData(
+                    tag,
+                    getPlugin().getDataVersion(mcVersion),
+                    DataFixerUtil.getCurrentVersion()
+            );
+        }
+
+        @NotNull
+        HuskSync getPlugin();
+    }
+
     public static class PotionEffects extends BukkitSerializer implements Serializer<BukkitData.PotionEffects> {
 
         private static final TypeToken<List<Data.PotionEffects.Effect>> TYPE = new TypeToken<>() {
@@ -149,46 +211,6 @@ public class BukkitSerializer {
         }
     }
 
-    public static class Location extends BukkitSerializer implements Serializer<BukkitData.Location> {
-
-        public Location(@NotNull HuskSync plugin) {
-            super(plugin);
-        }
-
-        @Override
-        public BukkitData.Location deserialize(@NotNull String serialized) throws DeserializationException {
-            return plugin.getDataAdapter().fromJson(serialized, BukkitData.Location.class);
-        }
-
-        @NotNull
-        @Override
-        public String serialize(@NotNull BukkitData.Location element) throws SerializationException {
-            return plugin.getDataAdapter().toJson(element);
-        }
-    }
-
-    public static class Statistics extends BukkitSerializer implements Serializer<BukkitData.Statistics> {
-
-        public Statistics(@NotNull HuskSync plugin) {
-            super(plugin);
-        }
-
-        @Override
-        public BukkitData.Statistics deserialize(@NotNull String serialized) throws DeserializationException {
-            return BukkitData.Statistics.from(plugin.getGson().fromJson(
-                    serialized,
-                    BukkitData.Statistics.StatisticsMap.class
-            ));
-        }
-
-        @NotNull
-        @Override
-        public String serialize(@NotNull BukkitData.Statistics element) throws SerializationException {
-            return plugin.getGson().toJson(element.getStatisticsSet());
-        }
-
-    }
-
     public static class PersistentData extends BukkitSerializer implements Serializer<BukkitData.PersistentData> {
 
         public PersistentData(@NotNull HuskSync plugin) {
@@ -197,7 +219,7 @@ public class BukkitSerializer {
 
         @Override
         public BukkitData.PersistentData deserialize(@NotNull String serialized) throws DeserializationException {
-            return BukkitData.PersistentData.from(new NBTContainer(serialized));
+            return BukkitData.PersistentData.from((NBTContainer) NBT.parseNBT(serialized));
         }
 
         @NotNull
@@ -208,56 +230,19 @@ public class BukkitSerializer {
 
     }
 
-    public static class Health extends Json<BukkitData.Health> implements Serializer<BukkitData.Health> {
+    /**
+     * @deprecated Use {@link Serializer.Json} in the common module instead
+     */
+    @Deprecated(since = "2.6")
+    public class Json<T extends Data & Adaptable> extends Serializer.Json<T> {
 
-        public Health(@NotNull HuskSync plugin) {
-            super(plugin, BukkitData.Health.class);
-        }
-
-    }
-
-    public static class Hunger extends Json<BukkitData.Hunger> implements Serializer<BukkitData.Hunger> {
-
-        public Hunger(@NotNull HuskSync plugin) {
-            super(plugin, BukkitData.Hunger.class);
-        }
-
-    }
-
-    public static class Experience extends Json<BukkitData.Experience> implements Serializer<BukkitData.Experience> {
-
-        public Experience(@NotNull HuskSync plugin) {
-            super(plugin, BukkitData.Experience.class);
-        }
-
-    }
-
-    public static class GameMode extends Json<BukkitData.GameMode> implements Serializer<BukkitData.GameMode> {
-
-        public GameMode(@NotNull HuskSync plugin) {
-            super(plugin, BukkitData.GameMode.class);
-        }
-
-    }
-
-    public static abstract class Json<T extends Data & Adaptable> extends BukkitSerializer implements Serializer<T> {
-
-        private final Class<T> type;
-
-        protected Json(@NotNull HuskSync plugin, Class<T> type) {
-            super(plugin);
-            this.type = type;
-        }
-
-        @Override
-        public T deserialize(@NotNull String serialized) throws DeserializationException {
-            return plugin.getDataAdapter().fromJson(serialized, type);
+        public Json(@NotNull HuskSync plugin, @NotNull Class<T> type) {
+            super(plugin, type);
         }
 
         @NotNull
-        @Override
-        public String serialize(@NotNull T element) throws SerializationException {
-            return plugin.getDataAdapter().toJson(element);
+        public BukkitHuskSync getPlugin() {
+            return (BukkitHuskSync) plugin;
         }
 
     }

bukkit/src/main/java/net/william278/husksync/data/BukkitUserDataHolder.java

@@ -20,19 +20,22 @@
 package net.william278.husksync.data;
 
 import net.william278.husksync.BukkitHuskSync;
-import net.william278.husksync.util.BukkitMapPersister;
+import net.william278.husksync.maps.BukkitMapHandler;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.PlayerInventory;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Map;
 import java.util.Optional;
 
 public interface BukkitUserDataHolder extends UserDataHolder {
 
     @Override
     default Optional<? extends Data> getData(@NotNull Identifier id) {
-        if (!id.isCustom()) {
+        if (id.isCustom()) {
+            return Optional.ofNullable(getCustomDataStore().get(id));
+        }
+
+        try {
             return switch (id.getKeyValue()) {
                 case "inventory" -> getInventory();
                 case "ender_chest" -> getEnderChest();
@@ -42,13 +45,17 @@ public interface BukkitUserDataHolder extends UserDataHolder {
                 case "statistics" -> getStatistics();
                 case "health" -> getHealth();
                 case "hunger" -> getHunger();
+                case "attributes" -> getAttributes();
                 case "experience" -> getExperience();
                 case "game_mode" -> getGameMode();
+                case "flight_status" -> getFlightStatus();
                 case "persistent_data" -> getPersistentData();
                 default -> throw new IllegalStateException(String.format("Unexpected data type: %s", id));
             };
+        } catch (Throwable e) {
+            getPlugin().debug("Failed to get data for key: " + id.asMinimalString(), e);
+            return Optional.empty();
         }
-        return Optional.ofNullable(getCustomDataStore().get(id));
     }
 
     @Override
@@ -62,12 +69,13 @@ public interface BukkitUserDataHolder extends UserDataHolder {
     @NotNull
     @Override
     default Optional<Data.Items.Inventory> getInventory() {
-        if ((isDead() && !getPlugin().getSettings().doSynchronizeDeadPlayersChangingServer())) {
+        if ((isDead() && !getPlugin().getSettings().getSynchronization().getSaveOnDeath()
+                .isSyncDeadPlayersChangingServer())) {
             return Optional.of(BukkitData.Items.Inventory.empty());
         }
-        final PlayerInventory inventory = getBukkitPlayer().getInventory();
+        final PlayerInventory inventory = getPlayer().getInventory();
         return Optional.of(BukkitData.Items.Inventory.from(
-                getMapPersister().persistLockedMaps(inventory.getContents(), getBukkitPlayer()),
+                getMapPersister().persistLockedMaps(inventory.getContents(), getPlayer()),
                 inventory.getHeldItemSlot()
         ));
     }
@@ -76,74 +84,92 @@ public interface BukkitUserDataHolder extends UserDataHolder {
     @Override
     default Optional<Data.Items.EnderChest> getEnderChest() {
         return Optional.of(BukkitData.Items.EnderChest.adapt(
-                getMapPersister().persistLockedMaps(getBukkitPlayer().getEnderChest().getContents(), getBukkitPlayer())
+                getMapPersister().persistLockedMaps(getPlayer().getEnderChest().getContents(), getPlayer())
         ));
     }
 
     @NotNull
     @Override
     default Optional<Data.PotionEffects> getPotionEffects() {
-        return Optional.of(BukkitData.PotionEffects.from(getBukkitPlayer().getActivePotionEffects()));
+        return Optional.of(BukkitData.PotionEffects.from(getPlayer().getActivePotionEffects()));
     }
 
     @NotNull
     @Override
     default Optional<Data.Advancements> getAdvancements() {
-        return Optional.of(BukkitData.Advancements.adapt(getBukkitPlayer()));
+        return Optional.of(BukkitData.Advancements.adapt(getPlayer()));
     }
 
     @NotNull
     @Override
     default Optional<Data.Location> getLocation() {
-        return Optional.of(BukkitData.Location.adapt(getBukkitPlayer().getLocation()));
+        return Optional.of(BukkitData.Location.adapt(getPlayer().getLocation()));
     }
 
     @NotNull
     @Override
     default Optional<Data.Statistics> getStatistics() {
-        return Optional.of(BukkitData.Statistics.adapt(getBukkitPlayer()));
+        return Optional.of(BukkitData.Statistics.adapt(getPlayer()));
     }
 
     @NotNull
     @Override
     default Optional<Data.Health> getHealth() {
-        return Optional.of(BukkitData.Health.adapt(getBukkitPlayer()));
+        return Optional.of(BukkitData.Health.adapt(getPlayer()));
     }
 
     @NotNull
     @Override
     default Optional<Data.Hunger> getHunger() {
-        return Optional.of(BukkitData.Hunger.adapt(getBukkitPlayer()));
+        return Optional.of(BukkitData.Hunger.adapt(getPlayer()));
+    }
+
+    @NotNull
+    @Override
+    default Optional<Data.Attributes> getAttributes() {
+        return Optional.of(BukkitData.Attributes.adapt(getPlayer(), getPlugin()));
     }
 
     @NotNull
     @Override
     default Optional<Data.Experience> getExperience() {
-        return Optional.of(BukkitData.Experience.adapt(getBukkitPlayer()));
+        return Optional.of(BukkitData.Experience.adapt(getPlayer()));
     }
 
     @NotNull
     @Override
     default Optional<Data.GameMode> getGameMode() {
-        return Optional.of(BukkitData.GameMode.adapt(getBukkitPlayer()));
+        return Optional.of(BukkitData.GameMode.adapt(getPlayer()));
+    }
+
+    @NotNull
+    @Override
+    default Optional<Data.FlightStatus> getFlightStatus() {
+        return Optional.of(BukkitData.FlightStatus.adapt(getPlayer()));
     }
 
     @NotNull
     @Override
     default Optional<Data.PersistentData> getPersistentData() {
-        return Optional.of(BukkitData.PersistentData.adapt(getBukkitPlayer().getPersistentDataContainer()));
+        return Optional.of(BukkitData.PersistentData.adapt(getPlayer().getPersistentDataContainer()));
     }
 
     boolean isDead();
 
     @NotNull
-    Player getBukkitPlayer();
+    Player getPlayer();
+
+    /**
+     * @deprecated Use {@link #getPlayer()} instead
+     */
+    @Deprecated(since = "3.6")
+    @NotNull
+    default Player getBukkitPlayer() {
+        return getPlayer();
+    }
 
     @NotNull
-    Map<Identifier, Data> getCustomDataStore();
-
-    @NotNull
-    default BukkitMapPersister getMapPersister() {
+    default BukkitMapHandler getMapPersister() {
         return (BukkitHuskSync) getPlugin();
     }
 

bukkit/src/main/java/net/william278/husksync/listener/BukkitEventListener.java

@@ -19,58 +19,75 @@
 
 package net.william278.husksync.listener;
 
+import lombok.Getter;
 import net.william278.husksync.BukkitHuskSync;
-import net.william278.husksync.HuskSync;
 import net.william278.husksync.data.BukkitData;
 import net.william278.husksync.user.BukkitUser;
 import net.william278.husksync.user.OnlineUser;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.Projectile;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.EntityPickupItemEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
-import org.bukkit.event.entity.ProjectileLaunchEvent;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.inventory.InventoryOpenEvent;
-import org.bukkit.event.inventory.PrepareItemCraftEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerDropItemEvent;
-import org.bukkit.event.player.PlayerInteractEntityEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.server.MapInitializeEvent;
 import org.bukkit.event.world.WorldSaveEvent;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.List;
-import java.util.Locale;
 import java.util.stream.Collectors;
 
+@Getter
 public class BukkitEventListener extends EventListener implements BukkitJoinEventListener, BukkitQuitEventListener,
         BukkitDeathEventListener, Listener {
-    protected final List<String> blacklistedCommands;
 
-    public BukkitEventListener(@NotNull BukkitHuskSync huskSync) {
-        super(huskSync);
-        this.blacklistedCommands = huskSync.getSettings().getBlacklistedCommandsWhileLocked();
-        Bukkit.getServer().getPluginManager().registerEvents(this, huskSync);
+    protected LockedHandler lockedHandler;
+
+    public BukkitEventListener(@NotNull BukkitHuskSync plugin) {
+        super(plugin);
+    }
+
+    public void onLoad() {
+        this.lockedHandler = createLockedHandler((BukkitHuskSync) plugin);
+    }
+
+    public void onEnable() {
+        getPlugin().getServer().getPluginManager().registerEvents(this, getPlugin());
+        lockedHandler.onEnable();
+    }
+
+    public void handlePluginDisable() {
+        super.handlePluginDisable();
+        lockedHandler.onDisable();
+    }
+
+    @NotNull
+    private LockedHandler createLockedHandler(@NotNull BukkitHuskSync plugin) {
+        if (!getPlugin().getSettings().isCancelPackets()) {
+            return new BukkitLockedEventListener(plugin);
+        }
+        if (getPlugin().isDependencyLoaded("PacketEvents")) {
+            return new BukkitPacketEventsLockedPacketListener(plugin);
+        } else if (getPlugin().isDependencyLoaded("ProtocolLib")) {
+            return new BukkitProtocolLibLockedPacketListener(plugin);
+        }
+
+        return new BukkitLockedEventListener(plugin);
     }
 
     @Override
     public boolean handleEvent(@NotNull ListenerType type, @NotNull Priority priority) {
-        return plugin.getSettings().getEventPriority(type).equals(priority);
+        return plugin.getSettings().getSynchronization().getEventPriority(type).equals(priority);
     }
 
     @Override
     public void handlePlayerQuit(@NotNull BukkitUser bukkitUser) {
         final Player player = bukkitUser.getPlayer();
-        if (!bukkitUser.isLocked() && !player.getItemOnCursor().getType().isAir()) {
-            player.getWorld().dropItem(player.getLocation(), player.getItemOnCursor());
+        final ItemStack itemOnCursor = player.getItemOnCursor();
+        if (!bukkitUser.isLocked() && !itemOnCursor.getType().isAir()) {
             player.setItemOnCursor(null);
+            player.getWorld().dropItem(player.getLocation(), itemOnCursor);
+            plugin.debug("Dropped " + itemOnCursor + " for " + player.getName() + " on quit");
         }
         super.handlePlayerQuit(bukkitUser);
     }
@@ -85,13 +102,13 @@ public class BukkitEventListener extends EventListener implements BukkitJoinEven
         final OnlineUser user = BukkitUser.adapt(event.getEntity(), plugin);
 
         // If the player is locked or the plugin disabling, clear their drops
-        if (cancelPlayerEvent(user.getUuid())) {
+        if (lockedHandler.cancelPlayerEvent(user.getUuid())) {
             event.getDrops().clear();
             return;
         }
 
         // Handle saving player data snapshots on death
-        if (!plugin.getSettings().doSaveOnDeath()) {
+        if (!plugin.getSettings().getSynchronization().getSaveOnDeath().isEnabled()) {
             return;
         }
 
@@ -105,7 +122,7 @@ public class BukkitEventListener extends EventListener implements BukkitJoinEven
 
     @EventHandler(ignoreCancelled = true)
     public void onWorldSave(@NotNull WorldSaveEvent event) {
-        if (!plugin.getSettings().doSaveOnWorldSave()) {
+        if (!plugin.getSettings().getSynchronization().isSaveOnWorldSave()) {
             return;
         }
 
@@ -115,88 +132,28 @@ public class BukkitEventListener extends EventListener implements BukkitJoinEven
                 .collect(Collectors.toList())));
     }
 
-
-    /*
-     * Events to cancel if the player has not been set yet
-     */
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onProjectileLaunch(@NotNull ProjectileLaunchEvent event) {
-        final Projectile projectile = event.getEntity();
-        if (projectile.getShooter() instanceof Player player) {
-            event.setCancelled(cancelPlayerEvent(player.getUniqueId()));
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onDropItem(@NotNull PlayerDropItemEvent event) {
-        event.setCancelled(cancelPlayerEvent(event.getPlayer().getUniqueId()));
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPickupItem(@NotNull EntityPickupItemEvent event) {
-        if (event.getEntity() instanceof Player player) {
-            event.setCancelled(cancelPlayerEvent(player.getUniqueId()));
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPlayerInteract(@NotNull PlayerInteractEvent event) {
-        event.setCancelled(cancelPlayerEvent(event.getPlayer().getUniqueId()));
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPlayerInteractEntity(@NotNull PlayerInteractEntityEvent event) {
-        event.setCancelled(cancelPlayerEvent(event.getPlayer().getUniqueId()));
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBlockPlace(@NotNull BlockPlaceEvent event) {
-        event.setCancelled(cancelPlayerEvent(event.getPlayer().getUniqueId()));
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBlockBreak(@NotNull BlockBreakEvent event) {
-        event.setCancelled(cancelPlayerEvent(event.getPlayer().getUniqueId()));
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onInventoryOpen(@NotNull InventoryOpenEvent event) {
-        if (event.getPlayer() instanceof Player player) {
-            event.setCancelled(cancelPlayerEvent(player.getUniqueId()));
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onInventoryClick(@NotNull InventoryClickEvent event) {
-        event.setCancelled(cancelPlayerEvent(event.getWhoClicked().getUniqueId()));
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onCraftItem(@NotNull PrepareItemCraftEvent event) {
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPlayerTakeDamage(@NotNull EntityDamageEvent event) {
-        if (event.getEntity() instanceof Player player) {
-            event.setCancelled(cancelPlayerEvent(player.getUniqueId()));
+    @EventHandler(ignoreCancelled = true)
+    public void onMapInitialize(@NotNull MapInitializeEvent event) {
+        if (plugin.getSettings().getSynchronization().isPersistLockedMaps() && event.getMap().isLocked()) {
+            getPlugin().runAsync(() -> ((BukkitHuskSync) plugin).renderInitializingLockedMap(event.getMap()));
         }
     }
 
+    // We handle commands here to allow specific command handling on ProtocolLib servers
     @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-    public void onPermissionCommand(@NotNull PlayerCommandPreprocessEvent event) {
-        final String[] commandArgs = event.getMessage().substring(1).split(" ");
-        final String commandLabel = commandArgs[0].toLowerCase(Locale.ENGLISH);
-
-        if (blacklistedCommands.contains("*") || blacklistedCommands.contains(commandLabel)) {
-            event.setCancelled(cancelPlayerEvent(event.getPlayer().getUniqueId()));
+    public void onCommandProcessed(@NotNull PlayerCommandPreprocessEvent event) {
+        if (!lockedHandler.isCommandDisabled(event.getMessage().substring(1).split(" ")[0])) {
+            return;
+        }
+        if (lockedHandler.cancelPlayerEvent(event.getPlayer().getUniqueId())) {
+            event.setCancelled(true);
         }
     }
 
     @NotNull
     @Override
-    public HuskSync getPlugin() {
-        return plugin;
+    public BukkitHuskSync getPlugin() {
+        return (BukkitHuskSync) plugin;
     }
 
 }

bukkit/src/main/java/net/william278/husksync/listener/BukkitLockedEventListener.java

@@ -0,0 +1,129 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync.listener;
+
+import lombok.Getter;
+import net.william278.husksync.BukkitHuskSync;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityPickupItemEvent;
+import org.bukkit.event.entity.ProjectileLaunchEvent;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryOpenEvent;
+import org.bukkit.event.player.PlayerArmorStandManipulateEvent;
+import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+@Getter
+public class BukkitLockedEventListener implements LockedHandler, Listener {
+
+    protected final BukkitHuskSync plugin;
+
+    protected BukkitLockedEventListener(@NotNull BukkitHuskSync plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public void onEnable() {
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onProjectileLaunch(@NotNull ProjectileLaunchEvent event) {
+        final Projectile projectile = event.getEntity();
+        if (projectile.getShooter() instanceof Player player) {
+            cancelPlayerEvent(player.getUniqueId(), event);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onDropItem(@NotNull PlayerDropItemEvent event) {
+        cancelPlayerEvent(event.getPlayer().getUniqueId(), event);
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPickupItem(@NotNull EntityPickupItemEvent event) {
+        if (event.getEntity() instanceof Player player) {
+            cancelPlayerEvent(player.getUniqueId(), event);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerInteract(@NotNull PlayerInteractEvent event) {
+        cancelPlayerEvent(event.getPlayer().getUniqueId(), event);
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerInteractEntity(@NotNull PlayerInteractEntityEvent event) {
+        cancelPlayerEvent(event.getPlayer().getUniqueId(), event);
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerInteractArmorStand(@NotNull PlayerArmorStandManipulateEvent event) {
+        cancelPlayerEvent(event.getPlayer().getUniqueId(), event);
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBlockPlace(@NotNull BlockPlaceEvent event) {
+        cancelPlayerEvent(event.getPlayer().getUniqueId(), event);
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBlockBreak(@NotNull BlockBreakEvent event) {
+        cancelPlayerEvent(event.getPlayer().getUniqueId(), event);
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onInventoryOpen(@NotNull InventoryOpenEvent event) {
+        if (event.getPlayer() instanceof Player player) {
+            cancelPlayerEvent(player.getUniqueId(), event);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onInventoryClick(@NotNull InventoryClickEvent event) {
+        cancelPlayerEvent(event.getWhoClicked().getUniqueId(), event);
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerTakeDamage(@NotNull EntityDamageEvent event) {
+        if (event.getEntity() instanceof Player player) {
+            cancelPlayerEvent(player.getUniqueId(), event);
+        }
+    }
+
+    private void cancelPlayerEvent(@NotNull UUID uuid, @NotNull Cancellable event) {
+        if (cancelPlayerEvent(uuid)) {
+            event.setCancelled(true);
+        }
+    }
+
+}

bukkit/src/main/java/net/william278/husksync/listener/BukkitPacketEventsLockedPacketListener.java

@@ -0,0 +1,117 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync.listener;
+
+import com.github.retrooper.packetevents.PacketEvents;
+import com.github.retrooper.packetevents.event.PacketListenerAbstract;
+import com.github.retrooper.packetevents.event.PacketListenerPriority;
+import com.github.retrooper.packetevents.event.PacketReceiveEvent;
+import com.github.retrooper.packetevents.event.PacketSendEvent;
+import com.github.retrooper.packetevents.protocol.packettype.PacketType;
+import com.google.common.collect.Sets;
+import io.github.retrooper.packetevents.factory.spigot.SpigotPacketEventsBuilder;
+import net.william278.husksync.BukkitHuskSync;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Set;
+import java.util.logging.Level;
+
+public class BukkitPacketEventsLockedPacketListener extends BukkitLockedEventListener implements LockedHandler {
+
+    protected BukkitPacketEventsLockedPacketListener(@NotNull BukkitHuskSync plugin) {
+        super(plugin);
+    }
+
+    @Override
+    @SuppressWarnings("UnstableApiUsage")
+    public void onLoad() {
+        super.onLoad();
+        PacketEvents.setAPI(SpigotPacketEventsBuilder.build(getPlugin()));
+        PacketEvents.getAPI().getSettings().reEncodeByDefault(false).checkForUpdates(false);
+        PacketEvents.getAPI().load();
+    }
+
+    @Override
+    public void onEnable() {
+        super.onEnable();
+        PacketEvents.getAPI().getEventManager().registerListener(new PlayerPacketAdapter(this));
+        PacketEvents.getAPI().init();
+        plugin.log(Level.INFO, "Using PacketEvents to cancel packets for locked players");
+    }
+
+    private static class PlayerPacketAdapter extends PacketListenerAbstract {
+
+        private static final Set<PacketType.Play.Client> ALLOWED_PACKETS = Set.of(
+                PacketType.Play.Client.KEEP_ALIVE, PacketType.Play.Client.PONG, PacketType.Play.Client.PLUGIN_MESSAGE, // Connection packets
+                PacketType.Play.Client.PLAYER_LOADED, PacketType.Play.Client.CLIENT_TICK_END, // Connection packets
+                PacketType.Play.Client.CHAT_MESSAGE, PacketType.Play.Client.CHAT_COMMAND, PacketType.Play.Client.CHAT_SESSION_UPDATE, // Chat / command packets
+                PacketType.Play.Client.PLAYER_POSITION, PacketType.Play.Client.PLAYER_POSITION_AND_ROTATION, PacketType.Play.Client.PLAYER_ROTATION, // Movement packets
+                PacketType.Play.Client.HELD_ITEM_CHANGE, PacketType.Play.Client.ANIMATION, PacketType.Play.Client.TELEPORT_CONFIRM, // Animation packets
+                PacketType.Play.Client.CLIENT_SETTINGS // Video setting packets
+        );
+
+        private static final Set<PacketType.Play.Client> CANCEL_PACKETS = getPacketsToListenFor();
+
+
+        private final BukkitPacketEventsLockedPacketListener listener;
+
+        public PlayerPacketAdapter(@NotNull BukkitPacketEventsLockedPacketListener listener) {
+            super(PacketListenerPriority.HIGH);
+            this.listener = listener;
+        }
+
+        @Override
+        public void onPacketReceive(PacketReceiveEvent event) {
+            if (!(event.getPacketType() instanceof PacketType.Play.Client client)) {
+                return;
+            }
+            if (!CANCEL_PACKETS.contains(client)) {
+                return;
+            }
+            if (listener.cancelPlayerEvent(event.getUser().getUUID())) {
+                event.setCancelled(true);
+            }
+        }
+
+        @Override
+        public void onPacketSend(PacketSendEvent event) {
+            if (!(event.getPacketType() instanceof PacketType.Play.Client client)) {
+                return;
+            }
+            if (!CANCEL_PACKETS.contains(client)) {
+                return;
+            }
+            if (listener.cancelPlayerEvent(event.getUser().getUUID())) {
+                event.setCancelled(true);
+            }
+        }
+
+        // Returns the set of ALL Server packets, excluding the set of allowed packets
+        @NotNull
+        private static Set<PacketType.Play.Client> getPacketsToListenFor() {
+            return Sets.difference(
+                    Sets.newHashSet(PacketType.Play.Client.values()),
+                    ALLOWED_PACKETS
+            );
+        }
+
+    }
+
+}

bukkit/src/main/java/net/william278/husksync/listener/BukkitProtocolLibLockedPacketListener.java

@@ -0,0 +1,93 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync.listener;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.ProtocolLibrary;
+import com.comphenix.protocol.events.ListenerPriority;
+import com.comphenix.protocol.events.PacketAdapter;
+import com.comphenix.protocol.events.PacketEvent;
+import com.google.common.collect.Sets;
+import net.william278.husksync.BukkitHuskSync;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.stream.Collectors;
+
+import static com.comphenix.protocol.PacketType.Play.Client;
+
+public class BukkitProtocolLibLockedPacketListener extends BukkitLockedEventListener implements LockedHandler {
+
+    protected BukkitProtocolLibLockedPacketListener(@NotNull BukkitHuskSync plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public void onEnable() {
+        super.onEnable();
+        ProtocolLibrary.getProtocolManager().addPacketListener(new PlayerPacketAdapter(this));
+        plugin.log(Level.INFO, "Using ProtocolLib to cancel packets for locked players");
+    }
+
+    private static class PlayerPacketAdapter extends PacketAdapter {
+
+        // Packets we want the player to still be able to send/receiver to/from the server - //todo update 1.21.4
+        private static final Set<PacketType> ALLOWED_PACKETS = Set.of(
+                Client.KEEP_ALIVE, Client.PONG, Client.CUSTOM_PAYLOAD, // Connection packets
+                Client.CHAT_COMMAND, Client.CLIENT_COMMAND, Client.CHAT, Client.CHAT_SESSION_UPDATE, // Chat / command packets
+                Client.POSITION, Client.POSITION_LOOK, Client.LOOK, // Movement packets
+                Client.HELD_ITEM_SLOT, Client.ARM_ANIMATION, Client.TELEPORT_ACCEPT, // Animation packets
+                Client.SETTINGS // Video setting packets
+        );
+
+        private final BukkitProtocolLibLockedPacketListener listener;
+
+        public PlayerPacketAdapter(@NotNull BukkitProtocolLibLockedPacketListener listener) {
+            super(listener.getPlugin(), ListenerPriority.HIGHEST, getPacketsToListenFor());
+            this.listener = listener;
+        }
+
+        @Override
+        public void onPacketReceiving(@NotNull PacketEvent event) {
+            if (listener.cancelPlayerEvent(event.getPlayer().getUniqueId()) && !event.isReadOnly()) {
+                event.setCancelled(true);
+            }
+        }
+
+        @Override
+        public void onPacketSending(@NotNull PacketEvent event) {
+            if (listener.cancelPlayerEvent(event.getPlayer().getUniqueId()) && !event.isReadOnly()) {
+                event.setCancelled(true);
+            }
+        }
+
+        // Returns the set of ALL Server packets, excluding the set of allowed packets
+        @NotNull
+        private static Set<PacketType> getPacketsToListenFor() {
+            return Sets.difference(
+                    Client.getInstance().values().stream().filter(PacketType::isSupported).collect(Collectors.toSet()),
+                    ALLOWED_PACKETS
+            );
+        }
+
+    }
+
+}

bukkit/src/main/java/net/william278/husksync/listener/PaperEventListener.java

@@ -0,0 +1,106 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync.listener;
+
+import com.google.common.collect.Lists;
+import net.william278.husksync.BukkitHuskSync;
+import net.william278.husksync.data.BukkitData;
+import net.william278.husksync.user.BukkitUser;
+import net.william278.husksync.user.OnlineUser;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.player.PlayerAdvancementDoneEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Iterator;
+import java.util.List;
+
+import static net.william278.husksync.config.Settings.SynchronizationSettings.SaveOnDeathSettings;
+
+public class PaperEventListener extends BukkitEventListener {
+
+    public PaperEventListener(@NotNull BukkitHuskSync plugin) {
+        super(plugin);
+    }
+
+    @Override
+    @SuppressWarnings("RedundantMethodOverride")
+    public void onEnable() {
+        getPlugin().getServer().getPluginManager().registerEvents(this, getPlugin());
+        lockedHandler.onEnable();
+    }
+
+    @Override
+    public void handlePlayerDeath(@NotNull PlayerDeathEvent event) {
+        // If the player is locked or the plugin disabling, clear their drops
+        final OnlineUser user = BukkitUser.adapt(event.getEntity(), plugin);
+        if (lockedHandler.cancelPlayerEvent(user.getUuid())) {
+            event.getDrops().clear();
+            event.getItemsToKeep().clear();
+            return;
+        }
+
+        // Handle saving player data snapshots on death
+        final SaveOnDeathSettings settings = plugin.getSettings().getSynchronization().getSaveOnDeath();
+        if (!settings.isEnabled()) {
+            return;
+        }
+
+        // Paper - support saving the player's items to keep if enabled
+        final int maxInventorySize = BukkitData.Items.Inventory.INVENTORY_SLOT_COUNT;
+        final List<ItemStack> itemsToSave = switch (settings.getItemsToSave()) {
+            case DROPS -> event.getDrops();
+            case ITEMS_TO_KEEP -> preserveOrder(event.getEntity().getInventory(), event.getItemsToKeep());
+        };
+        if (itemsToSave.size() > maxInventorySize) {
+            itemsToSave.subList(maxInventorySize, itemsToSave.size()).clear();
+        }
+        super.saveOnPlayerDeath(user, BukkitData.Items.ItemArray.adapt(itemsToSave));
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerAdvancementDone(@NotNull PlayerAdvancementDoneEvent event) {
+        if (lockedHandler.cancelPlayerEvent(event.getPlayer().getUniqueId())) {
+            event.message(null);
+        }
+    }
+
+    @NotNull
+    private List<ItemStack> preserveOrder(@NotNull PlayerInventory inventory, @NotNull List<ItemStack> toKeep) {
+        final List<ItemStack> preserved = Lists.newArrayList();
+        final List<ItemStack> items = Lists.newArrayList(inventory.getContents());
+        for (ItemStack item : toKeep) {
+            final Iterator<ItemStack> iterator = items.iterator();
+            while (iterator.hasNext()) {
+                final ItemStack originalItem = iterator.next();
+                if (originalItem != null && originalItem.equals(item)) {
+                    preserved.add(originalItem);
+                    iterator.remove();
+                    break;
+                }
+            }
+        }
+        return preserved;
+    }
+
+}

bukkit/src/main/java/net/william278/husksync/maps/BukkitMapHandler.java

@@ -0,0 +1,620 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync.maps;
+
+import com.google.common.collect.Lists;
+import de.tr7zw.changeme.nbtapi.NBT;
+import de.tr7zw.changeme.nbtapi.iface.ReadWriteNBT;
+import de.tr7zw.changeme.nbtapi.iface.ReadableItemNBT;
+import de.tr7zw.changeme.nbtapi.iface.ReadableNBT;
+import net.william278.husksync.BukkitHuskSync;
+import net.william278.husksync.redis.RedisManager;
+import net.william278.mapdataapi.MapBanner;
+import net.william278.mapdataapi.MapData;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Container;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.BlockStateMeta;
+import org.bukkit.inventory.meta.BundleMeta;
+import org.bukkit.inventory.meta.MapMeta;
+import org.bukkit.map.*;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Blocking;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.awt.*;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.List;
+import java.util.function.Function;
+import java.util.logging.Level;
+
+public interface BukkitMapHandler {
+
+    // The map used to store HuskSync data in ItemStack NBT
+    String MAP_DATA_KEY = "husksync:persisted_locked_map";
+    // The legacy map key used to store pixel data (3.7.3 and below)
+    String MAP_LEGACY_PIXEL_DATA_KEY = "husksync:canvas_data";
+    // Name of server the map originates from
+    String MAP_ORIGIN_KEY = "origin";
+    // Original map id
+    String MAP_ID_KEY = "id";
+
+    /**
+     * Persist locked maps in an array of {@link ItemStack}s
+     *
+     * @param items            the array of {@link ItemStack}s to persist locked maps in
+     * @param delegateRenderer the player to delegate the rendering of map pixel canvases to
+     * @return the array of {@link ItemStack}s with locked maps persisted to serialized NBT
+     */
+    @NotNull
+    default ItemStack[] persistLockedMaps(@NotNull ItemStack[] items, @NotNull Player delegateRenderer) {
+        if (!getPlugin().getSettings().getSynchronization().isPersistLockedMaps()) {
+            return items;
+        }
+        return forEachMap(items, map -> this.persistMapView(map, delegateRenderer));
+    }
+
+    /**
+     * Apply persisted locked maps to an array of {@link ItemStack}s
+     *
+     * @param items the array of {@link ItemStack}s to apply persisted locked maps to
+     * @return the array of {@link ItemStack}s with persisted locked maps applied
+     */
+    @Nullable
+    default ItemStack @NotNull [] setMapViews(@Nullable ItemStack @NotNull [] items) {
+        if (!getPlugin().getSettings().getSynchronization().isPersistLockedMaps()) {
+            return items;
+        }
+        return forEachMap(items, this::applyMapView);
+    }
+
+    // Perform an operation on each map in an array of ItemStacks
+    @NotNull
+    private ItemStack[] forEachMap(ItemStack[] items, @NotNull Function<ItemStack, ItemStack> function) {
+        for (int i = 0; i < items.length; i++) {
+            final ItemStack item = items[i];
+            if (item == null) {
+                continue;
+            }
+            if (item.getType() == Material.FILLED_MAP && item.hasItemMeta()) {
+                items[i] = function.apply(item);
+            } else if (item.getItemMeta() instanceof BlockStateMeta b && b.getBlockState() instanceof Container box
+                    && !box.getInventory().isEmpty()) {
+                forEachMap(box.getInventory().getContents(), function);
+                b.setBlockState(box);
+                item.setItemMeta(b);
+            } else if (item.getItemMeta() instanceof BundleMeta bundle && bundle.hasItems()) {
+                bundle.setItems(List.of(forEachMap(bundle.getItems().toArray(ItemStack[]::new), function)));
+                item.setItemMeta(bundle);
+            }
+        }
+        return items;
+    }
+
+    @Blocking
+    private void writeMapData(@NotNull String serverName, int mapId, MapData data) {
+        final byte[] dataBytes = getPlugin().getDataAdapter().toBytes(new AdaptableMapData(data));
+        getRedisManager().setMapData(serverName, mapId, dataBytes);
+        getPlugin().getDatabase().saveMapData(serverName, mapId, dataBytes);
+    }
+
+    @Nullable
+    @Blocking
+    private MapData readMapData(@NotNull String serverName, int mapId) {
+        final byte[] readData = fetchMapData(serverName, mapId);
+        if (readData == null) {
+            return null;
+        }
+        return deserializeMapData(readData);
+    }
+
+    @Nullable
+    @Blocking
+    private byte[] fetchMapData(@NotNull String serverName, int mapId) {
+        return fetchMapData(serverName, mapId, true);
+    }
+
+    @Nullable
+    @Blocking
+    private byte[] fetchMapData(@NotNull String serverName, int mapId, boolean doReverseLookup) {
+        // Read from Redis cache
+        final byte[] redisData = getRedisManager().getMapData(serverName, mapId);
+        if (redisData != null) {
+            return redisData;
+        }
+
+        // Read from database and set to Redis
+        final byte[] databaseData = getPlugin().getDatabase().getMapData(serverName, mapId);
+        if (databaseData != null) {
+            getRedisManager().setMapData(serverName, mapId, databaseData);
+            return databaseData;
+        }
+
+        // Otherwise, lookup a reverse map binding
+        if (doReverseLookup) {
+            return fetchReversedMapData(serverName, mapId);
+        }
+        return null;
+    }
+
+    @Nullable
+    private byte[] fetchReversedMapData(@NotNull String serverName, int mapId) {
+        // Lookup binding from Redis cache, then fetch data if found
+        Map.Entry<String, Integer> binding = getRedisManager().getReversedMapBound(serverName, mapId);
+        if (binding != null) {
+            return fetchMapData(binding.getKey(), binding.getValue(), false);
+        }
+
+        // Lookup binding from database, then set to Redis & fetch data if found
+        binding = getPlugin().getDatabase().getMapBinding(serverName, mapId);
+        if (binding != null) {
+            getRedisManager().bindMapIds(binding.getKey(), binding.getValue(), serverName, mapId);
+            return fetchMapData(binding.getKey(), binding.getValue(), false);
+        }
+        return null;
+    }
+
+    @Nullable
+    private MapData deserializeMapData(byte @NotNull [] data) {
+        try {
+            return getPlugin().getDataAdapter().fromBytes(data, AdaptableMapData.class)
+                    .getData(getPlugin().getDataVersion(getPlugin().getMinecraftVersion()));
+        } catch (IOException e) {
+            getPlugin().log(Level.WARNING, "Failed to deserialize map data", e);
+            return null;
+        }
+    }
+
+    // Get the bound map ID
+    private int getBoundMapId(@NotNull String fromServerName, int fromMapId, @NotNull String toServerName) {
+        // Get the map ID from Redis, if set
+        final Optional<Integer> redisId = getRedisManager().getBoundMapId(fromServerName, fromMapId, toServerName);
+        if (redisId.isPresent()) {
+            return redisId.get();
+        }
+
+        // Get from the database; if found, set to Redis
+        final int result = getPlugin().getDatabase().getBoundMapId(fromServerName, fromMapId, toServerName);
+        if (result != -1) {
+            getPlugin().getRedisManager().bindMapIds(fromServerName, fromMapId, toServerName, result);
+        }
+        return result;
+    }
+
+    @NotNull
+    private ItemStack persistMapView(@NotNull ItemStack map, @NotNull Player delegateRenderer) {
+        final MapMeta meta = Objects.requireNonNull((MapMeta) map.getItemMeta());
+        if (!meta.hasMapView()) {
+            return map;
+        }
+        final MapView view = meta.getMapView();
+        if (view == null || view.getWorld() == null || !view.isLocked() || view.isVirtual()) {
+            return map;
+        }
+
+        NBT.modify(map, nbt -> {
+            // Don't save the map's data twice
+            if (nbt.hasTag(MAP_DATA_KEY)) {
+                return;
+            }
+
+            // Render the map
+            final int dataVersion = getPlugin().getDataVersion(getPlugin().getMinecraftVersion());
+            final PersistentMapCanvas canvas = new PersistentMapCanvas(view, dataVersion);
+            for (MapRenderer renderer : view.getRenderers()) {
+                renderer.render(view, canvas, delegateRenderer);
+                getPlugin().debug(String.format("Rendered locked map canvas to view (#%s)", view.getId()));
+            }
+
+            // Persist map data
+            final ReadWriteNBT mapData = nbt.getOrCreateCompound(MAP_DATA_KEY);
+            final String serverName = getPlugin().getServerName();
+            mapData.setString(MAP_ORIGIN_KEY, serverName);
+            mapData.setInteger(MAP_ID_KEY, meta.getMapId());
+            if (readMapData(serverName, meta.getMapId()) == null) {
+                writeMapData(serverName, meta.getMapId(), canvas.extractMapData());
+            }
+            getPlugin().debug(String.format("Saved data for locked map (#%s, server: %s)", view.getId(), serverName));
+        });
+        return map;
+    }
+
+    @SuppressWarnings("deprecation")
+    @NotNull
+    private ItemStack applyMapView(@NotNull ItemStack map) {
+        final MapMeta meta = Objects.requireNonNull((MapMeta) map.getItemMeta());
+        NBT.get(map, nbt -> {
+            if (!nbt.hasTag(MAP_DATA_KEY)) {
+                return;
+            }
+
+            final ReadableNBT mapData = nbt.getCompound(MAP_DATA_KEY);
+            if (mapData == null) {
+                return;
+            }
+
+            // Server the map was originally created on, and the current server. If they match, isOrigin is true.
+            final String originServer = mapData.getString(MAP_ORIGIN_KEY);
+            final String currentServer = getPlugin().getServerName();
+            final boolean isOrigin = currentServer.equals(originServer);
+
+            // Determine the map's ID on its origin server, and the new ID it should be bound to here.
+            // Then, update the map item / data accordingly (re-rendering and caching the map if needed)
+            final int originalId = mapData.getInteger(MAP_ID_KEY);
+            int newId = isOrigin ? originalId : getBoundMapId(originServer, originalId, currentServer);
+            if (newId != -1) {
+                handleBoundMap(meta, nbt, originServer, originalId, newId, isOrigin);
+            } else {
+                handleUnboundMap(meta, nbt, originServer, originalId, currentServer);
+            }
+
+            map.setItemMeta(meta);
+        });
+        return map;
+    }
+
+    private void handleBoundMap(@NotNull MapMeta meta, @NotNull ReadableItemNBT nbt, @NotNull String originServer,
+                                int originalId, int newId, boolean isOrigin) {
+        MapView view = Bukkit.getMap(newId);
+        if (isOrigin && view != null) {
+            meta.setMapView(view);
+            getPlugin().debug("Map ID set to original ID #%s".formatted(newId));
+            return;
+        }
+
+        Optional<MapView> optionalView = getMapView(newId);
+        if (optionalView.isPresent()) {
+            meta.setMapView(optionalView.get());
+            getPlugin().debug("Map ID set to #%s".formatted(newId));
+            return;
+        }
+
+        getPlugin().debug("Deserializing map data from NBT and generating view...");
+        MapData mapData = readMapData(originServer, originalId);
+        if (mapData == null && nbt.hasTag(MAP_LEGACY_PIXEL_DATA_KEY)) {
+            mapData = readLegacyMapItemData(nbt);
+        }
+
+        if (mapData == null) {
+            getPlugin().debug("Read pixel data was not found in database, skipping...");
+            return;
+        }
+
+        MapView newView = view != null ? view : Bukkit.createMap(getDefaultMapWorld());
+        generateRenderedMap(mapData, newView);
+        meta.setMapView(newView);
+    }
+
+    private void handleUnboundMap(@NotNull MapMeta meta, @NotNull ReadableItemNBT nbt, @NotNull String originServer,
+                                  int originalId, @NotNull String currentServer) {
+        getPlugin().debug("Deserializing map data from NBT and generating view...");
+        MapData mapData = readMapData(originServer, originalId);
+        if (mapData == null && nbt.hasTag(MAP_LEGACY_PIXEL_DATA_KEY)) {
+            mapData = readLegacyMapItemData(nbt);
+        }
+
+        if (mapData == null) {
+            getPlugin().debug("Read pixel data was not found in database, skipping...");
+            return;
+        }
+
+        final MapView view = generateRenderedMap(Objects.requireNonNull(mapData, "Pixel data null!"));
+        meta.setMapView(view);
+
+        final int id = view.getId();
+        getRedisManager().bindMapIds(originServer, originalId, currentServer, id);
+        getPlugin().getDatabase().setMapBinding(originServer, originalId, currentServer, id);
+
+        getPlugin().debug("Bound map to view (#%s) on server %s".formatted(id, currentServer));
+    }
+
+    // Render a persisted locked map that is initializing (i.e. in an item frame)
+    default void renderInitializingLockedMap(@NotNull MapView view) {
+        if (view.isVirtual()) {
+            return;
+        }
+        final Optional<MapView> optionalView = getMapView(view.getId());
+        if (optionalView.isPresent()) {
+            view.getRenderers().clear();
+            view.getRenderers().addAll(optionalView.get().getRenderers());
+            view.setLocked(true);
+            view.setScale(MapView.Scale.CLOSEST);
+            view.setTrackingPosition(false);
+            view.setUnlimitedTracking(false);
+            return;
+        }
+
+        MapData data = readMapData(getPlugin().getServerName(), view.getId());
+        if (data == null) {
+            data = readLegacyMapFileData(view.getId());
+        }
+
+        if (data == null) {
+            World world = view.getWorld() == null ? getDefaultMapWorld() : view.getWorld();
+            getPlugin().debug("Not rendering map: no data in DB for world %s, map #%s."
+                    .formatted(world.getName(), view.getId()));
+            return;
+        }
+        renderMapView(view, data);
+    }
+
+    @NotNull
+    private MapView generateRenderedMap(@NotNull MapData canvasData) {
+        return generateRenderedMap(canvasData, Bukkit.createMap(getDefaultMapWorld()));
+    }
+
+    @NotNull
+    private MapView generateRenderedMap(@NotNull MapData canvasData, @NotNull MapView view) {
+        renderMapView(view, canvasData);
+        return view;
+    }
+
+    private void renderMapView(@NotNull MapView view, @NotNull MapData canvasData) {
+        view.getRenderers().clear();
+        view.addRenderer(new PersistentMapRenderer(canvasData));
+        view.setLocked(true);
+        view.setScale(MapView.Scale.CLOSEST);
+        view.setTrackingPosition(false);
+        view.setUnlimitedTracking(false);
+        setMapView(view);
+    }
+
+    @NotNull
+    private static World getDefaultMapWorld() {
+        final World world = Bukkit.getWorlds().get(0);
+        if (world == null) {
+            throw new IllegalStateException("No worlds are loaded on the server!");
+        }
+        return world;
+    }
+
+    default Optional<MapView> getMapView(int id) {
+        return getMapViews().containsKey(id) ? Optional.of(getMapViews().get(id)) : Optional.empty();
+    }
+
+    default void setMapView(@NotNull MapView view) {
+        getMapViews().put(view.getId(), view);
+    }
+
+    /**
+     * A {@link MapRenderer} that can be used to render persistently serialized {@link MapData} to a {@link MapView}
+     */
+    @SuppressWarnings("deprecation")
+    class PersistentMapRenderer extends MapRenderer {
+
+        private final MapData canvasData;
+
+        private PersistentMapRenderer(@NotNull MapData canvasData) {
+            super(false);
+            this.canvasData = canvasData;
+        }
+
+        @Override
+        public void render(@NotNull MapView map, @NotNull MapCanvas canvas, @NotNull Player player) {
+            // We set the pixels in this order to avoid the map being rendered upside down
+            for (int i = 0; i < 128; i++) {
+                for (int j = 0; j < 128; j++) {
+                    canvas.setPixel(j, i, (byte) canvasData.getColorAt(i, j));
+                }
+            }
+
+            // Set the map banners and markers
+            final MapCursorCollection cursors = canvas.getCursors();
+            while (cursors.size() > 0) {
+                cursors.removeCursor(cursors.getCursor(0));
+            }
+
+            canvasData.getBanners().forEach(banner -> cursors.addCursor(createBannerCursor(banner)));
+            canvas.setCursors(cursors);
+        }
+    }
+
+    @NotNull
+    private static MapCursor createBannerCursor(@NotNull MapBanner banner) {
+        return new MapCursor(
+                (byte) banner.getPosition().getX(),
+                (byte) banner.getPosition().getZ(),
+                (byte) 8, // Always rotate banners upright
+                switch (banner.getColor().toLowerCase(Locale.ENGLISH)) {
+                    case "white" -> MapCursor.Type.BANNER_WHITE;
+                    case "orange" -> MapCursor.Type.BANNER_ORANGE;
+                    case "magenta" -> MapCursor.Type.BANNER_MAGENTA;
+                    case "light_blue" -> MapCursor.Type.BANNER_LIGHT_BLUE;
+                    case "yellow" -> MapCursor.Type.BANNER_YELLOW;
+                    case "lime" -> MapCursor.Type.BANNER_LIME;
+                    case "pink" -> MapCursor.Type.BANNER_PINK;
+                    case "gray" -> MapCursor.Type.BANNER_GRAY;
+                    case "light_gray" -> MapCursor.Type.BANNER_LIGHT_GRAY;
+                    case "cyan" -> MapCursor.Type.BANNER_CYAN;
+                    case "purple" -> MapCursor.Type.BANNER_PURPLE;
+                    case "blue" -> MapCursor.Type.BANNER_BLUE;
+                    case "brown" -> MapCursor.Type.BANNER_BROWN;
+                    case "green" -> MapCursor.Type.BANNER_GREEN;
+                    case "red" -> MapCursor.Type.BANNER_RED;
+                    default -> MapCursor.Type.BANNER_BLACK;
+                },
+                true,
+                banner.getText().isEmpty() ? null : banner.getText()
+        );
+    }
+
+    // Legacy - read maps from item stacks
+    @Nullable
+    @Blocking
+    private MapData readLegacyMapItemData(@NotNull ReadableItemNBT nbt) {
+        final int dataVer = getPlugin().getDataVersion(getPlugin().getMinecraftVersion());
+        try {
+            return MapData.fromByteArray(dataVer,
+                    Objects.requireNonNull(nbt.getByteArray(MAP_LEGACY_PIXEL_DATA_KEY)));
+        } catch (IOException e) {
+            getPlugin().log(Level.WARNING, "Failed to read legacy map data", e);
+            return null;
+        }
+    }
+
+    // Legacy - read maps from files
+    @Nullable
+    private MapData readLegacyMapFileData(int mapId) {
+        final Path path = getPlugin().getDataFolder().toPath().resolve("maps").resolve(mapId + ".dat");
+        final File file = path.toFile();
+        if (!file.exists()) {
+            return null;
+        }
+        try {
+            return MapData.fromNbt(file);
+        } catch (IOException e) {
+            getPlugin().log(Level.WARNING, "Failed to read legacy map file", e);
+            return null;
+        }
+    }
+
+    /**
+     * A {@link MapCanvas} implementation used for pre-rendering maps to be converted into {@link MapData}
+     */
+    @SuppressWarnings({"deprecation", "removal"})
+    class PersistentMapCanvas implements MapCanvas {
+
+        private static final String BANNER_PREFIX = "banner_";
+
+        private final int mapDataVersion;
+        private final MapView mapView;
+        private final int[][] pixels = new int[128][128];
+        private MapCursorCollection cursors;
+
+        private PersistentMapCanvas(@NotNull MapView mapView, int mapDataVersion) {
+            this.mapDataVersion = mapDataVersion;
+            this.mapView = mapView;
+        }
+
+        @NotNull
+        @Override
+        public MapView getMapView() {
+            return mapView;
+        }
+
+        @NotNull
+        @Override
+        public MapCursorCollection getCursors() {
+            return cursors == null ? (cursors = new MapCursorCollection()) : cursors;
+        }
+
+        @Override
+        public void setCursors(@NotNull MapCursorCollection cursors) {
+            this.cursors = cursors;
+        }
+
+        @Override
+        @Deprecated
+        public void setPixel(int x, int y, byte color) {
+            pixels[x][y] = color;
+        }
+
+        @Override
+        @Deprecated
+        public byte getPixel(int x, int y) {
+            return (byte) pixels[x][y];
+        }
+
+        @Override
+        @Deprecated
+        public byte getBasePixel(int x, int y) {
+            return (byte) pixels[x][y];
+        }
+
+        @Override
+        public void setPixelColor(int x, int y, @Nullable Color color) {
+            pixels[x][y] = color == null ? -1 : MapPalette.matchColor(color);
+        }
+
+        @Nullable
+        @Override
+        public Color getPixelColor(int x, int y) {
+            return MapPalette.getColor((byte) pixels[x][y]);
+        }
+
+        @NotNull
+        @Override
+        public Color getBasePixelColor(int x, int y) {
+            return MapPalette.getColor((byte) pixels[x][y]);
+        }
+
+        @Override
+        public void drawImage(int x, int y, @NotNull Image image) {
+            // Not implemented
+        }
+
+        @Override
+        public void drawText(int x, int y, @NotNull MapFont font, @NotNull String text) {
+            // Not implemented
+        }
+
+        @NotNull
+        private String getDimension() {
+            return mapView.getWorld() != null ? switch (mapView.getWorld().getEnvironment()) {
+                case NETHER -> "minecraft:the_nether";
+                case THE_END -> "minecraft:the_end";
+                default -> "minecraft:overworld";
+            } : "minecraft:overworld";
+        }
+
+        /**
+         * Extract the map data from the canvas. Must be rendered first
+         *
+         * @return the extracted map data
+         */
+        @NotNull
+        private MapData extractMapData() {
+            final List<MapBanner> banners = Lists.newArrayList();
+            for (int i = 0; i < getCursors().size(); i++) {
+                final MapCursor cursor = getCursors().getCursor(i);
+                final String type = cursor.getType().getKey().getKey();
+                if (type.startsWith(BANNER_PREFIX)) {
+                    banners.add(new MapBanner(
+                            type.replaceAll(BANNER_PREFIX, ""),
+                            cursor.getCaption() == null ? "" : cursor.getCaption(),
+                            cursor.getX(),
+                            mapView.getWorld() != null ? mapView.getWorld().getSeaLevel() : 128,
+                            cursor.getY()
+                    ));
+                }
+
+            }
+            return MapData.fromPixels(mapDataVersion, pixels, getDimension(), (byte) 0, banners, List.of());
+        }
+    }
+
+    @NotNull
+    Map<Integer, MapView> getMapViews();
+
+    @ApiStatus.Internal
+    RedisManager getRedisManager();
+
+    @ApiStatus.Internal
+    @NotNull
+    BukkitHuskSync getPlugin();
+
+}

bukkit/src/main/java/net/william278/husksync/migrator/LegacyMigrator.java

@@ -19,6 +19,8 @@
 
 package net.william278.husksync.migrator;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.zaxxer.hikari.HikariDataSource;
 import me.william278.husksync.bukkit.data.DataSerializer;
 import net.william278.hslmigrator.HSLConverter;
@@ -42,6 +44,8 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.regex.Pattern;
 
+import static net.william278.husksync.config.Settings.DatabaseSettings;
+
 public class LegacyMigrator extends Migrator {
 
     private final HSLConverter hslConverter;
@@ -56,11 +60,13 @@ public class LegacyMigrator extends Migrator {
     public LegacyMigrator(@NotNull HuskSync plugin) {
         super(plugin);
         this.hslConverter = HSLConverter.getInstance();
-        this.sourceHost = plugin.getSettings().getMySqlHost();
-        this.sourcePort = plugin.getSettings().getMySqlPort();
-        this.sourceUsername = plugin.getSettings().getMySqlUsername();
-        this.sourcePassword = plugin.getSettings().getMySqlPassword();
-        this.sourceDatabase = plugin.getSettings().getMySqlDatabase();
+
+        final DatabaseSettings.DatabaseCredentials credentials = plugin.getSettings().getDatabase().getCredentials();
+        this.sourceHost = credentials.getHost();
+        this.sourcePort = credentials.getPort();
+        this.sourceUsername = credentials.getUsername();
+        this.sourcePassword = credentials.getPassword();
+        this.sourceDatabase = credentials.getDatabase();
         this.sourcePlayersTable = "husksync_players";
         this.sourceDataTable = "husksync_data";
     }
@@ -87,7 +93,7 @@ public class LegacyMigrator extends Migrator {
                 connectionPool.setPoolName((getIdentifier() + "_migrator_pool").toUpperCase(Locale.ENGLISH));
 
                 plugin.log(Level.INFO, "Downloading raw data from the legacy database (this might take a while)...");
-                final List<LegacyData> dataToMigrate = new ArrayList<>();
+                final List<LegacyData> dataToMigrate = Lists.newArrayList();
                 try (final Connection connection = connectionPool.getConnection()) {
                     try (final PreparedStatement statement = connection.prepareStatement("""
                             SELECT `uuid`, `username`, `inventory`, `ender_chest`, `health`, `max_health`, `health_scale`, `hunger`, `saturation`, `saturation_exhaustion`, `selected_slot`, `status_effects`, `total_experience`, `exp_level`, `exp_progress`, `game_mode`, `statistics`, `is_flying`, `advancements`, `location`
@@ -140,7 +146,7 @@ public class LegacyMigrator extends Migrator {
                     try {
                         plugin.getDatabase().addSnapshot(data.user(), convertedData);
                     } catch (Throwable e) {
-                        plugin.log(Level.SEVERE, "Failed to migrate legacy data for " + data.user().getUsername() + ": " + e.getMessage());
+                        plugin.log(Level.SEVERE, "Failed to migrate legacy data for " + data.user().getName() + ": " + e.getMessage());
                         return;
                     }
 
@@ -198,10 +204,10 @@ public class LegacyMigrator extends Migrator {
             }) {
                 plugin.log(Level.INFO, getHelpMenu());
                 plugin.log(Level.INFO, "Successfully set " + args[0] + " to " +
-                        obfuscateDataString(args[1]));
+                                       obfuscateDataString(args[1]));
             } else {
                 plugin.log(Level.INFO, "Invalid operation, could not set " + args[0] + " to " +
-                        obfuscateDataString(args[1]) + " (is it a valid option?)");
+                                       obfuscateDataString(args[1]) + " (is it a valid option?)");
             }
         } else {
             plugin.log(Level.INFO, getHelpMenu());
@@ -217,16 +223,16 @@ public class LegacyMigrator extends Migrator {
     @NotNull
     @Override
     public String getName() {
-        return "HuskSync v1.x --> v2.x Migrator";
+        return "HuskSync v1.x --> v3.x Migrator";
     }
 
     @NotNull
     @Override
     public String getHelpMenu() {
         return """
-                === HuskSync v1.x --> v2.x Migration Wizard =========
+                === HuskSync v1.x --> v3.x Migration Wizard =========
                 This will migrate all user data from HuskSync v1.x to
-                HuskSync v2.x's new format. To perform the migration,
+                HuskSync v3.x's new format. To perform the migration,
                 please follow the steps below carefully.
 
                 [!] Existing data in the database will be wiped. [!]
@@ -317,18 +323,18 @@ public class LegacyMigrator extends Migrator {
 
                         // Stats
                         .statistics(BukkitData.Statistics.from(
-                                BukkitData.Statistics.createStatisticsMap(
-                                        convertStatisticMap(stats.untypedStatisticValues()),
-                                        convertMaterialStatisticMap(stats.blockStatisticValues()),
-                                        convertMaterialStatisticMap(stats.itemStatisticValues()),
-                                        convertEntityStatisticMap(stats.entityStatisticValues())
-                                )))
+                                convertStatisticMap(stats.untypedStatisticValues()),
+                                convertMaterialStatisticMap(stats.blockStatisticValues()),
+                                convertMaterialStatisticMap(stats.itemStatisticValues()),
+                                convertEntityStatisticMap(stats.entityStatisticValues())
+                        ))
 
                         // Health, hunger, experience & game mode
-                        .health(BukkitData.Health.from(health, maxHealth, healthScale))
+                        .health(BukkitData.Health.from(health, healthScale, false))
                         .hunger(BukkitData.Hunger.from(hunger, saturation, saturationExhaustion))
                         .experience(BukkitData.Experience.from(totalExp, expLevel, expProgress))
-                        .gameMode(BukkitData.GameMode.from(gameMode, isFlying, isFlying))
+                        .gameMode(BukkitData.GameMode.from(gameMode))
+                        .flightStatus(BukkitData.FlightStatus.from(isFlying, isFlying))
 
                         // Build & pack into new format
                         .saveCause(DataSnapshot.SaveCause.LEGACY_MIGRATION).buildAndPack();
@@ -338,7 +344,7 @@ public class LegacyMigrator extends Migrator {
         }
 
         private Map<String, Integer> convertStatisticMap(@NotNull HashMap<Statistic, Integer> rawMap) {
-            final HashMap<String, Integer> convertedMap = new HashMap<>();
+            final HashMap<String, Integer> convertedMap = Maps.newHashMap();
             for (Map.Entry<Statistic, Integer> entry : rawMap.entrySet()) {
                 convertedMap.put(entry.getKey().getKey().toString(), entry.getValue());
             }
@@ -346,7 +352,7 @@ public class LegacyMigrator extends Migrator {
         }
 
         private Map<String, Map<String, Integer>> convertMaterialStatisticMap(@NotNull HashMap<Statistic, HashMap<Material, Integer>> rawMap) {
-            final Map<String, Map<String, Integer>> convertedMap = new HashMap<>();
+            final Map<String, Map<String, Integer>> convertedMap = Maps.newHashMap();
             for (Map.Entry<Statistic, HashMap<Material, Integer>> entry : rawMap.entrySet()) {
                 for (Map.Entry<Material, Integer> materialEntry : entry.getValue().entrySet()) {
                     convertedMap.computeIfAbsent(entry.getKey().getKey().toString(), k -> new HashMap<>())
@@ -357,7 +363,7 @@ public class LegacyMigrator extends Migrator {
         }
 
         private Map<String, Map<String, Integer>> convertEntityStatisticMap(@NotNull HashMap<Statistic, HashMap<EntityType, Integer>> rawMap) {
-            final Map<String, Map<String, Integer>> convertedMap = new HashMap<>();
+            final Map<String, Map<String, Integer>> convertedMap = Maps.newHashMap();
             for (Map.Entry<Statistic, HashMap<EntityType, Integer>> entry : rawMap.entrySet()) {
                 for (Map.Entry<EntityType, Integer> materialEntry : entry.getValue().entrySet()) {
                     convertedMap.computeIfAbsent(entry.getKey().getKey().toString(), k -> new HashMap<>())

bukkit/src/main/java/net/william278/husksync/migrator/MpdbMigrator.java

@@ -19,6 +19,7 @@
 
 package net.william278.husksync.migrator;
 
+import com.google.common.collect.Lists;
 import com.zaxxer.hikari.HikariDataSource;
 import net.william278.husksync.BukkitHuskSync;
 import net.william278.husksync.HuskSync;
@@ -35,12 +36,17 @@ import org.jetbrains.annotations.NotNull;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.util.*;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.regex.Pattern;
 
+import static net.william278.husksync.config.Settings.DatabaseSettings;
+
 /**
  * A migrator for migrating MySQLPlayerDataBridge data to HuskSync {@link DataSnapshot}s
  */
@@ -62,11 +68,12 @@ public class MpdbMigrator extends Migrator {
                 Bukkit.getPluginManager().getPlugin("MySQLPlayerDataBridge"),
                 "MySQLPlayerDataBridge dependency not found!"
         ));
-        this.sourceHost = plugin.getSettings().getMySqlHost();
-        this.sourcePort = plugin.getSettings().getMySqlPort();
-        this.sourceUsername = plugin.getSettings().getMySqlUsername();
-        this.sourcePassword = plugin.getSettings().getMySqlPassword();
-        this.sourceDatabase = plugin.getSettings().getMySqlDatabase();
+        final DatabaseSettings.DatabaseCredentials credentials = plugin.getSettings().getDatabase().getCredentials();
+        this.sourceHost = credentials.getHost();
+        this.sourcePort = credentials.getPort();
+        this.sourceUsername = credentials.getUsername();
+        this.sourcePassword = credentials.getPassword();
+        this.sourceDatabase = credentials.getDatabase();
         this.sourceInventoryTable = "mpdb_inventory";
         this.sourceEnderChestTable = "mpdb_enderchest";
         this.sourceExperienceTable = "mpdb_experience";
@@ -95,7 +102,7 @@ public class MpdbMigrator extends Migrator {
                 connectionPool.setPoolName((getIdentifier() + "_migrator_pool").toUpperCase(Locale.ENGLISH));
 
                 plugin.log(Level.INFO, "Downloading raw data from the MySQLPlayerDataBridge database (this might take a while)...");
-                final List<MpdbData> dataToMigrate = new ArrayList<>();
+                final List<MpdbData> dataToMigrate = Lists.newArrayList();
                 try (final Connection connection = connectionPool.getConnection()) {
                     try (final PreparedStatement statement = connection.prepareStatement("""
                             SELECT `%source_inventory_table%`.`player_uuid`, `%source_inventory_table%`.`player_name`, `inventory`, `armor`, `enderchest`, `exp_lvl`, `exp`, `total_exp`
@@ -143,7 +150,7 @@ public class MpdbMigrator extends Migrator {
                 });
                 plugin.log(Level.INFO, "Migration complete for " + dataToMigrate.size() + " users in " + ((System.currentTimeMillis() - startTime) / 1000) + " seconds!");
                 return true;
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 plugin.log(Level.SEVERE, "Error while migrating data: " + e.getMessage() + " - are your source database credentials correct?");
                 return false;
             }
@@ -194,10 +201,10 @@ public class MpdbMigrator extends Migrator {
             }) {
                 plugin.log(Level.INFO, getHelpMenu());
                 plugin.log(Level.INFO, "Successfully set " + args[0] + " to " +
-                        obfuscateDataString(args[1]));
+                                       obfuscateDataString(args[1]));
             } else {
                 plugin.log(Level.INFO, "Invalid operation, could not set " + args[0] + " to " +
-                        obfuscateDataString(args[1]) + " (is it a valid option?)");
+                                       obfuscateDataString(args[1]) + " (is it a valid option?)");
             }
         } else {
             plugin.log(Level.INFO, getHelpMenu());
@@ -221,6 +228,9 @@ public class MpdbMigrator extends Migrator {
     public String getHelpMenu() {
         return """
                 === MySQLPlayerDataBridge Migration Wizard ==========
+                NOTE: This migrator currently WORKS WITH MPDB version
+                v4.9.2 and below!
+                
                 This will migrate inventories, ender chests and XP
                 from the MySQLPlayerDataBridge plugin to HuskSync.
 
@@ -245,7 +255,7 @@ public class MpdbMigrator extends Migrator {
                 If any of these are not correct, please correct them
                 using the command:
                 "husksync migrate mpdb set <parameter> <value>"
-                (e.g.: "husksync migrate mpdb set host 1.2.3.4")
+                (e.g.: "husksync migrate set mpdb host 1.2.3.4")
 
                 STEP 3] HuskSync will migrate data into the database
                 tables configures in the config.yml file of this
@@ -253,7 +263,10 @@ public class MpdbMigrator extends Migrator {
                 before proceeding.
 
                 STEP 4] To start the migration, please run:
-                "husksync migrate mpdb start"
+                "husksync migrate start mpdb"
+                
+                NOTE: This migrator currently WORKS WITH MPDB version
+                v4.9.2 and below!
                 """.replaceAll(Pattern.quote("%source_host%"), obfuscateDataString(sourceHost))
                 .replaceAll(Pattern.quote("%source_port%"), Integer.toString(sourcePort))
                 .replaceAll(Pattern.quote("%source_username%"), obfuscateDataString(sourceUsername))
@@ -307,7 +320,7 @@ public class MpdbMigrator extends Migrator {
                     .inventory(BukkitData.Items.Inventory.from(inventory.getContents(), 0))
                     .enderChest(BukkitData.Items.EnderChest.adapt(enderChest))
                     .experience(BukkitData.Experience.from(totalExp, expLevel, expProgress))
-                    .gameMode(BukkitData.GameMode.from("SURVIVAL", false, false))
+                    .gameMode(BukkitData.GameMode.from("SURVIVAL"))
                     .saveCause(DataSnapshot.SaveCause.MPDB_MIGRATION)
                     .buildAndPack();
         }

bukkit/src/main/java/net/william278/husksync/user/BukkitUser.java

@@ -23,15 +23,10 @@ import de.themoep.minedown.adventure.MineDown;
 import dev.triumphteam.gui.builder.gui.StorageBuilder;
 import dev.triumphteam.gui.guis.Gui;
 import dev.triumphteam.gui.guis.StorageGui;
-import net.kyori.adventure.audience.Audience;
-import net.roxeez.advancement.display.FrameType;
-import net.william278.andjam.Toast;
-import net.william278.husksync.BukkitHuskSync;
 import net.william278.husksync.HuskSync;
 import net.william278.husksync.data.BukkitData;
 import net.william278.husksync.data.BukkitUserDataHolder;
 import net.william278.husksync.data.Data;
-import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.ApiStatus;
@@ -61,43 +56,19 @@ public class BukkitUser extends OnlineUser implements BukkitUserDataHolder {
         return new BukkitUser(player, plugin);
     }
 
-    /**
-     * Get the Bukkit {@link Player} instance of this user
-     *
-     * @return the {@link Player} instance
-     * @since 3.0
-     */
-    @NotNull
-    public Player getPlayer() {
-        return player;
-    }
-
-    @Override
-    public boolean isOffline() {
-        return player == null || !player.isOnline();
-    }
-
-    @NotNull
-    @Override
-    public Audience getAudience() {
-        return ((BukkitHuskSync) plugin).getAudiences().player(player);
+    @Override
+    public boolean hasDisconnected() {
+        return getPlugin().getDisconnectingPlayers().contains(getUuid())
+                || player == null || !player.isOnline();
     }
 
     @Override
+    @Deprecated(since = "3.6.7")
     public void sendToast(@NotNull MineDown title, @NotNull MineDown description,
                           @NotNull String iconMaterial, @NotNull String backgroundType) {
-        try {
-            final Material material = Material.matchMaterial(iconMaterial);
-            Toast.builder((BukkitHuskSync) plugin)
-                    .setTitle(title.toComponent())
-                    .setDescription(description.toComponent())
-                    .setIcon(material != null ? material : Material.BARRIER)
-                    .setFrameType(FrameType.valueOf(backgroundType))
-                    .build()
-                    .show(player);
-        } catch (Throwable e) {
-            plugin.log(Level.WARNING, "Failed to send toast to player " + player.getName(), e);
-        }
+        plugin.log(Level.WARNING, "Toast notifications are deprecated. " +
+                                  "Please change your notification display slot to CHAT, ACTION_BAR or NONE.");
+        this.sendActionBar(title);
     }
 
     @Override
@@ -108,13 +79,13 @@ public class BukkitUser extends OnlineUser implements BukkitUserDataHolder {
         if (!editable) {
             builder.disableAllInteractions();
         }
-        final StorageGui gui = builder.enableOtherActions()
+        final StorageGui gui = builder
                 .apply(a -> a.getInventory().setContents(contents))
                 .title(title.toComponent()).create();
         gui.setCloseGuiAction((close) -> onClose.accept(BukkitData.Items.ItemArray.adapt(
                 Arrays.stream(close.getInventory().getContents()).limit(size).toArray(ItemStack[]::new)
         )));
-        plugin.runSync(() -> gui.open(player));
+        plugin.runSync(() -> gui.open(player), this);
     }
 
     @Override
@@ -137,9 +108,14 @@ public class BukkitUser extends OnlineUser implements BukkitUserDataHolder {
         return player.hasMetadata("NPC");
     }
 
+    /**
+     * Get the Bukkit {@link Player} instance of this user
+     *
+     * @return the {@link Player} instance
+     * @since 3.6
+     */
     @NotNull
-    @Override
-    public Player getBukkitPlayer() {
+    public Player getPlayer() {
         return player;
     }
 

bukkit/src/main/java/net/william278/husksync/util/BukkitKeyedAdapter.java

@@ -0,0 +1,62 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync.util;
+
+import org.bukkit.*;
+import org.bukkit.attribute.Attribute;
+import org.bukkit.entity.EntityType;
+import org.bukkit.potion.PotionEffectType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+// Utility class for adapting "Keyed" Bukkit objects
+public final class BukkitKeyedAdapter {
+
+    @Nullable
+    public static Statistic matchStatistic(@NotNull String key) {
+        return getRegistryValue(Registry.STATISTIC, key);
+    }
+
+    @Nullable
+    public static EntityType matchEntityType(@NotNull String key) {
+        return getRegistryValue(Registry.ENTITY_TYPE, key);
+    }
+
+    @Nullable
+    public static Material matchMaterial(@NotNull String key) {
+        return getRegistryValue(Registry.MATERIAL, key);
+    }
+
+    @Nullable
+    public static Attribute matchAttribute(@NotNull String key) {
+        return getRegistryValue(Registry.ATTRIBUTE, key);
+    }
+
+    @Nullable
+    public static PotionEffectType matchEffectType(@NotNull String key) {
+        return getRegistryValue(Registry.EFFECT, key);
+    }
+
+    private static <T extends Keyed> T getRegistryValue(@NotNull Registry<T> registry, @NotNull String keyString) {
+        final NamespacedKey key = NamespacedKey.fromString(keyString);
+        return key != null ? registry.get(key) : null;
+    }
+
+}

bukkit/src/main/java/net/william278/husksync/util/BukkitLegacyConverter.java

@@ -19,15 +19,14 @@
 
 package net.william278.husksync.util;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import net.william278.husksync.HuskSync;
 import net.william278.husksync.adapter.DataAdapter;
 import net.william278.husksync.data.BukkitData;
 import net.william278.husksync.data.Data;
 import net.william278.husksync.data.DataSnapshot;
 import net.william278.husksync.data.Identifier;
-import org.bukkit.Material;
-import org.bukkit.Statistic;
-import org.bukkit.entity.EntityType;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.io.BukkitObjectInputStream;
 import org.jetbrains.annotations.NotNull;
@@ -43,15 +42,18 @@ import java.time.OffsetDateTime;
 import java.util.*;
 import java.util.logging.Level;
 
+import static net.william278.husksync.util.BukkitKeyedAdapter.matchEntityType;
+import static net.william278.husksync.util.BukkitKeyedAdapter.matchMaterial;
+
 public class BukkitLegacyConverter extends LegacyConverter {
 
     public BukkitLegacyConverter(@NotNull HuskSync plugin) {
         super(plugin);
     }
 
-    @NotNull
     @Override
-    public DataSnapshot.Packed convert(@NotNull byte[] data, @NotNull UUID id,
+    @NotNull
+    public DataSnapshot.Packed convert(byte @NotNull [] data, @NotNull UUID id,
                                        @NotNull OffsetDateTime timestamp) throws DataAdapter.AdaptionException {
         final JSONObject object = new JSONObject(plugin.getDataAdapter().bytesToString(data));
         final int version = object.getInt("format_version");
@@ -79,31 +81,35 @@ public class BukkitLegacyConverter extends LegacyConverter {
         }
 
         final JSONObject status = object.getJSONObject("status_data");
-        final HashMap<Identifier, Data> containers = new HashMap<>();
-        if (shouldImport(Identifier.HEALTH)) {
+        final HashMap<Identifier, Data> containers = Maps.newHashMap();
+        if (Identifier.HEALTH.isEnabled()) {
             containers.put(Identifier.HEALTH, BukkitData.Health.from(
                     status.getDouble("health"),
-                    status.getDouble("max_health"),
-                    status.getDouble("health_scale")
+                    status.getDouble("health_scale"),
+                    false
             ));
         }
-        if (shouldImport(Identifier.HUNGER)) {
+        if (Identifier.HUNGER.isEnabled()) {
             containers.put(Identifier.HUNGER, BukkitData.Hunger.from(
                     status.getInt("hunger"),
                     status.getFloat("saturation"),
                     status.getFloat("saturation_exhaustion")
             ));
         }
-        if (shouldImport(Identifier.EXPERIENCE)) {
+        if (Identifier.EXPERIENCE.isEnabled()) {
             containers.put(Identifier.EXPERIENCE, BukkitData.Experience.from(
                     status.getInt("total_experience"),
                     status.getInt("experience_level"),
                     status.getFloat("experience_progress")
             ));
         }
-        if (shouldImport(Identifier.GAME_MODE)) {
+        if (Identifier.GAME_MODE.isEnabled()) {
             containers.put(Identifier.GAME_MODE, BukkitData.GameMode.from(
-                    status.getString("game_mode"),
+                    status.getString("game_mode")
+            ));
+        }
+        if (Identifier.FLIGHT_STATUS.isEnabled()) {
+            containers.put(Identifier.FLIGHT_STATUS, BukkitData.FlightStatus.from(
                     status.getBoolean("is_flying"),
                     status.getBoolean("is_flying")
             ));
@@ -113,7 +119,7 @@ public class BukkitLegacyConverter extends LegacyConverter {
 
     @NotNull
     private Optional<Data.Items.Inventory> readInventory(@NotNull JSONObject object) {
-        if (!object.has("inventory") || !shouldImport(Identifier.INVENTORY)) {
+        if (!object.has("inventory") || !Identifier.INVENTORY.isEnabled()) {
             return Optional.empty();
         }
 
@@ -125,7 +131,7 @@ public class BukkitLegacyConverter extends LegacyConverter {
 
     @NotNull
     private Optional<Data.Items.EnderChest> readEnderChest(@NotNull JSONObject object) {
-        if (!object.has("ender_chest") || !shouldImport(Identifier.ENDER_CHEST)) {
+        if (!object.has("ender_chest") || !Identifier.ENDER_CHEST.isEnabled()) {
             return Optional.empty();
         }
 
@@ -137,7 +143,7 @@ public class BukkitLegacyConverter extends LegacyConverter {
 
     @NotNull
     private Optional<Data.Location> readLocation(@NotNull JSONObject object) {
-        if (!object.has("location") || !shouldImport(Identifier.LOCATION)) {
+        if (!object.has("location") || !Identifier.LOCATION.isEnabled()) {
             return Optional.empty();
         }
 
@@ -158,12 +164,12 @@ public class BukkitLegacyConverter extends LegacyConverter {
 
     @NotNull
     private Optional<Data.Advancements> readAdvancements(@NotNull JSONObject object) {
-        if (!object.has("advancements") || !shouldImport(Identifier.ADVANCEMENTS)) {
+        if (!object.has("advancements") || !Identifier.ADVANCEMENTS.isEnabled()) {
             return Optional.empty();
         }
 
         final JSONArray advancements = object.getJSONArray("advancements");
-        final List<Data.Advancements.Advancement> converted = new ArrayList<>();
+        final List<Data.Advancements.Advancement> converted = Lists.newArrayList();
         advancements.iterator().forEachRemaining(o -> {
             final JSONObject advancement = (JSONObject) JSONObject.wrap(o);
             final String key = advancement.getString("key");
@@ -181,7 +187,7 @@ public class BukkitLegacyConverter extends LegacyConverter {
 
     @NotNull
     private Optional<Data.Statistics> readStatistics(@NotNull JSONObject object) {
-        if (!object.has("statistics") || !shouldImport(Identifier.ADVANCEMENTS)) {
+        if (!object.has("statistics") || !Identifier.STATISTICS.isEnabled()) {
             return Optional.empty();
         }
 
@@ -197,36 +203,47 @@ public class BukkitLegacyConverter extends LegacyConverter {
     @NotNull
     private BukkitData.Statistics readStatisticMaps(@NotNull JSONObject untyped, @NotNull JSONObject blocks,
                                                     @NotNull JSONObject items, @NotNull JSONObject entities) {
-        final Map<Statistic, Integer> genericStats = new HashMap<>();
-        untyped.keys().forEachRemaining(stat -> genericStats.put(Statistic.valueOf(stat), untyped.getInt(stat)));
+        // Read generic stats
+        final Map<String, Integer> genericStats = Maps.newHashMap();
+        untyped.keys().forEachRemaining(stat -> genericStats.put(stat, untyped.getInt(stat)));
 
-        final Map<Statistic, Map<Material, Integer>> blockStats = new HashMap<>();
-        blocks.keys().forEachRemaining(stat -> {
-            final JSONObject blockStat = blocks.getJSONObject(stat);
-            final Map<Material, Integer> blockMap = new HashMap<>();
-            blockStat.keys().forEachRemaining(block -> blockMap.put(Material.valueOf(block), blockStat.getInt(block)));
-            blockStats.put(Statistic.valueOf(stat), blockMap);
-        });
+        // Read block & item stats
+        final Map<String, Map<String, Integer>> blockStats, itemStats, entityStats;
+        blockStats = readMaterialStatistics(blocks);
+        itemStats = readMaterialStatistics(items);
 
-        final Map<Statistic, Map<Material, Integer>> itemStats = new HashMap<>();
-        items.keys().forEachRemaining(stat -> {
-            final JSONObject itemStat = items.getJSONObject(stat);
-            final Map<Material, Integer> itemMap = new HashMap<>();
-            itemStat.keys().forEachRemaining(item -> itemMap.put(Material.valueOf(item), itemStat.getInt(item)));
-            itemStats.put(Statistic.valueOf(stat), itemMap);
-        });
-
-        final Map<Statistic, Map<EntityType, Integer>> entityStats = new HashMap<>();
+        // Read entity stats
+        entityStats = Maps.newHashMap();
         entities.keys().forEachRemaining(stat -> {
             final JSONObject entityStat = entities.getJSONObject(stat);
-            final Map<EntityType, Integer> entityMap = new HashMap<>();
-            entityStat.keys().forEachRemaining(entity -> entityMap.put(EntityType.valueOf(entity), entityStat.getInt(entity)));
-            entityStats.put(Statistic.valueOf(stat), entityMap);
+            final Map<String, Integer> entityMap = Maps.newHashMap();
+            entityStat.keys().forEachRemaining(entity -> {
+                if (matchEntityType(entity) != null) {
+                    entityMap.put(entity, entityStat.getInt(entity));
+                }
+            });
+            entityStats.put(stat, entityMap);
         });
 
         return BukkitData.Statistics.from(genericStats, blockStats, itemStats, entityStats);
     }
 
+    @NotNull
+    private Map<String, Map<String, Integer>> readMaterialStatistics(@NotNull JSONObject items) {
+        final Map<String, Map<String, Integer>> itemStats = Maps.newHashMap();
+        items.keys().forEachRemaining(stat -> {
+            final JSONObject itemStat = items.getJSONObject(stat);
+            final Map<String, Integer> itemMap = Maps.newHashMap();
+            itemStat.keys().forEachRemaining(item -> {
+                if (matchMaterial(item) != null) {
+                    itemMap.put(item, itemStat.getInt(item));
+                }
+            });
+            itemStats.put(stat, itemMap);
+        });
+        return itemStats;
+    }
+
     // Deserialize a legacy item stack array
     @NotNull
     public ItemStack[] deserializeLegacyItemStacks(@NotNull String items) {
@@ -258,16 +275,12 @@ public class BukkitLegacyConverter extends LegacyConverter {
     }
 
     // Deserialize a single legacy item stack
+    @SuppressWarnings("unchecked")
     @Nullable
     private static ItemStack deserializeLegacyItemStack(@Nullable Object serializedItemStack) {
         return serializedItemStack != null ? ItemStack.deserialize((Map<String, Object>) serializedItemStack) : null;
     }
 
-
-    private boolean shouldImport(@NotNull Identifier type) {
-        return plugin.getSettings().isSyncFeatureEnabled(type);
-    }
-
     @NotNull
     private Date parseDate(@NotNull String dateString) {
         try {

bukkit/src/main/java/net/william278/husksync/util/BukkitMapPersister.java

@@ -1,378 +0,0 @@
-/*
- * This file is part of HuskSync, licensed under the Apache License 2.0.
- *
- *  Copyright (c) William278 <will27528@gmail.com>
- *  Copyright (c) contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package net.william278.husksync.util;
-
-import de.tr7zw.changeme.nbtapi.NBT;
-import de.tr7zw.changeme.nbtapi.iface.ReadWriteNBT;
-import de.tr7zw.changeme.nbtapi.iface.ReadableNBT;
-import net.william278.husksync.HuskSync;
-import net.william278.mapdataapi.MapBanner;
-import net.william278.mapdataapi.MapData;
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.MapMeta;
-import org.bukkit.map.*;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-
-import java.awt.*;
-import java.util.List;
-import java.util.*;
-import java.util.function.Function;
-import java.util.logging.Level;
-
-public interface BukkitMapPersister {
-
-    // The map used to store HuskSync data in ItemStack NBT
-    String MAP_DATA_KEY = "husksync:persisted_locked_map";
-    // The key used to store the serialized map data in NBT
-    String MAP_PIXEL_DATA_KEY = "canvas_data";
-    // The key used to store the map of World UIDs to MapView IDs in NBT
-    String MAP_VIEW_ID_MAPPINGS_KEY = "id_mappings";
-
-    /**
-     * Persist locked maps in an array of {@link ItemStack}s
-     *
-     * @param items            the array of {@link ItemStack}s to persist locked maps in
-     * @param delegateRenderer the player to delegate the rendering of map pixel canvases to
-     * @return the array of {@link ItemStack}s with locked maps persisted to serialized NBT
-     */
-    @NotNull
-    default ItemStack[] persistLockedMaps(@NotNull ItemStack[] items, @NotNull Player delegateRenderer) {
-        if (!getPlugin().getSettings().doPersistLockedMaps()) {
-            return items;
-        }
-        return forEachMap(items, map -> this.persistMapView(map, delegateRenderer));
-    }
-
-    /**
-     * Apply persisted locked maps to an array of {@link ItemStack}s
-     *
-     * @param items the array of {@link ItemStack}s to apply persisted locked maps to
-     * @return the array of {@link ItemStack}s with persisted locked maps applied
-     */
-    @NotNull
-    default ItemStack[] setMapViews(@NotNull ItemStack[] items) {
-        if (!getPlugin().getSettings().doPersistLockedMaps()) {
-            return items;
-        }
-        return forEachMap(items, this::applyMapView);
-    }
-
-    // Perform an operation on each map in an array of ItemStacks
-    @NotNull
-    private ItemStack[] forEachMap(@NotNull ItemStack[] items, @NotNull Function<ItemStack, ItemStack> function) {
-        for (int i = 0; i < items.length; i++) {
-            final ItemStack item = items[i];
-            if (item == null) {
-                continue;
-            }
-            if (item.getType() == Material.FILLED_MAP && item.hasItemMeta()) {
-                items[i] = function.apply(item);
-            }
-        }
-        return items;
-    }
-
-    @NotNull
-    private ItemStack persistMapView(@NotNull ItemStack map, @NotNull Player delegateRenderer) {
-        final MapMeta meta = Objects.requireNonNull((MapMeta) map.getItemMeta());
-        if (!meta.hasMapView()) {
-            return map;
-        }
-        final MapView view = meta.getMapView();
-        if (view == null || view.getWorld() == null || !view.isLocked() || view.isVirtual()) {
-            return map;
-        }
-
-        NBT.modify(map, nbt -> {
-            // Don't save the map's data twice
-            if (nbt.hasTag(MAP_DATA_KEY)) {
-                return;
-            }
-
-            // Render the map
-            final PersistentMapCanvas canvas = new PersistentMapCanvas(view);
-            for (MapRenderer renderer : view.getRenderers()) {
-                renderer.render(view, canvas, delegateRenderer);
-                getPlugin().debug(String.format("Rendered locked map canvas to view (#%s)", view.getId()));
-            }
-
-            // Persist map data
-            final ReadWriteNBT mapData = nbt.getOrCreateCompound(MAP_DATA_KEY);
-            final String worldUid = view.getWorld().getUID().toString();
-            mapData.setByteArray(MAP_PIXEL_DATA_KEY, canvas.extractMapData().toBytes());
-            nbt.getOrCreateCompound(MAP_VIEW_ID_MAPPINGS_KEY).setInteger(worldUid, view.getId());
-            getPlugin().debug(String.format("Saved data for locked map (#%s, UID: %s)", view.getId(), worldUid));
-        });
-        return map;
-    }
-
-    @NotNull
-    private ItemStack applyMapView(@NotNull ItemStack map) {
-        final MapMeta meta = Objects.requireNonNull((MapMeta) map.getItemMeta());
-        NBT.get(map, nbt -> {
-            if (!nbt.hasTag(MAP_DATA_KEY)) {
-                return nbt;
-            }
-            final ReadableNBT mapData = nbt.getCompound(MAP_DATA_KEY);
-
-            // Search for an existing map view
-            final ReadableNBT mapIds = nbt.getCompound(MAP_VIEW_ID_MAPPINGS_KEY);
-            Optional<String> world = Optional.empty();
-            for (String worldUid : mapIds.getKeys()) {
-                world = Bukkit.getWorlds().stream()
-                        .map(w -> w.getUID().toString()).filter(u -> u.equals(worldUid))
-                        .findFirst();
-                if (world.isPresent()) {
-                    break;
-                }
-            }
-            if (world.isPresent()) {
-                final String uid = world.get();
-                final Optional<MapView> existingView = this.getMapView(mapIds.getInteger(uid));
-                if (existingView.isPresent()) {
-                    final MapView view = existingView.get();
-                    view.setLocked(true);
-                    meta.setMapView(view);
-                    map.setItemMeta(meta);
-                    getPlugin().debug(String.format("View exists (#%s); updated map (UID: %s)", view.getId(), uid));
-                    return nbt;
-                }
-            }
-
-            // Read the pixel data and generate a map view otherwise
-            final MapData canvasData;
-            try {
-                getPlugin().debug("Deserializing map data from NBT and generating view...");
-                canvasData = MapData.fromByteArray(mapData.getByteArray(MAP_PIXEL_DATA_KEY));
-            } catch (Throwable e) {
-                getPlugin().log(Level.WARNING, "Failed to deserialize map data from NBT", e);
-                return nbt;
-            }
-
-            // Add a renderer to the map with the data
-            final MapView view = generateRenderedMap(canvasData);
-            final String worldUid = getDefaultMapWorld().getUID().toString();
-            meta.setMapView(view);
-            map.setItemMeta(meta);
-
-            // Set the map view ID in NBT
-            NBT.modify(map, editable -> {
-                editable.getCompound(MAP_VIEW_ID_MAPPINGS_KEY).setInteger(worldUid, view.getId());
-            });
-            getPlugin().debug(String.format("Generated view (#%s) and updated map (UID: %s)", view.getId(), worldUid));
-            return nbt;
-        });
-        return map;
-    }
-
-    // Sets the renderer of a map, and returns the generated MapView
-    @NotNull
-    private MapView generateRenderedMap(@NotNull MapData canvasData) {
-        final MapView view = Bukkit.createMap(getDefaultMapWorld());
-        view.getRenderers().clear();
-
-        // Create a new map view renderer with the map data color at each pixel
-        view.addRenderer(new PersistentMapRenderer(canvasData));
-        view.setLocked(true);
-        view.setScale(MapView.Scale.NORMAL);
-        view.setTrackingPosition(false);
-        view.setUnlimitedTracking(false);
-
-        // Set the view to the map and return it
-        setMapView(view);
-        return view;
-    }
-
-    @NotNull
-    private static World getDefaultMapWorld() {
-        final World world = Bukkit.getWorlds().get(0);
-        if (world == null) {
-            throw new IllegalStateException("No worlds are loaded on the server!");
-        }
-        return world;
-    }
-
-    default Optional<MapView> getMapView(int id) {
-        return getMapViews().containsKey(id) ? Optional.of(getMapViews().get(id)) : Optional.empty();
-    }
-
-    default void setMapView(@NotNull MapView view) {
-        getMapViews().put(view.getId(), view);
-    }
-
-    /**
-     * A {@link MapRenderer} that can be used to render persistently serialized {@link MapData} to a {@link MapView}
-     */
-    class PersistentMapRenderer extends MapRenderer {
-
-        private final MapData canvasData;
-
-        private PersistentMapRenderer(@NotNull MapData canvasData) {
-            super(false);
-            this.canvasData = canvasData;
-        }
-
-        @Override
-        public void render(@NotNull MapView map, @NotNull MapCanvas canvas, @NotNull Player player) {
-            // We set the pixels in this order to avoid the map being rendered upside down
-            for (int i = 0; i < 128; i++) {
-                for (int j = 0; j < 128; j++) {
-                    canvas.setPixel(j, i, (byte) canvasData.getColorAt(i, j));
-                }
-            }
-
-            // Set the map banners and markers
-            final MapCursorCollection cursors = canvas.getCursors();
-            canvasData.getBanners().forEach(banner -> cursors.addCursor(createBannerCursor(banner)));
-            canvas.setCursors(cursors);
-        }
-    }
-
-    @NotNull
-    private static MapCursor createBannerCursor(@NotNull MapBanner banner) {
-        return new MapCursor(
-                (byte) banner.getPosition().getX(),
-                (byte) banner.getPosition().getZ(),
-                (byte) 0,
-                switch (banner.getColor().toLowerCase(Locale.ENGLISH)) {
-                    case "white" -> MapCursor.Type.BANNER_WHITE;
-                    case "orange" -> MapCursor.Type.BANNER_ORANGE;
-                    case "magenta" -> MapCursor.Type.BANNER_MAGENTA;
-                    case "light_blue" -> MapCursor.Type.BANNER_LIGHT_BLUE;
-                    case "yellow" -> MapCursor.Type.BANNER_YELLOW;
-                    case "lime" -> MapCursor.Type.BANNER_LIME;
-                    case "pink" -> MapCursor.Type.BANNER_PINK;
-                    case "gray" -> MapCursor.Type.BANNER_GRAY;
-                    case "light_gray" -> MapCursor.Type.BANNER_LIGHT_GRAY;
-                    case "cyan" -> MapCursor.Type.BANNER_CYAN;
-                    case "purple" -> MapCursor.Type.BANNER_PURPLE;
-                    case "blue" -> MapCursor.Type.BANNER_BLUE;
-                    case "brown" -> MapCursor.Type.BANNER_BROWN;
-                    case "green" -> MapCursor.Type.BANNER_GREEN;
-                    case "red" -> MapCursor.Type.BANNER_RED;
-                    default -> MapCursor.Type.BANNER_BLACK;
-                },
-                true,
-                banner.getText().isEmpty() ? null : banner.getText()
-        );
-    }
-
-    /**
-     * A {@link MapCanvas} implementation used for pre-rendering maps to be converted into {@link MapData}
-     */
-    class PersistentMapCanvas implements MapCanvas {
-
-        private final MapView mapView;
-        private final int[][] pixels = new int[128][128];
-        private MapCursorCollection cursors;
-
-        private PersistentMapCanvas(@NotNull MapView mapView) {
-            this.mapView = mapView;
-        }
-
-        @NotNull
-        @Override
-        public MapView getMapView() {
-            return mapView;
-        }
-
-        @NotNull
-        @Override
-        public MapCursorCollection getCursors() {
-            return cursors == null ? (cursors = new MapCursorCollection()) : cursors;
-        }
-
-        @Override
-        public void setCursors(@NotNull MapCursorCollection cursors) {
-            this.cursors = cursors;
-        }
-
-        @Override
-        public void setPixel(int x, int y, byte color) {
-            pixels[x][y] = color;
-        }
-
-        @Override
-        public byte getPixel(int x, int y) {
-            return (byte) pixels[x][y];
-        }
-
-        @Override
-        public byte getBasePixel(int x, int y) {
-            return getPixel(x, y);
-        }
-
-        @Override
-        public void drawImage(int x, int y, @NotNull Image image) {
-            // Not implemented
-        }
-
-        @Override
-        public void drawText(int x, int y, @NotNull MapFont font, @NotNull String text) {
-            // Not implemented
-        }
-
-        @NotNull
-        private String getDimension() {
-            return mapView.getWorld() != null ? switch (mapView.getWorld().getEnvironment()) {
-                case NETHER -> "minecraft:the_nether";
-                case THE_END -> "minecraft:the_end";
-                default -> "minecraft:overworld";
-            } : "minecraft:overworld";
-        }
-
-        /**
-         * Extract the map data from the canvas. Must be rendered first
-         *
-         * @return the extracted map data
-         */
-        @NotNull
-        private MapData extractMapData() {
-            final List<MapBanner> banners = new ArrayList<>();
-            for (int i = 0; i < getCursors().size(); i++) {
-                final MapCursor cursor = getCursors().getCursor(i);
-                final String type = cursor.getType().name().toLowerCase(Locale.ENGLISH);
-                if (type.startsWith("banner_")) {
-                    banners.add(new MapBanner(
-                            type.replaceAll("banner_", ""),
-                            cursor.getCaption() == null ? "" : cursor.getCaption(),
-                            cursor.getX(),
-                            mapView.getWorld() != null ? mapView.getWorld().getSeaLevel() : 128,
-                            cursor.getY()
-                    ));
-                }
-            }
-            return MapData.fromPixels(pixels, getDimension(), (byte) 2, banners, List.of());
-        }
-    }
-
-    @NotNull
-    Map<Integer, MapView> getMapViews();
-
-    @ApiStatus.Internal
-    @NotNull
-    HuskSync getPlugin();
-
-}

bukkit/src/main/java/net/william278/husksync/util/BukkitTask.java

@@ -21,8 +21,11 @@ package net.william278.husksync.util;
 
 import net.william278.husksync.BukkitHuskSync;
 import net.william278.husksync.HuskSync;
+import net.william278.husksync.data.UserDataHolder;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import space.arim.morepaperlib.scheduling.AsynchronousScheduler;
+import space.arim.morepaperlib.scheduling.AttachedScheduler;
 import space.arim.morepaperlib.scheduling.RegionalScheduler;
 import space.arim.morepaperlib.scheduling.ScheduledTask;
 
@@ -34,9 +37,12 @@ public interface BukkitTask extends Task {
     class Sync extends Task.Sync implements BukkitTask {
 
         private ScheduledTask task;
+        private final @Nullable UserDataHolder user;
 
-        protected Sync(@NotNull HuskSync plugin, @NotNull Runnable runnable, long delayTicks) {
+        protected Sync(@NotNull HuskSync plugin, @NotNull Runnable runnable,
+                       @Nullable UserDataHolder user, long delayTicks) {
             super(plugin, runnable, delayTicks);
+            this.user = user;
         }
 
         @Override
@@ -57,7 +63,19 @@ public interface BukkitTask extends Task {
                 return;
             }
 
-            final RegionalScheduler scheduler = ((BukkitHuskSync) getPlugin()).getRegionalScheduler();
+            // Use entity-specific scheduler if user is not null
+            if (user != null) {
+                final AttachedScheduler scheduler = ((BukkitHuskSync) getPlugin()).getUserSyncScheduler(user);
+                if (delayTicks > 0) {
+                    this.task = scheduler.runDelayed(runnable, null, delayTicks);
+                } else {
+                    this.task = scheduler.run(runnable, null);
+                }
+                return;
+            }
+
+            // Or default to the global scheduler
+            final RegionalScheduler scheduler = ((BukkitHuskSync) getPlugin()).getSyncScheduler();
             if (delayTicks > 0) {
                 this.task = scheduler.runDelayed(runnable, delayTicks);
             } else {
@@ -146,8 +164,8 @@ public interface BukkitTask extends Task {
 
         @NotNull
         @Override
-        default Task.Sync getSyncTask(@NotNull Runnable runnable, long delayTicks) {
-            return new Sync(getPlugin(), runnable, delayTicks);
+        default Task.Sync getSyncTask(@NotNull Runnable runnable, @Nullable UserDataHolder user, long delayTicks) {
+            return new Sync(getPlugin(), runnable, user, delayTicks);
         }
 
         @NotNull

bukkit/src/main/resources/commodore/enderchest.commodore

@@ -1,3 +0,0 @@
-inventory {
-  name brigadier:string single_word;
-}

bukkit/src/main/resources/commodore/husksync.commodore

@@ -1,5 +0,0 @@
-husksync {
-  update;
-  about;
-  reload;
-}

bukkit/src/main/resources/commodore/inventory.commodore

@@ -1,3 +0,0 @@
-enderchest {
-  name brigadier:string single_word;
-}

bukkit/src/main/resources/commodore/userdata.commodore

@@ -1,35 +0,0 @@
-userdata {
-  view {
-    name brigadier:string single_word {
-      version brigadier:string single_word;
-    }
-  }
-  list {
-    name brigadier:string single_word {
-      page brigadier:integer;
-    }
-  }
-  delete {
-    name brigadier:string single_word {
-      version brigadier:string single_word;
-    }
-  }
-  restore {
-    name brigadier:string single_word {
-      version brigadier:string single_word;
-    }
-  }
-  pin {
-    name brigadier:string single_word {
-      version brigadier:string single_word;
-    }
-  }
-  dump {
-    name brigadier:string single_word {
-      version brigadier:string single_word {
-        web;
-        file;
-      }
-    }
-  }
-}

bukkit/src/main/resources/compatibility.yml

@@ -0,0 +1,2 @@
+# File used for checking Minecraft server compatibility with this version of HuskSync
+minecraft_version_range: '${minecraft_version_range}'

bukkit/src/main/resources/paper-libraries.yml

@@ -0,0 +1,8 @@
+# Dependencies for HuskSync on Paper
+libraries:
+  - 'redis.clients:jedis:${jedis_version}'
+  - 'com.mysql:mysql-connector-j:${mysql_driver_version}'
+  - 'org.mariadb.jdbc:mariadb-java-client:${mariadb_driver_version}'
+  - 'org.postgresql:postgresql:${postgres_driver_version}'
+  - 'org.mongodb:mongodb-driver-sync:${mongodb_driver_version}'
+  - 'org.xerial.snappy:snappy-java:${snappy_version}'

bukkit/src/main/resources/paper-plugin.yml

@@ -0,0 +1,27 @@
+name: 'HuskSync'
+description: '${description}'
+author: 'William278'
+website: 'https://william278.net/'
+main: 'net.william278.husksync.PaperHuskSync'
+loader: 'net.william278.husksync.PaperHuskSyncLoader'
+version: '${version}'
+api-version: '${minecraft_api_version}'
+folia-supported: true
+dependencies:
+  server:
+    packetevents:
+      required: false
+      load: BEFORE
+      join-classpath: true
+    ProtocolLib:
+      required: false
+      load: BEFORE
+      join-classpath: true
+    MysqlPlayerDataBridge:
+      required: false
+      load: BEFORE
+      join-classpath: true
+    Plan:
+      required: false
+      load: BEFORE
+      join-classpath: true

bukkit/src/main/resources/plugin.yml

@@ -1,15 +1,20 @@
 name: 'HuskSync'
 version: '${version}'
 main: 'net.william278.husksync.BukkitHuskSync'
-api-version: 1.16
+api-version: '${minecraft_api_version}'
 author: 'William278'
 description: '${description}'
 website: 'https://william278.net'
+folia-supported: true
 softdepend:
+  - 'packetevents'
+  - 'ProtocolLib'
   - 'MysqlPlayerDataBridge'
   - 'Plan'
 libraries:
   - 'redis.clients:jedis:${jedis_version}'
   - 'com.mysql:mysql-connector-j:${mysql_driver_version}'
   - 'org.mariadb.jdbc:mariadb-java-client:${mariadb_driver_version}'
+  - 'org.postgresql:postgresql:${postgres_driver_version}'
+  - 'org.mongodb:mongodb-driver-sync:${mongodb_driver_version}'
   - 'org.xerial.snappy:snappy-java:${snappy_version}'

common/build.gradle

@@ -3,31 +3,44 @@ plugins {
 }
 
 dependencies {
-    api 'commons-io:commons-io:2.13.0'
-    api 'org.apache.commons:commons-text:1.10.0'
-    api 'de.themoep:minedown-adventure:1.7.2-SNAPSHOT'
-    api 'net.kyori:adventure-api:4.14.0'
-    api 'org.json:json:20230618'
-    api 'com.google.code.gson:gson:2.10.1'
+    api 'commons-io:commons-io:2.21.0'
+    api 'org.apache.commons:commons-text:1.14.0'
+    api 'net.william278:minedown:1.8.2'
+    api 'net.william278:mapdataapi:2.0'
+    api 'org.json:json:20250517'
+    api 'com.google.code.gson:gson:2.13.2'
     api 'com.fatboyindustrial.gson-javatime-serialisers:gson-javatime-serialisers:1.1.2'
-    api 'dev.dejvokep:boosted-yaml:1.3.1'
-    api 'net.william278:annotaml:2.0.7'
+    api 'de.exlll:configlib-yaml:4.6.4'
+    api 'net.william278:paginedown:1.1.2'
     api 'net.william278:DesertWell:2.0.4'
-    api 'net.william278:PagineDown:1.1'
-    api('com.zaxxer:HikariCP:5.0.1') {
+    api('com.zaxxer:HikariCP:7.0.2') {
         exclude module: 'slf4j-api'
     }
 
-    compileOnly 'org.jetbrains:annotations:24.0.1'
-    compileOnly 'com.github.plan-player-analytics:Plan:5.5.2272'
+    compileOnlyApi 'net.william278.toilet:toilet-common:1.0.16'
+
+    compileOnly 'net.william278.uniform:uniform-common:1.3.9'
+    compileOnly 'com.mojang:brigadier:1.1.8'
+    compileOnly 'org.projectlombok:lombok:1.18.42'
+    compileOnly 'org.jetbrains:annotations:26.0.2-1'
+    compileOnly 'net.kyori:adventure-api:4.25.0'
+    compileOnly 'net.kyori:adventure-platform-api:4.4.0'
+    compileOnly "net.kyori:adventure-text-serializer-plain:4.25.0"
+    compileOnly 'com.google.guava:guava:33.5.0-jre'
+    compileOnly 'com.github.plan-player-analytics:Plan:5.6.2965'
     compileOnly "redis.clients:jedis:$jedis_version"
     compileOnly "com.mysql:mysql-connector-j:$mysql_driver_version"
     compileOnly "org.mariadb.jdbc:mariadb-java-client:$mariadb_driver_version"
+    compileOnly "org.postgresql:postgresql:$postgres_driver_version"
+    compileOnly "org.mongodb:mongodb-driver-sync:$mongodb_driver_version"
     compileOnly "org.xerial.snappy:snappy-java:$snappy_version"
 
-    testImplementation 'com.github.plan-player-analytics:Plan:5.5.2272'
     testImplementation "redis.clients:jedis:$jedis_version"
     testImplementation "org.xerial.snappy:snappy-java:$snappy_version"
-    testCompileOnly 'dev.dejvokep:boosted-yaml:1.3.1'
-    testCompileOnly 'org.jetbrains:annotations:24.0.1'
+    testImplementation 'com.google.guava:guava:33.5.0-jre'
+    testImplementation 'com.github.plan-player-analytics:Plan:5.6.2965'
+    testCompileOnly 'de.exlll:configlib-yaml:4.6.4'
+    testCompileOnly 'org.jetbrains:annotations:26.0.2-1'
+
+    annotationProcessor 'org.projectlombok:lombok:1.18.42'
 }

common/src/main/java/net/william278/husksync/HuskSync.java

@@ -20,39 +20,41 @@
 package net.william278.husksync;
 
 import com.fatboyindustrial.gsonjavatime.Converters;
+import com.google.common.collect.Maps;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import net.william278.annotaml.Annotaml;
+import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.platform.AudienceProvider;
 import net.william278.desertwell.util.ThrowingConsumer;
 import net.william278.desertwell.util.UpdateChecker;
 import net.william278.desertwell.util.Version;
 import net.william278.husksync.adapter.DataAdapter;
-import net.william278.husksync.config.Locales;
-import net.william278.husksync.config.Settings;
+import net.william278.husksync.config.ConfigProvider;
 import net.william278.husksync.data.Data;
 import net.william278.husksync.data.Identifier;
-import net.william278.husksync.data.Serializer;
+import net.william278.husksync.data.SerializerRegistry;
 import net.william278.husksync.database.Database;
 import net.william278.husksync.event.EventDispatcher;
+import net.william278.husksync.listener.LockedHandler;
 import net.william278.husksync.migrator.Migrator;
 import net.william278.husksync.redis.RedisManager;
+import net.william278.husksync.sync.DataSyncer;
 import net.william278.husksync.user.ConsoleUser;
 import net.william278.husksync.user.OnlineUser;
-import net.william278.husksync.util.LegacyConverter;
-import net.william278.husksync.util.Task;
+import net.william278.husksync.util.*;
+import net.william278.uniform.Uniform;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.logging.Level;
 
 /**
  * Abstract implementation of the HuskSync plugin.
  */
-public interface HuskSync extends Task.Supplier, EventDispatcher {
+public interface HuskSync extends Task.Supplier, EventDispatcher, ConfigProvider, SerializerRegistry,
+        CompatibilityChecker, DumpProvider, DataVersionSupplier {
 
     int SPIGOT_RESOURCE_ID = 97144;
 
@@ -86,49 +88,39 @@ public interface HuskSync extends Task.Supplier, EventDispatcher {
      *
      * @return the {@link RedisManager} implementation
      */
-
     @NotNull
     RedisManager getRedisManager();
 
+    /**
+     * Returns the implementing adapter for serializing data
+     *
+     * @return the {@link DataAdapter}
+     */
     @NotNull
     DataAdapter getDataAdapter();
 
     /**
-     * Returns the data serializer for the given {@link Identifier}
+     * Returns the data syncer implementation
+     *
+     * @return the {@link DataSyncer} implementation
      */
     @NotNull
-    <T extends Data> Map<Identifier, Serializer<T>> getSerializers();
+    DataSyncer getDataSyncer();
 
     /**
-     * Register a data serializer for the given {@link Identifier}
+     * Set the data syncer implementation
      *
-     * @param identifier the {@link Identifier}
-     * @param serializer the {@link Serializer}
+     * @param dataSyncer the {@link DataSyncer} implementation
      */
-    default void registerSerializer(@NotNull Identifier identifier,
-                                    @NotNull Serializer<? extends Data> serializer) {
-        if (identifier.isCustom()) {
-            log(Level.INFO, String.format("Registered custom data type: %s", identifier));
-        }
-        getSerializers().put(identifier, (Serializer<Data>) serializer);
-    }
+    void setDataSyncer(@NotNull DataSyncer dataSyncer);
 
     /**
-     * Get the {@link Identifier} for the given key
-     */
-    default Optional<Identifier> getIdentifier(@NotNull String key) {
-        return getSerializers().keySet().stream().filter(identifier -> identifier.toString().equals(key)).findFirst();
-    }
-
-    /**
-     * Get the set of registered data types
+     * Get the uniform command provider
      *
-     * @return the set of registered data types
+     * @return the command provider
      */
     @NotNull
-    default Set<Identifier> getRegisteredDataTypes() {
-        return getSerializers().keySet();
-    }
+    Uniform getUniform();
 
     /**
      * Returns a list of available data {@link Migrator}s
@@ -139,7 +131,17 @@ public interface HuskSync extends Task.Supplier, EventDispatcher {
     List<Migrator> getAvailableMigrators();
 
     @NotNull
-    Map<Identifier, Data> getPlayerCustomDataStore(@NotNull OnlineUser user);
+    Map<UUID, Map<Identifier, Data>> getPlayerCustomDataStore();
+
+    @NotNull
+    default Map<Identifier, Data> getPlayerCustomDataStore(@NotNull OnlineUser user) {
+        if (getPlayerCustomDataStore().containsKey(user.getUuid())) {
+            return getPlayerCustomDataStore().get(user.getUuid());
+        }
+        final Map<Identifier, Data> data = Maps.newHashMap();
+        getPlayerCustomDataStore().put(user.getUuid(), data);
+        return data;
+    }
 
     /**
      * Initialize a faucet of the plugin.
@@ -157,26 +159,6 @@ public interface HuskSync extends Task.Supplier, EventDispatcher {
         log(Level.INFO, "Successfully initialized " + name);
     }
 
-    /**
-     * Returns the plugin {@link Settings}
-     *
-     * @return the {@link Settings}
-     */
-    @NotNull
-    Settings getSettings();
-
-    void setSettings(@NotNull Settings settings);
-
-    /**
-     * Returns the plugin {@link Locales}
-     *
-     * @return the {@link Locales}
-     */
-    @NotNull
-    Locales getLocales();
-
-    void setLocales(@NotNull Locales locales);
-
     /**
      * Returns if a dependency is loaded
      *
@@ -193,14 +175,6 @@ public interface HuskSync extends Task.Supplier, EventDispatcher {
      */
     InputStream getResource(@NotNull String name);
 
-    /**
-     * Returns the plugin data folder
-     *
-     * @return the plugin data folder as a {@link File}
-     */
-    @NotNull
-    File getDataFolder();
-
     /**
      * Log a message to the console
      *
@@ -217,18 +191,47 @@ public interface HuskSync extends Task.Supplier, EventDispatcher {
      * @param throwable a throwable to log
      */
     default void debug(@NotNull String message, @NotNull Throwable... throwable) {
-        if (getSettings().doDebugLogging()) {
-            log(Level.INFO, String.format("[DEBUG] %s", message), throwable);
+        if (getSettings().isDebugLogging()) {
+            log(Level.INFO, getDebugString(message), throwable);
         }
     }
 
+    // Get the debug log message format
+    @NotNull
+    private String getDebugString(@NotNull String message) {
+        return String.format("[DEBUG] [%s] %s", new SimpleDateFormat("mm:ss.SSS").format(new Date()), message);
+    }
+
     /**
-     * Get the console user
+     * Get the {@link AudienceProvider} instance
      *
-     * @return the {@link ConsoleUser}
+     * @return the {@link AudienceProvider} instance
+     * @since 1.0
      */
     @NotNull
-    ConsoleUser getConsole();
+    AudienceProvider getAudiences();
+
+    /**
+     * Get the {@link Audience} instance for the given {@link OnlineUser}
+     *
+     * @param user the {@link OnlineUser} to get the {@link Audience} for
+     * @return the {@link Audience} instance
+     */
+    @NotNull
+    default Audience getAudience(@NotNull UUID user) {
+        return getAudiences().player(user);
+    }
+
+    /**
+     * Get the {@link ConsoleUser} instance
+     *
+     * @return the {@link ConsoleUser} instance
+     * @since 1.0
+     */
+    @NotNull
+    default ConsoleUser getConsole() {
+        return new ConsoleUser(getAudiences());
+    }
 
     /**
      * Returns the plugin version
@@ -255,34 +258,20 @@ public interface HuskSync extends Task.Supplier, EventDispatcher {
     String getPlatformType();
 
     /**
-     * Returns the legacy data converter, if it exists
+     * Returns the server software version
+     *
+     * @return the server software version string
+     */
+    @NotNull
+    String getServerVersion();
+
+    /**
+     * Returns the legacy data converter if it exists
      *
      * @return the {@link LegacyConverter}
      */
     Optional<LegacyConverter> getLegacyConverter();
 
-    /**
-     * Reloads the {@link Settings} and {@link Locales} from their respective config files.
-     */
-    default void loadConfigs() {
-        try {
-            // Load settings
-            setSettings(Annotaml.create(new File(getDataFolder(), "config.yml"), Settings.class).get());
-
-            // Load locales from language preset default
-            final Locales languagePresets = Annotaml.create(
-                    Locales.class,
-                    Objects.requireNonNull(getResource(String.format("locales/%s.yml", getSettings().getLanguage())))
-            ).get();
-            setLocales(Annotaml.create(new File(
-                    getDataFolder(),
-                    String.format("messages_%s.yml", getSettings().getLanguage())
-            ), languagePresets).get());
-        } catch (IOException | InvocationTargetException | InstantiationException | IllegalAccessException e) {
-            throw new FailedToLoadException("Failed to load config or message files", e);
-        }
-    }
-
     @NotNull
     default UpdateChecker getUpdateChecker() {
         return UpdateChecker.builder()
@@ -293,7 +282,7 @@ public interface HuskSync extends Task.Supplier, EventDispatcher {
     }
 
     default void checkForUpdates() {
-        if (getSettings().doCheckForUpdates()) {
+        if (getSettings().isCheckForUpdates()) {
             getUpdateChecker().check().thenAccept(checked -> {
                 if (!checked.isUpToDate()) {
                     log(Level.WARNING, String.format(
@@ -305,12 +294,40 @@ public interface HuskSync extends Task.Supplier, EventDispatcher {
         }
     }
 
+    @NotNull
+    LockedHandler getLockedHandler();
+
+    /**
+     * Get the set of UUIDs of "locked players", for which events will be canceled.
+     * </p>
+     * Players are locked while their items are being set (on join) or saved (on quit)
+     */
     @NotNull
     Set<UUID> getLockedPlayers();
 
+    /**
+     * Get the set of UUIDs of players who are currently marked as disconnecting or disconnected
+     */
+    @NotNull
+    Set<UUID> getDisconnectingPlayers();
+
+    default boolean isLocked(@NotNull UUID uuid) {
+        return getLockedPlayers().contains(uuid);
+    }
+
+    default void lockPlayer(@NotNull UUID uuid) {
+        getLockedPlayers().add(uuid);
+    }
+
+    default void unlockPlayer(@NotNull UUID uuid) {
+        getLockedPlayers().remove(uuid);
+    }
+
     @NotNull
     Gson getGson();
 
+    boolean isDisabling();
+
     @NotNull
     default Gson createGson() {
         return Converters.registerOffsetDateTime(new GsonBuilder()).create();
@@ -324,15 +341,19 @@ public interface HuskSync extends Task.Supplier, EventDispatcher {
         private static final String FORMAT = """
                 HuskSync has failed to load! The plugin will not be enabled and no data will be synchronized.
                 Please make sure the plugin has been setup correctly (https://william278.net/docs/husksync/setup):
-                                
-                1) Make sure you've entered your MySQL or MariaDB database details correctly in config.yml
+                
+                1) Make sure you've entered your MySQL, MariaDB or MongoDB database details correctly in config.yml
                 2) Make sure your Redis server details are also correct in config.yml
-                3) Make sure your config is up-to-date (https://william278.net/docs/husksync/config-files)
+                3) Make sure your config is up-to-date (https://william278.net/docs/husksync/config-file)
                 4) Check the error below for more details
-                                
+                
                 Caused by: %s""";
 
-        FailedToLoadException(@NotNull String message, @NotNull Throwable cause) {
+        public FailedToLoadException(@NotNull String message) {
+            super(String.format(FORMAT, message));
+        }
+
+        public FailedToLoadException(@NotNull String message, @NotNull Throwable cause) {
             super(String.format(FORMAT, message), cause);
         }
 

common/src/main/java/net/william278/husksync/adapter/GsonAdapter.java

@@ -49,7 +49,7 @@ public class GsonAdapter implements DataAdapter {
 
     @Override
     @NotNull
-    public <A extends Adaptable> A fromBytes(@NotNull byte[] data, @NotNull Class<A> type) throws AdaptionException {
+    public <A extends Adaptable> A fromBytes(byte[] data, @NotNull Class<A> type) throws AdaptionException {
         return this.fromJson(new String(data, StandardCharsets.UTF_8), type);
     }
 

common/src/main/java/net/william278/husksync/adapter/SnappyGsonAdapter.java

@@ -31,7 +31,6 @@ public class SnappyGsonAdapter extends GsonAdapter {
         super(plugin);
     }
 
-    @NotNull
     @Override
     public <A extends Adaptable> byte[] toBytes(@NotNull A data) throws AdaptionException {
         try {
@@ -43,7 +42,7 @@ public class SnappyGsonAdapter extends GsonAdapter {
 
     @NotNull
     @Override
-    public <A extends Adaptable> A fromBytes(@NotNull byte[] data, @NotNull Class<A> type) throws AdaptionException {
+    public <A extends Adaptable> A fromBytes(byte[] data, @NotNull Class<A> type) throws AdaptionException {
         try {
             return super.fromBytes(decompressBytes(data), type);
         } catch (IOException e) {

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

@@ -26,25 +26,31 @@ import net.william278.husksync.data.Data;
 import net.william278.husksync.data.DataSnapshot;
 import net.william278.husksync.data.Identifier;
 import net.william278.husksync.data.Serializer;
+import net.william278.husksync.sync.DataSyncer;
 import net.william278.husksync.user.OnlineUser;
 import net.william278.husksync.user.User;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.BiConsumer;
 
 /**
- * The base implementation of the HuskSync API, containing cross-platform API calls.
+ * The common implementation of the HuskSync API, containing cross-platform API calls.
  * </p>
- * This class should not be used directly, but rather through platform-specific extending API classes.
+ * Retrieve an instance of the API class via {@link #getInstance()}.
  *
  * @since 2.0
  */
 @SuppressWarnings("unused")
-public abstract class HuskSyncAPI {
+public class HuskSyncAPI {
+
+    // Instance of the plugin
+    protected static HuskSyncAPI instance;
 
     /**
      * <b>(Internal use only)</b> - Instance of the implementing plugin.
@@ -59,6 +65,28 @@ public abstract class HuskSyncAPI {
         this.plugin = plugin;
     }
 
+    /**
+     * Entrypoint to the HuskSync API on the common platform - returns an instance of the API
+     *
+     * @return instance of the HuskSync API
+     * @since 3.3
+     */
+    @NotNull
+    public static HuskSyncAPI getInstance() {
+        if (instance == null) {
+            throw new NotRegisteredException();
+        }
+        return instance;
+    }
+
+    /**
+     * <b>(Internal use only)</b> - Unregister the API for this platform.
+     */
+    @ApiStatus.Internal
+    public static void unregister() {
+        instance = null;
+    }
+
     /**
      * Get a {@link User} by their UUID
      *
@@ -71,6 +99,18 @@ public abstract 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
      *
@@ -109,7 +149,7 @@ public abstract class HuskSyncAPI {
      */
     public CompletableFuture<Optional<DataSnapshot.Unpacked>> getCurrentData(@NotNull User user) {
         return plugin.getRedisManager()
-                .getUserData(UUID.randomUUID(), user)
+                .getOnlineUserData(UUID.randomUUID(), user, DataSnapshot.SaveCause.API)
                 .thenApply(data -> data.or(() -> plugin.getDatabase().getLatestSnapshot(user)))
                 .thenApply(data -> data.map(snapshot -> snapshot.unpack(plugin)));
     }
@@ -146,6 +186,7 @@ public abstract class HuskSyncAPI {
     public void editCurrentData(@NotNull User user, @NotNull ThrowingConsumer<DataSnapshot.Unpacked> editor) {
         getCurrentData(user).thenAccept(optional -> optional.ifPresent(data -> {
             editor.accept(data);
+            data.setId(UUID.randomUUID());
             setCurrentData(user, data);
         }));
     }
@@ -236,13 +277,32 @@ public abstract class HuskSyncAPI {
      *
      * @param user     The user to save the data for
      * @param snapshot The snapshot to save
+     * @param callback A callback to run after the data has been saved (if the DataSaveEvent was not canceled)
+     * @implNote Note that the {@link net.william278.husksync.event.DataSaveEvent} will be fired unless the
+     * {@link DataSnapshot.SaveCause#fireDataSaveEvent()} is {@code false}
+     * @since 3.3.2
+     */
+    public void addSnapshot(@NotNull User user, @NotNull DataSnapshot snapshot,
+                            @Nullable BiConsumer<User, DataSnapshot.Packed> callback) {
+        plugin.runAsync(() -> plugin.getDataSyncer().saveData(
+                user,
+                snapshot instanceof DataSnapshot.Unpacked unpacked
+                        ? unpacked.pack(plugin) : (DataSnapshot.Packed) snapshot,
+                callback
+        ));
+    }
+
+    /**
+     * Adds a data snapshot to the database
+     *
+     * @param user     The user to save the data for
+     * @param snapshot The snapshot to save
+     * @implNote Note that the {@link net.william278.husksync.event.DataSaveEvent} will be fired unless the
+     * {@link DataSnapshot.SaveCause#fireDataSaveEvent()} is {@code false}
      * @since 3.0
      */
     public void addSnapshot(@NotNull User user, @NotNull DataSnapshot snapshot) {
-        plugin.runAsync(() -> plugin.getDatabase().addSnapshot(
-                user, snapshot instanceof DataSnapshot.Unpacked unpacked
-                        ? unpacked.pack(plugin) : (DataSnapshot.Packed) snapshot
-        ));
+        this.addSnapshot(user, snapshot, null);
     }
 
     /**
@@ -330,6 +390,17 @@ public abstract class HuskSyncAPI {
         plugin.registerSerializer(identifier, serializer);
     }
 
+    /**
+     * Get a registered data serializer by its identifier
+     *
+     * @param identifier The identifier of the data type to get the serializer for
+     * @return The serializer for the given identifier, or an empty optional if the serializer isn't registered
+     * @since 3.5.4
+     */
+    public Optional<Serializer<Data>> getDataSerializer(@NotNull Identifier identifier) {
+        return plugin.getSerializer(identifier);
+    }
+
     /**
      * Get a {@link DataSnapshot.Unpacked} from a {@link DataSnapshot.Packed}
      *
@@ -404,6 +475,7 @@ public abstract class HuskSyncAPI {
      * @param <T>        The type of the element
      * @return The deserialized element
      * @throws Serializer.DeserializationException If the element could not be deserialized
+     * @since 3.0
      */
     @NotNull
     public <T extends Adaptable> T deserializeData(@NotNull String serialized, Class<T> type)
@@ -418,6 +490,7 @@ public abstract class HuskSyncAPI {
      * @param <T>     The type of the element
      * @return The serialized JSON string
      * @throws Serializer.SerializationException If the element could not be serialized
+     * @since 3.0
      */
     @NotNull
     public <T extends Adaptable> String serializeData(@NotNull T element)
@@ -425,6 +498,16 @@ public abstract class HuskSyncAPI {
         return plugin.getDataAdapter().toJson(element);
     }
 
+    /**
+     * Set the {@link DataSyncer} to be used to sync data
+     *
+     * @param syncer The data syncer to use for synchronizing user data
+     * @since 3.1
+     */
+    public void setDataSyncer(@NotNull DataSyncer syncer) {
+        plugin.setDataSyncer(syncer);
+    }
+
     /**
      * <b>(Internal use only)</b> - Get the plugin instance
      *
@@ -440,17 +523,19 @@ public abstract class HuskSyncAPI {
      */
     static final class NotRegisteredException extends IllegalStateException {
 
-        private static final String MESSAGE = """
-                Could not access the HuskSync API as it has not yet been registered. This could be because:
+        private static final String REASONS = """
+                This may be because:
                 1) HuskSync has failed to enable successfully
                 2) Your plugin isn't set to load after HuskSync has
                    (Check if it set as a (soft)depend in plugin.yml or to load: BEFORE in paper-plugin.yml?)
-                3) You are attempting to access HuskSync on plugin construction/before your plugin has enabled.
-                4) You have shaded HuskSync into your plugin jar and need to fix your maven/gradle/build script
-                   to only include HuskSync as a dependency and not as a shaded dependency.""";
+                3) You are attempting to access HuskSync on plugin construction/before your plugin has enabled.""";
+
+        NotRegisteredException(@NotNull String reasons) {
+            super("Could not access the HuskSync API as it has not yet been registered. %s".formatted(reasons));
+        }
 
         NotRegisteredException() {
-            super(MESSAGE);
+            this(REASONS);
         }
 
     }

common/src/main/java/net/william278/husksync/command/Command.java

@@ -1,84 +0,0 @@
-/*
- * This file is part of HuskSync, licensed under the Apache License 2.0.
- *
- *  Copyright (c) William278 <will27528@gmail.com>
- *  Copyright (c) contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package net.william278.husksync.command;
-
-import net.william278.husksync.HuskSync;
-import net.william278.husksync.user.CommandUser;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public abstract class Command extends Node {
-
-    private final String usage;
-    private final Map<String, Boolean> additionalPermissions;
-
-    protected Command(@NotNull String name, @NotNull List<String> aliases, @NotNull String usage,
-                      @NotNull HuskSync plugin) {
-        super(name, aliases, plugin);
-        this.usage = usage;
-        this.additionalPermissions = new HashMap<>();
-    }
-
-    @Override
-    public final void onExecuted(@NotNull CommandUser executor, @NotNull String[] args) {
-        if (!executor.hasPermission(getPermission())) {
-            plugin.getLocales().getLocale("error_no_permission")
-                    .ifPresent(executor::sendMessage);
-            return;
-        }
-        plugin.runAsync(() -> this.execute(executor, args));
-    }
-
-    public abstract void execute(@NotNull CommandUser executor, @NotNull String[] args);
-
-    @NotNull
-    public final String getRawUsage() {
-        return usage;
-    }
-
-    @NotNull
-    public final String getUsage() {
-        return "/" + getName() + " " + getRawUsage();
-    }
-
-    public final void addAdditionalPermissions(@NotNull Map<String, Boolean> permissions) {
-        permissions.forEach((permission, value) -> this.additionalPermissions.put(getPermission(permission), value));
-    }
-
-    @NotNull
-    public final Map<String, Boolean> getAdditionalPermissions() {
-        return additionalPermissions;
-    }
-
-    @NotNull
-    public String getDescription() {
-        return plugin.getLocales().getRawLocale(getName() + "_command_description")
-                .orElse(getUsage());
-    }
-
-    @NotNull
-    public final HuskSync getPlugin() {
-        return plugin;
-    }
-
-}

common/src/main/java/net/william278/husksync/command/EnderChestCommand.java

@@ -23,18 +23,20 @@ import de.themoep.minedown.adventure.MineDown;
 import net.william278.husksync.HuskSync;
 import net.william278.husksync.data.Data;
 import net.william278.husksync.data.DataSnapshot;
+import net.william278.husksync.redis.RedisManager;
 import net.william278.husksync.user.OnlineUser;
 import net.william278.husksync.user.User;
 import org.jetbrains.annotations.NotNull;
 
 import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
 import java.util.List;
 import java.util.Optional;
 
 public class EnderChestCommand extends ItemsCommand {
 
     public EnderChestCommand(@NotNull HuskSync plugin) {
-        super(plugin, List.of("enderchest", "echest", "openechest"));
+        super("enderchest", List.of("echest", "openechest"), DataSnapshot.SaveCause.ENDERCHEST_COMMAND, plugin);
     }
 
     @Override
@@ -48,16 +50,17 @@ public class EnderChestCommand extends ItemsCommand {
         }
 
         // Display opening message
-        plugin.getLocales().getLocale("ender_chest_viewer_opened", user.getUsername(),
-                        snapshot.getTimestamp().format(DateTimeFormatter.ofPattern("dd/MM/yyyy, HH:mm")))
+        plugin.getLocales().getLocale("ender_chest_viewer_opened", user.getName(),
+                        snapshot.getTimestamp().format(DateTimeFormatter
+                                .ofLocalizedDateTime(FormatStyle.MEDIUM, FormatStyle.SHORT)))
                 .ifPresent(viewer::sendMessage);
 
         // Show GUI
         final Data.Items.EnderChest enderChest = optionalEnderChest.get();
         viewer.showGui(
                 enderChest,
-                plugin.getLocales().getLocale("ender_chest_viewer_menu_title", user.getUsername())
-                        .orElse(new MineDown(String.format("%s's Ender Chest", user.getUsername()))),
+                plugin.getLocales().getLocale("ender_chest_viewer_menu_title", user.getName())
+                        .orElse(new MineDown(String.format("%s's Ender Chest", user.getName()))),
                 allowEdit,
                 enderChest.getSlotCount(),
                 (itemsOnClose) -> {
@@ -70,8 +73,8 @@ public class EnderChestCommand extends ItemsCommand {
 
     // Creates a new snapshot with the updated enderChest
     @SuppressWarnings("DuplicatedCode")
-    private void updateItems(@NotNull OnlineUser viewer, @NotNull Data.Items.Items items, @NotNull User user) {
-        final Optional<DataSnapshot.Packed> latestData = plugin.getDatabase().getLatestSnapshot(user);
+    private void updateItems(@NotNull OnlineUser viewer, @NotNull Data.Items.Items items, @NotNull User holder) {
+        final Optional<DataSnapshot.Packed> latestData = plugin.getDatabase().getLatestSnapshot(holder);
         if (latestData.isEmpty()) {
             plugin.getLocales().getLocale("error_no_data_to_display")
                     .ifPresent(viewer::sendMessage);
@@ -80,13 +83,19 @@ public class EnderChestCommand extends ItemsCommand {
 
         // Create and pack the snapshot with the updated enderChest
         final DataSnapshot.Packed snapshot = latestData.get().copy();
+        boolean pin = plugin.getSettings().getSynchronization().doAutoPin(saveCause);
         snapshot.edit(plugin, (data) -> {
-            data.setSaveCause(DataSnapshot.SaveCause.ENDERCHEST_COMMAND);
-            data.setPinned(plugin.getSettings().doAutoPin(DataSnapshot.SaveCause.ENDERCHEST_COMMAND));
             data.getEnderChest().ifPresent(enderChest -> enderChest.setContents(items));
+            data.setSaveCause(saveCause);
+            data.setPinned(pin);
+        });
+
+        // Save data
+        final RedisManager redis = plugin.getRedisManager();
+        plugin.getDataSyncer().saveData(holder, snapshot, (user, data) -> {
+            redis.getUserData(user).ifPresent(d -> redis.setUserData(user, snapshot));
+            redis.sendUserDataUpdate(user, data);
         });
-        plugin.getDatabase().addSnapshot(user, snapshot);
-        plugin.getRedisManager().sendUserDataUpdate(user, snapshot);
     }
 
 }

common/src/main/java/net/william278/husksync/command/HuskSyncCommand.java

@@ -19,38 +19,44 @@
 
 package net.william278.husksync.command;
 
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import de.themoep.minedown.adventure.MineDown;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.JoinConfiguration;
+import net.kyori.adventure.text.event.ClickEvent;
+import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextColor;
+import net.kyori.adventure.text.format.TextDecoration;
 import net.william278.desertwell.about.AboutMenu;
 import net.william278.desertwell.util.UpdateChecker;
 import net.william278.husksync.HuskSync;
+import net.william278.husksync.data.DataSnapshot;
+import net.william278.husksync.database.Database;
 import net.william278.husksync.migrator.Migrator;
 import net.william278.husksync.user.CommandUser;
-import net.william278.husksync.user.OnlineUser;
+import net.william278.husksync.util.LegacyConverter;
+import net.william278.husksync.util.StatusLine;
+import net.william278.uniform.BaseCommand;
+import net.william278.uniform.CommandProvider;
+import net.william278.uniform.Permission;
+import net.william278.uniform.element.ArgumentElement;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.time.OffsetDateTime;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
-public class HuskSyncCommand extends Command implements TabProvider {
-
-    private static final Map<String, Boolean> SUB_COMMANDS = Map.of(
-            "about", false,
-            "reload", true,
-            "migrate", true,
-            "update", true
-    );
+public class HuskSyncCommand extends PluginCommand {
 
     private final UpdateChecker updateChecker;
     private final AboutMenu aboutMenu;
 
     public HuskSyncCommand(@NotNull HuskSync plugin) {
-        super("husksync", List.of(), "[" + String.join("|", SUB_COMMANDS.keySet()) + "]", plugin);
-        addAdditionalPermissions(SUB_COMMANDS);
-
+        super("husksync", List.of(), Permission.Default.TRUE, ExecutionScope.ALL, plugin);
         this.updateChecker = plugin.getUpdateChecker();
         this.aboutMenu = AboutMenu.builder()
                 .title(Component.text("HuskSync"))
@@ -60,7 +66,11 @@ public class HuskSyncCommand extends Command implements TabProvider {
                         AboutMenu.Credit.of("William278").description("Click to visit website").url("https://william278.net"))
                 .credits("Contributors",
                         AboutMenu.Credit.of("HarvelsX").description("Code"),
-                        AboutMenu.Credit.of("HookWoods").description("Code"))
+                        AboutMenu.Credit.of("HookWoods").description("Code"),
+                        AboutMenu.Credit.of("Preva1l").description("Code"),
+                        AboutMenu.Credit.of("hanbings").description("Code (Fabric porting)"),
+                        AboutMenu.Credit.of("Stampede2011").description("Code (Fabric mixins)"),
+                        AboutMenu.Credit.of("VinerDream").description("Code"))
                 .credits("Translators",
                         AboutMenu.Credit.of("Namiu").description("Japanese (ja-jp)"),
                         AboutMenu.Credit.of("anchelthe").description("Spanish (es-es)"),
@@ -72,7 +82,11 @@ public class HuskSyncCommand extends Command implements TabProvider {
                         AboutMenu.Credit.of("Ghost-chu").description("Simplified Chinese (zh-cn)"),
                         AboutMenu.Credit.of("DJelly4K").description("Simplified Chinese (zh-cn)"),
                         AboutMenu.Credit.of("Thourgard").description("Ukrainian (uk-ua)"),
-                        AboutMenu.Credit.of("xF3d3").description("Italian (it-it)"))
+                        AboutMenu.Credit.of("xF3d3").description("Italian (it-it)"),
+                        AboutMenu.Credit.of("cada3141").description("Korean (ko-kr)"),
+                        AboutMenu.Credit.of("Wirayuda5620").description("Indonesian (id-id)"),
+                        AboutMenu.Credit.of("WinTone01").description("Turkish (tr-tr)"),
+                        AboutMenu.Credit.of("IbanEtchep").description("French (fr-fr)"))
                 .buttons(
                         AboutMenu.Link.of("https://william278.net/docs/husksync").text("Documentation").icon("⛏"),
                         AboutMenu.Link.of("https://github.com/WiIIiam278/HuskSync/issues").text("Issues").icon("❌").color(TextColor.color(0xff9f0f)),
@@ -81,104 +95,165 @@ public class HuskSyncCommand extends Command implements TabProvider {
     }
 
     @Override
-    public void execute(@NotNull CommandUser executor, @NotNull String[] args) {
-        final String subCommand = parseStringArg(args, 0).orElse("about").toLowerCase(Locale.ENGLISH);
-        if (SUB_COMMANDS.containsKey(subCommand) && !executor.hasPermission(getPermission(subCommand))) {
-            plugin.getLocales().getLocale("error_no_permission")
-                    .ifPresent(executor::sendMessage);
-            return;
-        }
-
-        switch (subCommand) {
-            case "about" -> executor.sendMessage(aboutMenu.toComponent());
-            case "reload" -> {
-                try {
-                    plugin.loadConfigs();
-                    plugin.getLocales().getLocale("reload_complete").ifPresent(executor::sendMessage);
-                } catch (Throwable e) {
-                    executor.sendMessage(new MineDown(
-                            "[Error:](#ff3300) [Failed to reload the plugin. Check console for errors.](#ff7e5e)"
-                    ));
-                    plugin.log(Level.SEVERE, "Failed to reload the plugin", e);
-                }
-            }
-            case "migrate" -> {
-                if (executor instanceof OnlineUser) {
-                    plugin.getLocales().getLocale("error_console_command_only")
-                            .ifPresent(executor::sendMessage);
-                    return;
-                }
-                this.handleMigrationCommand(args);
-            }
-            case "update" -> updateChecker.check().thenAccept(checked -> {
-                if (checked.isUpToDate()) {
-                    plugin.getLocales().getLocale("up_to_date", plugin.getPluginVersion().toString())
-                            .ifPresent(executor::sendMessage);
-                    return;
-                }
-                plugin.getLocales().getLocale("update_available", checked.getLatestVersion().toString(),
-                        plugin.getPluginVersion().toString()).ifPresent(executor::sendMessage);
-            });
-            default -> plugin.getLocales().getLocale("error_invalid_syntax", getUsage())
-                    .ifPresent(executor::sendMessage);
-        }
+    public void provide(@NotNull BaseCommand<?> command) {
+        command.setDefaultExecutor((ctx) -> about(command, ctx));
+        command.addSubCommand("about", (sub) -> sub.setDefaultExecutor((ctx) -> about(command, ctx)));
+        command.addSubCommand("status", needsOp("status"), status());
+        command.addSubCommand("dump", needsOp("dump"), dump());
+        command.addSubCommand("reload", needsOp("reload"), reload());
+        command.addSubCommand("update", needsOp("update"), update());
+        command.addSubCommand("forceupgrade", forceUpgrade());
+        command.addSubCommand("migrate", migrate());
     }
 
-    // Handle a migration console command input
-    private void handleMigrationCommand(@NotNull String[] args) {
-        if (args.length < 2) {
-            plugin.log(Level.INFO,
-                    "Please choose a migrator, then run \"husksync migrate <migrator>\"");
-            this.logMigratorList();
-            return;
-        }
+    private void about(@NotNull BaseCommand<?> c, @NotNull CommandContext<?> ctx) {
+        user(c, ctx).getAudience().sendMessage(aboutMenu.toComponent());
+    }
 
-        final Optional<Migrator> selectedMigrator = plugin.getAvailableMigrators().stream()
-                .filter(available -> available.getIdentifier().equalsIgnoreCase(args[1]))
-                .findFirst();
-        selectedMigrator.ifPresentOrElse(migrator -> {
-            if (args.length < 3) {
-                plugin.log(Level.INFO, migrator.getHelpMenu());
+    @NotNull
+    private CommandProvider status() {
+        return (sub) -> sub.setDefaultExecutor((ctx) -> {
+            final CommandUser user = user(sub, ctx);
+            plugin.getLocales().getLocale("system_status_header").ifPresent(user::sendMessage);
+            user.sendMessage(Component.join(
+                    JoinConfiguration.newlines(),
+                    Arrays.stream(StatusLine.values()).map(s -> s.get(plugin)).toList()
+            ));
+        });
+    }
+
+    @NotNull
+    private CommandProvider dump() {
+        return (sub) -> {
+            sub.setDefaultExecutor((ctx) -> {
+                final CommandUser user = user(sub, ctx);
+                plugin.getLocales().getLocale("system_dump_confirm").ifPresent(user::sendMessage);
+            });
+            sub.addSubCommand("confirm", (con) -> con.setDefaultExecutor((ctx) -> {
+                final CommandUser user = user(sub, ctx);
+                plugin.getLocales().getLocale("system_dump_started").ifPresent(user::sendMessage);
+                plugin.runAsync(() -> {
+                    final String url = plugin.createDump(user);
+                    plugin.getLocales().getLocale("system_dump_ready").ifPresent(user::sendMessage);
+                    user.sendMessage(Component.text(url).clickEvent(ClickEvent.openUrl(url))
+                            .decorate(TextDecoration.UNDERLINED).color(NamedTextColor.GRAY));
+                });
+            }));
+        };
+    }
+
+    @NotNull
+    private CommandProvider reload() {
+        return (sub) -> sub.setDefaultExecutor((ctx) -> {
+            final CommandUser user = user(sub, ctx);
+            try {
+                plugin.loadSettings();
+                plugin.loadLocales();
+                plugin.loadServer();
+                plugin.getLocales().getLocale("reload_complete").ifPresent(user::sendMessage);
+            } catch (Throwable e) {
+                user.sendMessage(new MineDown(
+                        "[Error:](#ff3300) [Failed to reload the plugin. Check console for errors.](#ff7e5e)"
+                ));
+                plugin.log(Level.SEVERE, "Failed to reload the plugin", e);
+            }
+        });
+    }
+
+    @NotNull
+    private CommandProvider update() {
+        return (sub) -> sub.setDefaultExecutor((ctx) -> updateChecker.check().thenAccept(checked -> {
+            final CommandUser user = user(sub, ctx);
+            if (checked.isUpToDate()) {
+                plugin.getLocales().getLocale("up_to_date", plugin.getPluginVersion().toString())
+                        .ifPresent(user::sendMessage);
                 return;
             }
-            switch (args[2]) {
-                case "start" -> migrator.start().thenAccept(succeeded -> {
+            plugin.getLocales().getLocale("update_available", checked.getLatestVersion().toString(),
+                    plugin.getPluginVersion().toString()).ifPresent(user::sendMessage);
+        }));
+    }
+
+    @NotNull
+    private CommandProvider migrate() {
+        return (sub) -> {
+            sub.setCondition((ctx) -> sub.getUser(ctx).isConsole());
+            sub.setDefaultExecutor((ctx) -> {
+                plugin.log(Level.INFO, "Please choose a migrator, then run \"husksync migrate start <migrator>\"");
+                plugin.log(Level.INFO, String.format(
+                        "List of available migrators:\nMigrator ID / Migrator Name:\n%s",
+                        plugin.getAvailableMigrators().stream()
+                                .map(migrator -> String.format("%s - %s", migrator.getIdentifier(), migrator.getName()))
+                                .collect(Collectors.joining("\n"))
+                ));
+            });
+            sub.addSubCommand("help", (help) -> help.addSyntax((cmd) -> {
+                final Migrator migrator = cmd.getArgument("migrator", Migrator.class);
+                plugin.log(Level.INFO, migrator.getHelpMenu());
+            }, migrator()));
+            sub.addSubCommand("start", (start) -> start.addSyntax((cmd) -> {
+                final Migrator migrator = cmd.getArgument("migrator", Migrator.class);
+                migrator.start().thenAccept(succeeded -> {
                     if (succeeded) {
                         plugin.log(Level.INFO, "Migration completed successfully!");
                     } else {
                         plugin.log(Level.WARNING, "Migration failed!");
                     }
                 });
-                case "set" -> migrator.handleConfigurationCommand(Arrays.copyOfRange(args, 3, args.length));
-                default -> plugin.log(Level.INFO, String.format(
-                        "Invalid syntax. Console usage: \"husksync migrate %s <start/set>", args[1]
-                ));
-            }
-        }, () -> {
-            plugin.log(Level.INFO,
-                    "Please specify a valid migrator.\n" +
-                            "If a migrator is not available, please verify that you meet the prerequisites to use it.");
-            this.logMigratorList();
-        });
-    }
-
-    // Log the list of available migrators
-    private void logMigratorList() {
-        plugin.log(Level.INFO, String.format(
-                "List of available migrators:\nMigrator ID / Migrator Name:\n%s",
-                plugin.getAvailableMigrators().stream()
-                        .map(migrator -> String.format("%s - %s", migrator.getIdentifier(), migrator.getName()))
-                        .collect(Collectors.joining("\n"))
-        ));
-    }
-
-    @Nullable
-    @Override
-    public List<String> suggest(@NotNull CommandUser user, @NotNull String[] args) {
-        return switch (args.length) {
-            case 0, 1 -> SUB_COMMANDS.keySet().stream().sorted().toList();
-            default -> null;
+            }, migrator()));
+            sub.addSubCommand("set", (set) -> set.addSyntax((cmd) -> {
+                final Migrator migrator = cmd.getArgument("migrator", Migrator.class);
+                final String[] args = cmd.getArgument("args", String.class).split(" ");
+                migrator.handleConfigurationCommand(args);
+            }, migrator(), BaseCommand.greedyString("args")));
         };
     }
 
+    @NotNull
+    private CommandProvider forceUpgrade() {
+        return (sub) -> {
+            sub.setCondition((ctx) -> sub.getUser(ctx).isConsole());
+            sub.setDefaultExecutor((ctx) -> {
+                final LegacyConverter converter = plugin.getLegacyConverter().orElse(null);
+                if (converter == null) {
+                    return;
+                }
+
+                plugin.runAsync(() -> {
+                    final Database database = plugin.getDatabase();
+                    plugin.log(Level.INFO, "Beginning forced legacy data upgrade for all users...");
+                    database.getAllUsers().forEach(user -> database.getLatestSnapshot(user).ifPresent(snapshot -> {
+                        final DataSnapshot.Packed upgraded = converter.convert(
+                                snapshot.asBytes(plugin),
+                                UUID.randomUUID(),
+                                OffsetDateTime.now()
+                        );
+                        upgraded.setSaveCause(DataSnapshot.SaveCause.CONVERTED_FROM_V2);
+                        plugin.getDatabase().addSnapshot(user, upgraded);
+                        plugin.getRedisManager().clearUserData(user);
+                    }));
+                    plugin.log(Level.INFO, "Legacy data upgrade complete!");
+                });
+            });
+        };
+    }
+
+    @NotNull
+    private <S> ArgumentElement<S, Migrator> migrator() {
+        return new ArgumentElement<>("migrator", reader -> {
+            final String id = reader.readString();
+            final Migrator migrator = plugin.getAvailableMigrators().stream()
+                    .filter(m -> m.getIdentifier().equalsIgnoreCase(id)).findFirst().orElse(null);
+            if (migrator == null) {
+                throw CommandSyntaxException.BUILT_IN_EXCEPTIONS.dispatcherUnknownArgument().createWithContext(reader);
+            }
+            return migrator;
+        }, (context, builder) -> {
+            for (Migrator material : plugin.getAvailableMigrators()) {
+                builder.suggest(material.getIdentifier());
+            }
+            return builder.buildFuture();
+        });
+    }
+
 }

common/src/main/java/net/william278/husksync/command/InventoryCommand.java

@@ -23,18 +23,20 @@ import de.themoep.minedown.adventure.MineDown;
 import net.william278.husksync.HuskSync;
 import net.william278.husksync.data.Data;
 import net.william278.husksync.data.DataSnapshot;
+import net.william278.husksync.redis.RedisManager;
 import net.william278.husksync.user.OnlineUser;
 import net.william278.husksync.user.User;
 import org.jetbrains.annotations.NotNull;
 
 import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
 import java.util.List;
 import java.util.Optional;
 
 public class InventoryCommand extends ItemsCommand {
 
     public InventoryCommand(@NotNull HuskSync plugin) {
-        super(plugin, List.of("inventory", "invsee", "openinv"));
+        super("inventory", List.of("invsee", "openinv"), DataSnapshot.SaveCause.INVENTORY_COMMAND, plugin);
     }
 
     @Override
@@ -48,16 +50,17 @@ public class InventoryCommand extends ItemsCommand {
         }
 
         // Display opening message
-        plugin.getLocales().getLocale("inventory_viewer_opened", user.getUsername(),
-                        snapshot.getTimestamp().format(DateTimeFormatter.ofPattern("dd/MM/yyyy, HH:mm")))
+        plugin.getLocales().getLocale("inventory_viewer_opened", user.getName(),
+                        snapshot.getTimestamp().format(DateTimeFormatter
+                                .ofLocalizedDateTime(FormatStyle.MEDIUM, FormatStyle.SHORT)))
                 .ifPresent(viewer::sendMessage);
 
         // Show GUI
         final Data.Items.Inventory inventory = optionalInventory.get();
         viewer.showGui(
                 inventory,
-                plugin.getLocales().getLocale("inventory_viewer_menu_title", user.getUsername())
-                        .orElse(new MineDown(String.format("%s's Inventory", user.getUsername()))),
+                plugin.getLocales().getLocale("inventory_viewer_menu_title", user.getName())
+                        .orElse(new MineDown(String.format("%s's Inventory", user.getName()))),
                 allowEdit,
                 inventory.getSlotCount(),
                 (itemsOnClose) -> {
@@ -70,8 +73,8 @@ public class InventoryCommand extends ItemsCommand {
 
     // Creates a new snapshot with the updated inventory
     @SuppressWarnings("DuplicatedCode")
-    private void updateItems(@NotNull OnlineUser viewer, @NotNull Data.Items.Items items, @NotNull User user) {
-        final Optional<DataSnapshot.Packed> latestData = plugin.getDatabase().getLatestSnapshot(user);
+    private void updateItems(@NotNull OnlineUser viewer, @NotNull Data.Items.Items items, @NotNull User holder) {
+        final Optional<DataSnapshot.Packed> latestData = plugin.getDatabase().getLatestSnapshot(holder);
         if (latestData.isEmpty()) {
             plugin.getLocales().getLocale("error_no_data_to_display")
                     .ifPresent(viewer::sendMessage);
@@ -80,13 +83,19 @@ public class InventoryCommand extends ItemsCommand {
 
         // Create and pack the snapshot with the updated inventory
         final DataSnapshot.Packed snapshot = latestData.get().copy();
+        boolean pin = plugin.getSettings().getSynchronization().doAutoPin(saveCause);
         snapshot.edit(plugin, (data) -> {
-            data.setSaveCause(DataSnapshot.SaveCause.INVENTORY_COMMAND);
-            data.setPinned(plugin.getSettings().doAutoPin(DataSnapshot.SaveCause.INVENTORY_COMMAND));
             data.getInventory().ifPresent(inventory -> inventory.setContents(items));
+            data.setSaveCause(saveCause);
+            data.setPinned(pin);
+        });
+
+        // Save data
+        final RedisManager redis = plugin.getRedisManager();
+        plugin.getDataSyncer().saveData(holder, snapshot, (user, data) -> {
+            redis.getUserData(user).ifPresent(d -> redis.setUserData(user, snapshot));
+            redis.sendUserDataUpdate(user, data);
         });
-        plugin.getDatabase().addSnapshot(user, snapshot);
-        plugin.getRedisManager().sendUserDataUpdate(user, snapshot);
     }
 
 }

common/src/main/java/net/william278/husksync/command/ItemsCommand.java

@@ -24,85 +24,94 @@ import net.william278.husksync.data.DataSnapshot;
 import net.william278.husksync.user.CommandUser;
 import net.william278.husksync.user.OnlineUser;
 import net.william278.husksync.user.User;
+import net.william278.uniform.BaseCommand;
+import net.william278.uniform.Permission;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 
-public abstract class ItemsCommand extends Command implements TabProvider {
+public abstract class ItemsCommand extends PluginCommand {
 
-    protected ItemsCommand(@NotNull HuskSync plugin, @NotNull List<String> aliases) {
-        super(aliases.get(0), aliases.subList(1, aliases.size()), "<player> [version_uuid]", plugin);
-        setOperatorCommand(true);
-        addAdditionalPermissions(Map.of("edit", true));
+    protected final DataSnapshot.SaveCause saveCause;
+
+    protected ItemsCommand(@NotNull String name, @NotNull List<String> aliases,
+                           @NotNull DataSnapshot.SaveCause saveCause, @NotNull HuskSync plugin) {
+        super(name, aliases, Permission.Default.IF_OP, ExecutionScope.IN_GAME, plugin);
+        this.saveCause = saveCause;
     }
 
-
     @Override
-    public void execute(@NotNull CommandUser executor, @NotNull String[] args) {
-        if (!(executor instanceof OnlineUser player)) {
-            plugin.getLocales().getLocale("error_in_game_command_only")
-                    .ifPresent(executor::sendMessage);
-            return;
-        }
-
-        // Find the user to view the items for
-        final Optional<User> optionalUser = parseStringArg(args, 0)
-                .flatMap(name -> plugin.getDatabase().getUserByName(name));
-        if (optionalUser.isEmpty()) {
-            plugin.getLocales().getLocale(
-                    args.length >= 1 ? "error_invalid_player" : "error_invalid_syntax", getUsage()
-            ).ifPresent(player::sendMessage);
-            return;
-        }
-
-        // Show the user data
-        final User user = optionalUser.get();
-        parseUUIDArg(args, 1).ifPresentOrElse(
-                version -> this.showSnapshotItems(player, user, version),
-                () -> this.showLatestItems(player, user)
-        );
+    public void provide(@NotNull BaseCommand<?> command) {
+        command.addSyntax((ctx) -> {
+            final User user = ctx.getArgument("username", User.class);
+            final UUID version = ctx.getArgument("version", UUID.class);
+            final CommandUser executor = user(command, ctx);
+            if (!(executor instanceof OnlineUser online)) {
+                plugin.getLocales().getLocale("error_in_game_command_only")
+                        .ifPresent(executor::sendMessage);
+                return;
+            }
+            this.showSnapshotItems(online, user, version);
+        }, user("username"), versionUuid());
+        command.addSyntax((ctx) -> {
+            final User user = ctx.getArgument("username", User.class);
+            final CommandUser executor = user(command, ctx);
+            if (!(executor instanceof OnlineUser online)) {
+                plugin.getLocales().getLocale("error_in_game_command_only")
+                        .ifPresent(executor::sendMessage);
+                return;
+            }
+            this.showLatestItems(online, user);
+        }, user("username"));
     }
 
     // View (and edit) the latest user data
     private void showLatestItems(@NotNull OnlineUser viewer, @NotNull User user) {
-        plugin.getRedisManager().getUserData(user.getUuid(), user).thenAccept(data -> data
+        plugin.getRedisManager().getOnlineUserData(user.getUuid(), user, saveCause).thenAccept(d -> d
                 .or(() -> plugin.getDatabase().getLatestSnapshot(user))
-                .ifPresentOrElse(
-                        snapshot -> this.showItems(
-                                viewer, snapshot.unpack(plugin), user,
-                                viewer.hasPermission(getPermission("edit"))
-                        ),
-                        () -> plugin.getLocales().getLocale("error_no_data_to_display")
-                                .ifPresent(viewer::sendMessage)
-                ));
+                .or(() -> {
+                    plugin.getLocales().getLocale("error_no_data_to_display")
+                            .ifPresent(viewer::sendMessage);
+                    return Optional.empty();
+                })
+                .flatMap(packed -> {
+                    if (packed.isInvalid()) {
+                        plugin.getLocales().getLocale("error_invalid_data", packed.getInvalidReason(plugin))
+                                .ifPresent(viewer::sendMessage);
+                        return Optional.empty();
+                    }
+                    return Optional.of(packed.unpack(plugin));
+                })
+                .ifPresent(snapshot -> this.showItems(
+                        viewer, snapshot, user, viewer.hasPermission(getPermission("edit"))
+                )));
     }
 
     // View a specific version of the user data
     private void showSnapshotItems(@NotNull OnlineUser viewer, @NotNull User user, @NotNull UUID version) {
         plugin.getDatabase().getSnapshot(user, version)
-                .ifPresentOrElse(
-                        snapshot -> this.showItems(
-                                viewer, snapshot.unpack(plugin), user, false
-                        ),
-                        () -> plugin.getLocales().getLocale("error_invalid_version_uuid")
-                                .ifPresent(viewer::sendMessage)
-                );
+                .or(() -> {
+                    plugin.getLocales().getLocale("error_invalid_version_uuid")
+                            .ifPresent(viewer::sendMessage);
+                    return Optional.empty();
+                })
+                .flatMap(packed -> {
+                    if (packed.isInvalid()) {
+                        plugin.getLocales().getLocale("error_invalid_data", packed.getInvalidReason(plugin))
+                                .ifPresent(viewer::sendMessage);
+                        return Optional.empty();
+                    }
+                    return Optional.of(packed.unpack(plugin));
+                })
+                .ifPresent(snapshot -> this.showItems(
+                        viewer, snapshot, user, false
+                ));
     }
 
     // Show a GUI menu with the correct item data from the snapshot
     protected abstract void showItems(@NotNull OnlineUser viewer, @NotNull DataSnapshot.Unpacked snapshot,
                                       @NotNull User user, boolean allowEdit);
 
-    @Nullable
-    @Override
-    public List<String> suggest(@NotNull CommandUser executor, @NotNull String[] args) {
-        return switch (args.length) {
-            case 0, 1 -> plugin.getOnlineUsers().stream().map(User::getUsername).toList();
-            default -> null;
-        };
-    }
 }

common/src/main/java/net/william278/husksync/command/Node.java

@@ -1,105 +0,0 @@
-/*
- * This file is part of HuskSync, licensed under the Apache License 2.0.
- *
- *  Copyright (c) William278 <will27528@gmail.com>
- *  Copyright (c) contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package net.william278.husksync.command;
-
-import net.william278.husksync.HuskSync;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.StringJoiner;
-import java.util.UUID;
-
-public abstract class Node implements Executable {
-
-    protected static final String PERMISSION_PREFIX = "husksync.command";
-
-    protected final HuskSync plugin;
-    private final String name;
-    private final List<String> aliases;
-    private boolean operatorCommand = false;
-
-    protected Node(@NotNull String name, @NotNull List<String> aliases, @NotNull HuskSync plugin) {
-        if (name.isBlank()) {
-            throw new IllegalArgumentException("Command name cannot be blank");
-        }
-        this.name = name;
-        this.aliases = aliases;
-        this.plugin = plugin;
-    }
-
-    @NotNull
-    public String getName() {
-        return name;
-    }
-
-    @NotNull
-    public List<String> getAliases() {
-        return aliases;
-    }
-
-    @NotNull
-    public String getPermission(@NotNull String... child) {
-        final StringJoiner joiner = new StringJoiner(".")
-                .add(PERMISSION_PREFIX)
-                .add(getName());
-        for (final String node : child) {
-            joiner.add(node);
-        }
-        return joiner.toString().trim();
-    }
-
-    public boolean isOperatorCommand() {
-        return operatorCommand;
-    }
-
-    public void setOperatorCommand(boolean operatorCommand) {
-        this.operatorCommand = operatorCommand;
-    }
-
-    protected Optional<String> parseStringArg(@NotNull String[] args, int index) {
-        if (args.length > index) {
-            return Optional.of(args[index]);
-        }
-        return Optional.empty();
-    }
-
-    protected Optional<Integer> parseIntArg(@NotNull String[] args, int index) {
-        return parseStringArg(args, index).flatMap(arg -> {
-            try {
-                return Optional.of(Integer.parseInt(arg));
-            } catch (NumberFormatException e) {
-                return Optional.empty();
-            }
-        });
-    }
-
-    protected Optional<UUID> parseUUIDArg(@NotNull String[] args, int index) {
-        return parseStringArg(args, index).flatMap(arg -> {
-            try {
-                return Optional.of(UUID.fromString(arg));
-            } catch (IllegalArgumentException e) {
-                return Optional.empty();
-            }
-        });
-    }
-
-
-}

common/src/main/java/net/william278/husksync/command/PluginCommand.java

@@ -0,0 +1,154 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync.command;
+
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import net.william278.husksync.HuskSync;
+import net.william278.husksync.user.CommandUser;
+import net.william278.husksync.user.OnlineUser;
+import net.william278.husksync.user.User;
+import net.william278.uniform.BaseCommand;
+import net.william278.uniform.Command;
+import net.william278.uniform.Permission;
+import net.william278.uniform.element.ArgumentElement;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.UUID;
+import java.util.function.Function;
+
+public abstract class PluginCommand extends Command {
+
+    protected final HuskSync plugin;
+
+    protected PluginCommand(@NotNull String name, @NotNull List<String> aliases, @NotNull Permission.Default defPerm,
+                            @NotNull ExecutionScope scope, @NotNull HuskSync plugin) {
+        super(name, aliases, getDescription(plugin, name), new Permission(createPermission(name), defPerm), scope);
+        this.plugin = plugin;
+    }
+
+    private static String getDescription(@NotNull HuskSync plugin, @NotNull String name) {
+        return plugin.getLocales().getRawLocale("%s_command_description".formatted(name)).orElse("");
+    }
+
+    @NotNull
+    private static String createPermission(@NotNull String name, @NotNull String... sub) {
+        return "husksync.command." + name + (sub.length > 0 ? "." + String.join(".", sub) : "");
+    }
+
+    @NotNull
+    protected String getPermission(@NotNull String... sub) {
+        return createPermission(this.getName(), sub);
+    }
+
+    @NotNull
+    @SuppressWarnings("rawtypes")
+    protected CommandUser user(@NotNull BaseCommand base, @NotNull CommandContext context) {
+        return adapt(base.getUser(context.getSource()));
+    }
+
+    @NotNull
+    protected Permission needsOp(@NotNull String... nodes) {
+        return new Permission(getPermission(nodes), Permission.Default.IF_OP);
+    }
+
+    @NotNull
+    protected CommandUser adapt(net.william278.uniform.CommandUser user) {
+        return user.getUuid() == null ? plugin.getConsole() : plugin.getOnlineUser(user.getUuid()).orElseThrow();
+    }
+
+    @NotNull
+    @SuppressWarnings("SameParameterValue")
+    protected <S> ArgumentElement<S, OnlineUser> onlineUser(@NotNull String name) {
+        return new ArgumentElement<>(name, reader -> {
+            final String username = reader.readString();
+            return plugin.getOnlineUsers().stream()
+                    .filter(user -> username.equals(user.getName()))
+                    .findFirst().orElse(null);
+        }, (context, builder) -> {
+            plugin.getOnlineUsers().forEach(u -> builder.suggest(u.getName()));
+            return builder.buildFuture();
+        });
+    }
+
+    @NotNull
+    protected <S> ArgumentElement<S, User> user(@NotNull String name) {
+        return new ArgumentElement<>(name, reader -> {
+            final String username = reader.readString();
+            return plugin.getDatabase().getUserByName(username).orElseThrow(
+                    () -> CommandSyntaxException.BUILT_IN_EXCEPTIONS.dispatcherUnknownArgument().createWithContext(reader)
+            );
+        }, (context, builder) -> {
+            plugin.getOnlineUsers().forEach(u -> builder.suggest(u.getName()));
+            return builder.buildFuture();
+        });
+    }
+
+    @NotNull
+    protected  <S> ArgumentElement<S, UUID> versionUuid() {
+        return new ArgumentElement<>("version", reader -> {
+            try {
+                return UUID.fromString(reader.readString());
+            } catch (IllegalArgumentException e) {
+                throw CommandSyntaxException.BUILT_IN_EXCEPTIONS.dispatcherUnknownArgument().createWithContext(reader);
+            }
+        }, (context, builder) -> {
+            try {
+                plugin.getDatabase().getAllSnapshots(context.getArgument("username", User.class))
+                        .stream().sorted(Comparator.comparing(d -> d.getTimestamp().toEpochSecond()))
+                        .forEach(id -> builder.suggest(id.getId().toString()));
+                return builder.buildFuture();
+            } catch (IllegalArgumentException e) {
+                return builder.buildFuture();
+            }
+        });
+    }
+
+    public enum Type {
+
+        HUSKSYNC_COMMAND(HuskSyncCommand::new),
+        USERDATA_COMMAND(UserDataCommand::new),
+        INVENTORY_COMMAND(InventoryCommand::new),
+        ENDER_CHEST_COMMAND(EnderChestCommand::new);
+
+        public final Function<HuskSync, PluginCommand> commandSupplier;
+
+        Type(@NotNull Function<HuskSync, PluginCommand> supplier) {
+            this.commandSupplier = supplier;
+        }
+
+        @NotNull
+        public PluginCommand supply(@NotNull HuskSync plugin) {
+            return commandSupplier.apply(plugin);
+        }
+
+        @NotNull
+        public static PluginCommand[] create(@NotNull HuskSync plugin) {
+            return Arrays.stream(values()).map(type -> type.supply(plugin))
+                    .filter(command -> !plugin.getSettings().isCommandDisabled(command))
+                    .toArray(PluginCommand[]::new);
+        }
+
+    }
+
+}

common/src/main/java/net/william278/husksync/command/TabProvider.java

@@ -1,50 +0,0 @@
-/*
- * This file is part of HuskSync, licensed under the Apache License 2.0.
- *
- *  Copyright (c) William278 <will27528@gmail.com>
- *  Copyright (c) contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package net.william278.husksync.command;
-
-import net.william278.husksync.user.CommandUser;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-
-public interface TabProvider {
-
-    @Nullable
-    List<String> suggest(@NotNull CommandUser user, @NotNull String[] args);
-
-    @NotNull
-    default List<String> getSuggestions(@NotNull CommandUser user, @NotNull String[] args) {
-        List<String> suggestions = suggest(user, args);
-        if (suggestions == null) {
-            suggestions = List.of();
-        }
-        return filter(suggestions, args);
-    }
-
-    @NotNull
-    default List<String> filter(@NotNull List<String> suggestions, @NotNull String[] args) {
-        return suggestions.stream()
-                .filter(suggestion -> args.length == 0 || suggestion.toLowerCase()
-                        .startsWith(args[args.length - 1].toLowerCase().trim()))
-                .toList();
-    }
-
-}

common/src/main/java/net/william278/husksync/command/UserDataCommand.java

@@ -19,217 +19,309 @@
 
 package net.william278.husksync.command;
 
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.event.ClickEvent;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.TextDecoration;
 import net.william278.husksync.HuskSync;
 import net.william278.husksync.data.DataSnapshot;
+import net.william278.husksync.redis.RedisManager;
 import net.william278.husksync.user.CommandUser;
+import net.william278.husksync.user.OnlineUser;
 import net.william278.husksync.user.User;
-import net.william278.husksync.util.DataDumper;
 import net.william278.husksync.util.DataSnapshotList;
 import net.william278.husksync.util.DataSnapshotOverview;
+import net.william278.husksync.util.UserDataDumper;
+import net.william278.uniform.BaseCommand;
+import net.william278.uniform.CommandProvider;
+import net.william278.uniform.Permission;
+import net.william278.uniform.element.ArgumentElement;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.UUID;
 import java.util.logging.Level;
 
-public class UserDataCommand extends Command implements TabProvider {
-
-    private static final Map<String, Boolean> SUB_COMMANDS = Map.of(
-            "view", false,
-            "list", false,
-            "delete", true,
-            "restore", true,
-            "pin", true,
-            "dump", true
-    );
+public class UserDataCommand extends PluginCommand {
 
     public UserDataCommand(@NotNull HuskSync plugin) {
-        super("userdata", List.of("playerdata"), String.format(
-                "<%s> [username] [version_uuid]", String.join("/", SUB_COMMANDS.keySet())
-        ), plugin);
-        setOperatorCommand(true);
-        addAdditionalPermissions(SUB_COMMANDS);
+        super("userdata", List.of("playerdata"), Permission.Default.IF_OP, ExecutionScope.ALL, plugin);
     }
 
     @Override
-    public void execute(@NotNull CommandUser executor, @NotNull String[] args) {
-        final String subCommand = parseStringArg(args, 0).orElse("view").toLowerCase(Locale.ENGLISH);
-        final Optional<User> optionalUser = parseStringArg(args, 1)
-                .flatMap(name -> plugin.getDatabase().getUserByName(name))
-                .or(() -> parseStringArg(args, 0).flatMap(name -> plugin.getDatabase().getUserByName(name)))
-                .or(() -> args.length < 2 && executor instanceof User userExecutor
-                        ? Optional.of(userExecutor) : Optional.empty());
-        final Optional<UUID> optionalUuid = parseUUIDArg(args, 2).or(() -> parseUUIDArg(args, 1));
-        if (optionalUser.isEmpty()) {
-            plugin.getLocales().getLocale("error_invalid_player")
+    public void provide(@NotNull BaseCommand<?> command) {
+        command.addSubCommand("view", needsOp("view"), view());
+        command.addSubCommand("list", needsOp("list"), list());
+        command.addSubCommand("delete", needsOp("delete"), delete());
+        command.addSubCommand("save", needsOp("save"), save());
+        command.addSubCommand("restore", needsOp("restore"), restore());
+        command.addSubCommand("pin", needsOp("pin"), pin());
+        command.addSubCommand("dump", needsOp("dump"), dump());
+    }
+
+    // Show the latest snapshot
+    private void viewLatestSnapshot(@NotNull CommandUser executor, @NotNull User user) {
+        plugin.getDatabase().getLatestSnapshot(user).ifPresentOrElse(
+                data -> {
+                    if (data.isInvalid()) {
+                        plugin.getLocales().getLocale("error_invalid_data", data.getInvalidReason(plugin))
+                                .ifPresent(executor::sendMessage);
+                        return;
+                    }
+                    DataSnapshotOverview.of(data.unpack(plugin), data.getFileSize(plugin), user, plugin)
+                            .show(executor);
+                },
+                () -> plugin.getLocales().getLocale("error_no_data_to_display")
+                        .ifPresent(executor::sendMessage)
+        );
+    }
+
+    // Show the specified snapshot
+    private void viewSnapshot(@NotNull CommandUser executor, @NotNull User user, @NotNull UUID version) {
+        plugin.getDatabase().getSnapshot(user, version).ifPresentOrElse(
+                data -> {
+                    if (data.isInvalid()) {
+                        plugin.getLocales().getLocale("error_invalid_data", data.getInvalidReason(plugin))
+                                .ifPresent(executor::sendMessage);
+                        return;
+                    }
+                    DataSnapshotOverview.of(data.unpack(plugin), data.getFileSize(plugin), user, plugin)
+                            .show(executor);
+                },
+                () -> plugin.getLocales().getLocale("error_invalid_version_uuid")
+                        .ifPresent(executor::sendMessage)
+        );
+    }
+
+    // View a list of snapshots
+    private void listSnapshots(@NotNull CommandUser executor, @NotNull User user, int page) {
+        final List<DataSnapshot.Packed> dataList = plugin.getDatabase().getAllSnapshots(user);
+        if (dataList.isEmpty()) {
+            plugin.getLocales().getLocale("error_no_data_to_display")
+                    .ifPresent(executor::sendMessage);
+            return;
+        }
+        DataSnapshotList.create(dataList, user, plugin).displayPage(executor, page);
+    }
+
+    // Create and save a snapshot of a user's current data
+    private void createAndSaveSnapshot(@NotNull CommandUser executor, @NotNull OnlineUser onlineUser) {
+        plugin.getDataSyncer().saveCurrentUserData(onlineUser, DataSnapshot.SaveCause.SAVE_COMMAND);
+        plugin.getLocales().getLocale("data_saved", onlineUser.getName())
+                .ifPresent(executor::sendMessage);
+    }
+
+    // Delete a snapshot
+    private void deleteSnapshot(@NotNull CommandUser executor, @NotNull User user, @NotNull UUID version) {
+        if (!plugin.getDatabase().deleteSnapshot(user, version)) {
+            plugin.getLocales().getLocale("error_invalid_version_uuid")
+                    .ifPresent(executor::sendMessage);
+            return;
+        }
+        plugin.getRedisManager().clearUserData(user);
+        plugin.getLocales().getLocale("data_deleted",
+                        version.toString().split("-")[0],
+                        version.toString(),
+                        user.getName(),
+                        user.getUuid().toString())
+                .ifPresent(executor::sendMessage);
+    }
+
+    // Restore a snapshot
+    private void restoreSnapshot(@NotNull CommandUser executor, @NotNull User user, @NotNull UUID version) {
+        final Optional<DataSnapshot.Packed> optionalData = plugin.getDatabase().getSnapshot(user, version);
+        if (optionalData.isEmpty()) {
+            plugin.getLocales().getLocale("error_invalid_version_uuid")
                     .ifPresent(executor::sendMessage);
             return;
         }
 
-        final User user = optionalUser.get();
-        switch (subCommand) {
-            case "view" -> optionalUuid.ifPresentOrElse(
-                    // Show the specified snapshot
-                    version -> plugin.getDatabase().getSnapshot(user, version).ifPresentOrElse(
-                            data -> DataSnapshotOverview.of(
-                                    data.unpack(plugin), data.getFileSize(plugin), user, plugin
-                            ).show(executor),
-                            () -> plugin.getLocales().getLocale("error_invalid_version_uuid")
-                                    .ifPresent(executor::sendMessage)),
-
-                    // Show the latest snapshot
-                    () -> plugin.getDatabase().getLatestSnapshot(user).ifPresentOrElse(
-                            data -> DataSnapshotOverview.of(
-                                    data.unpack(plugin), data.getFileSize(plugin), user, plugin
-                            ).show(executor),
-                            () -> plugin.getLocales().getLocale("error_no_data_to_display")
-                                    .ifPresent(executor::sendMessage))
-            );
-
-            case "list" -> {
-                // Check if there is data to display
-                final List<DataSnapshot.Packed> dataList = plugin.getDatabase().getAllSnapshots(user);
-                if (dataList.isEmpty()) {
-                    plugin.getLocales().getLocale("error_no_data_to_display")
-                            .ifPresent(executor::sendMessage);
-                    return;
-                }
-
-                // Show the list to the player
-                DataSnapshotList.create(dataList, user, plugin).displayPage(
-                        executor,
-                        parseIntArg(args, 2).or(() -> parseIntArg(args, 1)).orElse(1)
-                );
-            }
-
-            case "delete" -> {
-                if (optionalUuid.isEmpty()) {
-                    plugin.getLocales().getLocale("error_invalid_syntax",
-                                    "/userdata delete <username> <version_uuid>")
-                            .ifPresent(executor::sendMessage);
-                    return;
-                }
-
-                // Delete user data by specified UUID
-                final UUID version = optionalUuid.get();
-                if (!plugin.getDatabase().deleteSnapshot(user, version)) {
-                    plugin.getLocales().getLocale("error_invalid_version_uuid")
-                            .ifPresent(executor::sendMessage);
-                    return;
-                }
-
-                plugin.getLocales().getLocale("data_deleted",
-                                version.toString().split("-")[0],
-                                version.toString(),
-                                user.getUsername(),
-                                user.getUuid().toString())
-                        .ifPresent(executor::sendMessage);
-            }
-
-            case "restore" -> {
-                if (optionalUuid.isEmpty()) {
-                    plugin.getLocales().getLocale("error_invalid_syntax",
-                                    "/userdata restore <username> <version_uuid>")
-                            .ifPresent(executor::sendMessage);
-                    return;
-                }
-
-                // Restore user data by specified UUID
-                final Optional<DataSnapshot.Packed> optionalData = plugin.getDatabase().getSnapshot(user, optionalUuid.get());
-                if (optionalData.isEmpty()) {
-                    plugin.getLocales().getLocale("error_invalid_version_uuid")
-                            .ifPresent(executor::sendMessage);
-                    return;
-                }
-
-                // Restore users with a minimum of one health (prevent restoring players with <=0 health)
-                final DataSnapshot.Packed data = optionalData.get().copy();
-                data.edit(plugin, (unpacked -> {
-                    unpacked.getHealth().ifPresent(status -> status.setHealth(Math.max(1, status.getHealth())));
-                    unpacked.setSaveCause(DataSnapshot.SaveCause.BACKUP_RESTORE);
-                    unpacked.setPinned(plugin.getSettings().doAutoPin(DataSnapshot.SaveCause.BACKUP_RESTORE));
-                }));
-
-                // Set the user's data and send a message
-                plugin.getDatabase().addSnapshot(user, data);
-                plugin.getRedisManager().sendUserDataUpdate(user, data);
-                plugin.getLocales().getLocale("data_restored", user.getUsername(), user.getUuid().toString(),
-                        data.getShortId(), data.getId().toString()).ifPresent(executor::sendMessage);
-            }
-
-            case "pin" -> {
-                if (optionalUuid.isEmpty()) {
-                    plugin.getLocales().getLocale("error_invalid_syntax",
-                                    "/userdata pin <username> <version_uuid>")
-                            .ifPresent(executor::sendMessage);
-                    return;
-                }
-
-                // Check that the data exists
-                final Optional<DataSnapshot.Packed> optionalData = plugin.getDatabase().getSnapshot(user, optionalUuid.get());
-                if (optionalData.isEmpty()) {
-                    plugin.getLocales().getLocale("error_invalid_version_uuid")
-                            .ifPresent(executor::sendMessage);
-                    return;
-                }
-
-                // Pin or unpin the data
-                final DataSnapshot.Packed data = optionalData.get();
-                if (data.isPinned()) {
-                    plugin.getDatabase().unpinSnapshot(user, data.getId());
-                } else {
-                    plugin.getDatabase().pinSnapshot(user, data.getId());
-                }
-                plugin.getLocales().getLocale(data.isPinned() ? "data_unpinned" : "data_pinned", data.getShortId(),
-                                data.getId().toString(), user.getUsername(), user.getUuid().toString())
-                        .ifPresent(executor::sendMessage);
-            }
-
-            case "dump" -> {
-                if (optionalUuid.isEmpty()) {
-                    plugin.getLocales().getLocale("error_invalid_syntax",
-                                    "/userdata dump <username> <version_uuid>")
-                            .ifPresent(executor::sendMessage);
-                    return;
-                }
-
-                // Determine dump type
-                final boolean webDump = parseStringArg(args, 3)
-                        .map(arg -> arg.equalsIgnoreCase("web"))
-                        .orElse(false);
-                final Optional<DataSnapshot.Packed> data = plugin.getDatabase().getSnapshot(user, optionalUuid.get());
-                if (data.isEmpty()) {
-                    plugin.getLocales().getLocale("error_invalid_version_uuid")
-                            .ifPresent(executor::sendMessage);
-                    return;
-                }
-
-                // Dump the data
-                final DataSnapshot.Packed userData = data.get();
-                final DataDumper dumper = DataDumper.create(userData, user, plugin);
-                try {
-                    plugin.getLocales().getLocale("data_dumped", userData.getShortId(), user.getUsername(),
-                            (webDump ? dumper.toWeb() : dumper.toFile())).ifPresent(executor::sendMessage);
-                } catch (Throwable e) {
-                    plugin.log(Level.SEVERE, "Failed to dump user data", e);
-                }
-            }
-
-            default -> plugin.getLocales().getLocale("error_invalid_syntax", getUsage())
+        // Restore users with a minimum of one health (prevent restoring players with <= 0 health)
+        final DataSnapshot.Packed data = optionalData.get().copy();
+        if (data.isInvalid()) {
+            plugin.getLocales().getLocale("error_invalid_data", data.getInvalidReason(plugin))
                     .ifPresent(executor::sendMessage);
+            return;
+        }
+        data.edit(plugin, (unpacked -> {
+            unpacked.getHealth().ifPresent(status -> status.setHealth(Math.max(1, status.getHealth())));
+            unpacked.setSaveCause(DataSnapshot.SaveCause.BACKUP_RESTORE);
+            unpacked.setPinned(
+                    plugin.getSettings().getSynchronization().doAutoPin(DataSnapshot.SaveCause.BACKUP_RESTORE)
+            );
+        }));
+
+        // Save data
+        final RedisManager redis = plugin.getRedisManager();
+        plugin.getDataSyncer().saveData(user, data, (u, s) -> {
+            redis.getUserData(u).ifPresent(d -> redis.setUserData(u, s));
+            redis.sendUserDataUpdate(u, s);
+            plugin.getLocales().getLocale("data_restored", u.getName(), u.getUuid().toString(),
+                    s.getShortId(), s.getId().toString()).ifPresent(executor::sendMessage);
+        });
+    }
+
+    // Pin a snapshot
+    private void pinSnapshot(@NotNull CommandUser executor, @NotNull User user, @NotNull UUID version) {
+        final Optional<DataSnapshot.Packed> optionalData = plugin.getDatabase().getSnapshot(user, version);
+        if (optionalData.isEmpty()) {
+            plugin.getLocales().getLocale("error_invalid_version_uuid")
+                    .ifPresent(executor::sendMessage);
+            return;
+        }
+
+        // Pin or unpin the data
+        final DataSnapshot.Packed data = optionalData.get();
+        if (data.isPinned()) {
+            plugin.getDatabase().unpinSnapshot(user, data.getId());
+        } else {
+            plugin.getDatabase().pinSnapshot(user, data.getId());
+        }
+        plugin.getLocales().getLocale(data.isPinned() ? "data_unpinned" : "data_pinned", data.getShortId(),
+                        data.getId().toString(), user.getName(), user.getUuid().toString())
+                .ifPresent(executor::sendMessage);
+    }
+
+    // Lookup a snapshot by UUID and dump
+    private void dumpSnapshot(@NotNull CommandUser executor, @NotNull User user, @NotNull UUID version,
+                              @NotNull DumpType type) {
+        final Optional<DataSnapshot.Packed> data = plugin.getDatabase().getSnapshot(user, version);
+        if (data.isEmpty()) {
+            plugin.getLocales().getLocale("error_invalid_version_uuid")
+                    .ifPresent(executor::sendMessage);
+            return;
+        }
+        this.dumpSnapshot(executor, user, data.get(), type);
+    }
+
+    // Dump a snapshot
+    private void dumpSnapshot(@NotNull CommandUser executor, @NotNull User user,
+                              @NotNull DataSnapshot.Packed userData, @NotNull DumpType type) {
+        final UserDataDumper dumper = UserDataDumper.create(userData, user, plugin);
+        try {
+            final String url = type == DumpType.WEB ? dumper.toWeb() : dumper.toFile();
+            plugin.getLocales().getLocale("data_dumped", userData.getShortId(), user.getName())
+                    .ifPresent(executor::sendMessage);
+            executor.sendMessage(Component.text(url)
+                    .clickEvent(type == DumpType.WEB ? ClickEvent.openUrl(url) : ClickEvent.copyToClipboard(url))
+                    .decorate(TextDecoration.UNDERLINED).color(NamedTextColor.GRAY));
+        } catch (Throwable e) {
+            plugin.log(Level.SEVERE, "Failed to dump user data", e);
         }
     }
 
-    @Nullable
-    @Override
-    public List<String> suggest(@NotNull CommandUser executor, @NotNull String[] args) {
-        return switch (args.length) {
-            case 0, 1 -> SUB_COMMANDS.keySet().stream().sorted().toList();
-            case 2 -> plugin.getOnlineUsers().stream().map(User::getUsername).toList();
-            case 4 -> parseStringArg(args, 0)
-                    .map(arg -> arg.equalsIgnoreCase("dump") ? List.of("web", "file") : null)
-                    .orElse(null);
-            default -> null;
+    @NotNull
+    private CommandProvider view() {
+        return (sub) -> {
+            sub.addSyntax((ctx) -> {
+                final User user = ctx.getArgument("username", User.class);
+                final UUID version = ctx.getArgument("version", UUID.class);
+                viewSnapshot(user(sub, ctx), user, version);
+            }, user("username"), versionUuid());
+            sub.addSyntax((ctx) -> {
+                final User user = ctx.getArgument("username", User.class);
+                viewLatestSnapshot(user(sub, ctx), user);
+            }, user("username"));
         };
     }
+
+    @NotNull
+    private CommandProvider list() {
+        return (sub) -> {
+            sub.addSyntax((ctx) -> {
+                final User user = ctx.getArgument("username", User.class);
+                listSnapshots(user(sub, ctx), user, 1);
+            }, user("username"));
+            sub.addSyntax((ctx) -> {
+                final User user = ctx.getArgument("username", User.class);
+                final int page = ctx.getArgument("page", Integer.class);
+                listSnapshots(user(sub, ctx), user, page);
+            }, user("username"), BaseCommand.intNum("page", 1));
+        };
+    }
+
+    @NotNull
+    private CommandProvider delete() {
+        return (sub) -> sub.addSyntax((ctx) -> {
+            final User user = ctx.getArgument("username", User.class);
+            final UUID version = ctx.getArgument("version", UUID.class);
+            deleteSnapshot(user(sub, ctx), user, version);
+        }, user("username"), versionUuid());
+    }
+
+    @NotNull
+    private CommandProvider save() {
+        return (sub) -> sub.addSyntax((ctx) -> {
+            final OnlineUser user = ctx.getArgument("username", OnlineUser.class);
+            createAndSaveSnapshot(user(sub, ctx), user);
+        }, onlineUser("username"));
+    }
+
+    @NotNull
+    private CommandProvider restore() {
+        return (sub) -> sub.addSyntax((ctx) -> {
+            final User user = ctx.getArgument("username", User.class);
+            final UUID version = ctx.getArgument("version", UUID.class);
+            restoreSnapshot(user(sub, ctx), user, version);
+        }, user("username"), versionUuid());
+    }
+
+    @NotNull
+    private CommandProvider pin() {
+        return (sub) -> sub.addSyntax((ctx) -> {
+            final User user = ctx.getArgument("username", User.class);
+            final UUID version = ctx.getArgument("version", UUID.class);
+            pinSnapshot(user(sub, ctx), user, version);
+        }, user("username"), versionUuid());
+    }
+
+    @NotNull
+    private CommandProvider dump() {
+        return (sub) -> {
+            sub.addSyntax((ctx) -> {
+                final User user = ctx.getArgument("username", User.class);
+                final CommandUser executor = user(sub, ctx);
+                plugin.getRedisManager()
+                        .getOnlineUserData(UUID.randomUUID(), user, DataSnapshot.SaveCause.DUMP_COMMAND)
+                        .thenAccept((data) -> data
+                                .or(() -> plugin.getDatabase().getLatestSnapshot(user))
+                                .ifPresentOrElse(
+                                        (s) -> dumpSnapshot(executor, user, s, DumpType.WEB),
+                                        () -> plugin.getLocales().getLocale("error_no_data_to_display")
+                                                .ifPresent(executor::sendMessage)
+                                ));
+            }, user("username"));
+            sub.addSyntax((ctx) -> {
+                final User user = ctx.getArgument("username", User.class);
+                final UUID version = ctx.getArgument("version", UUID.class);
+                final DumpType type = ctx.getArgument("type", DumpType.class);
+                dumpSnapshot(user(sub, ctx), user, version, type);
+            }, user("username"), versionUuid(), dumpType());
+        };
+    }
+
+    private <S> ArgumentElement<S, DumpType> dumpType() {
+        return new ArgumentElement<>("type", reader -> {
+            final String type = reader.readString();
+            return switch (type.toLowerCase(Locale.ENGLISH)) {
+                case "web" -> DumpType.WEB;
+                case "file" -> DumpType.FILE;
+                default -> throw CommandSyntaxException.BUILT_IN_EXCEPTIONS
+                        .dispatcherUnknownArgument().createWithContext(reader);
+            };
+        }, (context, builder) -> {
+            builder.suggest("web");
+            builder.suggest("file");
+            return builder.buildFuture();
+        });
+    }
+
+    enum DumpType {
+        WEB,
+        FILE
+    }
+
 }

common/src/main/java/net/william278/husksync/config/ConfigProvider.java

@@ -0,0 +1,164 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync.config;
+
+
+import de.exlll.configlib.NameFormatters;
+import de.exlll.configlib.YamlConfigurationProperties;
+import de.exlll.configlib.YamlConfigurationStore;
+import de.exlll.configlib.YamlConfigurations;
+import net.william278.husksync.HuskSync;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.logging.Level;
+
+/**
+ * Interface for getting and setting data from plugin configuration files
+ *
+ * @since 1.0
+ */
+public interface ConfigProvider {
+
+    @NotNull
+    YamlConfigurationProperties.Builder<?> YAML_CONFIGURATION_PROPERTIES = YamlConfigurationProperties.newBuilder()
+            .charset(StandardCharsets.UTF_8)
+            .setNameFormatter(NameFormatters.LOWER_UNDERSCORE);
+
+    /**
+     * Get the plugin settings, read from the config file
+     *
+     * @return the plugin settings
+     * @since 1.0
+     */
+    @NotNull
+    Settings getSettings();
+
+    /**
+     * Set the plugin settings
+     *
+     * @param settings The settings to set
+     * @since 1.0
+     */
+    void setSettings(@NotNull Settings settings);
+
+    /**
+     * Load the plugin settings from the config file
+     *
+     * @since 1.0
+     */
+    default void loadSettings() {
+        setSettings(YamlConfigurations.update(
+                getConfigDirectory().resolve("config.yml"),
+                Settings.class,
+                YAML_CONFIGURATION_PROPERTIES.header(Settings.CONFIG_HEADER).build()
+        ));
+    }
+
+    /**
+     * Get the locales for the plugin
+     *
+     * @return the locales for the plugin
+     * @since 1.0
+     */
+    @NotNull
+    Locales getLocales();
+
+    /**
+     * Set the locales for the plugin
+     *
+     * @param locales The locales to set
+     * @since 1.0
+     */
+    void setLocales(@NotNull Locales locales);
+
+    /**
+     * Load the locales from the config file
+     *
+     * @since 1.0
+     */
+    default void loadLocales() {
+        final YamlConfigurationStore<Locales> store = new YamlConfigurationStore<>(
+                Locales.class, YAML_CONFIGURATION_PROPERTIES.header(Locales.CONFIG_HEADER).build()
+        );
+        // Read existing locales if present
+        final Path path = getConfigDirectory().resolve(String.format("messages-%s.yml", getSettings().getLanguage()));
+        if (Files.exists(path)) {
+            setLocales(store.load(path));
+            return;
+        }
+
+        // Otherwise, save and read the default locales
+        try (InputStream input = getResource(String.format("locales/%s.yml", getSettings().getLanguage()))) {
+            final Locales locales = store.read(input);
+            store.save(locales, path);
+            setLocales(locales);
+        } catch (Throwable e) {
+            getPlugin().log(Level.SEVERE, "An error occurred loading the locales (invalid lang code?)", e);
+        }
+    }
+
+    @NotNull
+    String getServerName();
+
+    void setServerName(@NotNull Server server);
+
+    default void loadServer() {
+        setServerName(YamlConfigurations.update(
+                getConfigDirectory().resolve("server.yml"),
+                Server.class,
+                YAML_CONFIGURATION_PROPERTIES.header(Server.CONFIG_HEADER).build()
+        ));
+    }
+
+    default void validateConfigFiles() {
+        // Validate server name is default
+        if (getServerName().equals("server")) {
+            getPlugin().log(Level.WARNING, "The server name set in ~/plugins/HuskSync/server.yml appears to" +
+                    "be unchanged from the default (currently set to: \"server\"). Please check that this value has" +
+                    "been updated to match the case-sensitive ID of this server in your proxy config file!");
+        }
+    }
+
+    /**
+     * Get a plugin resource
+     *
+     * @param name The name of the resource
+     * @return the resource, if found
+     * @since 1.0
+     */
+    InputStream getResource(@NotNull String name);
+
+    /**
+     * Get the plugin config directory
+     *
+     * @return the plugin config directory
+     * @since 1.0
+     */
+    @NotNull
+    Path getConfigDirectory();
+
+    @NotNull
+    HuskSync getPlugin();
+
+}

common/src/main/java/net/william278/husksync/config/Locales.java

@@ -19,53 +19,60 @@
 
 package net.william278.husksync.config;
 
+import com.google.common.collect.Maps;
+import de.exlll.configlib.Configuration;
 import de.themoep.minedown.adventure.MineDown;
-import net.william278.annotaml.YamlFile;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 import net.william278.paginedown.ListOptions;
 import org.apache.commons.text.StringEscapeUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
 /**
- * Loaded locales used by the plugin to display styled messages
+ * Plugin locale configuration
+ *
+ * @since 1.0
  */
-@YamlFile(rootedMap = true, header = """
-        ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-        ┃       HuskSync Locales       ┃
-        ┃    Developed by William278   ┃
-        ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
-        ┣╸ See plugin about menu for international locale credits
-        ┣╸ Formatted in MineDown: https://github.com/Phoenix616/MineDown
-        ┗╸ Translate HuskSync: https://william278.net/docs/husksync/Translations""")
+@SuppressWarnings("FieldMayBeFinal")
+@Configuration
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class Locales {
 
-    /**
-     * The raw set of locales loaded from yaml
-     */
-    @NotNull
-    public Map<String, String> rawLocales = new HashMap<>();
+    static final String CONFIG_HEADER = """
+            ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+            ┃      HuskSync - Locales      ┃
+            ┃    Developed by William278   ┃
+            ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+            ┣╸ See plugin about menu for international locale credits
+            ┣╸ Formatted in MineDown: https://github.com/Phoenix616/MineDown
+            ┗╸ Translate HuskSync: https://william278.net/docs/husksync/translations""";
+
+    protected static final String DEFAULT_LOCALE = "en-gb";
+
+    // The raw set of locales loaded from yaml
+    Map<String, String> locales = Maps.newTreeMap();
 
     /**
-     * Returns a raw, unformatted locale loaded from the Locales file
+     * Returns a raw, unformatted locale loaded from the locale file
      *
      * @param localeId String identifier of the locale, corresponding to a key in the file
      * @return An {@link Optional} containing the locale corresponding to the id, if it exists
      */
     public Optional<String> getRawLocale(@NotNull String localeId) {
-        return Optional.ofNullable(rawLocales.get(localeId)).map(StringEscapeUtils::unescapeJava);
+        return Optional.ofNullable(locales.get(localeId)).map(StringEscapeUtils::unescapeJava);
     }
 
     /**
-     * Returns a raw, unformatted locale loaded from the Locales file, with replacements applied
+     * Returns a raw, un-formatted locale loaded from the locales file, with replacements applied
      * <p>
-     * Note that replacements will not be MineDown-escaped; use {@link #escapeMineDown(String)} to escape replacements
+     * Note that replacements will not be MineDown-escaped; use {@link #escapeText(String)} to escape replacements
      *
      * @param localeId     String identifier of the locale, corresponding to a key in the file
-     * @param replacements An ordered array of replacement strings to fill in placeholders with
+     * @param replacements Ordered array of replacement strings to fill in placeholders with
      * @return An {@link Optional} containing the replacement-applied locale corresponding to the id, if it exists
      */
     public Optional<String> getRawLocale(@NotNull String localeId, @NotNull String... replacements) {
@@ -73,34 +80,45 @@ public class Locales {
     }
 
     /**
-     * Returns a MineDown-formatted locale from the Locales file
+     * Returns a MineDown-formatted locale from the locales file
      *
      * @param localeId String identifier of the locale, corresponding to a key in the file
      * @return An {@link Optional} containing the formatted locale corresponding to the id, if it exists
      */
     public Optional<MineDown> getLocale(@NotNull String localeId) {
-        return getRawLocale(localeId).map(MineDown::new);
+        return getRawLocale(localeId).map(this::format);
     }
 
     /**
-     * Returns a MineDown-formatted locale from the Locales file, with replacements applied
+     * Returns a MineDown-formatted locale from the locales file, with replacements applied
      * <p>
      * Note that replacements will be MineDown-escaped before application
      *
      * @param localeId     String identifier of the locale, corresponding to a key in the file
-     * @param replacements An ordered array of replacement strings to fill in placeholders with
+     * @param replacements Ordered array of replacement strings to fill in placeholders with
      * @return An {@link Optional} containing the replacement-applied, formatted locale corresponding to the id, if it exists
      */
     public Optional<MineDown> getLocale(@NotNull String localeId, @NotNull String... replacements) {
-        return getRawLocale(localeId, Arrays.stream(replacements).map(Locales::escapeMineDown)
-                .toArray(String[]::new)).map(MineDown::new);
+        return getRawLocale(localeId, Arrays.stream(replacements).map(Locales::escapeText)
+                .toArray(String[]::new)).map(this::format);
+    }
+
+    /**
+     * Returns a MineDown-formatted string
+     *
+     * @param text The text to format
+     * @return A {@link MineDown} object containing the formatted text
+     */
+    @NotNull
+    public MineDown format(@NotNull String text) {
+        return new MineDown(text);
     }
 
     /**
      * Apply placeholder replacements to a raw locale
      *
      * @param rawLocale    The raw, unparsed locale
-     * @param replacements An ordered array of replacement strings to fill in placeholders with
+     * @param replacements Ordered array of replacement strings to fill in placeholders with
      * @return the raw locale, with inserted placeholders
      */
     @NotNull
@@ -116,15 +134,12 @@ public class Locales {
 
     /**
      * Escape a string from {@link MineDown} formatting for use in a MineDown-formatted locale
-     * <p>
-     * Although MineDown provides {@link MineDown#escape(String)}, that method fails to escape events
-     * properly when using the escaped string in a replacement, so this is used instead
      *
      * @param string The string to escape
      * @return The escaped string
      */
     @NotNull
-    public static String escapeMineDown(@NotNull String string) {
+    public static String escapeText(@NotNull String string) {
         final StringBuilder value = new StringBuilder();
         for (int i = 0; i < string.length(); ++i) {
             char c = string.charAt(i);
@@ -140,21 +155,6 @@ public class Locales {
         return value.toString();
     }
 
-    /**
-     * Truncates a String to a specified length, and appends an ellipsis if it is longer than the specified length
-     *
-     * @param string The string to truncate
-     * @param length The maximum length of the string
-     * @return The truncated string
-     */
-    @NotNull
-    public static String truncate(@NotNull String string, int length) {
-        if (string.length() > length) {
-            return string.substring(0, length) + "…";
-        }
-        return string;
-    }
-
     /**
      * Returns the base list options to use for a paginated chat list
      *
@@ -185,10 +185,6 @@ public class Locales {
                 .setSpaceBeforeFooter(false);
     }
 
-    @SuppressWarnings("unused")
-    public Locales() {
-    }
-
     /**
      * Determines the slot a system notification should be displayed in
      */
@@ -197,14 +193,20 @@ public class Locales {
          * Displays the notification in the action bar
          */
         ACTION_BAR,
+
         /**
          * Displays the notification in the chat
          */
         CHAT,
+
         /**
          * Displays the notification in an Advancement Toast
+         *
+         * @deprecated No longer supported
          */
+        @Deprecated(since = "3.6.7")
         TOAST,
+
         /**
          * Does not display the notification
          */

common/src/main/java/net/william278/husksync/config/Server.java

@@ -0,0 +1,72 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync.config;
+
+import de.exlll.configlib.Configuration;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import org.jetbrains.annotations.NotNull;
+
+import java.nio.file.Path;
+
+@Configuration
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class Server {
+
+    static final String CONFIG_HEADER = """
+            ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+            ┃     HuskSync - Server ID     ┃
+            ┃    Developed by William278   ┃
+            ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+            ┣╸ This file should contain the ID of this server as defined in your proxy config.
+            ┗╸ If you join it using /server alpha, then set it to 'alpha' (case-sensitive)""";
+
+    private String name = getDefault();
+
+    @NotNull
+    public static Server of(@NotNull String name) {
+        return new Server(name);
+    }
+
+    /**
+     * Find a sensible default name for the server name property
+     */
+    @NotNull
+    private static String getDefault() {
+        final String serverFolder = System.getProperty("user.dir");
+        return serverFolder == null ? "server" : Path.of(serverFolder).getFileName().toString().trim();
+    }
+
+    @Override
+    public boolean equals(@NotNull Object other) {
+        // If the name of this server matches another, the servers are the same.
+        if (other instanceof Server server) {
+            return server.getName().equalsIgnoreCase(this.getName());
+        }
+        return super.equals(other);
+    }
+  
+    public String getName() {
+        final String envServerName = System.getenv("HUSKSYNC_SERVER_NAME");
+        return envServerName == null ? name : envServerName;
+    }
+}

common/src/main/java/net/william278/husksync/config/Settings.java

@@ -19,399 +19,376 @@
 
 package net.william278.husksync.config;
 
-import net.william278.annotaml.YamlComment;
-import net.william278.annotaml.YamlFile;
-import net.william278.annotaml.YamlKey;
+import com.google.common.collect.Lists;
+import de.exlll.configlib.Comment;
+import de.exlll.configlib.Configuration;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import net.william278.husksync.command.PluginCommand;
 import net.william278.husksync.data.DataSnapshot;
 import net.william278.husksync.data.Identifier;
 import net.william278.husksync.database.Database;
 import net.william278.husksync.listener.EventListener;
+import net.william278.husksync.sync.DataSyncer;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 
 /**
  * Plugin settings, read from config.yml
  */
-@YamlFile(header = """
-        ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-        ┃        HuskSync Config       ┃
-        ┃    Developed by William278   ┃
-        ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
-        ┣╸ Information: https://william278.net/project/husksync
-        ┣╸ Config Help: https://william278.net/docs/husksync/config-file/
-        ┗╸ Documentation: https://william278.net/docs/husksync""")
+@SuppressWarnings("FieldMayBeFinal")
+@Getter
+@Configuration
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class Settings {
 
-    // Top-level settings
-    @YamlComment("Locale of the default language file to use. Docs: https://william278.net/docs/huskhomes/translations")
-    @YamlKey("language")
-    private String language = "en-gb";
+    protected static final String CONFIG_HEADER = """
+            ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+            ┃        HuskSync Config       ┃
+            ┃    Developed by William278   ┃
+            ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+            ┣╸ Information: https://william278.net/project/husksync
+            ┣╸ Config Help: https://william278.net/docs/husksync/config-file/
+            ┗╸ Documentation: https://william278.net/docs/husksync""";
 
-    @YamlComment("Whether to automatically check for plugin updates on startup")
-    @YamlKey("check_for_updates")
+    // Top-level settings
+    @Comment({"Locale of the default language file to use.", "Docs: https://william278.net/docs/husksync/translations"})
+    private String language = Locales.DEFAULT_LOCALE;
+
+    @Comment("Whether to automatically check for plugin updates on startup")
     private boolean checkForUpdates = true;
 
-    @YamlComment("Specify a common ID for grouping servers running HuskSync. "
-            + "Don't modify this unless you know what you're doing!")
-    @YamlKey("cluster_id")
+    @Comment("Specify a common ID for grouping servers running HuskSync. "
+             + "Don't modify this unless you know what you're doing!")
     private String clusterId = "";
 
-    @YamlComment("Enable development debug logging")
-    @YamlKey("debug_logging")
+    @Comment("Enable development debug logging")
     private boolean debugLogging = false;
 
-    @YamlComment("Whether to provide modern, rich TAB suggestions for commands (if available)")
-    @YamlKey("brigadier_tab_completion")
-    private boolean brigadierTabCompletion = false;
-
-    @YamlComment("Whether to enable the Player Analytics hook. Docs: https://william278.net/docs/husksync/plan-hook")
-    @YamlKey("enable_plan_hook")
+    @Comment({"Whether to enable the Player Analytics hook.", "Docs: https://william278.net/docs/husksync/plan-hook"})
     private boolean enablePlanHook = true;
 
+    @Comment("Whether to cancel game event packets directly when handling locked players if ProtocolLib or PacketEvents is installed")
+    private boolean cancelPackets = true;
+
+    @Comment("Add HuskSync commands to this list to prevent them from being registered (e.g. ['userdata'])")
+    @Getter(AccessLevel.NONE)
+    private List<String> disabledCommands = Lists.newArrayList();
 
     // Database settings
-    @YamlComment("Type of database to use (MYSQL, MARIADB)")
-    @YamlKey("database.type")
-    private Database.Type databaseType = Database.Type.MYSQL;
+    @Comment("Database settings")
+    private DatabaseSettings database = new DatabaseSettings();
 
-    @YamlComment("Specify credentials here for your MYSQL or MARIADB database")
-    @YamlKey("database.credentials.host")
-    private String mySqlHost = "localhost";
+    @Getter
+    @Configuration
+    @NoArgsConstructor(access = AccessLevel.PRIVATE)
+    public static class DatabaseSettings {
 
-    @YamlKey("database.credentials.port")
-    private int mySqlPort = 3306;
+        @Comment("Type of database to use (MYSQL, MARIADB, POSTGRES, MONGO)")
+        private Database.Type type = Database.Type.MYSQL;
 
-    @YamlKey("database.credentials.database")
-    private String mySqlDatabase = "HuskSync";
+        @Comment("Specify credentials here for your MYSQL, MARIADB, POSTGRES OR MONGO database")
+        private DatabaseCredentials credentials = new DatabaseCredentials();
 
-    @YamlKey("database.credentials.username")
-    private String mySqlUsername = "root";
+        @Getter
+        @Configuration
+        @NoArgsConstructor(access = AccessLevel.PRIVATE)
+        public static class DatabaseCredentials {
+            private String host = "localhost";
+            private int port = 3306;
+            private String database = "HuskSync";
+            private String username = "root";
+            private String password = "pa55w0rd";
+            @Comment("Only change this if you're using MARIADB or POSTGRES")
+            private String parameters = String.join("&",
+                    "?autoReconnect=true", "useSSL=false",
+                    "useUnicode=true", "characterEncoding=UTF-8");
+        }
 
-    @YamlKey("database.credentials.password")
-    private String mySqlPassword = "pa55w0rd";
+        @Comment("MYSQL, MARIADB, POSTGRES database Hikari connection pool properties. Don't modify this unless you know what you're doing!")
+        private PoolSettings connectionPool = new PoolSettings();
 
-    @YamlKey("database.credentials.parameters")
-    private String mySqlConnectionParameters = "?autoReconnect=true"
-            + "&useSSL=false"
-            + "&useUnicode=true"
-            + "&characterEncoding=UTF-8";
+        @Getter
+        @Configuration
+        @NoArgsConstructor(access = AccessLevel.PRIVATE)
+        public static class PoolSettings {
+            private int maximumPoolSize = 10;
+            private int minimumIdle = 10;
+            private long maximumLifetime = 1800000;
+            private long keepaliveTime = 0;
+            private long connectionTimeout = 5000;
+        }
 
-    @YamlComment("MYSQL / MARIADB database Hikari connection pool properties. "
-            + "Don't modify this unless you know what you're doing!")
-    @YamlKey("database.connection_pool.maximum_pool_size")
-    private int mySqlConnectionPoolSize = 10;
+        @Comment("Advanced MongoDB settings. Don't modify unless you know what you're doing!")
+        private MongoSettings mongoSettings = new MongoSettings();
 
-    @YamlKey("database.connection_pool.minimum_idle")
-    private int mySqlConnectionPoolIdle = 10;
+        @Getter
+        @Configuration
+        @NoArgsConstructor(access = AccessLevel.PRIVATE)
+        public static class MongoSettings {
+            private boolean usingAtlas = false;
+            private String parameters = String.join("&",
+                    "?retryWrites=true", "w=majority",
+                    "authSource=HuskSync");
+        }
 
-    @YamlKey("database.connection_pool.maximum_lifetime")
-    private long mySqlConnectionPoolLifetime = 1800000;
+        @Comment("Names of tables to use on your database. Don't modify this unless you know what you're doing!")
+        @Getter(AccessLevel.NONE)
+        private Map<String, String> tableNames = Database.TableName.getDefaults();
 
-    @YamlKey("database.connection_pool.keepalive_time")
-    private long mySqlConnectionPoolKeepAlive = 0;
-
-    @YamlKey("database.connection_pool.connection_timeout")
-    private long mySqlConnectionPoolTimeout = 5000;
-
-    @YamlComment("Names of tables to use on your database. Don't modify this unless you know what you're doing!")
-    @YamlKey("database.table_names")
-    private Map<String, String> tableNames = TableName.getDefaults();
+        @Comment("Whether to run the creation SQL on the database when the server starts. Don't modify this unless you know what you're doing!")
+        private boolean createTables = true;
 
+        @NotNull
+        public String getTableName(@NotNull Database.TableName tableName) {
+            return tableNames.getOrDefault(tableName.name().toLowerCase(Locale.ENGLISH), tableName.getDefaultName());
+        }
+    }
 
     // Redis settings
-    @YamlComment("Specify the credentials of your Redis database here. Set \"password\" to '' if you don't have one")
-    @YamlKey("redis.credentials.host")
-    private String redisHost = "localhost";
+    @Comment("Redis settings")
+    private RedisSettings redis = new RedisSettings();
 
-    @YamlKey("redis.credentials.port")
-    private int redisPort = 6379;
+    @Getter
+    @Configuration
+    @NoArgsConstructor(access = AccessLevel.PRIVATE)
+    public static class RedisSettings {
 
-    @YamlKey("redis.credentials.password")
-    private String redisPassword = "";
+        @Comment({"Specify the credentials of your Redis server here.",
+                "Set \"user\" to '' if you don't have one or would like to use the default user.",
+                "Set \"password\" to '' if you don't have one."})
+        private RedisCredentials credentials = new RedisCredentials();
 
-    @YamlKey("redis.use_ssl")
-    private boolean redisUseSsl = false;
+        @Getter
+        @Configuration
+        @NoArgsConstructor(access = AccessLevel.PRIVATE)
+        public static class RedisCredentials {
+            private String host = "localhost";
+            private int port = 6379;
+            @Comment("Only change the database if you know what you are doing. The default is 0.")
+            private int database = 0;
+            private String user = "";
+            private String password = "";
 
+            @Comment("Use SSL/TLS for encrypted connections.")
+            private boolean useSsl = false;
+
+            @Comment("Connection timeout in milliseconds.")
+            private int connectionTimeout = 2000;
+
+            @Comment("Socket (read/write) timeout in milliseconds.")
+            private int socketTimeout = 2000;
+
+            @Comment("Max number of connections in the pool.")
+            private int maxTotalConnections = 50;
+
+            @Comment("Max number of idle connections in the pool.")
+            private int maxIdleConnections = 8;
+
+            @Comment("Min number of idle connections in the pool.")
+            private int minIdleConnections = 2;
+
+            @Comment("Enable health checks when borrowing connections from the pool.")
+            private boolean testOnBorrow = true;
+
+            @Comment("Enable health checks when returning connections to the pool.")
+            private boolean testOnReturn = true;
+
+            @Comment("Enable periodic idle connection health checks.")
+            private boolean testWhileIdle = true;
+
+            @Comment("Min evictable idle time (ms) before a connection is eligible for eviction.")
+            private long minEvictableIdleTimeMillis = 60000;
+
+            @Comment("Time (ms) between eviction runs.")
+            private long timeBetweenEvictionRunsMillis = 30000;
+
+            @Comment("Number of retries for commands when connection fails.")
+            private int maxRetries = 3;
+
+            @Comment("Base backoff time in ms for retries (exponential backoff multiplier).")
+            private int retryBackoffMillis = 200;
+        }
+
+        @Comment("Options for if you're using Redis sentinel. Don't modify this unless you know what you're doing!")
+        private RedisSentinel sentinel = new RedisSentinel();
+
+        @Getter
+        @Configuration
+        @NoArgsConstructor(access = AccessLevel.PRIVATE)
+        public static class RedisSentinel {
+            @Comment("The master set name for the Redis sentinel.")
+            private String master = "";
+            @Comment("List of host:port pairs")
+            private List<String> nodes = Lists.newArrayList();
+            private String password = "";
+        }
+
+    }
 
     // Synchronization settings
-    @YamlComment("The number of data snapshot backups that should be kept at once per user")
-    @YamlKey("synchronization.max_user_data_snapshots")
-    private int maxUserDataSnapshots = 16;
+    @Comment("Data syncing settings")
+    private SynchronizationSettings synchronization = new SynchronizationSettings();
 
-    @YamlComment("Number of hours between new snapshots being saved as backups (Use \"0\" to backup all snapshots)")
-    @YamlKey("synchronization.snapshot_backup_frequency")
-    private int snapshotBackupFrequency = 4;
+    @Getter
+    @Configuration
+    @NoArgsConstructor(access = AccessLevel.PRIVATE)
+    public static class SynchronizationSettings {
 
-    @YamlComment("List of save cause IDs for which a snapshot will be automatically pinned (so it won't be rotated)."
-            + " Docs: https://william278.net/docs/husksync/data-rotation#save-causes")
-    @YamlKey("synchronization.auto_pinned_save_causes")
-    private List<String> autoPinnedSaveCauses = List.of(
-            DataSnapshot.SaveCause.INVENTORY_COMMAND.name(),
-            DataSnapshot.SaveCause.ENDERCHEST_COMMAND.name(),
-            DataSnapshot.SaveCause.BACKUP_RESTORE.name(),
-            DataSnapshot.SaveCause.CONVERTED_FROM_V2.name(),
-            DataSnapshot.SaveCause.LEGACY_MIGRATION.name(),
-            DataSnapshot.SaveCause.MPDB_MIGRATION.name()
-    );
+        @Comment({"The data synchronization mode to use (LOCKSTEP or DELAY). LOCKSTEP is recommended for most networks.",
+                "Docs: https://william278.net/docs/husksync/sync-modes"})
+        private DataSyncer.Mode mode = DataSyncer.Mode.LOCKSTEP;
 
-    @YamlComment("Whether to create a snapshot for users on a world when the server saves that world")
-    @YamlKey("synchronization.save_on_world_save")
-    private boolean saveOnWorldSave = true;
+        @Comment("The number of data snapshot backups that should be kept at once per user")
+        private int maxUserDataSnapshots = 16;
 
-    @YamlComment("Whether to create a snapshot for users when they die (containing their death drops)")
-    @YamlKey("synchronization.save_on_death")
-    private boolean saveOnDeath = false;
+        @Comment("Number of hours between new snapshots being saved as backups (Use \"0\" to backup all snapshots)")
+        private int snapshotBackupFrequency = 4;
 
-    @YamlComment("Whether to save empty death drops for users when they die")
-    @YamlKey("synchronization.save_empty_drops_on_death")
-    private boolean saveEmptyDropsOnDeath = true;
+        @Comment({"List of save cause IDs for which a snapshot will be automatically pinned (so it won't be rotated).",
+                "Docs: https://william278.net/docs/husksync/data-rotation#save-causes"})
+        @Getter(AccessLevel.NONE)
+        private List<String> autoPinnedSaveCauses = List.of(
+                DataSnapshot.SaveCause.INVENTORY_COMMAND.name(),
+                DataSnapshot.SaveCause.ENDERCHEST_COMMAND.name(),
+                DataSnapshot.SaveCause.BACKUP_RESTORE.name(),
+                DataSnapshot.SaveCause.LEGACY_MIGRATION.name(),
+                DataSnapshot.SaveCause.MPDB_MIGRATION.name()
+        );
 
-    @YamlComment("Whether to use the snappy data compression algorithm. Keep on unless you know what you're doing")
-    @YamlKey("synchronization.compress_data")
-    private boolean compressData = true;
+        @Comment("Whether to create a snapshot for users on a world when the server saves that world")
+        private boolean saveOnWorldSave = true;
 
-    @YamlComment("Where to display sync notifications (ACTION_BAR, CHAT, TOAST or NONE)")
-    @YamlKey("synchronization.notification_display_slot")
-    private Locales.NotificationSlot notificationSlot = Locales.NotificationSlot.ACTION_BAR;
+        @Comment("Configuration for how and when to sync player data when they die")
+        private SaveOnDeathSettings saveOnDeath = new SaveOnDeathSettings();
 
-    @YamlComment("(Experimental) Persist Cartography Table locked maps to let them be viewed on any server")
-    @YamlKey("synchronization.persist_locked_maps")
-    private boolean persistLockedMaps = true;
+        @Getter
+        @Configuration
+        @NoArgsConstructor(access = AccessLevel.PRIVATE)
+        public static class SaveOnDeathSettings {
+            @Comment("Whether to create a snapshot for users when they die (containing their death drops)")
+            private boolean enabled = false;
 
-    @YamlComment("Whether to synchronize player max health (requires health syncing to be enabled)")
-    @YamlKey("synchronization.synchronize_max_health")
-    private boolean synchronizeMaxHealth = true;
+            @Comment("What items to save in death snapshots? (DROPS or ITEMS_TO_KEEP). "
+                     + "Note that ITEMS_TO_KEEP (suggested for keepInventory servers) requires a Paper 1.19.4+ server.")
+            private DeathItemsMode itemsToSave = DeathItemsMode.DROPS;
 
-    @YamlComment("Whether dead players who log out and log in to a different server should have their items saved. "
-            + "You may need to modify this if you're using the keepInventory gamerule.")
-    @YamlKey("synchronization.synchronize_dead_players_changing_server")
-    private boolean synchronizeDeadPlayersChangingServer = true;
+            @Comment("Should a death snapshot still be created even if the items to save on the player's death are empty?")
+            private boolean saveEmptyItems = true;
 
-    @YamlComment("How long, in milliseconds, this server should wait for a response from the redis server before "
-            + "pulling data from the database instead (i.e., if the user did not change servers).")
-    @YamlKey("synchronization.network_latency_milliseconds")
-    private int networkLatencyMilliseconds = 500;
+            @Comment("Whether dead players who log out and log in to a different server should have their items saved.")
+            private boolean syncDeadPlayersChangingServer = true;
 
-    @YamlComment("Which data types to synchronize (Docs: https://william278.net/docs/husksync/sync-features)")
-    @YamlKey("synchronization.features")
-    private Map<String, Boolean> synchronizationFeatures = Identifier.getConfigMap();
-
-    @YamlComment("Commands which should be blocked before a player has finished syncing (Use * to block all commands)")
-    @YamlKey("synchronization.blacklisted_commands_while_locked")
-    private List<String> blacklistedCommandsWhileLocked = new ArrayList<>(List.of("*"));
-
-    @YamlComment("Event priorities for listeners (HIGHEST, NORMAL, LOWEST). Change if you encounter plugin conflicts")
-    @YamlKey("synchronization.event_priorities")
-    private Map<String, String> syncEventPriorities = EventListener.ListenerType.getDefaults();
-
-
-    // Zero-args constructor for instantiation via Annotaml
-    @SuppressWarnings("unused")
-    public Settings() {
-    }
-
-
-    @NotNull
-    public String getLanguage() {
-        return language;
-    }
-
-    public boolean doCheckForUpdates() {
-        return checkForUpdates;
-    }
-
-    @NotNull
-    public String getClusterId() {
-        return clusterId;
-    }
-
-    public boolean doDebugLogging() {
-        return debugLogging;
-    }
-
-    public boolean doBrigadierTabCompletion() {
-        return brigadierTabCompletion;
-    }
-
-    public boolean usePlanHook() {
-        return enablePlanHook;
-    }
-
-    @NotNull
-    public Database.Type getDatabaseType() {
-        return databaseType;
-    }
-
-    @NotNull
-    public String getMySqlHost() {
-        return mySqlHost;
-    }
-
-    public int getMySqlPort() {
-        return mySqlPort;
-    }
-
-    @NotNull
-    public String getMySqlDatabase() {
-        return mySqlDatabase;
-    }
-
-    @NotNull
-    public String getMySqlUsername() {
-        return mySqlUsername;
-    }
-
-    @NotNull
-    public String getMySqlPassword() {
-        return mySqlPassword;
-    }
-
-    @NotNull
-    public String getMySqlConnectionParameters() {
-        return mySqlConnectionParameters;
-    }
-
-    @NotNull
-    public String getTableName(@NotNull TableName tableName) {
-        return tableNames.getOrDefault(tableName.name().toLowerCase(Locale.ENGLISH), tableName.defaultName);
-    }
-
-    public int getMySqlConnectionPoolSize() {
-        return mySqlConnectionPoolSize;
-    }
-
-    public int getMySqlConnectionPoolIdle() {
-        return mySqlConnectionPoolIdle;
-    }
-
-    public long getMySqlConnectionPoolLifetime() {
-        return mySqlConnectionPoolLifetime;
-    }
-
-    public long getMySqlConnectionPoolKeepAlive() {
-        return mySqlConnectionPoolKeepAlive;
-    }
-
-    public long getMySqlConnectionPoolTimeout() {
-        return mySqlConnectionPoolTimeout;
-    }
-
-    @NotNull
-    public String getRedisHost() {
-        return redisHost;
-    }
-
-    public int getRedisPort() {
-        return redisPort;
-    }
-
-    @NotNull
-    public String getRedisPassword() {
-        return redisPassword;
-    }
-
-    public boolean redisUseSsl() {
-        return redisUseSsl;
-    }
-
-    public int getMaxUserDataSnapshots() {
-        return maxUserDataSnapshots;
-    }
-
-    public int getBackupFrequency() {
-        return snapshotBackupFrequency;
-    }
-
-    public boolean doSaveOnWorldSave() {
-        return saveOnWorldSave;
-    }
-
-    public boolean doSaveOnDeath() {
-        return saveOnDeath;
-    }
-
-    public boolean doSaveEmptyDropsOnDeath() {
-        return saveEmptyDropsOnDeath;
-    }
-
-    public boolean doCompressData() {
-        return compressData;
-    }
-
-    public boolean doAutoPin(@NotNull DataSnapshot.SaveCause cause) {
-        return autoPinnedSaveCauses.contains(cause.name());
-    }
-
-    @NotNull
-    public Locales.NotificationSlot getNotificationDisplaySlot() {
-        return notificationSlot;
-    }
-
-    public boolean doPersistLockedMaps() {
-        return persistLockedMaps;
-    }
-
-    public boolean doSynchronizeDeadPlayersChangingServer() {
-        return synchronizeDeadPlayersChangingServer;
-    }
-
-    public boolean doSynchronizeMaxHealth() {
-        return synchronizeMaxHealth;
-    }
-
-    public int getNetworkLatencyMilliseconds() {
-        return networkLatencyMilliseconds;
-    }
-
-    @NotNull
-    public Map<String, Boolean> getSynchronizationFeatures() {
-        return synchronizationFeatures;
-    }
-
-    public boolean isSyncFeatureEnabled(@NotNull Identifier id) {
-        return id.isCustom() || getSynchronizationFeatures().getOrDefault(id.getKeyValue(), id.isEnabledByDefault());
-    }
-
-    @NotNull
-    public List<String> getBlacklistedCommandsWhileLocked() {
-        return blacklistedCommandsWhileLocked;
-    }
-
-    @NotNull
-    public EventListener.Priority getEventPriority(@NotNull EventListener.ListenerType type) {
-        try {
-            return EventListener.Priority.valueOf(syncEventPriorities.get(type.name().toLowerCase(Locale.ENGLISH)));
-        } catch (IllegalArgumentException e) {
-            return EventListener.Priority.NORMAL;
+            /**
+             * Represents the mode of saving items on death
+             */
+            public enum DeathItemsMode {
+                DROPS,
+                ITEMS_TO_KEEP
+            }
         }
-    }
 
-    /**
-     * Represents the names of tables in the database
-     */
-    public enum TableName {
-        USERS("husksync_users"),
-        USER_DATA("husksync_user_data");
+        @Comment("Whether to use the snappy data compression algorithm. Keep on unless you know what you're doing")
+        private boolean compressData = true;
 
-        private final String defaultName;
+        @Comment("Where to display sync notifications (ACTION_BAR, CHAT or NONE)")
+        private Locales.NotificationSlot notificationDisplaySlot = Locales.NotificationSlot.ACTION_BAR;
 
-        TableName(@NotNull String defaultName) {
-            this.defaultName = defaultName;
+        @Comment("Persist maps locked in a Cartography Table to let them be viewed on any server")
+        private boolean persistLockedMaps = true;
+
+        @Comment("If using the DELAY sync method, how long should this server listen for Redis key data updates before "
+                 + "pulling data from the database instead (i.e., if the user did not change servers).")
+        private int networkLatencyMilliseconds = 500;
+
+        @Comment({"Which data types to synchronize.", "Docs: https://william278.net/docs/husksync/sync-features"})
+        @Getter(AccessLevel.NONE)
+        private Map<String, Boolean> features = Identifier.getConfigMap();
+
+        @Comment("Commands which should be blocked before a player has finished syncing (Use * to block all commands)")
+        private List<String> blacklistedCommandsWhileLocked = new ArrayList<>(List.of("*"));
+
+        @Comment("Configuration for how to sync attributes")
+        private AttributeSettings attributes = new AttributeSettings();
+
+        @Getter
+        @Configuration
+        @NoArgsConstructor(access = AccessLevel.PRIVATE)
+        public static class AttributeSettings {
+
+            @Comment({"Which attribute types should be saved as part of attribute syncing. Supports wildcard matching.",
+                    "(e.g. ['minecraft:generic.max_health', 'minecraft:generic.*'])"})
+            @Getter(AccessLevel.NONE)
+            private List<String> syncedAttributes = new ArrayList<>(List.of(
+                    "minecraft:generic.max_health", "minecraft:max_health",
+                    "minecraft:generic.max_absorption", "minecraft:max_absorption",
+                    "minecraft:generic.luck", "minecraft:luck",
+                    "minecraft:generic.scale", "minecraft:scale",
+                    "minecraft:generic.step_height", "minecraft:step_height",
+                    "minecraft:generic.gravity", "minecraft:gravity"
+            ));
+
+            @Comment({"Which attribute modifiers should be saved. Supports wildcard matching.",
+                    "(e.g. ['minecraft:effect.speed', 'minecraft:effect.*'])"})
+            @Getter(AccessLevel.NONE)
+            private List<String> ignoredModifiers = new ArrayList<>(List.of(
+                    "minecraft:effect.*", "minecraft:creative_mode_*"
+            ));
+
+            private boolean matchesWildcard(@NotNull String pat, @NotNull String value) {
+                if (!pat.contains(":")) {
+                    pat = "minecraft:%s".formatted(pat);
+                }
+                if (!value.contains(":")) {
+                    value = "minecraft:%s".formatted(value);
+                }
+                return pat.contains("*") ? value.matches(pat.replace("*", ".*")) : pat.equals(value);
+            }
+
+            public boolean isIgnoredAttribute(@NotNull String attribute) {
+                return syncedAttributes.stream().noneMatch(wildcard -> matchesWildcard(wildcard, attribute));
+            }
+
+            public boolean isIgnoredModifier(@NotNull String modifier) {
+                return ignoredModifiers.stream().anyMatch(wildcard -> matchesWildcard(wildcard, modifier));
+            }
+
+        }
+
+        @Comment("Event priorities for listeners (HIGHEST, NORMAL, LOWEST). Change if you encounter plugin conflicts")
+        @Getter(AccessLevel.NONE)
+        private Map<String, String> eventPriorities = EventListener.ListenerType.getDefaults();
+
+        @Comment("Enable check-in petitions for data syncing (don't change this unless you know what you're doing)")
+        private boolean checkinPetitions = false;
+
+        public boolean doAutoPin(@NotNull DataSnapshot.SaveCause cause) {
+            return autoPinnedSaveCauses.contains(cause.name());
+        }
+
+        public boolean isFeatureEnabled(@NotNull Identifier id) {
+            return id.isCustom() || features.getOrDefault(id.getKeyValue(), id.isEnabledByDefault());
         }
 
         @NotNull
-        private Map.Entry<String, String> toEntry() {
-            return Map.entry(name().toLowerCase(Locale.ENGLISH), defaultName);
-        }
-
-        @SuppressWarnings("unchecked")
-        @NotNull
-        private static Map<String, String> getDefaults() {
-            return Map.ofEntries(Arrays.stream(values())
-                    .map(TableName::toEntry)
-                    .toArray(Map.Entry[]::new));
+        public EventListener.Priority getEventPriority(@NotNull EventListener.ListenerType type) {
+            try {
+                return EventListener.Priority.valueOf(eventPriorities.get(type.name().toLowerCase(Locale.ENGLISH)));
+            } catch (IllegalArgumentException e) {
+                return EventListener.Priority.NORMAL;
+            }
         }
     }
 
+    public boolean isCommandDisabled(@NotNull PluginCommand command) {
+        return disabledCommands.stream().map(c -> c.startsWith("/") ? c.substring(1) : c)
+                .anyMatch(c -> c.equalsIgnoreCase(command.getName()) || command.getAliases().contains(c));
+    }
+
+
 }

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

@@ -19,7 +19,13 @@
 
 package net.william278.husksync.data;
 
+import com.google.common.collect.Sets;
 import com.google.gson.annotations.SerializedName;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.Accessors;
+import net.kyori.adventure.key.Key;
 import net.william278.husksync.HuskSync;
 import net.william278.husksync.user.OnlineUser;
 import org.jetbrains.annotations.NotNull;
@@ -51,8 +57,8 @@ public interface Data {
      */
     interface Items extends Data {
 
-        @NotNull
-        Stack[] getStack();
+        @Nullable
+        Stack @NotNull [] getStack();
 
         default int getSlotCount() {
             return getStack().length;
@@ -76,6 +82,10 @@ public interface Data {
          */
         interface Inventory extends Items {
 
+            int INVENTORY_SLOT_COUNT = 41;
+            String ITEMS_TAG = "items";
+            String HELD_ITEM_SLOT_TAG = "held_item_slot";
+
             int getHeldItemSlot();
 
             void setHeldItemSlot(int heldItemSlot) throws IllegalArgumentException;
@@ -105,7 +115,7 @@ public interface Data {
          * Data container holding data for ender chests
          */
         interface EnderChest extends Items {
-
+            int ENDER_CHEST_SLOT_COUNT = 27;
         }
 
     }
@@ -121,7 +131,7 @@ public interface Data {
         /**
          * Represents a potion effect
          *
-         * @param type          the type of potion effect
+         * @param type          the key of potion effect
          * @param amplifier     the amplifier of the potion effect
          * @param duration      the duration of the potion effect
          * @param isAmbient     whether the potion effect is ambient
@@ -144,14 +154,14 @@ public interface Data {
      */
     interface Advancements extends Data {
 
+        String RECIPE_ADVANCEMENT = "minecraft:recipe";
+
         @NotNull
         List<Advancement> getCompleted();
 
         @NotNull
         default List<Advancement> getCompletedExcludingRecipes() {
-            return getCompleted().stream()
-                    .filter(advancement -> !advancement.getKey().startsWith("minecraft:recipe"))
-                    .collect(Collectors.toList());
+            return getCompleted().stream().filter(adv -> !adv.getKey().startsWith(RECIPE_ADVANCEMENT)).toList();
         }
 
         void setCompleted(@NotNull List<Advancement> completed);
@@ -283,15 +293,148 @@ public interface Data {
 
         void setHealth(double health);
 
-        double getMaxHealth();
+        /**
+         * @deprecated Use {@link Attributes#getMaxHealth()} instead
+         */
+        @Deprecated(forRemoval = true, since = "3.5")
+        default double getMaxHealth() {
+            return getHealth();
+        }
 
-        void setMaxHealth(double maxHealth);
+        /**
+         * @deprecated Use {@link Attributes#setMaxHealth(double)} instead
+         */
+        @Deprecated(forRemoval = true, since = "3.5")
+        default void setMaxHealth(double maxHealth) {
+        }
 
         double getHealthScale();
 
         void setHealthScale(double healthScale);
     }
 
+    /**
+     * A data container holding player attribute data
+     */
+    interface Attributes extends Data {
+
+        Key MAX_HEALTH_KEY = Key.key("generic.max_health");
+
+        List<Attribute> getAttributes();
+
+        record Attribute(
+                @NotNull String name,
+                double baseValue,
+                @NotNull Set<Modifier> modifiers
+        ) {
+
+            public double getValue() {
+                double value = baseValue;
+                for (Modifier modifier : modifiers) {
+                    value = modifier.modify(value);
+                }
+                return value;
+            }
+
+        }
+
+        @Getter
+        @Accessors(fluent = true)
+        @RequiredArgsConstructor
+        final class Modifier {
+            final static String ANY_EQUIPMENT_SLOT_GROUP = "any";
+
+            @Getter(AccessLevel.NONE)
+            @Nullable
+            @SerializedName("uuid")
+            private UUID uuid = null;
+
+            // Since 1.21.1: Name, amount, operation, slotGroup
+            @SerializedName("name")
+            private String name;
+
+            @SerializedName("amount")
+            private double amount;
+
+            @SerializedName("operation")
+            private int operation;
+
+            @SerializedName("equipment_slot")
+            @Deprecated(since = "3.7")
+            private int equipmentSlot;
+
+            @SerializedName("equipment_slot_group")
+            private String slotGroup = ANY_EQUIPMENT_SLOT_GROUP;
+
+            public Modifier(@NotNull String name, double amount, int operation, @NotNull String slotGroup) {
+                this.name = name;
+                this.amount = amount;
+                this.operation = operation;
+                this.slotGroup = slotGroup;
+            }
+
+            @Deprecated(since = "3.7")
+            public Modifier(@NotNull UUID uuid, @NotNull String name, double amount, int operation, int equipmentSlot) {
+                this.name = name;
+                this.amount = amount;
+                this.operation = operation;
+                this.equipmentSlot = equipmentSlot;
+            }
+
+            @Override
+            public boolean equals(Object obj) {
+                if (obj instanceof Modifier other) {
+                    if (uuid != null && other.uuid != null) {
+                        return uuid.equals(other.uuid);
+                    }
+                    return name.equals(other.name);
+                }
+                return super.equals(obj);
+            }
+
+            public double modify(double value) {
+                return switch (operation) {
+                    case 0 -> value + amount;
+                    case 1 -> value * amount;
+                    case 2 -> value * (1 + amount);
+                    default -> value;
+                };
+            }
+
+            public boolean hasUuid() {
+                return uuid != null;
+            }
+
+            @NotNull
+            public UUID uuid() {
+                return uuid != null ? uuid : UUID.nameUUIDFromBytes(name.getBytes());
+            }
+
+        }
+
+        default Optional<Attribute> getAttribute(@NotNull Key key) {
+            return getAttributes().stream()
+                    .filter(attribute -> attribute.name().equals(key.asString()))
+                    .findFirst();
+        }
+
+        default void removeAttribute(@NotNull Key key) {
+            getAttributes().removeIf(attribute -> attribute.name().equals(key.asString()));
+        }
+
+        default double getMaxHealth() {
+            return getAttribute(MAX_HEALTH_KEY)
+                    .map(Attribute::getValue)
+                    .orElse(20.0);
+        }
+
+        default void setMaxHealth(double maxHealth) {
+            removeAttribute(MAX_HEALTH_KEY);
+            getAttributes().add(new Attribute(MAX_HEALTH_KEY.asString(), maxHealth, Sets.newHashSet()));
+        }
+
+    }
+
     /**
      * A data container holding data for:
      * <ul>
@@ -341,12 +484,7 @@ public interface Data {
     }
 
     /**
-     * A data container holding data for:
-     * <ul>
-     *     <li>Game mode</li>
-     *     <li>Allow flight</li>
-     *     <li>Is flying</li>
-     * </ul>
+     * Data container holding data for the player's current game mode
      */
     interface GameMode extends Data {
 
@@ -355,13 +493,65 @@ public interface Data {
 
         void setGameMode(@NotNull String gameMode);
 
-        boolean getAllowFlight();
+        /**
+         * Get if the player can fly.
+         *
+         * @return {@code false} since v3.5
+         * @deprecated Moved to its own data type. This will always return {@code false}.
+         * Use {@link FlightStatus#isAllowFlight()} instead
+         */
+        @Deprecated(forRemoval = true, since = "3.5")
+        default boolean getAllowFlight() {
+            return false;
+        }
+
+        /**
+         * Set if the player can fly.
+         *
+         * @deprecated Moved to its own data type.
+         * Use {@link FlightStatus#setAllowFlight(boolean)} instead
+         */
+        @Deprecated(forRemoval = true, since = "3.5")
+        default void setAllowFlight(boolean allowFlight) {
+        }
+
+        /**
+         * Get if the player is flying.
+         *
+         * @return {@code false} since v3.5
+         * @deprecated Moved to its own data type. This will always return {@code false}.
+         * Use {@link FlightStatus#isFlying()} instead
+         */
+        @Deprecated(forRemoval = true, since = "3.5")
+        default boolean getIsFlying() {
+            return false;
+        }
+
+        /**
+         * Set if the player is flying.
+         *
+         * @deprecated Moved to its own data type.
+         * Use {@link FlightStatus#setFlying(boolean)} instead
+         */
+        @Deprecated(forRemoval = true, since = "3.5")
+        default void setIsFlying(boolean isFlying) {
+        }
+
+    }
+
+    /**
+     * Data container holding data for the player's flight status
+     *
+     * @since 3.5
+     */
+    interface FlightStatus extends Data {
+        boolean isAllowFlight();
 
         void setAllowFlight(boolean allowFlight);
 
-        boolean getIsFlying();
+        boolean isFlying();
 
-        void setIsFlying(boolean isFlying);
+        void setFlying(boolean isFlying);
     }
 
 

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

@@ -0,0 +1,72 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync.data;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import net.william278.husksync.HuskSync;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.function.BiFunction;
+
+/**
+ * An exception related to {@link DataSnapshot} formatting, thrown if an exception occurs when unpacking a snapshot
+ */
+@Getter
+public class DataException extends IllegalStateException {
+
+    private final Reason reason;
+
+    private DataException(@NotNull DataException.Reason reason, @NotNull DataSnapshot data, @NotNull HuskSync plugin) {
+        super(reason.getMessage(plugin, data));
+        this.reason = reason;
+    }
+
+    /**
+     * Reasons why {@link DataException}s were thrown
+     */
+    @AllArgsConstructor
+    public enum Reason {
+        INVALID_MINECRAFT_VERSION((plugin, snapshot) -> String.format("The Minecraft version of the snapshot (%s) is " +
+                                                                      "newer than the server's version (%s). Ensure each server is on the same version of Minecraft.",
+                snapshot.getMinecraftVersion(), plugin.getMinecraftVersion())),
+        INVALID_FORMAT_VERSION((plugin, snapshot) -> String.format("The format version of the snapshot (%s) is newer " +
+                                                                   "than the server's version (%s). Ensure each server is running the same version of HuskSync.",
+                snapshot.getFormatVersion(), DataSnapshot.CURRENT_FORMAT_VERSION)),
+        INVALID_PLATFORM_TYPE((plugin, snapshot) -> String.format("The platform type of the snapshot (%s) does " +
+                                                                  "not match the server's platform type (%s). Ensure each server has the same platform type.",
+                snapshot.getPlatformType(), plugin.getPlatformType())),
+        NO_LEGACY_CONVERTER((plugin, snapshot) -> String.format("No legacy converter to convert format version: %s",
+                snapshot.getFormatVersion()));
+
+        private final BiFunction<HuskSync, DataSnapshot, String> exception;
+
+        @NotNull
+        String getMessage(@NotNull HuskSync plugin, @NotNull DataSnapshot data) {
+            return exception.apply(plugin, data);
+        }
+
+        @NotNull
+        DataException toException(@NotNull DataSnapshot data, @NotNull HuskSync plugin) {
+            return new DataException(this, data, plugin);
+        }
+    }
+
+}

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

@@ -30,8 +30,11 @@ public interface DataHolder {
     @NotNull
     Map<Identifier, Data> getData();
 
-    default Optional<? extends Data> getData(@NotNull Identifier identifier) {
-        return Optional.ofNullable(getData().get(identifier));
+    default Optional<? extends Data> getData(@NotNull Identifier id) {
+        if (getData().containsKey(id)) {
+            return Optional.of(getData().get(id));
+        }
+        return Optional.empty();
     }
 
     default void setData(@NotNull Identifier identifier, @NotNull Data data) {
@@ -110,6 +113,15 @@ public interface DataHolder {
         getData().put(Identifier.HUNGER, hunger);
     }
 
+    @NotNull
+    default Optional<Data.Attributes> getAttributes() {
+        return Optional.ofNullable((Data.Attributes) getData().get(Identifier.ATTRIBUTES));
+    }
+
+    default void setAttributes(@NotNull Data.Attributes attributes) {
+        getData().put(Identifier.ATTRIBUTES, attributes);
+    }
+
     @NotNull
     default Optional<Data.Experience> getExperience() {
         return Optional.ofNullable((Data.Experience) getData().get(Identifier.EXPERIENCE));
@@ -128,6 +140,15 @@ public interface DataHolder {
         getData().put(Identifier.GAME_MODE, gameMode);
     }
 
+    @NotNull
+    default Optional<Data.FlightStatus> getFlightStatus() {
+        return Optional.ofNullable((Data.FlightStatus) getData().get(Identifier.FLIGHT_STATUS));
+    }
+
+    default void setFlightStatus(@NotNull Data.FlightStatus flightStatus) {
+        getData().put(Identifier.FLIGHT_STATUS, flightStatus);
+    }
+
     @NotNull
     default Optional<Data.PersistentData> getPersistentData() {
         return Optional.ofNullable((Data.PersistentData) getData().get(Identifier.PERSISTENT_DATA));

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

@@ -19,14 +19,20 @@
 
 package net.william278.husksync.data;
 
+import com.google.common.collect.Maps;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import de.themoep.minedown.adventure.MineDown;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 import net.william278.desertwell.util.Version;
 import net.william278.husksync.HuskSync;
 import net.william278.husksync.adapter.Adaptable;
 import net.william278.husksync.adapter.DataAdapter;
-import net.william278.husksync.config.Locales;
+import org.apache.commons.text.WordUtils;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -41,13 +47,15 @@ import java.util.stream.Collectors;
  *
  * @since 3.0
  */
+@SuppressWarnings({"LombokSetterMayBeUsed", "LombokGetterMayBeUsed"})
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class DataSnapshot {
 
     /*
      * Current version of the snapshot data format.
-     * HuskSync v3.0 uses v4; HuskSync v2.0 uses v1-v3
+     * HuskSync v3.1 uses v5, v3.0 uses v4; v2.0 uses v1-v3
      */
-    protected static final int CURRENT_FORMAT_VERSION = 4;
+    protected static final int CURRENT_FORMAT_VERSION = 5;
 
     @SerializedName("id")
     protected UUID id;
@@ -59,7 +67,10 @@ public class DataSnapshot {
     protected OffsetDateTime timestamp;
 
     @SerializedName("save_cause")
-    protected SaveCause saveCause;
+    protected String saveCause;
+
+    @SerializedName("server_name")
+    protected String serverName;
 
     @SerializedName("minecraft_version")
     protected String minecraftVersion;
@@ -73,23 +84,25 @@ public class DataSnapshot {
     @SerializedName("data")
     protected Map<String, String> data;
 
+    // If the snapshot is invalid, this will be set to the validation exception
+    @Nullable
+    @Expose(serialize = false, deserialize = false)
+    transient DataException.Reason exception = null;
+
     private DataSnapshot(@NotNull UUID id, boolean pinned, @NotNull OffsetDateTime timestamp,
-                         @NotNull SaveCause saveCause, @NotNull Map<String, String> data,
+                         @NotNull String saveCause, @NotNull String serverName, @NotNull Map<String, String> data,
                          @NotNull Version minecraftVersion, @NotNull String platformType, int formatVersion) {
         this.id = id;
         this.pinned = pinned;
         this.timestamp = timestamp;
         this.saveCause = saveCause;
+        this.serverName = serverName;
         this.data = data;
         this.minecraftVersion = minecraftVersion.toStringWithoutMetadata();
         this.platformType = platformType;
         this.formatVersion = formatVersion;
     }
 
-    @SuppressWarnings("unused")
-    private DataSnapshot() {
-    }
-
     @NotNull
     @ApiStatus.Internal
     public static DataSnapshot.Builder builder(@NotNull HuskSync plugin) {
@@ -100,37 +113,25 @@ public class DataSnapshot {
     @NotNull
     @ApiStatus.Internal
     public static DataSnapshot.Packed deserialize(@NotNull HuskSync plugin, byte[] data, @Nullable UUID id,
-                                                  @Nullable OffsetDateTime timestamp) throws IllegalStateException {
+                                                  @Nullable OffsetDateTime timestamp) {
         final DataSnapshot.Packed snapshot = plugin.getDataAdapter().fromBytes(data, DataSnapshot.Packed.class);
         if (snapshot.getMinecraftVersion().compareTo(plugin.getMinecraftVersion()) > 0) {
-            throw new IllegalStateException(String.format("Cannot set data for user because the Minecraft version of " +
-                            "their user data (%s) is newer than the server's Minecraft version (%s)." +
-                            "Please ensure each server is running the same version of Minecraft.",
-                    snapshot.getMinecraftVersion(), plugin.getMinecraftVersion()));
+            return snapshot.invalid(DataException.Reason.INVALID_MINECRAFT_VERSION);
         }
         if (snapshot.getFormatVersion() > CURRENT_FORMAT_VERSION) {
-            throw new IllegalStateException(String.format("Cannot set data for user because the format version of " +
-                            "their user data (%s) is newer than the current format version (%s). " +
-                            "Please ensure each server is running the latest version of HuskSync.",
-                    snapshot.getFormatVersion(), CURRENT_FORMAT_VERSION));
+            return snapshot.invalid(DataException.Reason.INVALID_FORMAT_VERSION);
         }
-        if (snapshot.getFormatVersion() < CURRENT_FORMAT_VERSION) {
+        if (snapshot.getFormatVersion() < 4) {
             if (plugin.getLegacyConverter().isPresent()) {
                 return plugin.getLegacyConverter().get().convert(
-                        data,
-                        Objects.requireNonNull(id, "Attempted legacy conversion with null UUID!"),
+                        data, Objects.requireNonNull(id, "Attempted legacy conversion with null UUID!"),
                         Objects.requireNonNull(timestamp, "Attempted legacy conversion with null timestamp!")
                 );
             }
-            throw new IllegalStateException(String.format(
-                    "No legacy converter to convert format version: %s", snapshot.getFormatVersion()
-            ));
+            return snapshot.invalid(DataException.Reason.NO_LEGACY_CONVERTER);
         }
         if (!snapshot.getPlatformType().equalsIgnoreCase(plugin.getPlatformType())) {
-            throw new IllegalStateException(String.format("Cannot set data for user because the platform type of " +
-                            "their user data (%s) is different to the server platform type (%s). " +
-                            "Please ensure each server is running the same platform type.",
-                    snapshot.getPlatformType(), plugin.getPlatformType()));
+            return snapshot.invalid(DataException.Reason.INVALID_PLATFORM_TYPE);
         }
         return snapshot;
     }
@@ -153,6 +154,17 @@ public class DataSnapshot {
         return id;
     }
 
+    /**
+     * <b>Internal use only</b> Set the ID of the snapshot
+     *
+     * @param id The snapshot ID
+     * @since 3.0
+     */
+    @ApiStatus.Internal
+    public void setId(@NotNull UUID id) {
+        this.id = id;
+    }
+
     /**
      * Get the short display ID of the snapshot
      *
@@ -192,7 +204,20 @@ public class DataSnapshot {
      */
     @NotNull
     public SaveCause getSaveCause() {
-        return saveCause;
+        return SaveCause.of(saveCause);
+    }
+
+    /**
+     * Get the server the snapshot was created on.
+     * <p>
+     * Note that snapshots generated before v3.1 will return {@code "N/A"}
+     *
+     * @return The server name
+     * @since 3.1
+     */
+    @NotNull
+    public String getServerName() {
+        return Optional.ofNullable(serverName).orElse("N/A");
     }
 
     /**
@@ -201,8 +226,8 @@ public class DataSnapshot {
      * @param saveCause The {@link SaveCause data save cause} of the snapshot
      * @since 3.0
      */
-    public void setSaveCause(SaveCause saveCause) {
-        this.saveCause = saveCause;
+    public void setSaveCause(@NotNull SaveCause saveCause) {
+        this.saveCause = saveCause.name();
     }
 
     /**
@@ -253,16 +278,39 @@ public class DataSnapshot {
      *
      * @since 3.0
      */
+    @NoArgsConstructor(access = AccessLevel.PRIVATE)
     public static class Packed extends DataSnapshot implements Adaptable {
 
         protected Packed(@NotNull UUID id, boolean pinned, @NotNull OffsetDateTime timestamp,
-                         @NotNull SaveCause saveCause, @NotNull Map<String, String> data,
+                         @NotNull String saveCause, @NotNull String serverName, @NotNull Map<String, String> data,
                          @NotNull Version minecraftVersion, @NotNull String platformType, int formatVersion) {
-            super(id, pinned, timestamp, saveCause, data, minecraftVersion, platformType, formatVersion);
+            super(id, pinned, timestamp, saveCause, serverName, data, minecraftVersion, platformType, formatVersion);
         }
 
-        @SuppressWarnings("unused")
-        private Packed() {
+        @NotNull
+        @ApiStatus.Internal
+        DataSnapshot.Packed invalid(@NotNull DataException.Reason reason) {
+            this.exception = reason;
+            return this;
+        }
+
+        public boolean isInvalid() {
+            return exception != null;
+        }
+
+        @NotNull
+        public String getInvalidReason(@NotNull HuskSync plugin) {
+            if (exception == null) {
+                throw new IllegalStateException("Attempted to get an invalid reason for a valid snapshot!");
+            }
+            return exception.getMessage(plugin, this);
+        }
+
+        @ApiStatus.Internal
+        void validate(@NotNull HuskSync plugin) throws DataException {
+            if (exception != null) {
+                throw exception.toException(this, plugin);
+            }
         }
 
         @ApiStatus.Internal
@@ -270,7 +318,7 @@ public class DataSnapshot {
             final Unpacked data = unpack(plugin);
             editor.accept(data);
             this.pinned = data.isPinned();
-            this.saveCause = data.getSaveCause();
+            this.saveCause = data.getSaveCause().name();
             this.data = data.serializeData(plugin);
         }
 
@@ -282,12 +330,11 @@ public class DataSnapshot {
         @NotNull
         public Packed copy() {
             return new Packed(
-                    UUID.randomUUID(), pinned, OffsetDateTime.now(), saveCause, data,
-                    getMinecraftVersion(), platformType, formatVersion
+                    UUID.randomUUID(), pinned, OffsetDateTime.now(), saveCause, serverName,
+                    data, getMinecraftVersion(), platformType, formatVersion
             );
         }
 
-        @NotNull
         @ApiStatus.Internal
         public byte[] asBytes(@NotNull HuskSync plugin) throws DataAdapter.AdaptionException {
             return plugin.getDataAdapter().toBytes(this);
@@ -305,9 +352,10 @@ public class DataSnapshot {
         }
 
         @NotNull
-        public DataSnapshot.Unpacked unpack(@NotNull HuskSync plugin) {
+        public DataSnapshot.Unpacked unpack(@NotNull HuskSync plugin) throws DataException {
+            this.validate(plugin);
             return new Unpacked(
-                    id, pinned, timestamp, saveCause, data,
+                    id, pinned, timestamp, saveCause, serverName, data,
                     getMinecraftVersion(), platformType, formatVersion, plugin
             );
         }
@@ -325,17 +373,17 @@ public class DataSnapshot {
         private final Map<Identifier, Data> deserialized;
 
         private Unpacked(@NotNull UUID id, boolean pinned, @NotNull OffsetDateTime timestamp,
-                         @NotNull SaveCause saveCause, @NotNull Map<String, String> data,
+                         @NotNull String saveCause, @NotNull String serverName, @NotNull Map<String, String> data,
                          @NotNull Version minecraftVersion, @NotNull String platformType, int formatVersion,
                          @NotNull HuskSync plugin) {
-            super(id, pinned, timestamp, saveCause, data, minecraftVersion, platformType, formatVersion);
+            super(id, pinned, timestamp, saveCause, serverName, data, minecraftVersion, platformType, formatVersion);
             this.deserialized = deserializeData(plugin);
         }
 
         private Unpacked(@NotNull UUID id, boolean pinned, @NotNull OffsetDateTime timestamp,
-                         @NotNull SaveCause saveCause, @NotNull Map<Identifier, Data> data,
+                         @NotNull String saveCause, @NotNull String serverName, @NotNull Map<Identifier, Data> data,
                          @NotNull Version minecraftVersion, @NotNull String platformType, int formatVersion) {
-            super(id, pinned, timestamp, saveCause, Map.of(), minecraftVersion, platformType, formatVersion);
+            super(id, pinned, timestamp, saveCause, serverName, Map.of(), minecraftVersion, platformType, formatVersion);
             this.deserialized = data;
         }
 
@@ -343,23 +391,26 @@ public class DataSnapshot {
         @ApiStatus.Internal
         private Map<Identifier, Data> deserializeData(@NotNull HuskSync plugin) {
             return data.entrySet().stream()
-                    .map((entry) -> plugin.getIdentifier(entry.getKey()).map(id -> Map.entry(
-                            id, plugin.getSerializers().get(id).deserialize(entry.getValue())
-                    )).orElse(null))
-                    .filter(Objects::nonNull)
-                    .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+                    .filter(e -> plugin.getIdentifier(e.getKey()).isPresent())
+                    .map(entry -> Map.entry(plugin.getIdentifier(entry.getKey()).orElseThrow(), entry.getValue()))
+                    .collect(Collectors.toMap(
+                            Map.Entry::getKey,
+                            entry -> plugin.deserializeData(entry.getKey(), entry.getValue(), getMinecraftVersion()),
+                            (a, b) -> a,
+                            HashMap::new
+                    ));
         }
 
         @NotNull
         @ApiStatus.Internal
         private Map<String, String> serializeData(@NotNull HuskSync plugin) {
             return deserialized.entrySet().stream()
-                    .map((entry) -> Map.entry(entry.getKey().toString(),
-                            Objects.requireNonNull(
-                                    plugin.getSerializers().get(entry.getKey()),
-                                    String.format("No serializer found for %s", entry.getKey())
-                            ).serialize(entry.getValue())))
-                    .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+                    .collect(Collectors.toMap(
+                            entry -> entry.getKey().toString(),
+                            entry -> plugin.serializeData(entry.getKey(), entry.getValue()),
+                            (a, b) -> a,
+                            HashMap::new
+                    ));
         }
 
         /**
@@ -373,6 +424,20 @@ public class DataSnapshot {
             return deserialized;
         }
 
+        /**
+         * Get a sorted iterable of the snapshots the snapshot is holding
+         *
+         * @return The data map
+         * @since 3.8.2
+         */
+        @NotNull
+        @ApiStatus.Internal
+        public Iterable<Map.Entry<Identifier, Data>> getSortedIterable() {
+            final TreeMap<Identifier, Data> tree = Maps.newTreeMap(SerializerRegistry.DEPENDENCY_ORDER_COMPARATOR);
+            tree.putAll(deserialized);
+            return tree.entrySet();
+        }
+
         /**
          * Pack the {@link DataSnapshot} into a {@link DataSnapshot.Packed packed} snapshot
          *
@@ -384,7 +449,7 @@ public class DataSnapshot {
         @ApiStatus.Internal
         public DataSnapshot.Packed pack(@NotNull HuskSync plugin) {
             return new DataSnapshot.Packed(
-                    id, pinned, timestamp, saveCause, serializeData(plugin),
+                    id, pinned, timestamp, saveCause, serverName, serializeData(plugin),
                     getMinecraftVersion(), platformType, formatVersion
             );
         }
@@ -402,6 +467,7 @@ public class DataSnapshot {
         private final HuskSync plugin;
         private UUID id;
         private SaveCause saveCause;
+        private String serverName;
         private boolean pinned;
         private OffsetDateTime timestamp;
         private final Map<Identifier, Data> data;
@@ -409,9 +475,10 @@ public class DataSnapshot {
         private Builder(@NotNull HuskSync plugin) {
             this.plugin = plugin;
             this.pinned = false;
-            this.data = new HashMap<>();
+            this.data = Maps.newHashMap();
             this.timestamp = OffsetDateTime.now();
             this.id = UUID.randomUUID();
+            this.serverName = plugin.getServerName();
         }
 
         /**
@@ -441,6 +508,19 @@ public class DataSnapshot {
             return this;
         }
 
+        /**
+         * Set the name of the server where this snapshot was created
+         *
+         * @param serverName The server name
+         * @return The builder
+         * @since 3.1
+         */
+        @NotNull
+        public Builder serverName(@NotNull String serverName) {
+            this.serverName = serverName;
+            return this;
+        }
+
         /**
          * Set whether the data should be pinned
          *
@@ -471,7 +551,10 @@ public class DataSnapshot {
         @NotNull
         public Builder timestamp(@NotNull OffsetDateTime timestamp) {
             if (timestamp.isAfter(OffsetDateTime.now())) {
-                throw new IllegalArgumentException("Data snapshots cannot have a timestamp set in the future");
+                throw new IllegalArgumentException("Data snapshots cannot have a timestamp set in the future! "
+                        + "Make sure your database server time matches the server time.\n"
+                        + "Current game server timestamp: " + OffsetDateTime.now() + " / "
+                        + "Snapshot timestamp: " + timestamp);
             }
             this.timestamp = timestamp;
             return this;
@@ -624,6 +707,21 @@ public class DataSnapshot {
             return data(Identifier.HUNGER, hunger);
         }
 
+        /**
+         * Set the attributes of the snapshot
+         * <p>
+         * Equivalent to {@code data(Identifier.ATTRIBUTES, attributes)}
+         * </p>
+         *
+         * @param attributes The user's attributes
+         * @return The builder
+         * @since 3.5
+         */
+        @NotNull
+        public Builder attributes(@NotNull Data.Attributes attributes) {
+            return data(Identifier.ATTRIBUTES, attributes);
+        }
+
         /**
          * Set the experience of the snapshot
          * <p>
@@ -654,6 +752,21 @@ public class DataSnapshot {
             return data(Identifier.GAME_MODE, gameMode);
         }
 
+        /**
+         * Set the flight status of the snapshot
+         * <p>
+         * Equivalent to {@code data(Identifier.FLIGHT_STATUS, flightStatus)}
+         * </p>
+         *
+         * @param flightStatus The flight status
+         * @return The builder
+         * @since 3.5
+         */
+        @NotNull
+        public Builder flightStatus(@NotNull Data.FlightStatus flightStatus) {
+            return data(Identifier.FLIGHT_STATUS, flightStatus);
+        }
+
         /**
          * Set the persistent data container of the snapshot
          * <p>
@@ -683,9 +796,10 @@ public class DataSnapshot {
             }
             return new Unpacked(
                     id,
-                    pinned || plugin.getSettings().doAutoPin(saveCause),
+                    pinned || plugin.getSettings().getSynchronization().doAutoPin(saveCause),
                     timestamp,
-                    saveCause,
+                    saveCause.name(),
+                    serverName,
                     data,
                     plugin.getMinecraftVersion(),
                     plugin.getPlatformType(),
@@ -707,134 +821,289 @@ public class DataSnapshot {
 
     }
 
+    public interface Cause {
+
+        @NotNull
+        String name();
+
+        /**
+         * Returns the capitalized display name of the cause.
+         *
+         * @return the cause display name
+         */
+        @NotNull
+        default String getDisplayName() {
+            return WordUtils.capitalizeFully(name().replaceAll("_", " "));
+        }
+
+    }
+
     /**
-     * Identifies the cause of a player data save.
-     *
-     * @implNote This enum is saved in the database.
+     * A string wrapper, for identifying the cause of a player data save.
      * </p>
      * Cause names have a max length of 32 characters.
      */
-    public enum SaveCause {
+    @Accessors(fluent = true)
+    @Getter
+    @AllArgsConstructor(access = AccessLevel.PRIVATE)
+    public static class SaveCause implements Cause {
 
         /**
          * Indicates data saved when a player disconnected from the server (either to change servers, or to log off)
          *
          * @since 2.0
          */
-        DISCONNECT,
+        public static final SaveCause DISCONNECT = of("DISCONNECT");
+
         /**
          * Indicates data saved when the world saved
          *
          * @since 2.0
          */
-        WORLD_SAVE,
+        public static final SaveCause WORLD_SAVE = of("WORLD_SAVE");
+
         /**
          * Indicates data saved when the user died
          *
          * @since 2.1
          */
-        DEATH,
+        public static final SaveCause DEATH = of("DEATH");
+
         /**
          * Indicates data saved when the server shut down
          *
          * @since 2.0
          */
-        SERVER_SHUTDOWN,
+        public static final SaveCause SERVER_SHUTDOWN = of("SERVER_SHUTDOWN", false);
+
         /**
          * Indicates data was saved by editing inventory contents via the {@code /inventory} command
          *
          * @since 2.0
          */
-        INVENTORY_COMMAND,
+        public static final SaveCause INVENTORY_COMMAND = of("INVENTORY_COMMAND");
+
         /**
          * Indicates data was saved by editing Ender Chest contents via the {@code /enderchest} command
          *
          * @since 2.0
          */
-        ENDERCHEST_COMMAND,
+        public static final SaveCause ENDERCHEST_COMMAND = of("ENDERCHEST_COMMAND");
+
         /**
          * Indicates data was saved by restoring it from a previous version
          *
          * @since 2.0
          */
-        BACKUP_RESTORE,
+        public static final SaveCause BACKUP_RESTORE = of("BACKUP_RESTORE");
+
+        /**
+         * Indicates data was saved from executing the {@code /userdata save} command
+         *
+         * @since 3.8
+         */
+        public static final SaveCause SAVE_COMMAND = of("SAVE_COMMAND", true);
+
+        /**
+         * Indicates data was saved from executing the {@code /userdata dump} command
+         *
+         * @since 3.8
+         */
+        public static final SaveCause DUMP_COMMAND = of("DUMP_COMMAND", true);
+
         /**
          * Indicates data was saved by an API call
          *
          * @since 2.0
          */
-        API,
+        public static final SaveCause API = of("API");
+
         /**
          * Indicates data was saved from being imported from MySQLPlayerDataBridge
          *
          * @since 2.0
          */
-        MPDB_MIGRATION,
+        public static final SaveCause MPDB_MIGRATION = of("MPDB_MIGRATION", false);
+
         /**
          * Indicates data was saved from being imported from a legacy version (v1.x -> v2.x)
          *
          * @since 2.0
          */
-        LEGACY_MIGRATION,
+        public static final SaveCause LEGACY_MIGRATION = of("LEGACY_MIGRATION", false);
+
         /**
          * Indicates data was saved from being imported from a legacy version (v2.x -> v3.x)
          *
          * @since 3.0
          */
-        CONVERTED_FROM_V2;
+        public static final SaveCause CONVERTED_FROM_V2 = of("CONVERTED_FROM_V2", false);
 
         @NotNull
-        public String getDisplayName() {
-            return Locales.truncate(name().toLowerCase(Locale.ENGLISH)
-                    .replaceAll("_", " "), 18);
+        private final String name;
+
+        private final boolean fireDataSaveEvent;
+
+        private static Map<String, SaveCause> registry;
+
+        /**
+         * Get or create a {@link SaveCause} from a name
+         *
+         * @param name the name to be displayed
+         * @return the cause
+         */
+        @NotNull
+        public static SaveCause of(@NotNull String name) {
+            return of(name, true);
         }
 
+        /**
+         * Get or create a {@link SaveCause} from a name and whether it should fire a save event
+         *
+         * @param name           the name to be displayed
+         * @param firesSaveEvent whether the cause should fire a save event
+         * @return the cause
+         */
+        @NotNull
+        public static SaveCause of(@NotNull String name, boolean firesSaveEvent) {
+            name = name.length() > 32 ? name.substring(0, 31) : name;
+
+            if (registry == null) registry = new HashMap<>();
+            if (registry.containsKey(name)) return registry.get(name);
+
+            SaveCause cause = new SaveCause(name, firesSaveEvent);
+            registry.put(cause.name(), cause);
+            return cause;
+        }
+
+        @NotNull
+        public String getLocale(@NotNull HuskSync plugin) {
+            return plugin.getLocales()
+                    .getRawLocale("save_cause_%s".formatted(name().toLowerCase(Locale.ENGLISH)))
+                    .orElse(getDisplayName());
+        }
+
+        @NotNull
+        @ApiStatus.Obsolete
+        public static SaveCause[] values() {
+            if (registry == null) registry = new HashMap<>();
+            return registry.values().toArray(new SaveCause[0]);
+        }
     }
 
     /**
-     * Represents the cause of a player having their data updated.
+     * A string wrapper, for identifying the cause of a player data update.
+     * </p>
+     * Cause names have a max length of 32 characters.
      */
-    public enum UpdateCause {
+    @Accessors(fluent = true)
+    @Getter
+    @AllArgsConstructor(access = AccessLevel.PRIVATE)
+    public static class UpdateCause implements Cause {
+
         /**
          * Indicates the data was updated by a synchronization process
          *
          * @since 3.0
          */
-        SYNCHRONIZED("synchronization_complete", "synchronization_failed"),
+        public static final UpdateCause SYNCHRONIZED = of("SYNCHRONIZED",
+                "synchronization_complete", "synchronization_failed"
+        );
+
         /**
          * Indicates the data was updated by a user joining the server
          *
          * @since 3.0
          */
-        NEW_USER("user_registration_complete", null),
+        public static final UpdateCause NEW_USER = of("NEW_USER",
+                "user_registration_complete", null
+        );
+
         /**
          * Indicates the data was updated by a data update process (management command, API, etc.)
          *
          * @since 3.0
          */
-        UPDATED("data_update_complete", "data_update_failed");
+        public static final UpdateCause UPDATED = of("UPDATED",
+                "data_update_complete", "data_update_failed"
+        );
 
-        private final String completedLocale;
-        private final String failureLocale;
+        /**
+         * Indicates data was saved by an API call
+         *
+         * @since 3.3.3
+         */
+        public static final UpdateCause API = of("API");
 
-        UpdateCause(@Nullable String completedLocale, @Nullable String failureLocale) {
-            this.completedLocale = completedLocale;
-            this.failureLocale = failureLocale;
+        @NotNull
+        private final String name;
+        @Nullable
+        private String completedLocale;
+        @Nullable
+        private String failureLocale;
+
+        /**
+         * Get or create a {@link UpdateCause} from a name and completed/failure locales
+         *
+         * @param name            the name to be displayed
+         * @param completedLocale the locale to be displayed on successful update,
+         *                        or {@code null} if none is to be shown
+         * @param failureLocale   the locale to be displayed on a failed update,
+         *                        or {@code null} if none is to be shown
+         * @return the cause
+         */
+        public static UpdateCause of(@NotNull String name, @Nullable String completedLocale,
+                                     @Nullable String failureLocale) {
+            return new UpdateCause(
+                    name.length() > 32 ? name.substring(0, 31) : name,
+                    completedLocale, failureLocale
+            );
         }
 
+        /**
+         * Get or create a {@link UpdateCause} from a name
+         *
+         * @param name the name to be displayed
+         * @return the cause
+         */
+        @NotNull
+        public static UpdateCause of(@NotNull String name) {
+            return of(name, null, null);
+        }
+
+        /**
+         * Get the message to be displayed when a user's data is successfully updated.
+         *
+         * @param plugin plugin instance
+         * @return the message
+         */
         public Optional<MineDown> getCompletedLocale(@NotNull HuskSync plugin) {
-            if (completedLocale != null) {
-                return plugin.getLocales().getLocale(completedLocale);
+            if (completedLocale() != null) {
+                return Optional.of(plugin.getLocales().getLocale(completedLocale())
+                        .orElse(plugin.getLocales().format(getDisplayName())));
             }
             return Optional.empty();
         }
 
+        /**
+         * Get the message to be displayed when a user's data fails to update.
+         *
+         * @param plugin plugin instance
+         * @return the message
+         */
         public Optional<MineDown> getFailedLocale(@NotNull HuskSync plugin) {
-            if (failureLocale != null) {
-                return plugin.getLocales().getLocale(failureLocale);
+            if (failureLocale() != null) {
+                return Optional.of(plugin.getLocales().getLocale(failureLocale())
+                        .orElse(plugin.getLocales().format(failureLocale())));
             }
             return Optional.empty();
         }
 
+        @NotNull
+        public static UpdateCause[] values() {
+            return new UpdateCause[]{
+                    SYNCHRONIZED, NEW_USER, UPDATED
+            };
+        }
     }
 }

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

@@ -19,38 +19,88 @@
 
 package net.william278.husksync.data;
 
+import lombok.*;
 import net.kyori.adventure.key.InvalidKeyException;
 import net.kyori.adventure.key.Key;
+import net.kyori.adventure.key.KeyPattern;
 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;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Stream;
 
 /**
  * Identifiers of different types of {@link Data}s
  */
-public class Identifier {
+@Getter
+public class Identifier implements Comparable<Identifier> {
 
-    public static Identifier INVENTORY = huskSync("inventory", true);
-    public static Identifier ENDER_CHEST = huskSync("ender_chest", true);
-    public static Identifier POTION_EFFECTS = huskSync("potion_effects", true);
-    public static Identifier ADVANCEMENTS = huskSync("advancements", true);
-    public static Identifier LOCATION = huskSync("location", false);
-    public static Identifier STATISTICS = huskSync("statistics", true);
-    public static Identifier HEALTH = huskSync("health", true);
-    public static Identifier HUNGER = huskSync("hunger", true);
-    public static Identifier EXPERIENCE = huskSync("experience", true);
-    public static Identifier GAME_MODE = huskSync("game_mode", true);
-    public static Identifier PERSISTENT_DATA = huskSync("persistent_data", true);
+    // Namespace for built-in identifiers
+    private static final @KeyPattern String DEFAULT_NAMESPACE = "husksync";
+
+    // Built-in identifiers
+    public static final Identifier PERSISTENT_DATA = huskSync("persistent_data", true);
+    public static final Identifier INVENTORY = huskSync("inventory", true);
+    public static final Identifier ENDER_CHEST = huskSync("ender_chest", true);
+    public static final Identifier ADVANCEMENTS = huskSync("advancements", true);
+    public static final Identifier STATISTICS = huskSync("statistics", true);
+    public static final Identifier POTION_EFFECTS = huskSync("potion_effects", true);
+    public static final Identifier GAME_MODE = huskSync("game_mode", true);
+    public static final Identifier FLIGHT_STATUS = huskSync("flight_status", true,
+            Dependency.optional("game_mode")
+    );
+    public static final Identifier ATTRIBUTES = huskSync("attributes", true,
+            Dependency.optional("inventory"),
+            Dependency.optional("potion_effects")
+    );
+    public static final Identifier HEALTH = huskSync("health", true,
+            Dependency.optional("attributes")
+    );
+    public static final Identifier HUNGER = huskSync("hunger", true,
+            Dependency.optional("attributes")
+    );
+    public static final Identifier EXPERIENCE = huskSync("experience", true,
+            Dependency.optional("advancements")
+    );
+    public static final Identifier LOCATION = huskSync("location", false,
+            Dependency.optional("flight_status"),
+            Dependency.optional("potion_effects")
+    );
 
     private final Key key;
-    private final boolean configDefault;
+    private final boolean enabledByDefault;
+    @Getter
+    private final Set<Dependency> dependencies;
+    @Setter
+    @Getter
+    public boolean enabled;
 
-    private Identifier(@NotNull Key key, boolean configDefault) {
+    private Identifier(@NotNull Key key, boolean enabledByDefault, @NotNull Set<Dependency> dependencies) {
         this.key = key;
-        this.configDefault = configDefault;
+        this.enabledByDefault = enabledByDefault;
+        this.enabled = enabledByDefault;
+        this.dependencies = dependencies;
+    }
+
+    /**
+     * Create an identifier from a {@link Key}
+     *
+     * @param key          the key
+     * @param dependencies the dependencies
+     * @return the identifier
+     * @since 3.5.4
+     */
+    @NotNull
+    public static Identifier from(@NotNull Key key, @NotNull Set<Dependency> dependencies) {
+        if (key.namespace().equals(DEFAULT_NAMESPACE)) {
+            throw new IllegalArgumentException("Cannot register with %s as key namespace!".formatted(key.namespace()));
+        }
+        return new Identifier(key, true, dependencies);
     }
 
     /**
@@ -62,10 +112,7 @@ public class Identifier {
      */
     @NotNull
     public static Identifier from(@NotNull Key key) {
-        if (key.namespace().equals("husksync")) {
-            throw new IllegalArgumentException("You cannot register a key with \"husksync\" as the namespace!");
-        }
-        return new Identifier(key, true);
+        return from(key, Collections.emptySet());
     }
 
     /**
@@ -81,25 +128,34 @@ public class Identifier {
         return from(Key.key(plugin, name));
     }
 
+    /**
+     * Create an identifier from a namespace, value, and dependencies
+     *
+     * @param plugin       the namespace
+     * @param name         the value
+     * @param dependencies the dependencies
+     * @return the identifier
+     * @since 3.5.4
+     */
+    @NotNull
+    public static Identifier from(@Subst("plugin") @NotNull String plugin, @Subst("null") @NotNull String name,
+                                  @NotNull Set<Dependency> dependencies) {
+        return from(Key.key(plugin, name), dependencies);
+    }
+
+    // Return an identifier with a HuskSync namespace
     @NotNull
     private static Identifier huskSync(@Subst("null") @NotNull String name,
                                        boolean configDefault) throws InvalidKeyException {
-        return new Identifier(Key.key("husksync", name), configDefault);
+        return new Identifier(Key.key(DEFAULT_NAMESPACE, name), configDefault, Collections.emptySet());
     }
 
+    // Return an identifier with a HuskSync namespace
     @NotNull
-    @SuppressWarnings("unused")
-    private static Identifier parse(@NotNull String key) throws InvalidKeyException {
-        return huskSync(key, true);
-    }
-
-    public boolean isEnabledByDefault() {
-        return configDefault;
-    }
-
-    @NotNull
-    private Map.Entry<String, Boolean> getConfigEntry() {
-        return Map.entry(getKeyValue(), configDefault);
+    private static Identifier huskSync(@Subst("null") @NotNull String name,
+                                       @SuppressWarnings("SameParameterValue") boolean configDefault,
+                                       @NotNull Dependency... dependents) throws InvalidKeyException {
+        return new Identifier(Key.key(DEFAULT_NAMESPACE, name), configDefault, Set.of(dependents));
     }
 
     /**
@@ -113,13 +169,24 @@ public class Identifier {
     @SuppressWarnings("unchecked")
     public static Map<String, Boolean> getConfigMap() {
         return Map.ofEntries(Stream.of(
-                        INVENTORY, ENDER_CHEST, POTION_EFFECTS, ADVANCEMENTS, LOCATION,
-                        STATISTICS, HEALTH, HUNGER, EXPERIENCE, GAME_MODE, PERSISTENT_DATA
+                        INVENTORY, ENDER_CHEST, POTION_EFFECTS, ADVANCEMENTS, LOCATION, STATISTICS,
+                        HEALTH, HUNGER, ATTRIBUTES, EXPERIENCE, GAME_MODE, FLIGHT_STATUS, PERSISTENT_DATA
                 )
                 .map(Identifier::getConfigEntry)
                 .toArray(Map.Entry[]::new));
     }
 
+    /**
+     * Returns {@code true} if the identifier depends on the given identifier
+     *
+     * @param identifier the identifier to check
+     * @return {@code true} if the identifier depends on the given identifier
+     * @since 3.5.4
+     */
+    public boolean dependsOn(@NotNull Identifier identifier) {
+        return dependencies.contains(Dependency.required(identifier.key));
+    }
+
     /**
      * Get the namespace of the identifier
      *
@@ -146,13 +213,30 @@ public class Identifier {
      * @return {@code false} if {@link #getKeyNamespace()} returns "husksync"; {@code true} otherwise
      */
     public boolean isCustom() {
-        return !getKeyNamespace().equals("husksync");
+        return !getKeyNamespace().equals(DEFAULT_NAMESPACE);
+    }
+
+    /**
+     * Get the minimal string representation of this key.
+     * <p>
+     * If the namespace of the key is {@link #DEFAULT_NAMESPACE}, only the key value will be returned.
+     *
+     * @return the minimal string key representation
+     * @since 3.8
+     */
+    @NotNull
+    public String asMinimalString() {
+        if (getKey().namespace().equals(DEFAULT_NAMESPACE)) {
+            return getKey().value();
+        }
+        return getKey().asString();
     }
 
     /**
      * Returns the identifier as a string (the key)
      *
      * @return the identifier as a string
+     * @since 3.0
      */
     @NotNull
     @Override
@@ -161,17 +245,123 @@ public class Identifier {
     }
 
     /**
-     * Returns {@code true} if the given object is an identifier with the same key as this identifier
+     * Return whether this Identifier is equal to another Identifier
      *
-     * @param obj the object to compare
-     * @return {@code true} if the given object is an identifier with the same key as this identifier
+     * @param obj another object
+     * @return {@code true} if this identifier matches the identifier of {@code obj}
+     * @since 3.8
      */
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(@Nullable Object obj) {
         if (obj instanceof Identifier other) {
-            return key.equals(other.key);
+            return asMinimalString().equals(other.asMinimalString());
         }
         return false;
     }
 
+    /**
+     * Get the hash code of the Identifier (equivalent to {@link #asMinimalString()}->{@code #hashCode()}
+     *
+     * @return the hash code
+     * @since 3.8
+     */
+    @Override
+    public int hashCode() {
+        return asMinimalString().hashCode();
+    }
+
+    // Get the config entry for the identifier
+    @NotNull
+    private Map.Entry<String, Boolean> getConfigEntry() {
+        return Map.entry(getKeyValue(), enabledByDefault);
+    }
+
+    // Comparable; always sort this Identifier after any dependencies
+    @Override
+    public int compareTo(@NotNull Identifier o) {
+        if (this.dependsOn(o)) return 1;
+        if (o.dependsOn(this)) return -1;
+        return this.key.compareTo(o.key);
+    }
+
+    /**
+     * Compares two identifiers based on their dependencies.
+     * <p>
+     * If this identifier contains a dependency on the other, it should come after & vice versa
+     *
+     * @since 3.5.4
+     */
+    @NoArgsConstructor(access = AccessLevel.PACKAGE)
+    static class DependencyOrderComparator implements Comparator<Identifier> {
+
+        @Override
+        public int compare(@NotNull Identifier i1, @NotNull Identifier i2) {
+            if (i1.equals(i2)) {
+                return 0;
+            }
+            if (i1.dependsOn(i2)) {
+                if (i2.dependsOn(i1)) {
+                    throw new IllegalArgumentException(
+                            "Found circular dependency between %s and %s".formatted(i1.getKey(), i2.getKey())
+                    );
+                }
+                return 1;
+            }
+            return -1;
+        }
+
+    }
+
+    /**
+     * Represents a data dependency of an identifier, used to determine the order in which data is applied to users
+     *
+     * @since 3.5.4
+     */
+    @Getter
+    @AllArgsConstructor(access = AccessLevel.PRIVATE)
+    public static class Dependency {
+        /**
+         * Key of the data dependency see {@code Identifier#key()}
+         */
+        private Key key;
+        /**
+         * Whether the data dependency is required to be present & enabled for the dependant data to enabled
+         */
+        private boolean required;
+
+        @NotNull
+        protected static Dependency required(@NotNull Key identifier) {
+            return new Dependency(identifier, true);
+        }
+
+        @NotNull
+        public static Dependency optional(@NotNull Key identifier) {
+            return new Dependency(identifier, false);
+        }
+
+        @NotNull
+        @SuppressWarnings("SameParameterValue")
+        private static Dependency required(@Subst("null") @NotNull String identifier) {
+            return required(Key.key("husksync", identifier));
+        }
+
+        @NotNull
+        private static Dependency optional(@Subst("null") @NotNull String identifier) {
+            return optional(Key.key("husksync", identifier));
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (obj instanceof Dependency other) {
+                return key.equals(other.key);
+            }
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            return key.toString().hashCode();
+        }
+    }
+
 }

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

@@ -19,26 +19,55 @@
 
 package net.william278.husksync.data;
 
+import net.william278.desertwell.util.Version;
+import net.william278.husksync.HuskSync;
+import net.william278.husksync.adapter.Adaptable;
 import org.jetbrains.annotations.NotNull;
 
 public interface Serializer<T extends Data> {
 
-    T deserialize(@NotNull String serialized) throws DeserializationException;
+    T deserialize(@NotNull String serialized);
+
+    default T deserialize(@NotNull String serialized, @NotNull Version dataMcVersion) throws DeserializationException {
+        return deserialize(serialized);
+    }
 
     @NotNull
     String serialize(@NotNull T element) throws SerializationException;
 
-    static final class DeserializationException extends IllegalStateException {
+    final class DeserializationException extends IllegalStateException {
         DeserializationException(@NotNull String message, @NotNull Throwable cause) {
             super(message, cause);
         }
     }
 
-    static final class SerializationException extends IllegalStateException {
+    final class SerializationException extends IllegalStateException {
         SerializationException(@NotNull String message, @NotNull Throwable cause) {
             super(message, cause);
         }
     }
 
 
+    class Json<T extends Data & Adaptable> implements Serializer<T> {
+
+        private final HuskSync plugin;
+        private final Class<T> type;
+
+        public Json(@NotNull HuskSync plugin, @NotNull Class<T> type) {
+            this.type = type;
+            this.plugin = plugin;
+        }
+
+        @Override
+        public T deserialize(@NotNull String serialized) throws DeserializationException {
+            return plugin.getDataAdapter().fromJson(serialized, type);
+        }
+
+        @NotNull
+        @Override
+        public String serialize(@NotNull T element) throws SerializationException {
+            return plugin.getDataAdapter().toJson(element);
+        }
+
+    }
 }

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

@@ -0,0 +1,172 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync.data;
+
+import net.william278.desertwell.util.Version;
+import net.william278.husksync.HuskSync;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.*;
+import java.util.logging.Level;
+import java.util.stream.Collectors;
+
+public interface SerializerRegistry {
+
+    // Comparator for ordering identifiers based on dependency
+    @NotNull
+    @ApiStatus.Internal
+    Comparator<Identifier> DEPENDENCY_ORDER_COMPARATOR = new Identifier.DependencyOrderComparator();
+
+    /**
+     * Returns the data serializer for the given {@link Identifier}
+     *
+     * @since 3.0
+     */
+    @NotNull
+    <T extends Data> Map<Identifier, Serializer<T>> getSerializers();
+
+    /**
+     * Register a data serializer for the given {@link Identifier}
+     *
+     * @param id         the {@link Identifier}
+     * @param serializer the {@link Serializer}
+     * @since 3.0
+     */
+    @SuppressWarnings("unchecked")
+    default void registerSerializer(@NotNull Identifier id, @NotNull Serializer<? extends Data> serializer) {
+        if (id.isCustom()) {
+            getPlugin().log(Level.INFO, "Registered custom data type: %s".formatted(id));
+        }
+        id.setEnabled(id.isCustom() || getPlugin().getSettings().getSynchronization().isFeatureEnabled(id));
+        getSerializers().put(id, (Serializer<Data>) serializer);
+    }
+
+    /**
+     * Ensure dependencies for identifiers that have required dependencies are met
+     * <p>
+     * This checks the dependencies of all registered identifiers and throws an {@link IllegalStateException}
+     * if a dependency has not been registered or enabled via the config
+     *
+     * @since 3.5.4
+     */
+    default void validateDependencies() throws IllegalStateException {
+        getSerializers().keySet().stream().filter(Identifier::isEnabled)
+                .forEach(identifier -> {
+                    final List<String> unmet = identifier.getDependencies().stream()
+                            .filter(Identifier.Dependency::isRequired)
+                            .filter(dep -> !isDataTypeAvailable(dep.getKey().asString()))
+                            .map(dep -> dep.getKey().asString()).toList();
+                    if (!unmet.isEmpty()) {
+                        identifier.setEnabled(false);
+                        getPlugin().log(Level.WARNING, "Disabled %s syncing as the following types need to be on: %s"
+                                .formatted(identifier, String.join(", ", unmet)));
+                    }
+                });
+    }
+
+    /**
+     * Get the {@link Identifier} for the given key
+     *
+     * @since 3.0
+     */
+    default Optional<Identifier> getIdentifier(@NotNull String key) {
+        return getSerializers().keySet().stream().filter(e -> e.toString().equals(key)).findFirst();
+    }
+
+    /**
+     * Get a data serializer for the given {@link Identifier}
+     *
+     * @param identifier the {@link Identifier} to get the serializer for
+     * @return the {@link Serializer} for the given {@link Identifier}
+     * @since 3.5.4
+     */
+    default Optional<Serializer<Data>> getSerializer(@NotNull Identifier identifier) {
+        return Optional.ofNullable(getSerializers().get(identifier));
+    }
+
+    /**
+     * Serialize data for the given {@link Identifier}
+     *
+     * @param identifier the {@link Identifier} to serialize data for
+     * @param data       the data to serialize
+     * @return the serialized data
+     * @throws IllegalArgumentException if no serializer is found for the given {@link Identifier}
+     * @since 3.5.4
+     */
+    @NotNull
+    default String serializeData(@NotNull Identifier identifier, @NotNull Data data) throws IllegalStateException {
+        return getSerializer(identifier).map(serializer -> serializer.serialize(data))
+                .orElseThrow(() -> new IllegalStateException("No serializer found for %s".formatted(identifier)));
+    }
+
+    /**
+     * Deserialize data of a given {@link Version Minecraft version} for the given {@link Identifier data identifier}
+     *
+     * @param identifier    the {@link Identifier} to deserialize data for
+     * @param data          the data to deserialize
+     * @param dataMcVersion the Minecraft version of the data
+     * @return the deserialized data
+     * @throws IllegalStateException if no serializer is found for the given {@link Identifier}
+     * @since 3.6.4
+     */
+    @NotNull
+    default Data deserializeData(@NotNull Identifier identifier, @NotNull String data,
+                                 @NotNull Version dataMcVersion) throws IllegalStateException {
+        return getSerializer(identifier).map(serializer -> serializer.deserialize(data, dataMcVersion)).orElseThrow(
+                () -> new IllegalStateException("No serializer found for %s".formatted(identifier))
+        );
+    }
+
+    /**
+     * Deserialize data for the given {@link Identifier data identifier}
+     *
+     * @param identifier the {@link Identifier} to deserialize data for
+     * @param data       the data to deserialize
+     * @return the deserialized data
+     * @since 3.5.4
+     * @deprecated Use {@link #deserializeData(Identifier, String, Version)} instead
+     */
+    @NotNull
+    @Deprecated(since = "3.6.5")
+    default Data deserializeData(@NotNull Identifier identifier, @NotNull String data) {
+        return deserializeData(identifier, data, getPlugin().getMinecraftVersion());
+    }
+
+    /**
+     * Get the list of registered data types, in dependency order
+     *
+     * @return the list of registered data types
+     * @since 3.0
+     */
+    @NotNull
+    default List<Identifier> getRegisteredDataTypes() {
+        return getSerializers().keySet().stream().sorted(DEPENDENCY_ORDER_COMPARATOR).toList();
+    }
+
+    // Returns if a data type is available and enabled in the config
+    private boolean isDataTypeAvailable(@NotNull String key) {
+        return getIdentifier(key).map(Identifier::isEnabled).orElse(false);
+    }
+
+    @NotNull
+    HuskSync getPlugin();
+
+}

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

@@ -27,6 +27,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
+import java.util.stream.Collectors;
 
 /**
  * A holder of data in the form of {@link Data}s, which can be synced
@@ -34,7 +35,7 @@ import java.util.logging.Level;
 public interface UserDataHolder extends DataHolder {
 
     /**
-     * Get the data that is enabled for syncing in the config
+     * Get the data enabled for syncing in the config
      *
      * @return the data that is enabled for syncing
      * @since 3.0
@@ -43,10 +44,14 @@ public interface UserDataHolder extends DataHolder {
     @NotNull
     default Map<Identifier, Data> getData() {
         return getPlugin().getRegisteredDataTypes().stream()
-                .filter(type -> type.isCustom() || getPlugin().getSettings().isSyncFeatureEnabled(type))
+                .filter(Identifier::isEnabled)
                 .map(id -> Map.entry(id, getData(id)))
                 .filter(data -> data.getValue().isPresent())
-                .collect(HashMap::new, (map, data) -> map.put(data.getKey(), data.getValue().get()), HashMap::putAll);
+                .collect(Collectors.toMap(
+                        Map.Entry::getKey,
+                        entry -> entry.getValue().get(),
+                        (a, b) -> a, HashMap::new
+                ));
     }
 
     /**
@@ -60,7 +65,7 @@ public interface UserDataHolder extends DataHolder {
      */
     @Override
     default void setData(@NotNull Identifier identifier, @NotNull Data data) {
-        getPlugin().runSync(() -> data.apply(this, getPlugin()));
+        getPlugin().runSync(() -> data.apply(this, getPlugin()), this);
     }
 
     /**
@@ -75,11 +80,21 @@ public interface UserDataHolder extends DataHolder {
         return DataSnapshot.builder(getPlugin()).data(this.getData()).saveCause(saveCause).buildAndPack();
     }
 
+    /**
+     * Returns whether data can be applied to the holder at this time
+     *
+     * @return {@code true} if data can be applied, otherwise false
+     */
+    default boolean cannotApplySnapshot() {
+        return false;
+    }
+
     /**
      * Deserialize and apply a data snapshot to this data owner
      * <p>
      * This method will deserialize the data on the current thread, then synchronously apply it on
-     * the main server thread.
+     * the main server thread. The order data will be applied is determined based on the dependencies of
+     * each data type (see {@link Identifier.Dependency}).
      * </p>
      * The {@code runAfter} callback function will be run after the snapshot has been applied.
      *
@@ -89,28 +104,39 @@ public interface UserDataHolder extends DataHolder {
      * @since 3.0
      */
     default void applySnapshot(@NotNull DataSnapshot.Packed snapshot, @NotNull ThrowingConsumer<Boolean> runAfter) {
-        final HuskSync plugin = getPlugin();
+        if (cannotApplySnapshot()) {
+            return;
+        }
 
         // Unpack the snapshot
+        final HuskSync plugin = getPlugin();
         final DataSnapshot.Unpacked unpacked;
         try {
             unpacked = snapshot.unpack(plugin);
         } catch (Throwable e) {
             plugin.log(Level.SEVERE, String.format("Failed to unpack data snapshot for %s", getUsername()), e);
+            runAfter.accept(false);
             return;
         }
 
         // Synchronously attempt to apply the snapshot
         plugin.runSync(() -> {
+            if (cannotApplySnapshot()) {
+                return;
+            }
+
             try {
-                for (Map.Entry<Identifier, Data> entry : unpacked.getData().entrySet()) {
+                for (Map.Entry<Identifier, Data> entry : unpacked.getSortedIterable()) {
                     final Identifier identifier = entry.getKey();
-                    if (plugin.getSettings().isSyncFeatureEnabled(identifier)) {
-                        if (identifier.isCustom()) {
-                            getCustomDataStore().put(identifier, entry.getValue());
-                        }
-                        entry.getValue().apply(this, plugin);
+                    if (!identifier.isEnabled()) {
+                        continue;
                     }
+
+                    // Apply the identified data
+                    if (identifier.isCustom()) {
+                        getCustomDataStore().put(identifier, entry.getValue());
+                    }
+                    entry.getValue().apply(this, plugin);
                 }
             } catch (Throwable e) {
                 plugin.log(Level.SEVERE, String.format("Failed to apply data snapshot to %s", getUsername()), e);
@@ -118,7 +144,7 @@ public interface UserDataHolder extends DataHolder {
                 return;
             }
             plugin.runAsync(() -> runAfter.accept(true));
-        });
+        }, this);
     }
 
     @Override
@@ -171,6 +197,11 @@ public interface UserDataHolder extends DataHolder {
         this.setData(Identifier.GAME_MODE, gameMode);
     }
 
+    @Override
+    default void setFlightStatus(@NotNull Data.FlightStatus flightStatus) {
+        this.setData(Identifier.FLIGHT_STATUS, flightStatus);
+    }
+
     @Override
     default void setPersistentData(@NotNull Data.PersistentData persistentData) {
         this.setData(Identifier.PERSISTENT_DATA, persistentData);

common/src/main/java/net/william278/husksync/database/Database.java

@@ -19,22 +19,21 @@
 
 package net.william278.husksync.database;
 
+import lombok.Getter;
 import net.william278.husksync.HuskSync;
 import net.william278.husksync.config.Settings;
 import net.william278.husksync.data.DataSnapshot;
-import net.william278.husksync.data.DataSnapshot.SaveCause;
-import net.william278.husksync.data.UserDataHolder;
 import net.william278.husksync.user.User;
+import org.intellij.lang.annotations.Language;
 import org.jetbrains.annotations.Blocking;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.time.OffsetDateTime;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.UUID;
+import java.util.*;
+import java.util.function.BiConsumer;
 
 /**
  * An abstract representation of the plugin database, storing player data.
@@ -59,8 +58,8 @@ public abstract class Database {
     @SuppressWarnings("SameParameterValue")
     @NotNull
     protected final String[] getSchemaStatements(@NotNull String schemaFileName) throws IOException {
-        return formatStatementTables(new String(Objects.requireNonNull(plugin.getResource(schemaFileName))
-                .readAllBytes(), StandardCharsets.UTF_8)).split(";");
+        return Arrays.stream(formatStatementTables(new String(Objects.requireNonNull(plugin.getResource(schemaFileName))
+                .readAllBytes(), StandardCharsets.UTF_8)).split(";")).filter(s -> !s.isBlank()).toArray(String[]::new);
     }
 
     /**
@@ -70,9 +69,12 @@ public abstract class Database {
      * @return the formatted statement, with table placeholders replaced with the correct names
      */
     @NotNull
-    protected final String formatStatementTables(@NotNull String sql) {
-        return sql.replaceAll("%users_table%", plugin.getSettings().getTableName(Settings.TableName.USERS))
-                .replaceAll("%user_data_table%", plugin.getSettings().getTableName(Settings.TableName.USER_DATA));
+    protected final String formatStatementTables(@NotNull @Language("SQL") String sql) {
+        final Settings.DatabaseSettings settings = plugin.getSettings().getDatabase();
+        return sql.replaceAll("%users_table%", settings.getTableName(TableName.USERS))
+                .replaceAll("%user_data_table%", settings.getTableName(TableName.USER_DATA))
+                .replaceAll("%map_data_table%", settings.getTableName(TableName.MAP_DATA))
+                .replaceAll("%map_ids_table%", settings.getTableName(TableName.MAP_IDS));
     }
 
     /**
@@ -109,6 +111,14 @@ public abstract class Database {
     @Blocking
     public abstract Optional<User> getUserByName(@NotNull String username);
 
+    /**
+     * Get all users
+     *
+     * @return A list of all users
+     */
+    @NotNull
+    @Blocking
+    public abstract List<User> getAllUsers();
 
     /**
      * Get the latest data snapshot for a user.
@@ -129,6 +139,15 @@ public abstract class Database {
     @NotNull
     public abstract List<DataSnapshot.Packed> getAllSnapshots(@NotNull User user);
 
+    /**
+     * Get the number of unpinned {@link DataSnapshot}s a user has
+     *
+     * @param user the user to count snapshots for
+     * @return the number of snapshots this user has saved
+     */
+    @Blocking
+    public abstract int getUnpinnedSnapshotCount(@NotNull User user);
+
     /**
      * Gets a specific {@link DataSnapshot} entry for a user from the database, by its UUID.
      *
@@ -157,43 +176,24 @@ public abstract class Database {
     @Blocking
     public abstract boolean deleteSnapshot(@NotNull User user, @NotNull UUID versionUuid);
 
-    /**
-     * Save user data to the database
-     * </p>
-     * This will remove the oldest data for the user if the amount of data exceeds the limit as configured
-     *
-     * @param user     The user to add data for
-     * @param snapshot The {@link DataSnapshot} to set.
-     *                 The implementation should version it with a random UUID and the current timestamp during insertion.
-     * @see UserDataHolder#createSnapshot(SaveCause)
-     */
-    @Blocking
-    public void addSnapshot(@NotNull User user, @NotNull DataSnapshot.Packed snapshot) {
-        if (snapshot.getSaveCause() != SaveCause.SERVER_SHUTDOWN) {
-            plugin.fireEvent(
-                    plugin.getDataSaveEvent(user, snapshot),
-                    (event) -> this.addAndRotateSnapshot(user, snapshot)
-            );
-            return;
-        }
-
-        this.addAndRotateSnapshot(user, snapshot);
-    }
 
     /**
-     * <b>Internal</b> - Save user data to the database. This will:
+     * Save user data to the database, doing the following (in order):
      * <ol>
      *     <li>Delete their most recent snapshot, if it was created before the backup frequency time</li>
      *     <li>Create the snapshot</li>
      *     <li>Rotate snapshot backups</li>
      * </ol>
+     * This is an expensive blocking method and should be run off the main thread.
      *
      * @param user     The user to add data for
      * @param snapshot The {@link DataSnapshot} to set.
+     * @apiNote Prefer {@link net.william278.husksync.sync.DataSyncer#saveData(User, DataSnapshot.Packed, BiConsumer)}.
+     * </p>This method will not fire the {@link net.william278.husksync.event.DataSaveEvent}
      */
     @Blocking
-    private void addAndRotateSnapshot(@NotNull User user, @NotNull DataSnapshot.Packed snapshot) {
-        final int backupFrequency = plugin.getSettings().getBackupFrequency();
+    public void addSnapshot(@NotNull User user, @NotNull DataSnapshot.Packed snapshot) {
+        final int backupFrequency = plugin.getSettings().getSynchronization().getSnapshotBackupFrequency();
         if (!snapshot.isPinned() && backupFrequency > 0) {
             this.rotateLatestSnapshot(user, snapshot.getTimestamp().minusHours(backupFrequency));
         }
@@ -259,6 +259,58 @@ public abstract class Database {
         });
     }
 
+    /**
+     * Write map data to a database
+     *
+     * @param serverName Name of the server the map originates from
+     * @param mapId      Original map ID
+     * @param data       Map data
+     */
+    @Blocking
+    public abstract void saveMapData(@NotNull String serverName, int mapId, byte @NotNull [] data);
+
+    /**
+     * Read map data from a database
+     *
+     * @param serverName Name of the server the map originates from
+     * @param mapId      Original map ID
+     * @return the map data bytes, or null if not found
+     */
+    @Blocking
+    public abstract byte @Nullable [] getMapData(@NotNull String serverName, int mapId);
+
+    /**
+     * Reverse lookup: given a local map binding, find the origin server and map ID.
+     *
+     * @param serverName Name of the local server (to_server_name in the binding)
+     * @param mapId      Local map ID on this server (to_id in the binding)
+     * @return Map.Entry with origin server name (key) and origin map ID (value), or null if not found
+     */
+    @Blocking
+    public abstract @Nullable Map.Entry<String, Integer> getMapBinding(@NotNull String serverName, int mapId);
+
+    /**
+     * Bind map IDs across different servers
+     *
+     * @param fromServerName Name of the server the map originates from
+     * @param fromMapId      Original map ID
+     * @param toServerName   Name of the new server
+     * @param toMapId        New map ID
+     */
+    @Blocking
+    public abstract void setMapBinding(@NotNull String fromServerName, int fromMapId, @NotNull String toServerName, int toMapId);
+
+    /**
+     * Get map ID for the new server
+     *
+     * @param fromServerName Name of the server the map originates from
+     * @param fromMapId      Original map ID
+     * @param toServerName   Name of the new server
+     * @return New map ID or -1 if not found
+     */
+    @Blocking
+    public abstract int getBoundMapId(@NotNull String fromServerName, int fromMapId, @NotNull String toServerName);
+
     /**
      * Wipes <b>all</b> {@link User} entries from the database.
      * <b>This should only be used when preparing tables for a data migration.</b>
@@ -274,9 +326,12 @@ public abstract class Database {
     /**
      * Identifies types of databases
      */
+    @Getter
     public enum Type {
         MYSQL("MySQL", "mysql"),
-        MARIADB("MariaDB", "mariadb");
+        MARIADB("MariaDB", "mariadb"),
+        POSTGRES("PostgreSQL", "postgresql"),
+        MONGO("MongoDB", "mongo");
 
         private final String displayName;
         private final String protocol;
@@ -285,16 +340,35 @@ public abstract class Database {
             this.displayName = displayName;
             this.protocol = protocol;
         }
-
-        @NotNull
-        public String getDisplayName() {
-            return displayName;
-        }
-
-        @NotNull
-        public String getProtocol() {
-            return protocol;
-        }
     }
 
+    /**
+     * Represents the names of tables in the database
+     */
+    @Getter
+    public enum TableName {
+        USERS("husksync_users"),
+        USER_DATA("husksync_user_data"),
+        MAP_DATA("husksync_map_data"),
+        MAP_IDS("husksync_map_ids");
+
+        private final String defaultName;
+
+        TableName(@NotNull String defaultName) {
+            this.defaultName = defaultName;
+        }
+
+        @NotNull
+        private Map.Entry<String, String> toEntry() {
+            return Map.entry(name().toLowerCase(Locale.ENGLISH), defaultName);
+        }
+
+        @SuppressWarnings("unchecked")
+        @NotNull
+        public static Map<String, String> getDefaults() {
+            return Map.ofEntries(Arrays.stream(values())
+                    .map(TableName::toEntry)
+                    .toArray(Map.Entry[]::new));
+        }
+    }
 }

common/src/main/java/net/william278/husksync/database/MongoDbDatabase.java

@@ -0,0 +1,459 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync.database;
+
+import com.google.common.collect.Lists;
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoException;
+import com.mongodb.client.FindIterable;
+import com.mongodb.client.model.Updates;
+import net.william278.husksync.HuskSync;
+import net.william278.husksync.config.Settings;
+import net.william278.husksync.data.DataSnapshot;
+import net.william278.husksync.database.mongo.MongoCollectionHelper;
+import net.william278.husksync.database.mongo.MongoConnectionHandler;
+import net.william278.husksync.user.User;
+import org.bson.Document;
+import org.bson.conversions.Bson;
+import org.bson.types.Binary;
+import org.jetbrains.annotations.Blocking;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.util.*;
+import java.util.logging.Level;
+
+public class MongoDbDatabase extends Database {
+    private MongoConnectionHandler mongoConnectionHandler;
+    private MongoCollectionHelper mongoCollectionHelper;
+
+    private final String usersTable;
+    private final String userDataTable;
+    private final String mapDataTable;
+    private final String mapIdsTable;
+
+    public MongoDbDatabase(@NotNull HuskSync plugin) {
+        super(plugin);
+        this.usersTable = plugin.getSettings().getDatabase().getTableName(TableName.USERS);
+        this.userDataTable = plugin.getSettings().getDatabase().getTableName(TableName.USER_DATA);
+        this.mapDataTable = plugin.getSettings().getDatabase().getTableName(TableName.MAP_DATA);
+        this.mapIdsTable = plugin.getSettings().getDatabase().getTableName(TableName.MAP_IDS);
+    }
+
+    @Override
+    public void initialize() throws IllegalStateException {
+        final Settings.DatabaseSettings.DatabaseCredentials credentials = plugin.getSettings().getDatabase().getCredentials();
+        try {
+            ConnectionString URI = createConnectionURI(credentials);
+            mongoConnectionHandler = new MongoConnectionHandler(URI, credentials.getDatabase());
+            mongoCollectionHelper = new MongoCollectionHelper(mongoConnectionHandler);
+
+            // Check config for if tables should be created
+            if (!plugin.getSettings().getDatabase().isCreateTables()) return;
+
+            if (mongoCollectionHelper.getCollection(usersTable) == null) {
+                mongoCollectionHelper.createCollection(usersTable);
+            }
+            if (mongoCollectionHelper.getCollection(userDataTable) == null) {
+                mongoCollectionHelper.createCollection(userDataTable);
+            }
+            if (mongoCollectionHelper.getCollection(mapDataTable) == null) {
+                mongoCollectionHelper.createCollection(mapDataTable);
+            }
+            if (mongoCollectionHelper.getCollection(mapIdsTable) == null) {
+                mongoCollectionHelper.createCollection(mapIdsTable);
+            }
+        } catch (Exception e) {
+            throw new IllegalStateException("Failed to establish a connection to the MongoDB database. " +
+                    "Please check the supplied database credentials in the config file", e);
+        }
+    }
+
+    @NotNull
+    private ConnectionString createConnectionURI(Settings.DatabaseSettings.DatabaseCredentials credentials) {
+        String baseURI = plugin.getSettings().getDatabase().getMongoSettings().isUsingAtlas() ?
+                "mongodb+srv://{0}:{1}@{2}/{4}{5}" : "mongodb://{0}:{1}@{2}:{3}/{4}{5}";
+        baseURI = baseURI.replace("{0}", credentials.getUsername());
+        baseURI = baseURI.replace("{1}", credentials.getPassword());
+        baseURI = baseURI.replace("{2}", credentials.getHost());
+        baseURI = baseURI.replace("{3}", String.valueOf(credentials.getPort()));
+        baseURI = baseURI.replace("{4}", credentials.getDatabase());
+        baseURI = baseURI.replace("{5}", plugin.getSettings().getDatabase().getMongoSettings().getParameters());
+        return new ConnectionString(baseURI);
+    }
+
+    @Blocking
+    @Override
+    public void ensureUser(@NotNull User user) {
+        try {
+            getUser(user.getUuid()).ifPresentOrElse(
+                    existingUser -> {
+                        if (!existingUser.getName().equals(user.getName())) {
+                            // Update a user's name if it has changed in the database
+                            try {
+                                Document filter = new Document("uuid", existingUser.getUuid());
+                                Document doc = mongoCollectionHelper.getCollection(usersTable).find(filter).first();
+                                if (doc == null) {
+                                    throw new MongoException("User document returned null!");
+                                }
+
+                                Bson updates = Updates.set("username", user.getName());
+                                mongoCollectionHelper.updateDocument(usersTable, doc, updates);
+                            } catch (MongoException e) {
+                                plugin.log(Level.SEVERE, "Failed to insert a user into the database", e);
+                            }
+                        }
+                    },
+                    () -> {
+                        // Insert new player data into the database
+                        try {
+                            Document doc = new Document("uuid", user.getUuid()).append("username", user.getName());
+                            mongoCollectionHelper.insertDocument(usersTable, doc);
+                        } catch (MongoException e) {
+                            plugin.log(Level.SEVERE, "Failed to insert a user into the database", e);
+                        }
+                    }
+            );
+        } catch (MongoException e) {
+            plugin.log(Level.SEVERE, "Failed to ensure user data is in the database", e);
+        }
+    }
+
+    @Blocking
+    @Override
+    public Optional<User> getUser(@NotNull UUID uuid) {
+        try {
+            Document filter = new Document("uuid", uuid);
+            Document doc = mongoCollectionHelper.getCollection(usersTable).find(filter).first();
+            if (doc != null) {
+                return Optional.of(new User(uuid, doc.getString("username")));
+            }
+            return Optional.empty();
+        } catch (MongoException e) {
+            plugin.log(Level.SEVERE, "Failed to get user data from the database", e);
+            return Optional.empty();
+        }
+    }
+
+    @Blocking
+    @Override
+    public Optional<User> getUserByName(@NotNull String username) {
+        try {
+            Document filter = new Document("username", username);
+            Document doc = mongoCollectionHelper.getCollection(usersTable).find(filter).first();
+            if (doc != null) {
+                return Optional.of(new User(doc.get("uuid", UUID.class),
+                        doc.getString("username")));
+            }
+            return Optional.empty();
+        } catch (MongoException e) {
+            plugin.log(Level.SEVERE, "Failed to get user data from the database", e);
+            return Optional.empty();
+        }
+    }
+
+    @Override
+    @NotNull
+    public List<User> getAllUsers() {
+        final List<User> users = Lists.newArrayList();
+        try {
+            final FindIterable<Document> doc = mongoCollectionHelper.getCollection(usersTable).find();
+            for (Document document : doc) {
+                users.add(new User(
+                        UUID.fromString(document.getString("uuid")),
+                        document.getString("username")
+                ));
+            }
+        } catch (MongoException e) {
+            plugin.log(Level.SEVERE, "Failed to get all users from the database", e);
+        }
+        return users;
+    }
+
+    @Blocking
+    @Override
+    public Optional<DataSnapshot.Packed> getLatestSnapshot(@NotNull User user) {
+        try {
+            Document filter = new Document("player_uuid", user.getUuid());
+            Document sort = new Document("timestamp", -1); // -1 = Descending
+            FindIterable<Document> iterable = mongoCollectionHelper.getCollection(userDataTable).find(filter).sort(sort);
+            Document doc = iterable.first();
+            if (doc != null) {
+                final UUID versionUuid = doc.get("version_uuid", UUID.class);
+                final OffsetDateTime timestamp = OffsetDateTime.ofInstant(Instant.ofEpochMilli((long) doc.get("timestamp")), TimeZone.getDefault().toZoneId());
+                final Binary bin = doc.get("data", Binary.class);
+                final byte[] dataByteArray = bin.getData();
+                return Optional.of(DataSnapshot.deserialize(plugin, dataByteArray, versionUuid, timestamp));
+            }
+            return Optional.empty();
+        } catch (MongoException e) {
+            plugin.log(Level.SEVERE, "Failed to get latest snapshot from the database", e);
+            return Optional.empty();
+        }
+    }
+
+    @Blocking
+    @Override
+    @NotNull
+    public List<DataSnapshot.Packed> getAllSnapshots(@NotNull User user) {
+        try {
+            final List<DataSnapshot.Packed> retrievedData = Lists.newArrayList();
+            Document filter = new Document("player_uuid", user.getUuid());
+            Document sort = new Document("timestamp", -1); // -1 = Descending
+            FindIterable<Document> iterable = mongoCollectionHelper.getCollection(userDataTable).find(filter).sort(sort);
+            for (Document doc : iterable) {
+                final UUID versionUuid = doc.get("version_uuid", UUID.class);
+                final OffsetDateTime timestamp = OffsetDateTime.ofInstant(Instant.ofEpochMilli((long) doc.get("timestamp")), TimeZone.getDefault().toZoneId());
+                final Binary bin = doc.get("data", Binary.class);
+                final byte[] dataByteArray = bin.getData();
+                retrievedData.add(DataSnapshot.deserialize(plugin, dataByteArray, versionUuid, timestamp));
+            }
+            return retrievedData;
+        } catch (MongoException e) {
+            plugin.log(Level.SEVERE, "Failed to get all snapshots from the database", e);
+            return Lists.newArrayList();
+        }
+    }
+
+    @Override
+    public int getUnpinnedSnapshotCount(@NotNull User user) {
+        try {
+            Document filter = new Document("player_uuid", user.getUuid()).append("pinned", false);
+            return (int) mongoCollectionHelper.getCollection(userDataTable).countDocuments(filter);
+        } catch (MongoException e) {
+            plugin.log(Level.SEVERE, "Failed to fetch a user's current snapshot count", e);
+        }
+        return 0;
+    }
+
+    @Blocking
+    @Override
+    public Optional<DataSnapshot.Packed> getSnapshot(@NotNull User user, @NotNull UUID versionUuid) {
+        try {
+            Document filter = new Document("player_uuid", user.getUuid()).append("version_uuid", versionUuid);
+            Document sort = new Document("timestamp", -1); // -1 = Descending
+            FindIterable<Document> iterable = mongoCollectionHelper.getCollection(userDataTable).find(filter).sort(sort);
+            Document doc = iterable.first();
+            if (doc != null) {
+                final OffsetDateTime timestamp = OffsetDateTime.ofInstant(Instant.ofEpochMilli((long) doc.get("timestamp")), TimeZone.getDefault().toZoneId());
+                final Binary bin = doc.get("data", Binary.class);
+                final byte[] dataByteArray = bin.getData();
+                return Optional.of(DataSnapshot.deserialize(plugin, dataByteArray, versionUuid, timestamp));
+            }
+            return Optional.empty();
+        } catch (MongoException e) {
+            plugin.log(Level.SEVERE, "Failed to get snapshot from the database", e);
+            return Optional.empty();
+        }
+    }
+
+    @Blocking
+    @Override
+    protected void rotateSnapshots(@NotNull User user) {
+        try {
+            final int unpinnedSnapshots = getUnpinnedSnapshotCount(user);
+            final int maxSnapshots = plugin.getSettings().getSynchronization().getMaxUserDataSnapshots();
+            if (unpinnedSnapshots > maxSnapshots) {
+                Document filter = new Document("player_uuid", user.getUuid()).append("pinned", false);
+                Document sort = new Document("timestamp", 1); // 1 = Ascending
+                FindIterable<Document> iterable = mongoCollectionHelper.getCollection(userDataTable)
+                        .find(filter).sort(sort)
+                        .limit(unpinnedSnapshots - maxSnapshots);
+
+                for (Document doc : iterable) {
+                    mongoCollectionHelper.deleteDocument(userDataTable, doc);
+                }
+            }
+        } catch (MongoException e) {
+            plugin.log(Level.SEVERE, "Failed to rotate snapshots", e);
+        }
+    }
+
+    @Blocking
+    @Override
+    public boolean deleteSnapshot(@NotNull User user, @NotNull UUID versionUuid) {
+        try {
+            Document filter = new Document("player_uuid", user.getUuid()).append("version_uuid", versionUuid);
+            Document doc = mongoCollectionHelper.getCollection(userDataTable).find(filter).first();
+            if (doc == null) {
+                return false;
+            }
+            mongoCollectionHelper.deleteDocument(userDataTable, doc);
+            return true;
+        } catch (MongoException e) {
+            plugin.log(Level.SEVERE, "Failed to delete specific user data from the database", e);
+        }
+        return false;
+    }
+
+    @Blocking
+    @Override
+    protected void rotateLatestSnapshot(@NotNull User user, @NotNull OffsetDateTime within) {
+        try {
+            Document filter = new Document("player_uuid", user.getUuid()).append("pinned", false);
+            Document sort = new Document("timestamp", 1); // 1 = Ascending
+            FindIterable<Document> iterable = mongoCollectionHelper.getCollection(userDataTable)
+                    .find(filter)
+                    .sort(sort);
+
+            for (Document doc : iterable) {
+                final OffsetDateTime timestamp = OffsetDateTime.ofInstant(
+                        Instant.ofEpochMilli((long) doc.get("timestamp")), TimeZone.getDefault().toZoneId()
+                );
+                if (timestamp.isAfter(within)) {
+                    mongoCollectionHelper.deleteDocument(userDataTable, doc);
+                    return;
+                }
+            }
+        } catch (MongoException e) {
+            plugin.log(Level.SEVERE, "Failed to rotate latest snapshot from the database", e);
+        }
+    }
+
+    @Blocking
+    @Override
+    protected void createSnapshot(@NotNull User user, @NotNull DataSnapshot.Packed data) {
+        try {
+            Document doc = new Document("player_uuid", user.getUuid())
+                    .append("version_uuid", data.getId())
+                    .append("timestamp", data.getTimestamp().toInstant().toEpochMilli())
+                    .append("save_cause", data.getSaveCause().name())
+                    .append("pinned", data.isPinned())
+                    .append("data", new Binary(data.asBytes(plugin)));
+            mongoCollectionHelper.insertDocument(userDataTable, doc);
+        } catch (MongoException e) {
+            plugin.log(Level.SEVERE, "Failed to set user data in the database", e);
+        }
+    }
+
+    @Blocking
+    @Override
+    public void updateSnapshot(@NotNull User user, @NotNull DataSnapshot.Packed data) {
+        try {
+            Document doc = new Document("player_uuid", user.getUuid()).append("version_uuid", data.getId());
+            Bson updates = Updates.combine(
+                    Updates.set("save_cause", data.getSaveCause().name()),
+                    Updates.set("pinned", data.isPinned()),
+                    Updates.set("data", new Binary(data.asBytes(plugin)))
+            );
+            mongoCollectionHelper.updateDocument(userDataTable, doc, updates);
+        } catch (MongoException e) {
+            plugin.log(Level.SEVERE, "Failed to update snapshot in the database", e);
+        }
+    }
+
+    @Blocking
+    @Override
+    public void saveMapData(@NotNull String serverName, int mapId, byte @NotNull [] data) {
+        try {
+            Document doc = new Document("server_name", serverName)
+                    .append("map_id", mapId)
+                    .append("data", new Binary(data));
+            mongoCollectionHelper.insertDocument(mapDataTable, doc);
+        } catch (MongoException e) {
+            plugin.log(Level.SEVERE, "Failed to write map data to the database", e);
+        }
+    }
+
+    @Blocking
+    @Override
+    public byte @Nullable [] getMapData(@NotNull String serverName, int mapId) {
+        try {
+            Document filter = new Document("server_name", serverName).append("map_id", mapId);
+            FindIterable<Document> iterable = mongoCollectionHelper.getCollection(mapDataTable).find(filter);
+            Document doc = iterable.first();
+            if (doc != null) {
+                final Binary bin = doc.get("data", Binary.class);
+                return bin.getData();
+            }
+        } catch (MongoException e) {
+            plugin.log(Level.SEVERE, "Failed to get map data from the database", e);
+        }
+        return null;
+    }
+
+    @Blocking
+    @Override
+    public @Nullable Map.Entry<String, Integer> getMapBinding(@NotNull String serverName, int mapId) {
+        final Document filter = new Document("to_server_name", serverName).append("to_id", mapId);
+        final FindIterable<Document> iterable = mongoCollectionHelper.getCollection(mapIdsTable).find(filter);
+        final Document doc = iterable.first();
+        if (doc != null) {
+            return new AbstractMap.SimpleImmutableEntry<>(
+                    doc.getString("from_server_name"),
+                    doc.getInteger("from_id")
+            );
+        }
+        return null;
+    }
+
+    @Blocking
+    @Override
+    public void setMapBinding(@NotNull String fromServerName, int fromMapId, @NotNull String toServerName, int toMapId) {
+        try {
+            final Document doc = new Document("from_server_name", fromServerName)
+                    .append("from_id", fromMapId)
+                    .append("to_server_name", toServerName)
+                    .append("to_id", toMapId);
+            mongoCollectionHelper.insertDocument(mapIdsTable, doc);
+        } catch (MongoException e) {
+            plugin.log(Level.SEVERE, "Failed to connect map IDs in the database", e);
+        }
+    }
+
+    @Blocking
+    @Override
+    public int getBoundMapId(@NotNull String fromServerName, int fromMapId, @NotNull String toServerName) {
+        try {
+            final Document filter = new Document("from_server_name", fromServerName)
+                    .append("from_id", fromMapId)
+                    .append("to_server_name", toServerName);
+            final FindIterable<Document> iterable = mongoCollectionHelper.getCollection(mapIdsTable).find(filter);
+
+            final Document doc = iterable.first();
+            if (doc != null) {
+                return doc.getInteger("to_id");
+            }
+            return -1;
+        } catch (MongoException e) {
+            plugin.log(Level.SEVERE, "Failed to get new map id from the database", e);
+            return -1;
+        }
+    }
+
+    @Blocking
+    @Override
+    public void wipeDatabase() {
+        try {
+            mongoCollectionHelper.deleteCollection(usersTable);
+        } catch (MongoException e) {
+            plugin.log(Level.SEVERE, "Failed to wipe the database", e);
+        }
+    }
+
+    @Override
+    public void terminate() {
+        if (mongoConnectionHandler != null) {
+            mongoConnectionHandler.closeConnection();
+        }
+    }
+}

common/src/main/java/net/william278/husksync/database/MySqlDatabase.java

@@ -19,6 +19,7 @@
 
 package net.william278.husksync.database;
 
+import com.google.common.collect.Lists;
 import com.zaxxer.hikari.HikariDataSource;
 import net.william278.husksync.HuskSync;
 import net.william278.husksync.adapter.DataAdapter;
@@ -26,6 +27,7 @@ import net.william278.husksync.data.DataSnapshot;
 import net.william278.husksync.user.User;
 import org.jetbrains.annotations.Blocking;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -34,6 +36,8 @@ import java.time.OffsetDateTime;
 import java.util.*;
 import java.util.logging.Level;
 
+import static net.william278.husksync.config.Settings.DatabaseSettings;
+
 public class MySqlDatabase extends Database {
 
     private static final String DATA_POOL_NAME = "HuskSyncHikariPool";
@@ -43,9 +47,10 @@ public class MySqlDatabase extends Database {
 
     public MySqlDatabase(@NotNull HuskSync plugin) {
         super(plugin);
-        this.flavor = plugin.getSettings().getDatabaseType().getProtocol();
-        this.driverClass = plugin.getSettings().getDatabaseType() == Type.MARIADB
-                ? "org.mariadb.jdbc.Driver" : "com.mysql.cj.jdbc.Driver";
+
+        final Type type = plugin.getSettings().getDatabase().getType();
+        this.flavor = type.getProtocol();
+        this.driverClass = type == Type.MARIADB ? "org.mariadb.jdbc.Driver" : "com.mysql.cj.jdbc.Driver";
     }
 
     /**
@@ -67,26 +72,28 @@ public class MySqlDatabase extends Database {
     @Override
     public void initialize() throws IllegalStateException {
         // Initialize the Hikari pooled connection
+        final DatabaseSettings.DatabaseCredentials credentials = plugin.getSettings().getDatabase().getCredentials();
         dataSource = new HikariDataSource();
         dataSource.setDriverClassName(driverClass);
         dataSource.setJdbcUrl(String.format("jdbc:%s://%s:%s/%s%s",
                 flavor,
-                plugin.getSettings().getMySqlHost(),
-                plugin.getSettings().getMySqlPort(),
-                plugin.getSettings().getMySqlDatabase(),
-                plugin.getSettings().getMySqlConnectionParameters()
+                credentials.getHost(),
+                credentials.getPort(),
+                credentials.getDatabase(),
+                credentials.getParameters()
         ));
 
         // Authenticate with the database
-        dataSource.setUsername(plugin.getSettings().getMySqlUsername());
-        dataSource.setPassword(plugin.getSettings().getMySqlPassword());
+        dataSource.setUsername(credentials.getUsername());
+        dataSource.setPassword(credentials.getPassword());
 
         // Set connection pool options
-        dataSource.setMaximumPoolSize(plugin.getSettings().getMySqlConnectionPoolSize());
-        dataSource.setMinimumIdle(plugin.getSettings().getMySqlConnectionPoolIdle());
-        dataSource.setMaxLifetime(plugin.getSettings().getMySqlConnectionPoolLifetime());
-        dataSource.setKeepaliveTime(plugin.getSettings().getMySqlConnectionPoolKeepAlive());
-        dataSource.setConnectionTimeout(plugin.getSettings().getMySqlConnectionPoolTimeout());
+        final DatabaseSettings.PoolSettings pool = plugin.getSettings().getDatabase().getConnectionPool();
+        dataSource.setMaximumPoolSize(pool.getMaximumPoolSize());
+        dataSource.setMinimumIdle(pool.getMinimumIdle());
+        dataSource.setMaxLifetime(pool.getMaximumLifetime());
+        dataSource.setKeepaliveTime(pool.getKeepaliveTime());
+        dataSource.setConnectionTimeout(pool.getConnectionTimeout());
         dataSource.setPoolName(DATA_POOL_NAME);
 
         // Set additional connection pool properties
@@ -109,6 +116,9 @@ public class MySqlDatabase extends Database {
         );
         dataSource.setDataSourceProperties(properties);
 
+        // Check config for if tables should be created
+        if (!plugin.getSettings().getDatabase().isCreateTables()) return;
+
         // Prepare database schema; make tables if they don't exist
         try (Connection connection = dataSource.getConnection()) {
             final String[] databaseSchema = getSchemaStatements(String.format("database/%s_schema.sql", flavor));
@@ -131,7 +141,7 @@ public class MySqlDatabase extends Database {
     public void ensureUser(@NotNull User user) {
         getUser(user.getUuid()).ifPresentOrElse(
                 existingUser -> {
-                    if (!existingUser.getUsername().equals(user.getUsername())) {
+                    if (!existingUser.getName().equals(user.getName())) {
                         // Update a user's name if it has changed in the database
                         try (Connection connection = getConnection()) {
                             try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
@@ -139,11 +149,12 @@ public class MySqlDatabase extends Database {
                                     SET `username`=?
                                     WHERE `uuid`=?"""))) {
 
-                                statement.setString(1, user.getUsername());
+                                statement.setString(1, user.getName());
                                 statement.setString(2, existingUser.getUuid().toString());
                                 statement.executeUpdate();
                             }
-                            plugin.log(Level.INFO, "Updated " + user.getUsername() + "'s name in the database (" + existingUser.getUsername() + " -> " + user.getUsername() + ")");
+                            plugin.log(Level.INFO, "Updated " + user.getName() + "'s name in the database ("
+                                    + existingUser.getName() + " -> " + user.getName() + ")");
                         } catch (SQLException e) {
                             plugin.log(Level.SEVERE, "Failed to update a user's name on the database", e);
                         }
@@ -157,7 +168,7 @@ public class MySqlDatabase extends Database {
                                 VALUES (?,?);"""))) {
 
                             statement.setString(1, user.getUuid().toString());
-                            statement.setString(2, user.getUsername());
+                            statement.setString(2, user.getName());
                             statement.executeUpdate();
                         }
                     } catch (SQLException e) {
@@ -212,6 +223,27 @@ public class MySqlDatabase extends Database {
         return Optional.empty();
     }
 
+    @Override
+    @NotNull
+    public List<User> getAllUsers() {
+        final List<User> users = Lists.newArrayList();
+        try (Connection connection = getConnection()) {
+            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                    SELECT `uuid`, `username`
+                    FROM `%users_table%`;
+                    """))) {
+                final ResultSet resultSet = statement.executeQuery();
+                while (resultSet.next()) {
+                    users.add(new User(UUID.fromString(resultSet.getString("uuid")),
+                            resultSet.getString("username")));
+                }
+            }
+        } catch (SQLException e) {
+            plugin.log(Level.SEVERE, "Failed to fetch a user by name from the database", e);
+        }
+        return users;
+    }
+
     @Blocking
     @Override
     public Optional<DataSnapshot.Packed> getLatestSnapshot(@NotNull User user) {
@@ -245,7 +277,7 @@ public class MySqlDatabase extends Database {
     @Override
     @NotNull
     public List<DataSnapshot.Packed> getAllSnapshots(@NotNull User user) {
-        final List<DataSnapshot.Packed> retrievedData = new ArrayList<>();
+        final List<DataSnapshot.Packed> retrievedData = Lists.newArrayList();
         try (Connection connection = getConnection()) {
             try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
                     SELECT `version_uuid`, `timestamp`,  `data`
@@ -267,11 +299,30 @@ public class MySqlDatabase extends Database {
                 return retrievedData;
             }
         } catch (SQLException | DataAdapter.AdaptionException e) {
-            plugin.log(Level.SEVERE, "Failed to fetch a user's current user data from the database", e);
+            plugin.log(Level.SEVERE, "Failed to fetch a user's list of snapshots from the database", e);
         }
         return retrievedData;
     }
 
+    @Override
+    public int getUnpinnedSnapshotCount(@NotNull User user) {
+        try (Connection connection = getConnection()) {
+            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+            SELECT COUNT(`version_uuid`)
+            FROM `%user_data_table%`
+            WHERE `player_uuid`=? AND `pinned`=false;"""))) {
+                statement.setString(1, user.getUuid().toString());
+                final ResultSet resultSet = statement.executeQuery();
+                if (resultSet.next()) {
+                    return resultSet.getInt(1);
+                }
+            }
+        } catch (SQLException e) {
+            plugin.log(Level.SEVERE, "Failed to fetch a user's current snapshot count", e);
+        }
+        return 0;
+    }
+
     @Blocking
     @Override
     public Optional<DataSnapshot.Packed> getSnapshot(@NotNull User user, @NotNull UUID versionUuid) {
@@ -304,9 +355,9 @@ public class MySqlDatabase extends Database {
     @Blocking
     @Override
     protected void rotateSnapshots(@NotNull User user) {
-        final List<DataSnapshot.Packed> unpinnedUserData = getAllSnapshots(user).stream()
-                .filter(dataSnapshot -> !dataSnapshot.isPinned()).toList();
-        if (unpinnedUserData.size() > plugin.getSettings().getMaxUserDataSnapshots()) {
+        final int unpinnedSnapshots = getUnpinnedSnapshotCount(user);
+        final int maxSnapshots = plugin.getSettings().getSynchronization().getMaxUserDataSnapshots();
+        if (unpinnedSnapshots > maxSnapshots) {
             try (Connection connection = getConnection()) {
                 try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
                         DELETE FROM `%user_data_table%`
@@ -314,7 +365,7 @@ public class MySqlDatabase extends Database {
                         AND `pinned` IS FALSE
                         ORDER BY `timestamp` ASC
                         LIMIT %entry_count%;""".replace("%entry_count%",
-                        Integer.toString(unpinnedUserData.size() - plugin.getSettings().getMaxUserDataSnapshots()))))) {
+                        Integer.toString(unpinnedSnapshots - maxSnapshots))))) {
                     statement.setString(1, user.getUuid().toString());
                     statement.executeUpdate();
                 }
@@ -402,6 +453,120 @@ public class MySqlDatabase extends Database {
         }
     }
 
+    @Blocking
+    @Override
+    public void saveMapData(@NotNull String serverName, int mapId, byte @NotNull [] data) {
+        try (Connection connection = getConnection()) {
+            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                    INSERT INTO `%map_data_table%`
+                    (`server_name`,`map_id`,`data`)
+                    VALUES (?,?,?);"""))) {
+                statement.setString(1, serverName);
+                statement.setInt(2, mapId);
+                statement.setBlob(3, new ByteArrayInputStream(data));
+                statement.executeUpdate();
+            }
+        } catch (SQLException | DataAdapter.AdaptionException e) {
+            plugin.log(Level.SEVERE, "Failed to write map data to the database", e);
+        }
+    }
+
+    @Blocking
+    @Override
+    public byte @Nullable [] getMapData(@NotNull String serverName, int mapId) {
+        try (Connection connection = getConnection()) {
+            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                    SELECT `data`
+                    FROM `%map_data_table%`
+                    WHERE `server_name`=? AND `map_id`=?
+                    LIMIT 1;"""))) {
+                statement.setString(1, serverName);
+                statement.setInt(2, mapId);
+
+                final ResultSet resultSet = statement.executeQuery();
+                if (resultSet.next()) {
+                    final Blob blob = resultSet.getBlob("data");
+                    final byte[] dataByteArray = blob.getBytes(1, (int) blob.length());
+                    blob.free();
+                    return dataByteArray;
+                }
+            }
+        } catch (SQLException | DataAdapter.AdaptionException e) {
+            plugin.log(Level.SEVERE, "Failed to get map data from the database", e);
+        }
+        return null;
+    }
+
+    @Blocking
+    @Override
+    public @Nullable Map.Entry<String, Integer> getMapBinding(@NotNull String serverName, int mapId) {
+        try (Connection connection = getConnection()) {
+            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                    SELECT `from_server_name`, `from_id`
+                    FROM `%map_ids_table%`
+                    WHERE `to_server_name`=? AND `to_id`=?
+                    LIMIT 1;
+                    """))) {
+                statement.setString(1, serverName);
+                statement.setInt(2, mapId);
+
+                final ResultSet resultSet = statement.executeQuery();
+                if (resultSet.next()) {
+                    return new AbstractMap.SimpleImmutableEntry<>(
+                            resultSet.getString("from_server_name"),
+                            resultSet.getInt("from_id")
+                    );
+                }
+            }
+        } catch (SQLException | DataAdapter.AdaptionException e) {
+            plugin.log(Level.SEVERE, "Failed to get map data from the database", e);
+        }
+        return null;
+    }
+
+    @Blocking
+    @Override
+    public void setMapBinding(@NotNull String fromServerName, int fromMapId, @NotNull String toServerName, int toMapId) {
+        try (Connection connection = getConnection()) {
+            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                    INSERT INTO `%map_ids_table%`
+                    (`from_server_name`,`from_id`,`to_server_name`,`to_id`)
+                    VALUES (?,?,?,?);"""))) {
+                statement.setString(1, fromServerName);
+                statement.setInt(2, fromMapId);
+                statement.setString(3, toServerName);
+                statement.setInt(4, toMapId);
+                statement.executeUpdate();
+            }
+        } catch (SQLException | DataAdapter.AdaptionException e) {
+            plugin.log(Level.SEVERE, "Failed to connect map IDs in the database", e);
+        }
+    }
+
+    @Blocking
+    @Override
+    public int getBoundMapId(@NotNull String fromServerName, int fromMapId, @NotNull String toServerName) {
+        try (Connection connection = getConnection()) {
+            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                    SELECT `to_id`
+                    FROM `%map_ids_table%`
+                    WHERE `from_server_name`=? AND `from_id`=? AND `to_server_name`=?
+                    LIMIT 1;"""))) {
+                statement.setString(1, fromServerName);
+                statement.setInt(2, fromMapId);
+                statement.setString(3, toServerName);
+
+                final ResultSet resultSet = statement.executeQuery();
+                if (resultSet.next()) {
+                    return resultSet.getInt("to_id");
+                }
+            }
+        } catch (SQLException | DataAdapter.AdaptionException e) {
+            plugin.log(Level.SEVERE, "Failed to get new map id from the database", e);
+        }
+        return -1;
+    }
+
     @Override
     public void wipeDatabase() {
         try (Connection connection = getConnection()) {

common/src/main/java/net/william278/husksync/database/PostgresDatabase.java

@@ -0,0 +1,583 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync.database;
+
+import com.google.common.collect.Lists;
+import com.zaxxer.hikari.HikariDataSource;
+import net.william278.husksync.HuskSync;
+import net.william278.husksync.adapter.DataAdapter;
+import net.william278.husksync.data.DataSnapshot;
+import net.william278.husksync.user.User;
+import org.jetbrains.annotations.Blocking;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.IOException;
+import java.sql.*;
+import java.time.OffsetDateTime;
+import java.util.*;
+import java.util.logging.Level;
+
+import static net.william278.husksync.config.Settings.DatabaseSettings;
+
+public class PostgresDatabase extends Database {
+
+    private static final String DATA_POOL_NAME = "HuskSyncHikariPool";
+    private final String flavor;
+    private final String driverClass;
+    private HikariDataSource dataSource;
+
+    public PostgresDatabase(@NotNull HuskSync plugin) {
+        super(plugin);
+
+        final Type type = plugin.getSettings().getDatabase().getType();
+        this.flavor = type.getProtocol();
+        this.driverClass = "org.postgresql.Driver";
+    }
+
+    @Blocking
+    @NotNull
+    private Connection getConnection() throws SQLException {
+        if (dataSource == null) {
+            throw new IllegalStateException("The database has not been initialized");
+        }
+        return dataSource.getConnection();
+    }
+
+    @Blocking
+    @Override
+    public void initialize() throws IllegalStateException {
+        // Initialize the Hikari pooled connection
+        final DatabaseSettings.DatabaseCredentials credentials = plugin.getSettings().getDatabase().getCredentials();
+        dataSource = new HikariDataSource();
+        dataSource.setDriverClassName(driverClass);
+        dataSource.setJdbcUrl(String.format("jdbc:%s://%s:%s/%s%s",
+                flavor,
+                credentials.getHost(),
+                credentials.getPort(),
+                credentials.getDatabase(),
+                credentials.getParameters()
+        ));
+
+        // Authenticate with the database
+        dataSource.setUsername(credentials.getUsername());
+        dataSource.setPassword(credentials.getPassword());
+
+        // Set connection pool options
+        final DatabaseSettings.PoolSettings pool = plugin.getSettings().getDatabase().getConnectionPool();
+        dataSource.setMaximumPoolSize(pool.getMaximumPoolSize());
+        dataSource.setMinimumIdle(pool.getMinimumIdle());
+        dataSource.setMaxLifetime(pool.getMaximumLifetime());
+        dataSource.setKeepaliveTime(pool.getKeepaliveTime());
+        dataSource.setConnectionTimeout(pool.getConnectionTimeout());
+        dataSource.setPoolName(DATA_POOL_NAME);
+
+        // Set additional connection pool properties
+        final Properties properties = new Properties();
+        properties.putAll(
+                Map.of("cachePrepStmts", "true",
+                        "prepStmtCacheSize", "250",
+                        "prepStmtCacheSqlLimit", "2048",
+                        "useServerPrepStmts", "true",
+                        "useLocalSessionState", "true",
+                        "useLocalTransactionState", "true"
+                ));
+        properties.putAll(
+                Map.of(
+                        "rewriteBatchedStatements", "true",
+                        "cacheResultSetMetadata", "true",
+                        "cacheServerConfiguration", "true",
+                        "elideSetAutoCommits", "true",
+                        "maintainTimeStats", "false")
+        );
+        dataSource.setDataSourceProperties(properties);
+
+        // Check config for if tables should be created
+        if (!plugin.getSettings().getDatabase().isCreateTables()) return;
+
+        // Prepare database schema; make tables if they don't exist
+        try (Connection connection = dataSource.getConnection()) {
+            final String[] databaseSchema = getSchemaStatements(String.format("database/%s_schema.sql", flavor));
+            try (Statement statement = connection.createStatement()) {
+                for (String tableCreationStatement : databaseSchema) {
+                    statement.execute(tableCreationStatement);
+                }
+            } catch (SQLException e) {
+                throw new IllegalStateException("Failed to create database tables. Please ensure you are running PostgreSQL " +
+                        "and that your connecting user account has privileges to create tables.", e);
+            }
+        } catch (SQLException | IOException e) {
+            throw new IllegalStateException("Failed to establish a connection to the PostgreSQL database. " +
+                    "Please check the supplied database credentials in the config file", e);
+        }
+    }
+
+    @Blocking
+    @Override
+    public void ensureUser(@NotNull User user) {
+        getUser(user.getUuid()).ifPresentOrElse(
+                existingUser -> {
+                    if (!existingUser.getName().equals(user.getName())) {
+                        // Update a user's name if it has changed in the database
+                        try (Connection connection = getConnection()) {
+                            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                                    UPDATE %users_table%
+                                    SET username=?
+                                    WHERE uuid=?;"""))) {
+
+                                statement.setString(1, user.getName());
+                                statement.setObject(2, existingUser.getUuid());
+                                statement.executeUpdate();
+                            }
+                            plugin.log(Level.INFO, "Updated " + user.getName() + "'s name in the database (" + existingUser.getName() + " -> " + user.getName() + ")");
+                        } catch (SQLException e) {
+                            plugin.log(Level.SEVERE, "Failed to update a user's name on the database", e);
+                        }
+                    }
+                },
+                () -> {
+                    // Insert new player data into the database
+                    try (Connection connection = getConnection()) {
+                        try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                                INSERT INTO %users_table% (uuid,username)
+                                VALUES (?,?);"""))) {
+
+                            statement.setObject(1, user.getUuid());
+                            statement.setString(2, user.getName());
+                            statement.executeUpdate();
+                        }
+                    } catch (SQLException e) {
+                        plugin.log(Level.SEVERE, "Failed to insert a user into the database", e);
+                    }
+                }
+        );
+    }
+
+    @Blocking
+    @Override
+    public Optional<User> getUser(@NotNull UUID uuid) {
+        try (Connection connection = getConnection()) {
+            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                    SELECT uuid, username
+                    FROM %users_table%
+                    WHERE uuid=?;"""))) {
+
+                statement.setObject(1, uuid);
+
+                final ResultSet resultSet = statement.executeQuery();
+                if (resultSet.next()) {
+                    return Optional.of(new User((UUID) resultSet.getObject("uuid"),
+                            resultSet.getString("username")));
+                }
+            }
+        } catch (SQLException e) {
+            plugin.log(Level.SEVERE, "Failed to fetch a user from uuid from the database", e);
+        }
+        return Optional.empty();
+    }
+
+    @Blocking
+    @Override
+    public Optional<User> getUserByName(@NotNull String username) {
+        try (Connection connection = getConnection()) {
+            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                    SELECT uuid, username
+                    FROM %users_table%
+                    WHERE username=?;"""))) {
+                statement.setString(1, username);
+
+                final ResultSet resultSet = statement.executeQuery();
+                if (resultSet.next()) {
+                    return Optional.of(new User((UUID) resultSet.getObject("uuid"),
+                            resultSet.getString("username")));
+                }
+            }
+        } catch (SQLException e) {
+            plugin.log(Level.SEVERE, "Failed to fetch a user by name from the database", e);
+        }
+        return Optional.empty();
+    }
+
+
+    @Override
+    @NotNull
+    public List<User> getAllUsers() {
+        final List<User> users = Lists.newArrayList();
+        try (Connection connection = getConnection()) {
+            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                    SELECT uuid, username
+                    FROM %users_table%;
+                    """))) {
+                final ResultSet resultSet = statement.executeQuery();
+                while (resultSet.next()) {
+                    users.add(new User(UUID.fromString(resultSet.getString("uuid")),
+                            resultSet.getString("username")));
+                }
+            }
+        } catch (SQLException e) {
+            plugin.log(Level.SEVERE, "Failed to fetch a user by name from the database", e);
+        }
+        return users;
+    }
+
+    @Blocking
+    @Override
+    public Optional<DataSnapshot.Packed> getLatestSnapshot(@NotNull User user) {
+        try (Connection connection = getConnection()) {
+            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                    SELECT version_uuid, timestamp, data
+                    FROM %user_data_table%
+                    WHERE player_uuid=?
+                    ORDER BY timestamp DESC
+                    LIMIT 1;"""))) {
+                statement.setObject(1, user.getUuid());
+                final ResultSet resultSet = statement.executeQuery();
+                if (resultSet.next()) {
+                    final UUID versionUuid = (UUID) resultSet.getObject("version_uuid");
+                    final OffsetDateTime timestamp = OffsetDateTime.ofInstant(
+                            resultSet.getTimestamp("timestamp").toInstant(), TimeZone.getDefault().toZoneId()
+                    );
+                    final byte[] dataByteArray = resultSet.getBytes("data");
+                    return Optional.of(DataSnapshot.deserialize(plugin, dataByteArray, versionUuid, timestamp));
+                }
+            }
+        } catch (SQLException | DataAdapter.AdaptionException e) {
+            plugin.log(Level.SEVERE, "Failed to fetch a user's current user data from the database", e);
+        }
+        return Optional.empty();
+    }
+
+    @Blocking
+    @Override
+    @NotNull
+    public List<DataSnapshot.Packed> getAllSnapshots(@NotNull User user) {
+        final List<DataSnapshot.Packed> retrievedData = Lists.newArrayList();
+        try (Connection connection = getConnection()) {
+            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                    SELECT version_uuid, timestamp,  data
+                    FROM %user_data_table%
+                    WHERE player_uuid=?
+                    ORDER BY timestamp DESC;"""))) {
+                statement.setObject(1, user.getUuid());
+                final ResultSet resultSet = statement.executeQuery();
+                while (resultSet.next()) {
+                    final UUID versionUuid = (UUID) resultSet.getObject("version_uuid");
+                    final OffsetDateTime timestamp = OffsetDateTime.ofInstant(
+                            resultSet.getTimestamp("timestamp").toInstant(), TimeZone.getDefault().toZoneId()
+                    );
+                    final byte[] dataByteArray = resultSet.getBytes("data");
+                    retrievedData.add(DataSnapshot.deserialize(plugin, dataByteArray, versionUuid, timestamp));
+                }
+                return retrievedData;
+            }
+        } catch (SQLException | DataAdapter.AdaptionException e) {
+            plugin.log(Level.SEVERE, "Failed to fetch a user's list of snapshots from the database", e);
+        }
+        return retrievedData;
+    }
+
+    @Override
+    public int getUnpinnedSnapshotCount(@NotNull User user) {
+        try (Connection connection = getConnection()) {
+            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+            SELECT COUNT(version_uuid)
+            FROM %user_data_table%
+            WHERE player_uuid=? AND pinned=false;"""))) {
+                statement.setObject(1, user.getUuid());
+                final ResultSet resultSet = statement.executeQuery();
+                if (resultSet.next()) {
+                    return resultSet.getInt(1);
+                }
+            }
+        } catch (SQLException e) {
+            plugin.log(Level.SEVERE, "Failed to fetch a user's current snapshot count", e);
+        }
+        return 0;
+    }
+
+    @Blocking
+    @Override
+    public Optional<DataSnapshot.Packed> getSnapshot(@NotNull User user, @NotNull UUID versionUuid) {
+        try (Connection connection = getConnection()) {
+            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                    SELECT version_uuid, timestamp,  data
+                    FROM %user_data_table%
+                    WHERE player_uuid=? AND version_uuid=?
+                    ORDER BY timestamp DESC
+                    LIMIT 1;"""))) {
+                statement.setObject(1, user.getUuid());
+                statement.setObject(2, versionUuid);
+                final ResultSet resultSet = statement.executeQuery();
+                if (resultSet.next()) {
+                    final OffsetDateTime timestamp = OffsetDateTime.ofInstant(
+                            resultSet.getTimestamp("timestamp").toInstant(), TimeZone.getDefault().toZoneId()
+                    );
+                    final byte[] dataByteArray = resultSet.getBytes("data");
+                    return Optional.of(DataSnapshot.deserialize(plugin, dataByteArray, versionUuid, timestamp));
+                }
+            }
+        } catch (SQLException | DataAdapter.AdaptionException e) {
+            plugin.log(Level.SEVERE, "Failed to fetch specific user data by UUID from the database", e);
+        }
+        return Optional.empty();
+    }
+
+    @Blocking
+    @Override
+    protected void rotateSnapshots(@NotNull User user) {
+        final int unpinnedSnapshots = getUnpinnedSnapshotCount(user);
+        final int maxSnapshots = plugin.getSettings().getSynchronization().getMaxUserDataSnapshots();
+        if (unpinnedSnapshots > maxSnapshots) {
+            try (Connection connection = getConnection()) {
+                try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                        WITH cte AS (
+                          SELECT version_uuid
+                          FROM %user_data_table%
+                          WHERE player_uuid=?
+                            AND pinned=FALSE
+                          ORDER BY timestamp ASC
+                          LIMIT %entry_count%
+                        )
+                        DELETE FROM %user_data_table%
+                        WHERE version_uuid IN (SELECT version_uuid FROM cte);""".replace("%entry_count%",
+                        Integer.toString(unpinnedSnapshots - maxSnapshots))))) {
+                    statement.setObject(1, user.getUuid());
+                    statement.executeUpdate();
+                }
+            } catch (SQLException e) {
+                plugin.log(Level.SEVERE, "Failed to prune user data from the database", e);
+            }
+        }
+    }
+
+    @Blocking
+    @Override
+    public boolean deleteSnapshot(@NotNull User user, @NotNull UUID versionUuid) {
+        try (Connection connection = getConnection()) {
+            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                    DELETE FROM %user_data_table%
+                    WHERE player_uuid=? AND version_uuid=?;"""))) {
+                statement.setObject(1, user.getUuid());
+                statement.setObject(2, versionUuid);
+                return statement.executeUpdate() > 0;
+            }
+        } catch (SQLException e) {
+            plugin.log(Level.SEVERE, "Failed to delete specific user data from the database", e);
+        }
+        return false;
+    }
+
+    @Blocking
+    @Override
+    protected void rotateLatestSnapshot(@NotNull User user, @NotNull OffsetDateTime within) {
+        try (Connection connection = getConnection()) {
+            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                    DELETE FROM %user_data_table%
+                    WHERE player_uuid=? AND timestamp = (
+                       SELECT timestamp
+                       FROM %user_data_table%
+                       WHERE player_uuid=? AND timestamp > ? AND pinned=FALSE
+                       ORDER BY timestamp ASC
+                       LIMIT 1
+                    );"""))) {
+                statement.setObject(1, user.getUuid());
+                statement.setObject(2, user.getUuid());
+                statement.setTimestamp(3, Timestamp.from(within.toInstant()));
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            plugin.log(Level.SEVERE, "Failed to delete a user's data from the database", e);
+        }
+    }
+
+    @Blocking
+    @Override
+    protected void createSnapshot(@NotNull User user, @NotNull DataSnapshot.Packed data) {
+        try (Connection connection = getConnection()) {
+            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                    INSERT INTO %user_data_table%
+                    (player_uuid,version_uuid,timestamp,save_cause,pinned,data)
+                    VALUES (?,?,?,?,?,?);"""))) {
+                statement.setObject(1, user.getUuid());
+                statement.setObject(2, data.getId());
+                statement.setTimestamp(3, Timestamp.from(data.getTimestamp().toInstant()));
+                statement.setString(4, data.getSaveCause().name());
+                statement.setBoolean(5, data.isPinned());
+                statement.setBytes(6, data.asBytes(plugin));
+                statement.executeUpdate();
+            }
+        } catch (SQLException | DataAdapter.AdaptionException e) {
+            plugin.log(Level.SEVERE, "Failed to set user data in the database", e);
+        }
+    }
+
+    @Blocking
+    @Override
+    public void updateSnapshot(@NotNull User user, @NotNull DataSnapshot.Packed data) {
+        try (Connection connection = getConnection()) {
+            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                    UPDATE %user_data_table%
+                    SET save_cause=?,pinned=?,data=?
+                    WHERE player_uuid=? AND version_uuid=?;
+                    """))) {
+                statement.setString(1, data.getSaveCause().name());
+                statement.setBoolean(2, data.isPinned());
+                statement.setBytes(3, data.asBytes(plugin));
+                statement.setObject(4, user.getUuid());
+                statement.setObject(5, data.getId());
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            plugin.log(Level.SEVERE, "Failed to pin user data in the database", e);
+        }
+    }
+
+    @Blocking
+    @Override
+    public void saveMapData(@NotNull String serverName, int mapId, byte @NotNull [] data) {
+        try (Connection connection = getConnection()) {
+            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                    INSERT INTO %map_data_table%
+                    (server_name,map_id,data)
+                    VALUES (?,?,?);"""))) {
+                statement.setString(1, serverName);
+                statement.setInt(2, mapId);
+                statement.setBytes(3, data);
+                statement.executeUpdate();
+            }
+        } catch (SQLException | DataAdapter.AdaptionException e) {
+            plugin.log(Level.SEVERE, "Failed to write map data to the database", e);
+        }
+    }
+
+    @Blocking
+    @Override
+    public byte @Nullable [] getMapData(@NotNull String serverName, int mapId) {
+        try (Connection connection = getConnection()) {
+            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                    SELECT data
+                    FROM %map_data_table%
+                    WHERE server_name=? AND map_id=?
+                    LIMIT 1;"""))) {
+                statement.setString(1, serverName);
+                statement.setInt(2, mapId);
+                final ResultSet resultSet = statement.executeQuery();
+                if (resultSet.next()) {
+                    return resultSet.getBytes("data");
+                }
+                return null;
+            }
+        } catch (SQLException | DataAdapter.AdaptionException e) {
+            plugin.log(Level.SEVERE, "Failed to get map data from the database", e);
+        }
+        return null;
+    }
+
+    @Blocking
+    @Override
+    public @Nullable Map.Entry<String, Integer> getMapBinding(@NotNull String serverName, int mapId) {
+        try (Connection connection = getConnection()) {
+            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                    SELECT from_server_name, from_id
+                    FROM %map_ids_table%
+                    WHERE to_server_name=? AND to_id=?
+                    LIMIT 1;
+                    """))) {
+                statement.setString(1, serverName);
+                statement.setInt(2, mapId);
+
+                final ResultSet resultSet = statement.executeQuery();
+                if (resultSet.next()) {
+                    return new AbstractMap.SimpleImmutableEntry<>(
+                            resultSet.getString("from_server_name"),
+                            resultSet.getInt("from_id")
+                    );
+                }
+            }
+        } catch (SQLException | DataAdapter.AdaptionException e) {
+            plugin.log(Level.SEVERE, "Failed to get map data from the database", e);
+        }
+        return null;
+    }
+
+    @Blocking
+    @Override
+    public void setMapBinding(@NotNull String fromServerName, int fromMapId, @NotNull String toServerName, int toMapId) {
+        try (Connection connection = getConnection()) {
+            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                    INSERT INTO %map_ids_table%
+                    (from_server_name,from_id,to_server_name,to_id)
+                    VALUES (?,?,?,?);"""))) {
+                statement.setString(1, fromServerName);
+                statement.setInt(2, fromMapId);
+                statement.setString(3, toServerName);
+                statement.setInt(4, toMapId);
+                statement.executeUpdate();
+            }
+        } catch (SQLException | DataAdapter.AdaptionException e) {
+            plugin.log(Level.SEVERE, "Failed to connect map IDs in the database", e);
+        }
+    }
+
+    @Blocking
+    @Override
+    public int getBoundMapId(@NotNull String fromServerName, int fromMapId, @NotNull String toServerName) {
+        try (Connection connection = getConnection()) {
+            try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                    SELECT to_id
+                    FROM %map_ids_table%
+                    WHERE from_server_name=? AND from_id=? AND to_server_name=?
+                    LIMIT 1;"""))) {
+                statement.setString(1, fromServerName);
+                statement.setInt(2, fromMapId);
+                statement.setString(3, toServerName);
+
+                final ResultSet resultSet = statement.executeQuery();
+                if (resultSet.next()) {
+                    return resultSet.getInt("to_id");
+                }
+            }
+        } catch (SQLException | DataAdapter.AdaptionException e) {
+            plugin.log(Level.SEVERE, "Failed to get new map id from the database", e);
+        }
+        return -1;
+    }
+
+    @Override
+    public void wipeDatabase() {
+        try (Connection connection = getConnection()) {
+            try (Statement statement = connection.createStatement()) {
+                statement.executeUpdate(formatStatementTables("DELETE FROM %user_data_table%;"));
+            }
+        } catch (SQLException e) {
+            plugin.log(Level.SEVERE, "Failed to wipe the database", e);
+        }
+    }
+
+    @Override
+    public void terminate() {
+        if (dataSource != null) {
+            if (!dataSource.isClosed()) {
+                dataSource.close();
+            }
+        }
+    }
+
+}

common/src/main/java/net/william278/husksync/database/mongo/MongoCollectionHelper.java

@@ -0,0 +1,100 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync.database.mongo;
+
+import com.mongodb.client.MongoCollection;
+import org.bson.Document;
+import org.bson.conversions.Bson;
+import org.jetbrains.annotations.NotNull;
+
+public class MongoCollectionHelper {
+    private final MongoConnectionHandler database;
+
+    /**
+     * Initialize the collection helper
+     *
+     * @param database Instance of {@link MongoConnectionHandler}
+     */
+    public MongoCollectionHelper(@NotNull MongoConnectionHandler database) {
+        this.database = database;
+    }
+
+    /**
+     * Create a collection
+     *
+     * @param collectionName the collection name
+     */
+    public void createCollection(@NotNull String collectionName) {
+        database.getDatabase().createCollection(collectionName);
+    }
+
+    /**
+     * Delete a collection
+     *
+     * @param collectionName the collection name
+     */
+    public void deleteCollection(@NotNull String collectionName) {
+        database.getDatabase().getCollection(collectionName).drop();
+    }
+
+    /**
+     * Get a collection
+     *
+     * @param collectionName the collection name
+     * @return MongoCollection<Document>
+     */
+    public MongoCollection<Document> getCollection(@NotNull String collectionName) {
+        return database.getDatabase().getCollection(collectionName);
+    }
+
+    /**
+     * Add a document to a collection
+     *
+     * @param collectionName collection to add to
+     * @param document       Document to add
+     */
+    public void insertDocument(@NotNull String collectionName, @NotNull Document document) {
+        MongoCollection<Document> collection = database.getDatabase().getCollection(collectionName);
+        collection.insertOne(document);
+    }
+
+    /**
+     * Update a document
+     *
+     * @param collectionName collection the document is in
+     * @param document       filter of document
+     * @param updates        Bson of updates
+     */
+    public void updateDocument(@NotNull String collectionName, @NotNull Document document, @NotNull Bson updates) {
+        MongoCollection<Document> collection = database.getDatabase().getCollection(collectionName);
+        collection.updateOne(document, updates);
+    }
+
+    /**
+     * Delete a document
+     *
+     * @param collectionName collection the document is in
+     * @param document       filter to remove
+     */
+    public void deleteDocument(@NotNull String collectionName, @NotNull Document document) {
+        MongoCollection<Document> collection = database.getDatabase().getCollection(collectionName);
+        collection.deleteOne(document);
+    }
+}

common/src/main/java/net/william278/husksync/database/mongo/MongoConnectionHandler.java

@@ -0,0 +1,64 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync.database.mongo;
+
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoDatabase;
+import lombok.Getter;
+import org.bson.UuidRepresentation;
+import org.jetbrains.annotations.NotNull;
+
+@Getter
+public class MongoConnectionHandler {
+    private final MongoClient mongoClient;
+    private final MongoDatabase database;
+
+    /**
+     * Initiate a connection to a Mongo Server
+     *
+     * @param uri The connection string
+     */
+    public MongoConnectionHandler(@NotNull ConnectionString uri, @NotNull String databaseName) {
+        try {
+            final MongoClientSettings settings = MongoClientSettings.builder()
+                    .applyConnectionString(uri)
+                    .uuidRepresentation(UuidRepresentation.STANDARD)
+                    .build();
+
+            this.mongoClient = MongoClients.create(settings);
+            this.database = mongoClient.getDatabase(databaseName);
+        } catch (Exception e) {
+            throw new IllegalStateException("Failed to establish a connection to the MongoDB database. " +
+                                            "Please check the supplied database credentials in the config file", e);
+        }
+    }
+
+    /**
+     * Close the connection with the database
+     */
+    public void closeConnection() {
+        if (this.mongoClient != null) {
+            this.mongoClient.close();
+        }
+    }
+}

common/src/main/java/net/william278/husksync/event/Cancellable.java

@@ -19,7 +19,6 @@
 
 package net.william278.husksync.event;
 
-@SuppressWarnings("unused")
 public interface Cancellable extends Event {
 
     default boolean isCancelled() {

common/src/main/java/net/william278/husksync/event/PreSyncEvent.java

@@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.function.Consumer;
 
 @SuppressWarnings("unused")
-public interface PreSyncEvent extends PlayerEvent {
+public interface PreSyncEvent extends PlayerEvent, Cancellable {
 
     @NotNull
     DataSnapshot.Packed getData();

common/src/main/java/net/william278/husksync/hook/PlanHook.java

@@ -184,7 +184,7 @@ public class PlanHook {
         public String getHealth(@NotNull UUID uuid) {
             return getLatestSnapshot(uuid)
                     .flatMap(DataHolder::getHealth)
-                    .map(health -> String.format("%s / %s", health.getHealth(), health.getMaxHealth()))
+                    .map(health -> String.format("%s", health.getHealth()))
                     .orElse(UNKNOWN_STRING);
         }
 

common/src/main/java/net/william278/husksync/listener/EventListener.java

@@ -23,13 +23,11 @@ import net.william278.husksync.HuskSync;
 import net.william278.husksync.data.Data;
 import net.william278.husksync.data.DataSnapshot;
 import net.william278.husksync.user.OnlineUser;
-import net.william278.husksync.util.Task;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.logging.Level;
+
+import static net.william278.husksync.config.Settings.SynchronizationSettings.SaveOnDeathSettings;
 
 /**
  * Handles what should happen when events are fired
@@ -39,22 +37,8 @@ public abstract class EventListener {
     // The plugin instance
     protected final HuskSync plugin;
 
-    /**
-     * Set of UUIDs of "locked players", for which events will be canceled.
-     * </p>
-     * Players are locked while their items are being set (on join) or saved (on quit)
-     */
-    private final Set<UUID> lockedPlayers;
-
-    /**
-     * Whether the plugin is currently being disabled
-     */
-    private boolean disabling;
-
     protected EventListener(@NotNull HuskSync plugin) {
         this.plugin = plugin;
-        this.lockedPlayers = new HashSet<>();
-        this.disabling = false;
     }
 
     /**
@@ -63,54 +47,12 @@ public abstract class EventListener {
      * @param user The {@link OnlineUser} to handle
      */
     protected final void handlePlayerJoin(@NotNull OnlineUser user) {
+        plugin.getDisconnectingPlayers().remove(user.getUuid());
         if (user.isNpc()) {
             return;
         }
-        lockedPlayers.add(user.getUuid());
-
-        plugin.runAsyncDelayed(() -> {
-            // Fetch from the database if the user isn't changing servers
-            if (!plugin.getRedisManager().getUserServerSwitch(user)) {
-                this.setUserFromDatabase(user);
-                return;
-            }
-
-            // Set the user as soon as the source server has set the data to redis
-            final long MAX_ATTEMPTS = 16L;
-            final AtomicLong timesRun = new AtomicLong(0L);
-            final AtomicReference<Task.Repeating> task = new AtomicReference<>();
-            final Runnable runnable = () -> {
-                if (user.isOffline()) {
-                    task.get().cancel();
-                    return;
-                }
-                if (disabling || timesRun.getAndIncrement() > MAX_ATTEMPTS) {
-                    task.get().cancel();
-                    this.setUserFromDatabase(user);
-                    return;
-                }
-
-                plugin.getRedisManager().getUserData(user).ifPresent(redisData -> {
-                    task.get().cancel();
-                    user.applySnapshot(redisData, DataSnapshot.UpdateCause.SYNCHRONIZED);
-                });
-            };
-            task.set(plugin.getRepeatingTask(runnable, 10));
-            task.get().run();
-
-        }, Math.max(0, plugin.getSettings().getNetworkLatencyMilliseconds() / 50L));
-    }
-
-    /**
-     * Set a user's data from the database
-     *
-     * @param user The user to set the data for
-     */
-    private void setUserFromDatabase(@NotNull OnlineUser user) {
-        plugin.getDatabase().getLatestSnapshot(user).ifPresentOrElse(
-                snapshot -> user.applySnapshot(snapshot, DataSnapshot.UpdateCause.SYNCHRONIZED),
-                () -> user.completeSync(true, DataSnapshot.UpdateCause.NEW_USER, plugin)
-        );
+        plugin.lockPlayer(user.getUuid());
+        plugin.getDataSyncer().syncApplyUserData(user);
     }
 
     /**
@@ -119,26 +61,16 @@ public abstract class EventListener {
      * @param user The {@link OnlineUser} to handle
      */
     protected final void handlePlayerQuit(@NotNull OnlineUser user) {
-        // Players quitting have their data manually saved when the plugin is disabled
-        if (disabling) {
+        // Check the user is a user, the plugin isn't disabling, then mark as disconnecting
+        if (user.isNpc() || plugin.isDisabling()) {
             return;
         }
+        plugin.getDisconnectingPlayers().add(user.getUuid());
 
-        // Don't sync players awaiting synchronization
-        if (lockedPlayers.contains(user.getUuid()) || user.isNpc()) {
-            return;
-        }
-
-        // Handle disconnection
-        try {
-            lockedPlayers.add(user.getUuid());
-            plugin.getRedisManager().setUserServerSwitch(user).thenRun(() -> {
-                final DataSnapshot.Packed data = user.createSnapshot(DataSnapshot.SaveCause.DISCONNECT);
-                plugin.getRedisManager().setUserData(user, data);
-                plugin.getDatabase().addSnapshot(user, data);
-            });
-        } catch (Throwable e) {
-            plugin.log(Level.SEVERE, "An exception occurred handling a player disconnection", e);
+        // Lock, then save their data if the user is unlocked
+        if (!plugin.isLocked(user.getUuid())) {
+            plugin.lockPlayer(user.getUuid());
+            plugin.getDataSyncer().syncSaveUserData(user);
         }
     }
 
@@ -148,13 +80,13 @@ public abstract class EventListener {
      * @param usersInWorld a list of users in the world that is being saved
      */
     protected final void saveOnWorldSave(@NotNull List<OnlineUser> usersInWorld) {
-        if (disabling || !plugin.getSettings().doSaveOnWorldSave()) {
+        if (plugin.isDisabling() || !plugin.getSettings().getSynchronization().isSaveOnWorldSave()) {
             return;
         }
         usersInWorld.stream()
-                .filter(user -> !lockedPlayers.contains(user.getUuid()) && !user.isNpc())
-                .forEach(user -> plugin.getDatabase().addSnapshot(
-                        user, user.createSnapshot(DataSnapshot.SaveCause.WORLD_SAVE)
+                .filter(user -> !user.isNpc() && !user.hasDisconnected() && !plugin.isLocked(user.getUuid()))
+                .forEach(user -> plugin.getDataSyncer().saveCurrentUserData(
+                        user, DataSnapshot.SaveCause.WORLD_SAVE
                 ));
     }
 
@@ -162,41 +94,32 @@ public abstract class EventListener {
      * Handles the saving of data when a player dies
      *
      * @param user  The user who died
-     * @param drops The items that this user would have dropped
+     * @param items The items that should be saved for this user on their death
      */
-    protected void saveOnPlayerDeath(@NotNull OnlineUser user, @NotNull Data.Items drops) {
-        if (disabling || !plugin.getSettings().doSaveOnDeath() || lockedPlayers.contains(user.getUuid()) || user.isNpc()
-                || (!plugin.getSettings().doSaveEmptyDropsOnDeath() && drops.isEmpty())) {
+    protected void saveOnPlayerDeath(@NotNull OnlineUser user, @NotNull Data.Items items) {
+        final SaveOnDeathSettings settings = plugin.getSettings().getSynchronization().getSaveOnDeath();
+        if (plugin.isDisabling() || !settings.isEnabled() || plugin.isLocked(user.getUuid())
+                || user.isNpc() || (!settings.isSaveEmptyItems() && items.isEmpty())) {
             return;
         }
 
+        // We don't persist this to Redis for syncing, as this snapshot is from a state they won't be in post-respawn
         final DataSnapshot.Packed snapshot = user.createSnapshot(DataSnapshot.SaveCause.DEATH);
-        snapshot.edit(plugin, (data -> data.getInventory().ifPresent(inventory -> inventory.setContents(drops))));
-        plugin.getDatabase().addSnapshot(user, snapshot);
+        snapshot.edit(plugin, (data -> data.getInventory().ifPresent(inv -> inv.setContents(items))));
+        plugin.getDataSyncer().saveData(user, snapshot);
     }
 
-    /**
-     * Determine whether a player event should be canceled
-     *
-     * @param userUuid The UUID of the user to check
-     * @return Whether the event should be canceled
-     */
-    protected final boolean cancelPlayerEvent(@NotNull UUID userUuid) {
-        return disabling || lockedPlayers.contains(userUuid);
-    }
 
     /**
      * Handle the plugin disabling
      */
-    public final void handlePluginDisable() {
-        disabling = true;
-
-        // Save data for all online users
+    public void handlePluginDisable() {
+        // Save for all online players.
         plugin.getOnlineUsers().stream()
-                .filter(user -> !lockedPlayers.contains(user.getUuid()) && !user.isNpc())
+                .filter(user -> !plugin.isLocked(user.getUuid()) && !user.isNpc())
                 .forEach(user -> {
-                    lockedPlayers.add(user.getUuid());
-                    plugin.getDatabase().addSnapshot(user, user.createSnapshot(DataSnapshot.SaveCause.SERVER_SHUTDOWN));
+                    plugin.lockPlayer(user.getUuid());
+                    plugin.getDataSyncer().saveCurrentUserData(user, DataSnapshot.SaveCause.SERVER_SHUTDOWN);
                 });
 
         // Close outstanding connections
@@ -204,10 +127,6 @@ public abstract class EventListener {
         plugin.getRedisManager().terminate();
     }
 
-    public final Set<UUID> getLockedPlayers() {
-        return this.lockedPlayers;
-    }
-
     /**
      * Represents priorities for events that HuskSync listens to
      */
@@ -245,7 +164,6 @@ public abstract class EventListener {
             return Map.entry(name().toLowerCase(), defaultPriority.name());
         }
 
-
         @SuppressWarnings("unchecked")
         @NotNull
         public static Map<String, String> getDefaults() {

common/src/main/java/net/william278/husksync/listener/LockedHandler.java

@@ -0,0 +1,69 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync.listener;
+
+import net.william278.husksync.HuskSync;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.UUID;
+
+/**
+ * Interface for doing stuff with locked users or when the plugin is disabled
+ */
+public interface LockedHandler {
+
+    /**
+     * Get if a command should be disabled while the user is locked
+     */
+    default boolean isCommandDisabled(@NotNull String label) {
+        final List<String> blocked = getPlugin().getSettings().getSynchronization().getBlacklistedCommandsWhileLocked();
+        return blocked.contains("*") || blocked.contains(label.toLowerCase(Locale.ENGLISH));
+    }
+
+    /**
+     * Determine whether a player event should be canceled
+     *
+     * @param userUuid The UUID of the user to check
+     * @return Whether the event should be canceled
+     */
+    default boolean cancelPlayerEvent(@NotNull UUID userUuid) {
+        return getPlugin().isDisabling() || getPlugin().isLocked(userUuid);
+    }
+
+    @NotNull
+    @ApiStatus.Internal
+    HuskSync getPlugin();
+
+    default void onLoad() {
+
+    }
+
+    default void onEnable() {
+
+    }
+
+    default void onDisable() {
+
+    }
+
+}

common/src/main/java/net/william278/husksync/maps/AdaptableMapData.java

@@ -0,0 +1,45 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync.maps;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
+import org.jetbrains.annotations.NotNull;
+import net.william278.husksync.adapter.Adaptable;
+import net.william278.mapdataapi.MapData;
+
+import java.io.IOException;
+
+@AllArgsConstructor
+public class AdaptableMapData implements Adaptable {
+
+    @SerializedName("data")
+    private final byte[] data;
+
+    public AdaptableMapData(@NotNull MapData data) {
+        this(data.toBytes());
+    }
+
+    @NotNull
+    public MapData getData(int dataVersion) throws IOException {
+        return MapData.fromByteArray(dataVersion, data);
+    }
+
+}

common/src/main/java/net/william278/husksync/redis/RedisKeyType.java

@@ -24,15 +24,16 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Locale;
 
 public enum RedisKeyType {
-    CACHE(60 * 60 * 24),
-    DATA_UPDATE(10),
-    SERVER_SWITCH(10);
 
-    private final int timeToLive;
+    LATEST_SNAPSHOT,
+    SERVER_SWITCH,
+    DATA_CHECKOUT,
+    MAP_ID,
+    MAP_ID_REVERSED,
+    MAP_DATA;
 
-    RedisKeyType(int timeToLive) {
-        this.timeToLive = timeToLive;
-    }
+    public static final int TTL_1_YEAR = 60 * 60 * 24 * 7 * 52; // 1 year
+    public static final int TTL_10_SECONDS = 10; // 10 seconds
 
     @NotNull
     public String getKeyPrefix(@NotNull String clusterId) {
@@ -44,8 +45,4 @@ public enum RedisKeyType {
         );
     }
 
-    public int getTimeToLive() {
-        return timeToLive;
-    }
-
 }

common/src/main/java/net/william278/husksync/redis/RedisManager.java

@@ -20,18 +20,17 @@
 package net.william278.husksync.redis;
 
 import net.william278.husksync.HuskSync;
+import net.william278.husksync.config.Settings;
 import net.william278.husksync.data.DataSnapshot;
 import net.william278.husksync.user.User;
 import org.jetbrains.annotations.Blocking;
 import org.jetbrains.annotations.NotNull;
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.JedisPoolConfig;
-import redis.clients.jedis.JedisPubSub;
+import org.jetbrains.annotations.Nullable;
+import redis.clients.jedis.*;
 import redis.clients.jedis.exceptions.JedisException;
+import redis.clients.jedis.util.Pool;
 
 import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
@@ -39,17 +38,21 @@ import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 
 /**
- * Manages the connection to the Redis server, handling the caching of user data
+ * Manages the connection to Redis, handling the caching of user data
  */
 public class RedisManager extends JedisPubSub {
 
     protected static final String KEY_NAMESPACE = "husksync:";
+    private static final int RECONNECTION_TIME = 8000;
 
     private final HuskSync plugin;
     private final String clusterId;
-    private JedisPool jedisPool;
+    private Pool<Jedis> jedisPool;
     private final Map<UUID, CompletableFuture<Optional<DataSnapshot.Packed>>> pendingRequests;
 
+    private boolean enabled;
+    private boolean reconnected;
+
     public RedisManager(@NotNull HuskSync plugin) {
         this.plugin = plugin;
         this.clusterId = plugin.getSettings().getClusterId();
@@ -57,81 +60,189 @@ public class RedisManager extends JedisPubSub {
     }
 
     /**
-     * Initialize the redis connection pool
+     * Initialize Redis connection pool
      */
+
     @Blocking
     public void initialize() throws IllegalStateException {
-        final String password = plugin.getSettings().getRedisPassword();
-        final String host = plugin.getSettings().getRedisHost();
-        final int port = plugin.getSettings().getRedisPort();
-        final boolean useSSL = plugin.getSettings().redisUseSsl();
+        final Settings.RedisSettings.RedisCredentials credentials = plugin.getSettings().getRedis().getCredentials();
 
-        // Create the jedis pool
+        final String user = credentials.getUser();
+        final String password = credentials.getPassword();
+        final String host = credentials.getHost();
+        final int port = credentials.getPort();
+        final int database = credentials.getDatabase();
+        final boolean useSSL = credentials.isUseSsl();
+
+        // Configure JedisPoolConfig
         final JedisPoolConfig config = new JedisPoolConfig();
-        config.setMaxIdle(0);
-        config.setTestOnBorrow(true);
-        config.setTestOnReturn(true);
-        this.jedisPool = password.isEmpty()
-                ? new JedisPool(config, host, port, 0, useSSL)
-                : new JedisPool(config, host, port, 0, password, useSSL);
+        config.setMaxTotal(credentials.getMaxTotalConnections());
+        config.setMaxIdle(credentials.getMaxIdleConnections());
+        config.setMinIdle(credentials.getMinIdleConnections());
+        config.setTestOnBorrow(credentials.isTestOnBorrow());
+        config.setTestOnReturn(credentials.isTestOnReturn());
+        config.setTestWhileIdle(credentials.isTestWhileIdle());
+        config.setMinEvictableIdleTimeMillis(credentials.getMinEvictableIdleTimeMillis());
+        config.setTimeBetweenEvictionRunsMillis(credentials.getTimeBetweenEvictionRunsMillis());
 
-        // Ping the server to check the connection
-        try {
-            jedisPool.getResource().ping();
-        } catch (JedisException e) {
-            throw new IllegalStateException("Failed to establish connection with the Redis server. "
-                    + "Please check the supplied credentials in the config file", e);
+        final Settings.RedisSettings.RedisSentinel sentinel = plugin.getSettings().getRedis().getSentinel();
+        Set<String> redisSentinelNodes = new HashSet<>(sentinel.getNodes());
+
+        if (redisSentinelNodes.isEmpty()) {
+            // Standalone Redis setup
+            DefaultJedisClientConfig.Builder clientConfigBuilder = DefaultJedisClientConfig.builder()
+                    .ssl(useSSL)
+                    .database(database)
+                    .timeoutMillis(credentials.getConnectionTimeout()) // connection and socket timeout combined
+                    .user(user.isEmpty() ? null : user)
+                    .password(password.isEmpty() ? null : password);
+
+            this.jedisPool = new JedisPool(config, new HostAndPort(host, port), clientConfigBuilder.build());
+        } else {
+            final String sentinelPassword = sentinel.getPassword();
+            this.jedisPool = new JedisSentinelPool(
+                    sentinel.getMaster(),
+                    redisSentinelNodes,
+                    config,
+                    credentials.getConnectionTimeout(),
+                    credentials.getSocketTimeout(),
+                    password.isEmpty() ? null : password,
+                    sentinelPassword.isEmpty() ? null : sentinelPassword,
+                    database);
         }
 
-        // Subscribe using a thread (rather than a task)
+        try (var jedis = jedisPool.getResource()) {
+            jedis.ping();
+        } catch (JedisException e) {
+            throw new IllegalStateException("Failed to establish connection with Redis. " +
+                    "Please check the supplied credentials in the config file", e);
+        }
+
+        enabled = true;
         new Thread(this::subscribe, "husksync:redis_subscriber").start();
     }
 
     @Blocking
     private void subscribe() {
-        try (Jedis jedis = jedisPool.getResource()) {
-            jedis.subscribe(
-                    this,
-                    Arrays.stream(RedisMessageType.values())
-                            .map(type -> type.getMessageChannel(clusterId))
-                            .toArray(String[]::new)
-            );
+        while (enabled && !Thread.interrupted() && jedisPool != null && !jedisPool.isClosed()) {
+            try (Jedis jedis = jedisPool.getResource()) {
+                if (reconnected) {
+                    plugin.log(Level.INFO, "Redis connection is alive again");
+                }
+                // Subscribe channels and lock the thread
+                jedis.subscribe(
+                        this,
+                        Arrays.stream(RedisMessage.Type.values())
+                                .map(type -> type.getMessageChannel(clusterId))
+                                .toArray(String[]::new));
+            } catch (Throwable t) {
+                // Thread was unlocked due error
+                onThreadUnlock(t);
+            }
+        }
+    }
+
+    private void onThreadUnlock(@NotNull Throwable t) {
+        if (!enabled) {
+            return;
+        }
+
+        if (reconnected) {
+            plugin.log(Level.WARNING, "Redis Server connection lost. Attempting reconnect in %ss..."
+                    .formatted(RECONNECTION_TIME / 1000), t);
+        }
+        try {
+            this.unsubscribe();
+        } catch (Throwable ignored) {
+            // empty catch
+        }
+
+        // Make an instant subscribe if occurs any error on initialization
+        if (!reconnected) {
+            reconnected = true;
+        } else {
+            try {
+                Thread.sleep(RECONNECTION_TIME);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
         }
     }
 
     @Override
     public void onMessage(@NotNull String channel, @NotNull String message) {
-        final RedisMessageType messageType = RedisMessageType.getTypeFromChannel(channel, clusterId).orElse(null);
+        final RedisMessage.Type messageType = RedisMessage.Type.getTypeFromChannel(channel, clusterId).orElse(null);
         if (messageType == null) {
             return;
         }
 
         final RedisMessage redisMessage = RedisMessage.fromJson(plugin, message);
         switch (messageType) {
-            case UPDATE_USER_DATA -> plugin.getOnlineUser(redisMessage.getTargetUuid()).ifPresent(
-                    user -> user.applySnapshot(
-                            DataSnapshot.deserialize(plugin, redisMessage.getPayload()),
-                            DataSnapshot.UpdateCause.UPDATED
-                    )
-            );
-            case REQUEST_USER_DATA -> plugin.getOnlineUser(redisMessage.getTargetUuid()).ifPresent(
+            case UPDATE_USER_DATA -> redisMessage.getTargetUser(plugin).ifPresent(
+                    user -> {
+                        plugin.lockPlayer(user.getUuid());
+                        try {
+                            final DataSnapshot.Packed data = DataSnapshot.deserialize(plugin,
+                                    redisMessage.getPayload());
+                            user.applySnapshot(data, DataSnapshot.UpdateCause.UPDATED);
+                        } catch (Throwable e) {
+                            plugin.log(Level.SEVERE, "An exception occurred updating user data from Redis", e);
+                            user.completeSync(false, DataSnapshot.UpdateCause.UPDATED, plugin);
+                        }
+                    });
+            case REQUEST_USER_DATA -> redisMessage.getTargetUser(plugin).ifPresent(
                     user -> RedisMessage.create(
                             UUID.fromString(new String(redisMessage.getPayload(), StandardCharsets.UTF_8)),
-                            user.createSnapshot(DataSnapshot.SaveCause.INVENTORY_COMMAND).asBytes(plugin)
-                    ).dispatch(plugin, RedisMessageType.RETURN_USER_DATA)
-            );
+                            user.createSnapshot(DataSnapshot.SaveCause.INVENTORY_COMMAND).asBytes(plugin))
+                            .dispatch(plugin, RedisMessage.Type.RETURN_USER_DATA));
+            case CHECK_IN_PETITION -> {
+                if (!redisMessage.isTargetServer(plugin)
+                        || !plugin.getSettings().getSynchronization().isCheckinPetitions()) {
+                    return;
+                }
+                final String payload = new String(redisMessage.getPayload(), StandardCharsets.UTF_8);
+                final User user = new User(UUID.fromString(payload.split("/")[0]), payload.split("/")[1]);
+
+                // Only release checkout if user is truly offline AND not being processed
+                final boolean isOnline = plugin.getOnlineUser(user.getUuid()).isPresent();
+                final boolean isLocked = plugin.isLocked(user.getUuid());
+
+                if (isOnline || isLocked) {
+                    plugin.debug("[%s] Petition ignored - user still being processed (online=%s, locked=%s)"
+                            .formatted(user.getName(), isOnline, isLocked));
+                    return;
+                }
+
+                plugin.getRedisManager().setUserCheckedOut(user, false);
+                plugin.debug("[%s] Petition accepted - user checked in".formatted(user.getName()));
+            }
             case RETURN_USER_DATA -> {
-                final CompletableFuture<Optional<DataSnapshot.Packed>> future = pendingRequests.get(
-                        redisMessage.getTargetUuid()
-                );
+                final UUID target = redisMessage.getTargetUuid().orElse(null);
+                final CompletableFuture<Optional<DataSnapshot.Packed>> future = pendingRequests.get(target);
                 if (future != null) {
-                    future.complete(Optional.of(DataSnapshot.deserialize(plugin, redisMessage.getPayload())));
-                    pendingRequests.remove(redisMessage.getTargetUuid());
+                    try {
+                        final DataSnapshot.Packed data = DataSnapshot.deserialize(plugin, redisMessage.getPayload());
+                        future.complete(Optional.of(data));
+                    } catch (Throwable e) {
+                        plugin.log(Level.SEVERE, "An exception occurred returning user data from Redis", e);
+                        future.complete(Optional.empty());
+                    }
+                    pendingRequests.remove(target);
                 }
             }
         }
     }
 
+    @Override
+    public void onSubscribe(String channel, int subscribedChannels) {
+        plugin.log(Level.INFO, "Redis subscribed to channel '" + channel + "'");
+    }
+
+    @Override
+    public void onUnsubscribe(String channel, int subscribedChannels) {
+        plugin.log(Level.INFO, "Redis unsubscribed from channel '" + channel + "'");
+    }
+
     @Blocking
     protected void sendMessage(@NotNull String channel, @NotNull String message) {
         try (Jedis jedis = jedisPool.getResource()) {
@@ -139,106 +250,172 @@ public class RedisManager extends JedisPubSub {
         }
     }
 
+    @Blocking
     public void sendUserDataUpdate(@NotNull User user, @NotNull DataSnapshot.Packed data) {
-        plugin.runAsync(() -> {
-            final RedisMessage redisMessage = RedisMessage.create(user.getUuid(), data.asBytes(plugin));
-            redisMessage.dispatch(plugin, RedisMessageType.UPDATE_USER_DATA);
-        });
+        final RedisMessage redisMessage = RedisMessage.create(user.getUuid(), data.asBytes(plugin));
+        redisMessage.dispatch(plugin, RedisMessage.Type.UPDATE_USER_DATA);
     }
 
-    public CompletableFuture<Optional<DataSnapshot.Packed>> getUserData(@NotNull UUID requestId, @NotNull User user) {
+    @Blocking
+    public void petitionServerCheckin(@NotNull String server, @NotNull User user) {
+        final RedisMessage redisMessage = RedisMessage.create(
+                server, "%s/%s".formatted(user.getUuid(), user.getName()).getBytes(StandardCharsets.UTF_8));
+        redisMessage.dispatch(plugin, RedisMessage.Type.CHECK_IN_PETITION);
+    }
+
+    public CompletableFuture<Optional<DataSnapshot.Packed>> getOnlineUserData(@NotNull UUID requestId,
+            @NotNull User user,
+            @NotNull DataSnapshot.SaveCause saveCause) {
         return plugin.getOnlineUser(user.getUuid())
                 .map(online -> CompletableFuture.completedFuture(
-                        Optional.of(online.createSnapshot(DataSnapshot.SaveCause.API)))
-                )
-                .orElse(this.requestData(requestId, user));
+                        Optional.of(online.createSnapshot(saveCause))))
+                .orElse(this.getNetworkedUserData(requestId, user));
     }
 
-    private CompletableFuture<Optional<DataSnapshot.Packed>> requestData(@NotNull UUID requestId, @NotNull User user) {
+    // Request a user's dat x-server
+    private CompletableFuture<Optional<DataSnapshot.Packed>> getNetworkedUserData(@NotNull UUID requestId,
+            @NotNull User user) {
         final CompletableFuture<Optional<DataSnapshot.Packed>> future = new CompletableFuture<>();
         pendingRequests.put(requestId, future);
         plugin.runAsync(() -> {
             final RedisMessage redisMessage = RedisMessage.create(
                     user.getUuid(),
-                    requestId.toString().getBytes(StandardCharsets.UTF_8)
-            );
-            redisMessage.dispatch(plugin, RedisMessageType.REQUEST_USER_DATA);
+                    requestId.toString().getBytes(StandardCharsets.UTF_8));
+            redisMessage.dispatch(plugin, RedisMessage.Type.REQUEST_USER_DATA);
         });
-        return future.orTimeout(
-                        plugin.getSettings().getNetworkLatencyMilliseconds(),
-                        TimeUnit.MILLISECONDS
-                )
+        return future
+                .orTimeout(
+                        plugin.getSettings().getSynchronization().getNetworkLatencyMilliseconds(),
+                        TimeUnit.MILLISECONDS)
                 .exceptionally(throwable -> {
                     pendingRequests.remove(requestId);
                     return Optional.empty();
                 });
     }
 
-    /**
-     * Set a user's data to the Redis server
-     *
-     * @param user the user to set data for
-     * @param data the user's data to set
-     */
+    // Set a user's data to Redis
+    @Blocking
     public void setUserData(@NotNull User user, @NotNull DataSnapshot.Packed data) {
-        plugin.runAsync(() -> {
-            try (Jedis jedis = jedisPool.getResource()) {
-                jedis.setex(
-                        getKey(RedisKeyType.DATA_UPDATE, user.getUuid(), clusterId),
-                        RedisKeyType.DATA_UPDATE.getTimeToLive(),
-                        data.asBytes(plugin)
-                );
-                plugin.debug(String.format("[%s] Set %s key to redis at: %s", user.getUsername(),
-                        RedisKeyType.DATA_UPDATE.name(), new SimpleDateFormat("mm:ss.SSS").format(new Date())));
-            } catch (Throwable e) {
-                plugin.log(Level.SEVERE, "An exception occurred setting a user's server switch", e);
+        try (Jedis jedis = jedisPool.getResource()) {
+            jedis.setex(
+                    getKey(RedisKeyType.LATEST_SNAPSHOT, user.getUuid(), clusterId),
+                    RedisKeyType.TTL_1_YEAR,
+                    data.asBytes(plugin));
+            plugin.debug(String.format("[%s] Set %s key on Redis", user.getName(), RedisKeyType.LATEST_SNAPSHOT));
+        } catch (Throwable e) {
+            plugin.log(Level.SEVERE, "An exception occurred setting user data on Redis", e);
+        }
+    }
+
+    @Blocking
+    public void clearUserData(@NotNull User user) {
+        try (Jedis jedis = jedisPool.getResource()) {
+            jedis.del(
+                    getKey(RedisKeyType.LATEST_SNAPSHOT, user.getUuid(), clusterId));
+            plugin.debug(String.format("[%s] Cleared %s on Redis", user.getName(), RedisKeyType.LATEST_SNAPSHOT));
+        } catch (Throwable e) {
+            plugin.log(Level.SEVERE, "An exception occurred clearing user data on Redis", e);
+        }
+    }
+
+    @Blocking
+    public void setUserCheckedOut(@NotNull User user, boolean checkedOut) {
+        try (Jedis jedis = jedisPool.getResource()) {
+            final String key = getKeyString(RedisKeyType.DATA_CHECKOUT, user.getUuid(), clusterId);
+            if (checkedOut) {
+                jedis.set(
+                        key.getBytes(StandardCharsets.UTF_8),
+                        plugin.getServerName().getBytes(StandardCharsets.UTF_8));
+            } else {
+                if (jedis.del(key.getBytes(StandardCharsets.UTF_8)) == 0) {
+                    plugin.debug(String.format("[%s] %s key not set on Redis when attempting removal (%s)",
+                            user.getName(), RedisKeyType.DATA_CHECKOUT, key));
+                    return;
+                }
             }
-        });
+            plugin.debug(String.format("[%s] %s %s key %s Redis (%s)", user.getName(),
+                    checkedOut ? "Set" : "Removed", RedisKeyType.DATA_CHECKOUT, checkedOut ? "to" : "from", key));
+        } catch (Throwable e) {
+            plugin.log(Level.SEVERE, "An exception occurred setting checkout to", e);
+        }
+    }
+
+    @Blocking
+    public Optional<String> getUserCheckedOut(@NotNull User user) {
+        try (Jedis jedis = jedisPool.getResource()) {
+            final byte[] key = getKey(RedisKeyType.DATA_CHECKOUT, user.getUuid(), clusterId);
+            final byte[] readData = jedis.get(key);
+            if (readData != null) {
+                final String checkoutServer = new String(readData, StandardCharsets.UTF_8);
+                plugin.debug(String.format("[%s] Waiting for %s %s key to be unset on Redis",
+                        user.getName(), checkoutServer, RedisKeyType.DATA_CHECKOUT));
+                return Optional.of(checkoutServer);
+            }
+        } catch (Throwable e) {
+            plugin.log(Level.SEVERE, "An exception occurred getting a user's checkout key from Redis", e);
+        }
+        plugin.debug(String.format("[%s] %s key not set on Redis", user.getName(),
+                RedisKeyType.DATA_CHECKOUT));
+        return Optional.empty();
+    }
+
+    @Blocking
+    public void clearUsersCheckedOutOnServer() {
+        final String keyFormat = String.format("%s*", RedisKeyType.DATA_CHECKOUT.getKeyPrefix(clusterId));
+        try (Jedis jedis = jedisPool.getResource()) {
+            final Set<String> keys = jedis.keys(keyFormat);
+            if (keys == null) {
+                plugin.log(Level.WARNING, "Checkout key returned null from Redis during clearing");
+                return;
+            }
+            for (String key : keys) {
+                if (jedis.get(key).equals(plugin.getServerName())) {
+                    jedis.del(key);
+                }
+            }
+        } catch (Throwable e) {
+            plugin.log(Level.SEVERE, "An exception occurred clearing this server's checkout keys on Redis", e);
+        }
     }
 
     /**
-     * Set a user's server switch to the Redis server
+     * Set a user's server switch to Redis
      *
      * @param user the user to set the server switch for
-     * @return a future returning void when complete
      */
-    public CompletableFuture<Void> setUserServerSwitch(@NotNull User user) {
-        final CompletableFuture<Void> future = new CompletableFuture<>();
-        plugin.runAsync(() -> {
-            try (Jedis jedis = jedisPool.getResource()) {
-                jedis.setex(
-                        getKey(RedisKeyType.SERVER_SWITCH, user.getUuid(), clusterId),
-                        RedisKeyType.SERVER_SWITCH.getTimeToLive(), new byte[0]
-                );
-                future.complete(null);
-                plugin.debug(String.format("[%s] Set %s key to redis at: %s", user.getUsername(),
-                        RedisKeyType.SERVER_SWITCH.name(), new SimpleDateFormat("mm:ss.SSS").format(new Date())));
-            } catch (Throwable e) {
-                plugin.log(Level.SEVERE, "An exception occurred setting a user's server switch", e);
-            }
-        });
-        return future;
+    @Blocking
+    public void setUserServerSwitch(@NotNull User user) {
+        try (Jedis jedis = jedisPool.getResource()) {
+            jedis.setex(
+                    getKey(RedisKeyType.SERVER_SWITCH, user.getUuid(), clusterId),
+                    RedisKeyType.TTL_10_SECONDS,
+                    new byte[0]);
+            plugin.debug(String.format("[%s] Set %s key to Redis",
+                    user.getName(), RedisKeyType.SERVER_SWITCH));
+        } catch (Throwable e) {
+            plugin.log(Level.SEVERE, "An exception occurred setting a user's server switch key from Redis", e);
+        }
     }
 
     /**
-     * Fetch a user's data from the Redis server and consume the key if found
+     * Fetch a user's data from Redis and consume the key if found
      *
      * @param user The user to fetch data for
-     * @return The user's data, if it's present on the database. Otherwise, an empty optional.
+     * @return The user's data, if it's present on the database. Otherwise, an empty
+     *         optional.
      */
+    @Blocking
     public Optional<DataSnapshot.Packed> getUserData(@NotNull User user) {
         try (Jedis jedis = jedisPool.getResource()) {
-            final byte[] key = getKey(RedisKeyType.DATA_UPDATE, user.getUuid(), clusterId);
+            final byte[] key = getKey(RedisKeyType.LATEST_SNAPSHOT, user.getUuid(), clusterId);
             final byte[] dataByteArray = jedis.get(key);
             if (dataByteArray == null) {
-                plugin.debug("[" + user.getUsername() + "] Could not read " +
-                        RedisKeyType.DATA_UPDATE.name() + " key from redis at: " +
-                        new SimpleDateFormat("mm:ss.SSS").format(new Date()));
+                plugin.debug(String.format("[%s] Waiting for %s key from Redis",
+                        user.getName(), RedisKeyType.LATEST_SNAPSHOT));
                 return Optional.empty();
             }
-            plugin.debug("[" + user.getUsername() + "] Successfully read "
-                    + RedisKeyType.DATA_UPDATE.name() + " key from redis at: " +
-                    new SimpleDateFormat("mm:ss.SSS").format(new Date()));
+            plugin.debug(String.format("[%s] Read %s key from Redis",
+                    user.getName(), RedisKeyType.LATEST_SNAPSHOT));
 
             // Consume the key (delete from redis)
             jedis.del(key);
@@ -246,35 +423,151 @@ public class RedisManager extends JedisPubSub {
             // Use Snappy to decompress the json
             return Optional.of(DataSnapshot.deserialize(plugin, dataByteArray));
         } catch (Throwable e) {
-            plugin.log(Level.SEVERE, "An exception occurred fetching a user's data from redis", e);
+            plugin.log(Level.SEVERE, "An exception occurred getting a user's data from Redis", e);
             return Optional.empty();
         }
     }
 
+    @Blocking
     public boolean getUserServerSwitch(@NotNull User user) {
         try (Jedis jedis = jedisPool.getResource()) {
             final byte[] key = getKey(RedisKeyType.SERVER_SWITCH, user.getUuid(), clusterId);
             final byte[] readData = jedis.get(key);
             if (readData == null) {
-                plugin.debug("[" + user.getUsername() + "] Could not read " +
-                        RedisKeyType.SERVER_SWITCH.name() + " key from redis at: " +
-                        new SimpleDateFormat("mm:ss.SSS").format(new Date()));
+                plugin.debug(String.format("[%s] Waiting for %s key from Redis",
+                        user.getName(), RedisKeyType.SERVER_SWITCH));
                 return false;
             }
-            plugin.debug("[" + user.getUsername() + "] Successfully read "
-                    + RedisKeyType.SERVER_SWITCH.name() + " key from redis at: " +
-                    new SimpleDateFormat("mm:ss.SSS").format(new Date()));
+            plugin.debug(String.format("[%s] Read %s key from Redis",
+                    user.getName(), RedisKeyType.SERVER_SWITCH));
 
             // Consume the key (delete from redis)
             jedis.del(key);
             return true;
         } catch (Throwable e) {
-            plugin.log(Level.SEVERE, "An exception occurred fetching a user's server switch from redis", e);
+            plugin.log(Level.SEVERE, "An exception occurred getting a user's server switch from Redis", e);
             return false;
         }
     }
 
+    @Blocking
+    public String getStatusDump() {
+        try (Jedis jedis = jedisPool.getResource()) {
+            return jedis.info();
+        }
+    }
+
+    @Blocking
+    public long getLatency() {
+        final long startTime = System.currentTimeMillis();
+        try (Jedis jedis = jedisPool.getResource()) {
+            jedis.ping();
+            return System.currentTimeMillis() - startTime;
+        }
+    }
+
+    @Blocking
+    public String getVersion() {
+        final String info = getStatusDump();
+        for (String line : info.split("\n")) {
+            if (line.startsWith("redis_version:")) {
+                return line.split(":")[1];
+            }
+        }
+        return "unknown";
+    }
+
+    @Blocking
+    public void bindMapIds(@NotNull String fromServer, int fromId, @NotNull String toServer, int toId) {
+        try (Jedis jedis = jedisPool.getResource()) {
+            jedis.setex(
+                    getMapIdKey(fromServer, fromId, toServer, clusterId),
+                    RedisKeyType.TTL_1_YEAR,
+                    String.valueOf(toId).getBytes(StandardCharsets.UTF_8));
+            jedis.setex(
+                    getReversedMapIdKey(toServer, toId, clusterId),
+                    RedisKeyType.TTL_1_YEAR,
+                    String.format("%s:%s", fromServer, fromId).getBytes(StandardCharsets.UTF_8));
+            plugin.debug(String.format("Bound map %s:%s -> %s:%s on Redis", fromServer, fromId, toServer, toId));
+        } catch (Throwable e) {
+            plugin.log(Level.SEVERE, "An exception occurred binding map ids on Redis", e);
+        }
+    }
+
+    @Blocking
+    public Optional<Integer> getBoundMapId(@NotNull String fromServer, int fromId, @NotNull String toServer) {
+        try (Jedis jedis = jedisPool.getResource()) {
+            final byte[] readData = jedis.get(getMapIdKey(fromServer, fromId, toServer, clusterId));
+            if (readData == null) {
+                plugin.debug(String.format("[%s:%s] No bound map id for server %s Redis",
+                        fromServer, fromId, toServer));
+                return Optional.empty();
+            }
+            plugin.debug(String.format("[%s:%s] Read bound map id for server %s from Redis",
+                    fromServer, fromId, toServer));
+
+            return Optional.of(Integer.parseInt(new String(readData, StandardCharsets.UTF_8)));
+        } catch (Throwable e) {
+            plugin.log(Level.SEVERE, "An exception occurred getting bound map id from Redis", e);
+            return Optional.empty();
+        }
+    }
+
+    @Blocking
+    public @Nullable Map.Entry<String, Integer> getReversedMapBound(@NotNull String toServer, int toId) {
+        try (Jedis jedis = jedisPool.getResource()) {
+            final byte[] readData = jedis.get(getReversedMapIdKey(toServer, toId, clusterId));
+            if (readData == null) {
+                plugin.debug(String.format("[%s:%s] No reversed map bound on Redis",
+                        toServer, toId));
+                return null;
+            }
+            plugin.debug(String.format("[%s:%s] Read reversed map bound from Redis",
+                    toServer, toId));
+
+            String[] parts = new String(readData, StandardCharsets.UTF_8).split(":");
+            return Map.entry(parts[0], Integer.parseInt(parts[1]));
+        } catch (Throwable e) {
+            plugin.log(Level.SEVERE, "An exception occurred reading reversed map bound from Redis", e);
+            return null;
+        }
+    }
+
+    @Blocking
+    public void setMapData(@NotNull String serverName, int mapId, byte[] data) {
+        try (Jedis jedis = jedisPool.getResource()) {
+            jedis.setex(
+                    getMapDataKey(serverName, mapId, clusterId),
+                    RedisKeyType.TTL_1_YEAR,
+                    data);
+            plugin.debug(String.format("Set map data %s:%s on Redis", serverName, mapId));
+        } catch (Throwable e) {
+            plugin.log(Level.SEVERE, "An exception occurred setting map data on Redis", e);
+        }
+    }
+
+    @Blocking
+    public byte @Nullable [] getMapData(@NotNull String serverName, int mapId) {
+        try (Jedis jedis = jedisPool.getResource()) {
+            final byte[] readData = jedis.get(getMapDataKey(serverName, mapId, clusterId));
+            if (readData == null) {
+                plugin.debug(String.format("[%s:%s] No map data on Redis",
+                        serverName, mapId));
+                return null;
+            }
+            plugin.debug(String.format("[%s:%s] Read map data from Redis",
+                    serverName, mapId));
+
+            return readData;
+        } catch (Throwable e) {
+            plugin.log(Level.SEVERE, "An exception occurred reading map data from Redis", e);
+            return null;
+        }
+    }
+
+    @Blocking
     public void terminate() {
+        enabled = false;
         if (jedisPool != null) {
             if (!jedisPool.isClosed()) {
                 jedisPool.close();
@@ -284,7 +577,28 @@ public class RedisManager extends JedisPubSub {
     }
 
     private static byte[] getKey(@NotNull RedisKeyType keyType, @NotNull UUID uuid, @NotNull String clusterId) {
-        return String.format("%s:%s", keyType.getKeyPrefix(clusterId), uuid).getBytes(StandardCharsets.UTF_8);
+        return getKeyString(keyType, uuid, clusterId).getBytes(StandardCharsets.UTF_8);
+    }
+
+    @NotNull
+    private static String getKeyString(@NotNull RedisKeyType keyType, @NotNull UUID uuid, @NotNull String clusterId) {
+        return String.format("%s:%s", keyType.getKeyPrefix(clusterId), uuid);
+    }
+
+    private static byte[] getMapIdKey(@NotNull String fromServer, int fromId, @NotNull String toServer,
+            @NotNull String clusterId) {
+        return String.format("%s:%s:%s:%s", RedisKeyType.MAP_ID.getKeyPrefix(clusterId), fromServer, fromId, toServer)
+                .getBytes(StandardCharsets.UTF_8);
+    }
+
+    private static byte[] getReversedMapIdKey(@NotNull String toServer, int toId, @NotNull String clusterId) {
+        return String.format("%s:%s:%s", RedisKeyType.MAP_ID_REVERSED.getKeyPrefix(clusterId), toServer, toId)
+                .getBytes(StandardCharsets.UTF_8);
+    }
+
+    private static byte[] getMapDataKey(@NotNull String serverName, int mapId, @NotNull String clusterId) {
+        return String.format("%s:%s:%s", RedisKeyType.MAP_DATA.getKeyPrefix(clusterId), serverName, mapId)
+                .getBytes(StandardCharsets.UTF_8);
     }
 
 }

common/src/main/java/net/william278/husksync/redis/RedisMessage.java

@@ -21,22 +21,42 @@ package net.william278.husksync.redis;
 
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
+import lombok.Setter;
 import net.william278.husksync.HuskSync;
 import net.william278.husksync.adapter.Adaptable;
+import net.william278.husksync.user.OnlineUser;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.Optional;
 import java.util.UUID;
 
+@Setter
 public class RedisMessage implements Adaptable {
 
+    private @Nullable String targetServer;
     @SerializedName("target_uuid")
-    private UUID targetUuid;
+    private @Nullable UUID targetUuid;
+    @Getter
+    @Setter
     @SerializedName("payload")
     private byte[] payload;
 
+    private RedisMessage(byte[] payload) {
+        setPayload(payload);
+    }
+
     private RedisMessage(@NotNull UUID targetUuid, byte[] message) {
+        this(message);
         this.setTargetUuid(targetUuid);
-        this.setPayload(message);
+    }
+
+    private RedisMessage(@NotNull String targetServer, byte[] message) {
+        this(message);
+        this.setTargetServer(targetServer);
     }
 
     @SuppressWarnings("unused")
@@ -48,33 +68,56 @@ public class RedisMessage implements Adaptable {
         return new RedisMessage(targetUuid, message);
     }
 
+    @NotNull
+    public static RedisMessage create(@NotNull String targetServer, byte[] message) {
+        return new RedisMessage(targetServer, message);
+    }
+
     @NotNull
     public static RedisMessage fromJson(@NotNull HuskSync plugin, @NotNull String json) throws JsonSyntaxException {
         return plugin.getGson().fromJson(json, RedisMessage.class);
     }
 
-    public void dispatch(@NotNull HuskSync plugin, @NotNull RedisMessageType type) {
+    public void dispatch(@NotNull HuskSync plugin, @NotNull Type type) {
         plugin.runAsync(() -> plugin.getRedisManager().sendMessage(
                 type.getMessageChannel(plugin.getSettings().getClusterId()),
                 plugin.getGson().toJson(this)
         ));
     }
 
-    @NotNull
-    public UUID getTargetUuid() {
-        return targetUuid;
+    public Optional<UUID> getTargetUuid() {
+        return Optional.ofNullable(targetUuid);
     }
 
-    public void setTargetUuid(@NotNull UUID targetUuid) {
-        this.targetUuid = targetUuid;
+    public Optional<OnlineUser> getTargetUser(@NotNull HuskSync plugin) {
+        return getTargetUuid().flatMap(plugin::getOnlineUser);
     }
 
-    public byte[] getPayload() {
-        return payload;
+    public boolean isTargetServer(@NotNull HuskSync plugin) {
+        return targetServer != null && targetServer.equals(plugin.getServerName());
     }
 
-    public void setPayload(byte[] payload) {
-        this.payload = payload;
-    }
+    public enum Type {
+        UPDATE_USER_DATA,
+        REQUEST_USER_DATA,
+        RETURN_USER_DATA,
+        CHECK_IN_PETITION;
 
+        @NotNull
+        public String getMessageChannel(@NotNull String clusterId) {
+            return String.format(
+                    "%s:%s:%s",
+                    RedisManager.KEY_NAMESPACE.toLowerCase(Locale.ENGLISH),
+                    clusterId.toLowerCase(Locale.ENGLISH),
+                    name().toLowerCase(Locale.ENGLISH)
+            );
+        }
+
+        public static Optional<Type> getTypeFromChannel(@NotNull String channel, @NotNull String clusterId) {
+            return Arrays.stream(values())
+                    .filter(messageType -> messageType.getMessageChannel(clusterId).equalsIgnoreCase(channel))
+                    .findFirst();
+        }
+
+    }
 }

common/src/main/java/net/william278/husksync/sync/DataSyncer.java

@@ -0,0 +1,249 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync.sync;
+
+import net.william278.husksync.HuskSync;
+import net.william278.husksync.api.HuskSyncAPI;
+import net.william278.husksync.data.DataSnapshot;
+import net.william278.husksync.database.Database;
+import net.william278.husksync.redis.RedisManager;
+import net.william278.husksync.user.OnlineUser;
+import net.william278.husksync.user.User;
+import net.william278.husksync.util.Task;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Blocking;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.logging.Level;
+
+/**
+ * Handles the synchronization of data when a player changes servers or logs in
+ *
+ * @since 3.1
+ */
+public abstract class DataSyncer {
+    private static final long BASE_LISTEN_ATTEMPTS = 16;
+    private static final long LISTEN_DELAY = 10;
+
+    protected final HuskSync plugin;
+    private final long maxListenAttempts;
+
+    @ApiStatus.Internal
+    protected DataSyncer(@NotNull HuskSync plugin) {
+        this.plugin = plugin;
+        this.maxListenAttempts = getMaxListenAttempts();
+    }
+
+    /**
+     * API-exposed constructor for a {@link DataSyncer}
+     *
+     * @param api instance of the {@link HuskSyncAPI}
+     */
+    @SuppressWarnings("unused")
+    public DataSyncer(@NotNull HuskSyncAPI api) {
+        this(api.getPlugin());
+    }
+
+    /**
+     * Called when the plugin is enabled
+     */
+    public void initialize() {
+    }
+
+    /**
+     * Called when the plugin is disabled
+     */
+    public void terminate() {
+    }
+
+    /**
+     * Called when a user's data should be fetched and applied to them as part of a synchronization process
+     *
+     * @param user the user to fetch data for
+     */
+    public abstract void syncApplyUserData(@NotNull OnlineUser user);
+
+    /**
+     * Called when a user's data should be serialized and saved as part of a synchronization process
+     *
+     * @param user the user to save
+     */
+    public abstract void syncSaveUserData(@NotNull OnlineUser user);
+
+    /**
+     * Save a user's current data
+     *
+     * @param onlineUser the user to save data of
+     * @param cause      the save cause
+     */
+    public void saveCurrentUserData(@NotNull OnlineUser onlineUser, @NotNull DataSnapshot.SaveCause cause) {
+        this.saveData(onlineUser, onlineUser.createSnapshot(cause), getRedis()::setUserData);
+    }
+
+    /**
+     * Save a {@link DataSnapshot.Packed user's data snapshot} to the database,
+     * first firing the {@link net.william278.husksync.event.DataSaveEvent}. This will not update data on Redis.
+     *
+     * @param user  the user to save the data for
+     * @param data  the data to save
+     * @param after a consumer to run after data has been saved. Will be run async (off the main thread).
+     * @apiNote Data will not be saved if the {@link net.william278.husksync.event.DataSaveEvent} is canceled.
+     * Note that this method can also edit the data before saving it.
+     * @implNote Note that the {@link net.william278.husksync.event.DataSaveEvent} will <b>not</b> be fired if
+     * {@link DataSnapshot.SaveCause#fireDataSaveEvent()} is {@code false} (e.g., with the SERVER_SHUTDOWN cause).
+     * @since 3.3.2
+     */
+    @Blocking
+    public void saveData(@NotNull User user, @NotNull DataSnapshot.Packed data,
+                         @Nullable BiConsumer<User, DataSnapshot.Packed> after) {
+        if (!data.getSaveCause().fireDataSaveEvent()) {
+            addSnapshotToDatabase(user, data, after);
+            return;
+        }
+        plugin.fireEvent(
+                plugin.getDataSaveEvent(user, data),
+                (event) -> addSnapshotToDatabase(user, data, after)
+        );
+    }
+
+    /**
+     * Save a {@link DataSnapshot.Packed user's data snapshot} to the database,
+     * first firing the {@link net.william278.husksync.event.DataSaveEvent}. This will not update data on Redis.
+     *
+     * @param user the user to save the data for
+     * @param data the data to save
+     * @apiNote Data will not be saved if the {@link net.william278.husksync.event.DataSaveEvent} is canceled.
+     * Note that this method can also edit the data before saving it.
+     * @implNote Note that the {@link net.william278.husksync.event.DataSaveEvent} will <b>not</b> be fired if
+     * {@link DataSnapshot.SaveCause#fireDataSaveEvent()} is {@code false} (e.g., with the SERVER_SHUTDOWN cause).
+     * @since 3.3.3
+     */
+    public void saveData(@NotNull User user, @NotNull DataSnapshot.Packed data) {
+        saveData(user, data, null);
+    }
+
+    // Adds a snapshot to the database and runs the after consumer
+    @Blocking
+    private void addSnapshotToDatabase(@NotNull User user, @NotNull DataSnapshot.Packed data,
+                                       @Nullable BiConsumer<User, DataSnapshot.Packed> after) {
+        getDatabase().addSnapshot(user, data);
+        if (after != null) {
+            after.accept(user, data);
+        }
+    }
+
+    // Calculates the max attempts the system should listen for user data for based on the latency value
+    private long getMaxListenAttempts() {
+        return BASE_LISTEN_ATTEMPTS + (
+                (Math.max(100, plugin.getSettings().getSynchronization().getNetworkLatencyMilliseconds()) / 1000)
+                        * 20 / LISTEN_DELAY
+        );
+    }
+
+    // Set a user's data from the database, or set them as a new user
+    @ApiStatus.Internal
+    protected void setUserFromDatabase(@NotNull OnlineUser user) {
+        try {
+            getDatabase().getLatestSnapshot(user).ifPresentOrElse(
+                    snapshot -> user.applySnapshot(snapshot, DataSnapshot.UpdateCause.SYNCHRONIZED),
+                    () -> user.completeSync(true, DataSnapshot.UpdateCause.NEW_USER, plugin)
+            );
+        } catch (Throwable e) {
+            plugin.log(Level.WARNING, "Failed to set %s's data from the database".formatted(user.getName()), e);
+            user.completeSync(false, DataSnapshot.UpdateCause.SYNCHRONIZED, plugin);
+        }
+    }
+
+    // Continuously listen for data from Redis
+    @ApiStatus.Internal
+    protected void listenForRedisData(@NotNull OnlineUser user, @NotNull Supplier<Boolean> completionSupplier) {
+        final AtomicLong timesRun = new AtomicLong(0L);
+        final AtomicReference<Task.Repeating> task = new AtomicReference<>();
+        final AtomicBoolean processing = new AtomicBoolean(false);
+        final Runnable runnable = () -> {
+            if (user.cannotApplySnapshot()) {
+                task.get().cancel();
+                return;
+            }
+            // Ensure only one task is running at a time
+            if (processing.getAndSet(true)) {
+                return;
+            }
+
+            // Timeout if the plugin is disabling or the max attempts have been reached
+            if (plugin.isDisabling() || timesRun.getAndIncrement() > maxListenAttempts) {
+                task.get().cancel();
+                plugin.debug(String.format("[%s] Redis timed out after %s attempts; setting from database",
+                        user.getName(), timesRun.get()));
+                setUserFromDatabase(user);
+                return;
+            }
+
+            // Fire the completion supplier
+            if (completionSupplier.get()) {
+                task.get().cancel();
+            }
+            processing.set(false);
+        };
+        task.set(plugin.getRepeatingTask(runnable, LISTEN_DELAY));
+        task.get().run();
+    }
+
+    @NotNull
+    protected RedisManager getRedis() {
+        return plugin.getRedisManager();
+    }
+
+    @NotNull
+    protected Database getDatabase() {
+        return plugin.getDatabase();
+    }
+
+    /**
+     * Represents the different available default modes of {@link DataSyncer}
+     *
+     * @since 3.1
+     */
+    public enum Mode {
+        LOCKSTEP(LockstepDataSyncer::new),
+        DELAY(DelayDataSyncer::new);
+
+        private final Function<HuskSync, ? extends DataSyncer> supplier;
+
+        Mode(@NotNull Function<HuskSync, ? extends DataSyncer> supplier) {
+            this.supplier = supplier;
+        }
+
+        @NotNull
+        public DataSyncer create(@NotNull HuskSync plugin) {
+            return supplier.apply(plugin);
+        }
+
+    }
+
+
+}

common/src/main/java/net/william278/husksync/sync/DelayDataSyncer.java

@@ -0,0 +1,73 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync.sync;
+
+import net.william278.husksync.HuskSync;
+import net.william278.husksync.data.DataSnapshot;
+import net.william278.husksync.user.OnlineUser;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A data syncer which applies a network delay before checking the presence of user data
+ */
+public class DelayDataSyncer extends DataSyncer {
+
+    public DelayDataSyncer(@NotNull HuskSync plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public void syncApplyUserData(@NotNull OnlineUser user) {
+        plugin.runAsyncDelayed(
+                () -> {
+                    // Fetch from the database if the user isn't changing servers
+                    if (!getRedis().getUserServerSwitch(user)) {
+                        this.setUserFromDatabase(user);
+                        return;
+                    }
+
+                    // Listen for the data to be updated
+                    this.listenForRedisData(
+                            user,
+                            () -> getRedis().getUserData(user).map(data -> {
+                                user.applySnapshot(data, DataSnapshot.UpdateCause.SYNCHRONIZED);
+                                return true;
+                            }).orElse(false)
+                    );
+                },
+                Math.max(0, plugin.getSettings().getSynchronization().getNetworkLatencyMilliseconds() / 50L)
+        );
+    }
+
+    @Override
+    public void syncSaveUserData(@NotNull OnlineUser onlineUser) {
+        plugin.runAsync(() -> {
+            getRedis().setUserServerSwitch(onlineUser);
+            saveData(
+                    onlineUser, onlineUser.createSnapshot(DataSnapshot.SaveCause.DISCONNECT),
+                    (user, data) -> {
+                        getRedis().setUserData(user, data);
+                        plugin.unlockPlayer(user.getUuid());
+                    }
+            );
+        });
+    }
+
+}

common/src/main/java/net/william278/husksync/sync/LockstepDataSyncer.java

@@ -0,0 +1,85 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync.sync;
+
+import net.william278.husksync.HuskSync;
+import net.william278.husksync.data.DataSnapshot;
+import net.william278.husksync.user.OnlineUser;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Optional;
+
+public class LockstepDataSyncer extends DataSyncer {
+
+    public LockstepDataSyncer(@NotNull HuskSync plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public void initialize() {
+        getRedis().clearUsersCheckedOutOnServer();
+    }
+
+    @Override
+    public void terminate() {
+        getRedis().clearUsersCheckedOutOnServer();
+    }
+
+    // Consume their data when they are checked in
+    @Override
+    public void syncApplyUserData(@NotNull OnlineUser user) {
+        this.listenForRedisData(user, () -> {
+            if (user.cannotApplySnapshot()) {
+                plugin.debug("Not checking data state for user who has gone offline: %s".formatted(user.getName()));
+                return false;
+            }
+
+            // If they are checked out, ask the server to check them back in and return false
+            final Optional<String> server = getRedis().getUserCheckedOut(user);
+            if (server.isPresent() && !server.get().equals(plugin.getServerName())) {
+                if (plugin.getSettings().getSynchronization().isCheckinPetitions()) {
+                    getRedis().petitionServerCheckin(server.get(), user);
+                }
+                return false;
+            }
+
+            // If they are checked in - or checked out on *this* server - we can apply their latest data
+            getRedis().setUserCheckedOut(user, true);
+            getRedis().getUserData(user).ifPresentOrElse(
+                    data -> user.applySnapshot(data, DataSnapshot.UpdateCause.SYNCHRONIZED),
+                    () -> this.setUserFromDatabase(user)
+            );
+            return true;
+        });
+    }
+
+    @Override
+    public void syncSaveUserData(@NotNull OnlineUser onlineUser) {
+        plugin.runAsync(() -> saveData(
+                onlineUser, onlineUser.createSnapshot(DataSnapshot.SaveCause.DISCONNECT),
+                (user, data) -> {
+                    getRedis().setUserData(user, data);
+                    getRedis().setUserCheckedOut(user, false);
+                    plugin.unlockPlayer(user.getUuid());
+                }
+        ));
+    }
+
+}

common/src/main/java/net/william278/husksync/user/ConsoleUser.java

@@ -20,6 +20,7 @@
 package net.william278.husksync.user;
 
 import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.platform.AudienceProvider;
 import org.jetbrains.annotations.NotNull;
 
 public final class ConsoleUser implements CommandUser {
@@ -27,8 +28,8 @@ public final class ConsoleUser implements CommandUser {
     @NotNull
     private final Audience audience;
 
-    public ConsoleUser(@NotNull Audience console) {
-        this.audience = console;
+    public ConsoleUser(@NotNull AudienceProvider audiences) {
+        this.audience = audiences.console();
     }
 
     @Override
@@ -41,4 +42,6 @@ public final class ConsoleUser implements CommandUser {
     public boolean hasPermission(@NotNull String permission) {
         return true;
     }
+
+
 }

common/src/main/java/net/william278/husksync/user/OnlineUser.java

@@ -20,7 +20,6 @@
 package net.william278.husksync.user;
 
 import de.themoep.minedown.adventure.MineDown;
-import de.themoep.minedown.adventure.MineDownParser;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import net.william278.husksync.HuskSync;
@@ -44,19 +43,33 @@ public abstract class OnlineUser extends User implements CommandUser, UserDataHo
     }
 
     /**
-     * Indicates if the player has gone offline
+     * Indicates if the player is offline
      *
      * @return {@code true} if the player has left the server; {@code false} otherwise
+     * @deprecated use {@code hasDisconnected} instead
      */
-    public abstract boolean isOffline();
+    @Deprecated(since = "3.8")
+    public boolean isOffline() {
+        return hasDisconnected();
+    }
+
+    public abstract boolean hasDisconnected();
+
+    // Users cannot have snapshots applied if they have disconnected!
+    @Override
+    public boolean cannotApplySnapshot() {
+        if (hasDisconnected()) {
+            getPlugin().debug("[%s] Cannot apply snapshot as user is offline!".formatted(getName()));
+            return true;
+        }
+        return false;
+    }
 
-    /**
-     * Get the player's adventure {@link Audience}
-     *
-     * @return the player's {@link Audience}
-     */
     @NotNull
-    public abstract Audience getAudience();
+    @Override
+    public Audience getAudience() {
+        return getPlugin().getAudience(getUuid());
+    }
 
     /**
      * Send a message to this player
@@ -73,9 +86,7 @@ public abstract class OnlineUser extends User implements CommandUser, UserDataHo
      * @param mineDown the parsed {@link MineDown} to send
      */
     public void sendMessage(@NotNull MineDown mineDown) {
-        sendMessage(mineDown
-                .disable(MineDownParser.Option.SIMPLE_FORMATTING)
-                .replace().toComponent());
+        sendMessage(mineDown.toComponent());
     }
 
     /**
@@ -84,9 +95,7 @@ public abstract class OnlineUser extends User implements CommandUser, UserDataHo
      * @param mineDown the parsed {@link MineDown} to send
      */
     public void sendActionBar(@NotNull MineDown mineDown) {
-        getAudience().sendActionBar(mineDown
-                .disable(MineDownParser.Option.SIMPLE_FORMATTING)
-                .replace().toComponent());
+        getAudience().sendActionBar(mineDown.toComponent());
     }
 
     /**
@@ -96,7 +105,9 @@ public abstract class OnlineUser extends User implements CommandUser, UserDataHo
      * @param description    the description of the toast
      * @param iconMaterial   the namespace-keyed material to use as an hasIcon of the toast
      * @param backgroundType the background ("ToastType") of the toast
+     * @deprecated No longer supported
      */
+    @Deprecated(since = "3.6.7")
     public abstract void sendToast(@NotNull MineDown title, @NotNull MineDown description,
                                    @NotNull String iconMaterial, @NotNull String backgroundType);
 
@@ -122,7 +133,7 @@ public abstract class OnlineUser extends User implements CommandUser, UserDataHo
 
 
     /**
-     * Set a player's status from a {@link DataSnapshot}
+     * Apply a {@link DataSnapshot} to a player, updating their data
      *
      * @param snapshot The {@link DataSnapshot} to set the player's status from
      * @param cause    The {@link DataSnapshot.UpdateCause} of the snapshot
@@ -130,11 +141,12 @@ public abstract class OnlineUser extends User implements CommandUser, UserDataHo
      */
     public void applySnapshot(@NotNull DataSnapshot.Packed snapshot, @NotNull DataSnapshot.UpdateCause cause) {
         getPlugin().fireEvent(getPlugin().getPreSyncEvent(this, snapshot), (event) -> {
-            if (!isOffline()) {
-                UserDataHolder.super.applySnapshot(
-                        event.getData(), (succeeded) -> completeSync(succeeded, cause, getPlugin())
-                );
-            }
+            getPlugin().debug(String.format("Attempting to apply snapshot (%s) to %s (cause: %s)",
+                    snapshot.getShortId(), getName(), cause.getDisplayName()
+            ));
+            UserDataHolder.super.applySnapshot(
+                    event.getData(), (succeeded) -> completeSync(succeeded, cause, getPlugin())
+            );
         });
     }
 
@@ -146,19 +158,13 @@ public abstract class OnlineUser extends User implements CommandUser, UserDataHo
      */
     public void completeSync(boolean succeeded, @NotNull DataSnapshot.UpdateCause cause, @NotNull HuskSync plugin) {
         if (succeeded) {
-            switch (plugin.getSettings().getNotificationDisplaySlot()) {
+            switch (plugin.getSettings().getSynchronization().getNotificationDisplaySlot()) {
                 case CHAT -> cause.getCompletedLocale(plugin).ifPresent(this::sendMessage);
                 case ACTION_BAR -> cause.getCompletedLocale(plugin).ifPresent(this::sendActionBar);
-                case TOAST -> cause.getCompletedLocale(plugin)
-                        .ifPresent(locale -> this.sendToast(
-                                locale, new MineDown(""),
-                                "minecraft:bell",
-                                "TASK"
-                        ));
             }
             plugin.fireEvent(
                     plugin.getSyncCompleteEvent(this),
-                    (event) -> plugin.getLockedPlayers().remove(getUuid())
+                    (event) -> plugin.unlockPlayer(getUuid())
             );
         } else {
             cause.getFailedLocale(plugin).ifPresent(this::sendMessage);

common/src/main/java/net/william278/husksync/user/User.java

@@ -19,6 +19,9 @@
 
 package net.william278.husksync.user;
 
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.UUID;
@@ -26,39 +29,18 @@ import java.util.UUID;
 /**
  * Represents a user who has their data synchronized by HuskSync
  */
+@Getter
+@AllArgsConstructor
+@EqualsAndHashCode(exclude = {"name"})
 public class User {
 
     private final UUID uuid;
+    private final String name;
 
-    private final String username;
-
-    public User(@NotNull UUID uuid, @NotNull String username) {
-        this.username = username;
-        this.uuid = uuid;
-    }
-
-    /**
-     * Get the user's unique account ID
-     */
-    @NotNull
-    public UUID getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Get the user's username
-     */
     @NotNull
+    @Deprecated(since = "3.7.4")
     public String getUsername() {
-        return username;
-    }
-
-    @Override
-    public boolean equals(Object object) {
-        if (object instanceof User other) {
-            return this.getUuid().equals(other.getUuid());
-        }
-        return super.equals(object);
+        return name;
     }
 
 }

common/src/main/java/net/william278/husksync/util/CompatibilityChecker.java

@@ -0,0 +1,103 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync.util;
+
+import de.exlll.configlib.Configuration;
+import de.exlll.configlib.YamlConfigurationProperties;
+import de.exlll.configlib.YamlConfigurationStore;
+import lombok.AllArgsConstructor;
+import net.william278.desertwell.util.Version;
+import net.william278.husksync.HuskSync;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.InputStream;
+import java.util.function.BiFunction;
+import java.util.logging.Level;
+
+import static net.william278.husksync.config.ConfigProvider.YAML_CONFIGURATION_PROPERTIES;
+
+public interface CompatibilityChecker {
+
+    String COMPATIBILITY_FILE = "compatibility.yml";
+
+    default void checkCompatibility() throws HuskSync.FailedToLoadException {
+        final YamlConfigurationProperties p = YAML_CONFIGURATION_PROPERTIES.build();
+        final CompatibilityConfig compat;
+
+        // Load compatibility file
+        try (InputStream input = getResource(COMPATIBILITY_FILE)) {
+            compat = new YamlConfigurationStore<>(CompatibilityConfig.class, p).read(input);
+        } catch (Throwable e) {
+            getPlugin().log(Level.WARNING, "Failed to load compatibility config, skipping check.", e);
+            return;
+        }
+
+        // Check compatibility
+        if (!compat.isCompatibleWith(getPlugin().getMinecraftVersion())) {
+            throw new HuskSync.FailedToLoadException("""
+                    Incompatible Minecraft version. This version of HuskSync is designed for Minecraft %s.
+                    Please download the correct version of HuskSync for your server's Minecraft version (%s)."""
+                    .formatted(compat.minecraftVersionRange(), getPlugin().getMinecraftVersion().toString()));
+        }
+    }
+
+    InputStream getResource(@NotNull String name);
+
+    @NotNull
+    HuskSync getPlugin();
+
+    @Configuration
+    record CompatibilityConfig(@NotNull String minecraftVersionRange) {
+
+        @AllArgsConstructor
+        enum ExpressionType {
+            GTE(">=", (v, s) -> v.compareTo(Version.fromString(s.substring(2))) >= 0),
+            LTE("<=", (v, s) -> v.compareTo(Version.fromString(s.substring(2))) <= 0),
+            GT(">", (v, s) -> v.compareTo(Version.fromString(s.substring(1))) > 0),
+            LT("<", (v, s) -> v.compareTo(Version.fromString(s.substring(1))) < 0),
+            NOT("!", (v, s) -> v.compareTo(Version.fromString(s.substring(1))) != 0),
+            E("=", (v, s) -> v.compareTo(Version.fromString(s.substring(1))) == 0);
+
+            private final String match;
+            private final BiFunction<Version, String, Boolean> function;
+
+            private static boolean check(@NotNull String versionRange, @NotNull Version mcVer) {
+                boolean passes = true;
+                versions:
+                for (String exp : versionRange.split(" ")) {
+                    for (ExpressionType type : values()) {
+                        if (exp.trim().startsWith(type.match)) {
+                            passes = passes && type.function.apply(mcVer, exp.trim());
+                            continue versions;
+                        }
+                    }
+                    passes = passes && mcVer.compareTo(Version.fromString(exp.trim())) == 0;
+                }
+                return passes;
+            }
+        }
+
+        public boolean isCompatibleWith(@NotNull Version version) {
+            return ExpressionType.check(minecraftVersionRange, version);
+        }
+
+    }
+
+}

common/src/main/java/net/william278/husksync/util/DataDumper.java

@@ -1,191 +0,0 @@
-/*
- * This file is part of HuskSync, licensed under the Apache License 2.0.
- *
- *  Copyright (c) William278 <will27528@gmail.com>
- *  Copyright (c) contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package net.william278.husksync.util;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import net.william278.husksync.HuskSync;
-import net.william278.husksync.data.DataSnapshot;
-import net.william278.husksync.user.User;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.time.format.DateTimeFormatter;
-import java.util.Locale;
-import java.util.StringJoiner;
-import java.util.logging.Level;
-
-/**
- * Utility class for dumping {@link DataSnapshot}s to a file or as a paste on the web
- */
-public class DataDumper {
-
-    private static final String LOGS_SITE_ENDPOINT = "https://api.mclo.gs/1/log";
-
-    private final HuskSync plugin;
-    private final DataSnapshot.Packed snapshot;
-    private final User user;
-
-    private DataDumper(@NotNull DataSnapshot.Packed snapshot, @NotNull User user, @NotNull HuskSync implementor) {
-        this.snapshot = snapshot;
-        this.user = user;
-        this.plugin = implementor;
-    }
-
-    /**
-     * Create a {@link DataDumper} of the given {@link DataSnapshot}
-     *
-     * @param dataSnapshot The {@link DataSnapshot} to dump
-     * @param user         The {@link User} whose data is being dumped
-     * @param plugin       The implementing {@link HuskSync} plugin
-     * @return A {@link DataDumper} for the given {@link DataSnapshot}
-     */
-    public static DataDumper create(@NotNull DataSnapshot.Packed dataSnapshot,
-                                    @NotNull User user, @NotNull HuskSync plugin) {
-        return new DataDumper(dataSnapshot, user, plugin);
-    }
-
-    /**
-     * Dumps the data snapshot to a string
-     *
-     * @return the data snapshot as a string
-     */
-    @Override
-    @NotNull
-    public String toString() {
-        return snapshot.asJson(plugin);
-    }
-
-    @NotNull
-    public String toWeb() {
-        try {
-            final URL url = new URL(LOGS_SITE_ENDPOINT);
-            final HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-            connection.setRequestMethod("POST");
-            connection.setDoOutput(true);
-
-            // Dispatch the request
-            final byte[] messageBody = getWebContentField().getBytes(StandardCharsets.UTF_8);
-            final int messageLength = messageBody.length;
-            connection.setFixedLengthStreamingMode(messageLength);
-            connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
-            connection.connect();
-            try (OutputStream messageOutputStream = connection.getOutputStream()) {
-                messageOutputStream.write(messageBody);
-            }
-
-            // Get the response
-            if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) {
-                // Get the body as a json
-                try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
-                    final StringBuilder response = new StringBuilder();
-                    String line;
-                    while ((line = reader.readLine()) != null) {
-                        response.append(line);
-                    }
-
-                    // Parse the response as json
-                    final JsonObject responseJson = JsonParser.parseString(response.toString()).getAsJsonObject();
-                    if (responseJson.has("url")) {
-                        return responseJson.get("url").getAsString();
-                    }
-                    return "(Failed to get URL from response)";
-                }
-            } else {
-                return "(Failed to upload to logs site, got: " + connection.getResponseCode() + ")";
-            }
-        } catch (Exception e) {
-            plugin.log(Level.SEVERE, "Failed to upload data to logs site", e);
-        }
-        return "(Failed to upload to logs site)";
-    }
-
-    @NotNull
-    private String getWebContentField() {
-        return "content=" + URLEncoder.encode(toString(), StandardCharsets.UTF_8);
-    }
-
-    /**
-     * Dump the {@link DataSnapshot} to a file and return the file name
-     *
-     * @return the relative path of the file the data was dumped to
-     */
-    @NotNull
-    public String toFile() throws IOException {
-        final File filePath = getFilePath();
-
-        // Write the data from #getString to the file using a writer
-        try (final FileWriter writer = new FileWriter(filePath, StandardCharsets.UTF_8, false)) {
-            writer.write(toString());
-        } catch (IOException e) {
-            throw new IOException("Failed to write data to file", e);
-        }
-
-        return "~/plugins/HuskSync/dumps/" + filePath.getName();
-    }
-
-    /**
-     * Get the file path to dump the data to
-     *
-     * @return the file path
-     * @throws IOException if the prerequisite dumps parent folder could not be created
-     */
-    @NotNull
-    private File getFilePath() throws IOException {
-        return new File(getDumpsFolder(), getFileName());
-    }
-
-    /**
-     * Get the folder to dump the data to and create it if it does not exist
-     *
-     * @return the dumps folder
-     * @throws IOException if the folder could not be created
-     */
-    @NotNull
-    private File getDumpsFolder() throws IOException {
-        final File dumpsFolder = new File(plugin.getDataFolder(), "dumps");
-        if (!dumpsFolder.exists()) {
-            if (!dumpsFolder.mkdirs()) {
-                throw new IOException("Failed to create user data dumps folder");
-            }
-        }
-        return dumpsFolder;
-    }
-
-    /**
-     * Get the name of the file to dump the data snapshot to
-     *
-     * @return the file name
-     */
-    @NotNull
-    private String getFileName() {
-        return new StringJoiner("_")
-                .add(user.getUsername())
-                .add(snapshot.getTimestamp().format(DateTimeFormatter.ofPattern("yyyy-MM-dd_HH-mm-ss")))
-                .add(snapshot.getSaveCause().name().toLowerCase(Locale.ENGLISH))
-                .add(snapshot.getShortId())
-                + ".json";
-    }
-
-}

common/src/main/java/net/william278/husksync/util/DataSnapshotList.java

@@ -27,6 +27,7 @@ import net.william278.paginedown.PaginatedList;
 import org.jetbrains.annotations.NotNull;
 
 import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -46,25 +47,26 @@ public class DataSnapshotList {
         final AtomicInteger snapshotNumber = new AtomicInteger(1);
         this.paginatedList = PaginatedList.of(snapshots.stream()
                         .map(snapshot -> plugin.getLocales()
-                                .getRawLocale("data_list_item",
+                                .getRawLocale(!snapshot.isInvalid() ? "data_list_item" : "data_list_item_invalid",
                                         getNumberIcon(snapshotNumber.getAndIncrement()),
-                                        dataOwner.getUsername(),
+                                        dataOwner.getName(),
                                         snapshot.getId().toString(),
                                         snapshot.getShortId(),
                                         snapshot.isPinned() ? "※" : "  ",
                                         snapshot.getTimestamp().format(DateTimeFormatter
-                                                .ofPattern("dd/MM/yyyy, HH:mm")),
+                                                .ofLocalizedDateTime(FormatStyle.MEDIUM, FormatStyle.SHORT)),
                                         snapshot.getTimestamp().format(DateTimeFormatter
-                                                .ofPattern("MMM dd yyyy, HH:mm:ss.SSS")),
-                                        snapshot.getSaveCause().getDisplayName(),
-                                        String.format("%.2fKiB", snapshot.getFileSize(plugin) / 1024f))
+                                                .ofLocalizedDateTime(FormatStyle.LONG, FormatStyle.MEDIUM)),
+                                        snapshot.getSaveCause().getLocale(plugin),
+                                        String.format("%.2fKiB", snapshot.getFileSize(plugin) / 1024f),
+                                        snapshot.isInvalid() ? snapshot.getInvalidReason(plugin) : "")
                                 .orElse("• " + snapshot.getId())).toList(),
                 plugin.getLocales().getBaseChatList(6)
                         .setHeaderFormat(plugin.getLocales()
-                                .getRawLocale("data_list_title", dataOwner.getUsername(),
+                                .getRawLocale("data_list_title", dataOwner.getName(),
                                         "%first_item_on_page_index%", "%last_item_on_page_index%", "%total_items%")
                                 .orElse(""))
-                        .setCommand("/husksync:userdata list " + dataOwner.getUsername())
+                        .setCommand("/husksync:userdata list " + dataOwner.getName())
                         .build());
     }