fix: exception when reading server defaults

* feat: start work on moving to Exll's configlib

* refactor: Fully migrate to Exlll's configlib

* refactor: Optimize imports

.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,4 +1,3 @@
-# Builds, tests the project with Gradle
 name: CI Tests
 
 on:
@@ -17,21 +16,29 @@ 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@v4
+      - name: 'Set up JDK 17 📦'
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
-      - name: Build with Gradle
+      - name: 'Build with Gradle 🏗️'
         uses: gradle/gradle-build-action@v2
         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
+      - name: 'Publish Test Report 📊'
+        uses: mikepenz/action-junit-report@v4
+        if: success() || failure() # Continue on failure
         with:
           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

.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@v4
+      - name: 'Set up JDK 17 📦'
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
-      - name: Test Pull Request
+      - name: 'Build with Gradle 🏗️'
         uses: gradle/gradle-build-action@v2
         with:
           arguments: test
+      - name: 'Publish Test Report 📊'
+        uses: mikepenz/action-junit-report@v4
+        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
 
 on:
   release:
-    types: [ published ]
+    types: [ 'published' ]
 
 permissions:
   contents: read
@@ -13,21 +12,22 @@ 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@v4
+      - name: 'Set up JDK 17 📦'
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
-      - name: Build with Gradle
+      - name: 'Build with Gradle 🏗️'
         uses: gradle/gradle-build-action@v2
         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@v4
+        if: success() || failure() # Continue on failure
         with:
           report_paths: '**/build/test-results/test/TEST-*.xml'

.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:
@@ -17,12 +16,9 @@ jobs:
   deploy-wiki:
     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@v4
+      - name: 'Push Docs to Github Wiki 📄️'
+        uses: Andrew-Chen-Wang/github-wiki-action@v4
+        with:
+          path: 'docs'

.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

@@ -4,8 +4,8 @@
     <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 href="https://repo.william278.net/#/releases/net/william278/husksync/">
+        <img src="https://repo.william278.net/api/badge/latest/releases/net/william278/husksync?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" />
@@ -44,7 +44,7 @@
 **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+.
+Requires a MySQL (v8.0+) database, a Redis (v5.0+) server and any number of Spigot-based 1.17.1+ Minecraft servers, running Java 17+.
 
 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.
 2. Start, then stop every server to let HuskSync generate the config file.
@@ -66,17 +66,17 @@ 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, Craftaro, 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

build.gradle

@@ -1,7 +1,9 @@
+import org.apache.tools.ant.filters.ReplaceTokens
+
 plugins {
     id 'com.github.johnrengelman.shadow' version '8.1.1'
     id 'org.cadixdev.licenser' version '0.6.1' apply false
-    id 'org.ajoberstar.grgit' version '5.2.0'
+    id 'org.ajoberstar.grgit' version '5.2.1'
     id 'maven-publish'
     id 'java'
 }
@@ -21,86 +23,6 @@ ext {
     set 'snappy_version', snappy_version.toString()
 }
 
-import org.apache.tools.ant.filters.ReplaceTokens
-
-allprojects {
-    apply plugin: 'com.github.johnrengelman.shadow'
-    apply plugin: 'org.cadixdev.licenser'
-    apply plugin: 'java'
-
-    compileJava.options.encoding = 'UTF-8'
-    javadoc.options.encoding = 'UTF-8'
-    javadoc.options.addStringOption('Xdoclint:none', '-quiet')
-
-    compileJava.options.release.set 16
-
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
-        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()
-    }
-
-    license {
-        header = rootProject.file('HEADER')
-        include '**/*.java'
-        newLine = true
-    }
-
-    processResources {
-        filter ReplaceTokens as Class, beginToken: '${', endToken: '}',
-                tokens: rootProject.ext.properties
-    }
-}
-
-subprojects {
-    version rootProject.version
-    archivesBaseName = "${rootProject.name}-${project.name.capitalize()}"
-
-    jar {
-        from '../LICENSE'
-    }
-
-    if (['paper'].contains(project.name)) {
-        compileJava.options.release.set 17
-    }
-
-    if (['bukkit', 'paper', 'plugin'].contains(project.name)) {
-        shadowJar {
-            destinationDirectory.set(file("$rootDir/target"))
-            archiveClassifier.set('')
-        }
-
-        // 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) {
@@ -130,15 +52,106 @@ subprojects {
             }
         }
     }
+}
 
+allprojects {
+    apply plugin: 'com.github.johnrengelman.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')
+
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
+        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.1'
+        testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.1'
+        testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.1'
+    }
+
+    test {
+        useJUnitPlatform()
+    }
+
+    license {
+        header = rootProject.file('HEADER')
+        include '**/*.java'
+        newLine = true
+    }
+
+    processResources {
+        filesMatching(['**/*.json', '**/*.yml']) {
+            filter ReplaceTokens as Class, beginToken: '${', endToken: '}',
+                    tokens: rootProject.ext.properties
+        }
+    }
+}
+
+subprojects {
+    version rootProject.version
+    archivesBaseName = "${rootProject.name}-${project.name.capitalize()}"
+
+    jar {
+        from '../LICENSE'
+    }
+
+    shadowJar {
+        destinationDirectory.set(file("$rootDir/target"))
+        archiveClassifier.set('')
+    }
+
+    // API publishing
+    if (['common', 'bukkit'].contains(project.name)) {
+        java {
+            withSourcesJar()
+            withJavadocJar()
+        }
+        sourcesJar {
+            destinationDirectory.set(file("$rootDir/target"))
+        }
+        javadocJar {
+            destinationDirectory.set(file("$rootDir/target"))
+        }
+        shadowJar.dependsOn(sourcesJar, javadocJar)
+
+        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 (['bukkit'].contains(project.name)) {
+                publications {
+                    mavenJavaBukkit(MavenPublication) {
+                        groupId = 'net.william278.husksync'
+                        artifactId = 'husksync-bukkit'
+                        version = "$rootProject.version"
+                        artifact shadowJar
+                        artifact sourcesJar
+                        artifact javadocJar
+                    }
                 }
             }
         }
@@ -147,7 +160,6 @@ subprojects {
     jar.dependsOn(shadowJar)
     clean.delete "$rootDir/target"
 }
-}
 
 logger.lifecycle("Building HuskSync ${version} by William278")
 

bukkit/build.gradle

@@ -7,54 +7,53 @@ dependencies {
     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.1'
-    implementation 'dev.triumphteam:triumph-gui:3.1.6'
+    implementation 'net.kyori:adventure-platform-bukkit:4.3.2'
+    implementation 'dev.triumphteam:triumph-gui:3.1.7'
     implementation 'space.arim.morepaperlib:morepaperlib:0.4.3'
-    implementation 'de.tr7zw:item-nbt-api:2.12.0'
+    implementation 'de.tr7zw:item-nbt-api:2.12.2'
 
-    compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT'
-    compileOnly 'commons-io:commons-io:2.14.0'
-    compileOnly 'org.json:json:20230618'
+    compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
+    compileOnly 'org.projectlombok:lombok:1.18.30'
+    compileOnly 'commons-io:commons-io:2.15.1'
+    compileOnly 'org.json:json:20231013'
     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 'com.github.Exlll.ConfigLib:configlib-yaml:v4.4.0'
+    compileOnly 'com.zaxxer:HikariCP:5.1.0'
     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.30'
 }
 
 shadowJar {
     dependencies {
         exclude(dependency('com.mojang:brigadier'))
     }
-
     relocate 'org.apache.commons.io', 'net.william278.husksync.libraries.commons.io'
     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.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.huskclaims.libraries'
     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 'me.lucko.commodore', 'net.william278.husksync.libraries.commodore'
+    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()
 }

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

@@ -19,7 +19,15 @@
 
 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 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;
@@ -46,7 +54,6 @@ 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;
@@ -64,14 +71,15 @@ import space.arim.morepaperlib.scheduling.AsynchronousScheduler;
 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.concurrent.ConcurrentSkipListSet;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
-public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.Supplier, BukkitEventDispatcher,
-        BukkitMapPersister {
+@Getter
+@NoArgsConstructor
+public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.Supplier,
+        BukkitEventDispatcher, BukkitMapPersister {
 
     /**
      * Metrics ID for <a href="https://bstats.org/plugin/bukkit/HuskSync%20-%20Bukkit/13140">HuskSync on Bukkit</a>.
@@ -79,26 +87,31 @@ 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 Map<Identifier, Serializer<? extends Data>> serializers = Maps.newLinkedHashMap();
+    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 boolean disabling;
+    private Gson gson;
+    private AudienceProvider audiences;
+    private MorePaperLib paperLib;
     private Database database;
     private RedisManager redisManager;
     private EventListener eventListener;
     private DataAdapter dataAdapter;
-    private Map<Identifier, Serializer<? extends Data>> serializers;
-    private Map<UUID, Map<Identifier, Data>> playerCustomDataStore;
-    private Set<UUID> lockedPlayers;
     private DataSyncer dataSyncer;
-    private Settings settings;
-    private Locales locales;
-    private Server server;
-    private List<Migrator> availableMigrators;
     private LegacyConverter legacyConverter;
-    private Map<Integer, MapView> mapViews;
-    private BukkitAudiences audiences;
-    private MorePaperLib paperLib;
     private AsynchronousScheduler asyncScheduler;
     private RegionalScheduler regionalScheduler;
-    private Gson gson;
-    private boolean disabling;
+    @Setter
+    private Settings settings;
+    @Setter
+    private Locales locales;
+    @Setter
+    @Getter(AccessLevel.NONE)
+    private Server serverName;
 
     @Override
     public void onEnable() {
@@ -107,18 +120,17 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
         this.gson = createGson();
         this.audiences = BukkitAudiences.create(this);
         this.paperLib = new MorePaperLib(this);
-        this.availableMigrators = new ArrayList<>();
-        this.serializers = new LinkedHashMap<>();
-        this.lockedPlayers = new ConcurrentSkipListSet<>();
-        this.playerCustomDataStore = new ConcurrentHashMap<>();
-        this.mapViews = new ConcurrentHashMap<>();
 
         // Load settings and locales
-        initialize("plugin config & locale files", (plugin) -> this.loadConfigs());
+        initialize("plugin config & locale files", (plugin) -> {
+            loadSettings();
+            loadLocales();
+            loadServer();
+        });
 
         // Prepare data adapter
         initialize("data adapter", (plugin) -> {
-            if (settings.doCompressData()) {
+            if (settings.getSynchronization().isCompressData()) {
                 dataAdapter = new SnappyGsonAdapter(this);
             } else {
                 dataAdapter = new GsonAdapter(this);
@@ -150,7 +162,7 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
         });
 
         // Initialize the database
-        initialize(getSettings().getDatabaseType().getDisplayName() + " database connection", (plugin) -> {
+        initialize(getSettings().getDatabase().getType().getDisplayName() + " database connection", (plugin) -> {
             this.database = new MySqlDatabase(this);
             this.database.initialize();
         });
@@ -163,7 +175,7 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
 
         // Prepare data syncer
         initialize("data syncer", (plugin) -> {
-            dataSyncer = getSettings().getSyncMode().create(this);
+            dataSyncer = getSettings().getSynchronization().getMode().create(this);
             dataSyncer.initialize();
         });
 
@@ -175,7 +187,7 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
 
         // Register plugin hooks
         initialize("hooks", (plugin) -> {
-            if (isDependencyLoaded("Plan") && getSettings().usePlanHook()) {
+            if (isDependencyLoaded("Plan") && getSettings().isEnablePlanHook()) {
                 new PlanHook(this).hookIntoPlan();
             }
         });
@@ -232,91 +244,27 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
         return Optional.of(BukkitUser.adapt(player, this));
     }
 
-    @Override
-    @NotNull
-    public Database getDatabase() {
-        return database;
-    }
-
-    @Override
-    @NotNull
-    public RedisManager getRedisManager() {
-        return redisManager;
-    }
-
-    @NotNull
-    @Override
-    public DataAdapter getDataAdapter() {
-        return dataAdapter;
-    }
-
-    @NotNull
-    @Override
-    public DataSyncer getDataSyncer() {
-        return dataSyncer;
-    }
-
     @Override
     public void setDataSyncer(@NotNull DataSyncer dataSyncer) {
         log(Level.INFO, String.format("Switching data syncer to %s", dataSyncer.getClass().getSimpleName()));
         this.dataSyncer = dataSyncer;
     }
 
-    @NotNull
-    @Override
-    @SuppressWarnings("unchecked")
-    public Map<Identifier, Serializer<? extends Data>> getSerializers() {
-        return serializers;
-    }
-
-    @NotNull
-    @Override
-    public List<Migrator> getAvailableMigrators() {
-        return availableMigrators;
-    }
-
     @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<>();
+        final Map<Identifier, Data> data = Maps.newHashMap();
         playerCustomDataStore.put(user.getUuid(), data);
         return data;
     }
 
     @Override
     @NotNull
-    public Settings getSettings() {
-        return settings;
-    }
-
-    @Override
-    public void setSettings(@NotNull Settings settings) {
-        this.settings = settings;
-    }
-
-    @NotNull
-    @Override
     public String getServerName() {
-        return server.getName();
-    }
-
-    @Override
-    public void setServer(@NotNull Server server) {
-        this.server = server;
-    }
-
-    @Override
-    @NotNull
-    public Locales getLocales() {
-        return locales;
-    }
-
-    @Override
-    public void setLocales(@NotNull Locales locales) {
-        this.locales = locales;
+        return serverName == null ? "server" : serverName.getName();
     }
 
     @Override
@@ -346,12 +294,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() {
@@ -375,28 +317,6 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
         return Optional.of(legacyConverter);
     }
 
-    @NotNull
-    @Override
-    public Set<UUID> getLockedPlayers() {
-        return lockedPlayers;
-    }
-
-    @NotNull
-    @Override
-    public Gson getGson() {
-        return gson;
-    }
-
-    @Override
-    public boolean isDisabling() {
-        return disabling;
-    }
-
-    @NotNull
-    public Map<Integer, MapView> getMapViews() {
-        return mapViews;
-    }
-
     @NotNull
     public GracefulScheduling getScheduler() {
         return paperLib.scheduling();
@@ -414,16 +334,17 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
                 ? regionalScheduler = getScheduler().globalRegionalScheduler() : regionalScheduler;
     }
 
-    @NotNull
-    public BukkitAudiences getAudiences() {
-        return audiences;
-    }
-
     @NotNull
     public CommandRegistration getCommandRegistrar() {
         return paperLib.commandRegistration();
     }
 
+    @Override
+    @NotNull
+    public Path getConfigDirectory() {
+        return getDataFolder().toPath();
+    }
+
     @Override
     @NotNull
     public HuskSync getPlugin() {

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

@@ -43,9 +43,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,7 +52,7 @@ 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
@@ -65,7 +62,7 @@ public class BukkitHuskSyncAPI extends HuskSyncAPI {
         if (instance == null) {
             throw new NotRegisteredException();
         }
-        return instance;
+        return (BukkitHuskSyncAPI) instance;
     }
 
     /**
@@ -79,14 +76,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/BukkitCommand.java

@@ -98,7 +98,7 @@ public class BukkitCommand extends org.bukkit.command.Command {
         }
 
         // Register commodore TAB completion
-        if (CommodoreProvider.isSupported() && plugin.getSettings().doBrigadierTabCompletion()) {
+        if (CommodoreProvider.isSupported() && plugin.getSettings().isBrigadierTabCompletion()) {
             BrigadierUtil.registerCommodore(plugin, this, command);
         }
     }

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

@@ -19,6 +19,8 @@
 
 package net.william278.husksync.data;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.google.gson.annotations.SerializedName;
 import de.tr7zw.changeme.nbtapi.NBTCompound;
 import de.tr7zw.changeme.nbtapi.NBTPersistentDataContainer;
@@ -48,6 +50,8 @@ import java.util.logging.Level;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static net.william278.husksync.util.BukkitKeyedAdapter.*;
+
 public abstract class BukkitData implements Data {
 
     @Override
@@ -311,10 +315,10 @@ public abstract class BukkitData implements Data {
         // Iterate through the server advancement set and add all advancements to the list
         @NotNull
         public static BukkitData.Advancements adapt(@NotNull Player player) {
-            final List<Advancement> advancements = new ArrayList<>();
+            final List<Advancement> advancements = Lists.newArrayList();
             forEachAdvancement(advancement -> {
                 final AdvancementProgress advancementProgress = player.getAdvancementProgress(advancement);
-                final Map<String, Date> awardedCriteria = new HashMap<>();
+                final Map<String, Date> awardedCriteria = Maps.newHashMap();
 
                 advancementProgress.getAwardedCriteria().forEach(criteriaKey -> awardedCriteria.put(criteriaKey,
                         advancementProgress.getDateAwarded(criteriaKey)));
@@ -608,7 +612,7 @@ public abstract class BukkitData implements Data {
                                     Map.Entry::getKey,
                                     entry -> entry.getValue().entrySet().stream()
                                             .flatMap(blockEntry -> {
-                                Material material = Material.matchMaterial(blockEntry.getKey());
+                                                Material material = matchMaterial(blockEntry.getKey());
                                                 return material != null ? Stream.of(new AbstractMap.SimpleEntry<>(material, blockEntry.getValue())) : Stream.empty();
                                             })
                                             .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))
@@ -622,7 +626,7 @@ public abstract class BukkitData implements Data {
                                     Map.Entry::getKey,
                                     entry -> entry.getValue().entrySet().stream()
                                             .flatMap(itemEntry -> {
-                                Material material = Material.matchMaterial(itemEntry.getKey());
+                                                Material material = matchMaterial(itemEntry.getKey());
                                                 return material != null ? Stream.of(new AbstractMap.SimpleEntry<>(material, itemEntry.getValue())) : Stream.empty();
                                             })
                                             .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))
@@ -661,20 +665,6 @@ public abstract class BukkitData implements Data {
             return new StatisticsMap(genericStats, blockStats, itemStats, entityStats);
         }
 
-        @Nullable
-        private static Statistic matchStatistic(@NotNull String key) {
-            return Arrays.stream(Statistic.values())
-                    .filter(stat -> stat.getKey().toString().equals(key))
-                    .findFirst().orElse(null);
-        }
-
-        @Nullable
-        private static EntityType matchEntityType(@NotNull String key) {
-            return Arrays.stream(EntityType.values())
-                    .filter(entityType -> entityType.getKey().toString().equals(key))
-                    .findFirst().orElse(null);
-        }
-
         @Override
         public void apply(@NotNull BukkitUser user, @NotNull BukkitHuskSync plugin) throws IllegalStateException {
             genericStatistics.forEach((stat, value) -> applyStat(user, stat, null, value));
@@ -708,7 +698,8 @@ public abstract class BukkitData implements Data {
         public Map<String, Map<String, Integer>> getBlockStatistics() {
             return blockStatistics.entrySet().stream().filter(entry -> entry.getKey() != null).collect(
                     TreeMap::new,
-                    (m, e) -> m.put(e.getKey().getKey().toString(), convertStatistics(e.getValue())), TreeMap::putAll
+                    (m, e) -> getKeyName(e.getKey()).ifPresent(key -> m.put(key, convertStatistics(e.getValue()))),
+                    TreeMap::putAll
             );
         }
 
@@ -717,7 +708,8 @@ public abstract class BukkitData implements Data {
         public Map<String, Map<String, Integer>> getItemStatistics() {
             return itemStatistics.entrySet().stream().filter(entry -> entry.getKey() != null).collect(
                     TreeMap::new,
-                    (m, e) -> m.put(e.getKey().getKey().toString(), convertStatistics(e.getValue())), TreeMap::putAll
+                    (m, e) -> getKeyName(e.getKey()).ifPresent(key -> m.put(key, convertStatistics(e.getValue()))),
+                    TreeMap::putAll
             );
         }
 
@@ -726,7 +718,8 @@ public abstract class BukkitData implements Data {
         public Map<String, Map<String, Integer>> getEntityStatistics() {
             return entityStatistics.entrySet().stream().filter(entry -> entry.getKey() != null).collect(
                     TreeMap::new,
-                    (m, e) -> m.put(e.getKey().getKey().toString(), convertStatistics(e.getValue())), TreeMap::putAll
+                    (m, e) -> getKeyName(e.getKey()).ifPresent(key -> m.put(key, convertStatistics(e.getValue()))),
+                    TreeMap::putAll
             );
         }
 
@@ -734,13 +727,8 @@ public abstract class BukkitData implements Data {
         private <T extends Keyed> Map<String, Integer> convertStatistics(@NotNull Map<T, Integer> stats) {
             return stats.entrySet().stream().filter(entry -> entry.getKey() != null).collect(
                     TreeMap::new,
-                    (m, e) -> {
-                        try {
-                            m.put(e.getKey().getKey().toString(), e.getValue());
-                        } catch (Throwable t) {
-                            // Ignore; skip elements with invalid keys (e.g., legacy materials)
-                        }
-                    }, TreeMap::putAll
+                    (m, e) -> getKeyName(e.getKey()).ifPresent(key -> m.put(key, e.getValue())),
+                    TreeMap::putAll
             );
         }
 
@@ -822,10 +810,9 @@ public abstract class BukkitData implements Data {
 
         @NotNull
         public static BukkitData.Health adapt(@NotNull Player player) {
-            final double maxHealth = getMaxHealth(player);
             return from(
-                    Math.min(player.getHealth(), maxHealth),
-                    maxHealth,
+                    player.getHealth(),
+                    getMaxHealth(player),
                     player.isHealthScaled() ? player.getHealthScale() : 0d
             );
         }
@@ -834,64 +821,65 @@ public abstract class BukkitData implements Data {
         public void apply(@NotNull BukkitUser user, @NotNull BukkitHuskSync plugin) throws IllegalStateException {
             final Player player = user.getPlayer();
 
-            // Set base max health
-            final AttributeInstance maxHealthAttribute = Objects.requireNonNull(
-                    player.getAttribute(Attribute.GENERIC_MAX_HEALTH), "Max health attribute was null"
-            );
-            double currentMaxHealth = maxHealthAttribute.getBaseValue();
-            if (plugin.getSettings().doSynchronizeMaxHealth() && maxHealth != 0d) {
-                maxHealthAttribute.setBaseValue(maxHealth);
-                currentMaxHealth = maxHealth;
+            // Set max health
+            final AttributeInstance maxHealth = getMaxHealthAttribute(player);
+            try {
+                if (plugin.getSettings().getSynchronization().isSynchronizeMaxHealth() && this.maxHealth != 0) {
+                    maxHealth.setBaseValue(this.maxHealth);
+                }
+            } catch (Throwable e) {
+                plugin.log(Level.WARNING, String.format("Failed setting the max health of %s to %s",
+                        player.getName(), this.maxHealth), e);
             }
 
             // Set health
-            final double currentHealth = player.getHealth();
-            if (health != currentHealth) {
-                final double healthToSet = currentHealth > currentMaxHealth ? currentMaxHealth : health;
             try {
-                    player.setHealth(Math.min(healthToSet, currentMaxHealth));
-                } catch (IllegalArgumentException e) {
-                    plugin.log(Level.WARNING, "Failed to set player health", e);
-                }
+                final double health = player.getHealth();
+                player.setHealth(Math.min(health, maxHealth.getBaseValue()));
+            } catch (Throwable e) {
+                plugin.log(Level.WARNING, String.format("Failed setting the health of %s to %s",
+                        player.getName(), this.maxHealth), e);
             }
 
             // Set health scale
             try {
-                if (healthScale != 0d) {
-                    player.setHealthScale(healthScale);
+                if (this.healthScale != 0d) {
+                    player.setHealthScaled(true);
+                    player.setHealthScale(this.healthScale);
                 } else {
-                    player.setHealthScale(maxHealth);
+                    player.setHealthScaled(false);
+                    player.setHealthScale(this.maxHealth);
                 }
-                player.setHealthScaled(healthScale != 0D);
-            } catch (IllegalArgumentException e) {
-                plugin.log(Level.WARNING, "Failed to set player health scale", e);
+            } catch (Throwable e) {
+                plugin.log(Level.WARNING, String.format("Failed setting the health scale of %s to %s",
+                        player.getName(), this.healthScale), e);
             }
         }
 
-        /**
-         * Returns a {@link Player}'s maximum health, minus any health boost effects
-         *
-         * @param player The {@link Player} to get the maximum health of
-         * @return The {@link Player}'s max health
-         */
+        // Returns the max health of a player, accounting for health boost potion effects
         private static double getMaxHealth(@NotNull Player player) {
-            double maxHealth = Objects.requireNonNull(
-                    player.getAttribute(Attribute.GENERIC_MAX_HEALTH), "Max health attribute was null"
-            ).getBaseValue();
+            // Get the base value of the attribute (ignore armor, items that give health boosts, etc.)
+            double maxHealth = getMaxHealthAttribute(player).getBaseValue();
 
-            // If the player has additional health bonuses from synchronized potion effects,
-            // subtract these from this number as they are synchronized separately
+            // Subtract health boost potion effects from stored max health
             if (player.hasPotionEffect(PotionEffectType.HEALTH_BOOST) && maxHealth > 20d) {
                 final PotionEffect healthBoost = Objects.requireNonNull(
                         player.getPotionEffect(PotionEffectType.HEALTH_BOOST), "Health boost effect was null"
                 );
-                final double boostEffect = 4 * (healthBoost.getAmplifier() + 1);
-                maxHealth -= boostEffect;
+                maxHealth -= (4 * (healthBoost.getAmplifier() + 1));
             }
 
             return maxHealth;
         }
 
+        // Returns the max health attribute of a player
+        @NotNull
+        private static AttributeInstance getMaxHealthAttribute(@NotNull Player player) {
+            return Objects.requireNonNull(
+                    player.getAttribute(Attribute.GENERIC_MAX_HEALTH), "Max health attribute was null"
+            );
+        }
+
         @Override
         public double getHealth() {
             return health;
@@ -1093,7 +1081,7 @@ public abstract class BukkitData implements Data {
             final Player player = user.getPlayer();
             player.setGameMode(org.bukkit.GameMode.valueOf(gameMode));
             player.setAllowFlight(allowFlight);
-            player.setFlying(isFlying);
+            player.setFlying(allowFlight && isFlying);
         }
 
         @NotNull

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

@@ -62,7 +62,8 @@ 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();

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

@@ -57,13 +57,13 @@ public class BukkitEventListener extends EventListener implements BukkitJoinEven
 
     public BukkitEventListener(@NotNull BukkitHuskSync huskSync) {
         super(huskSync);
-        this.blacklistedCommands = huskSync.getSettings().getBlacklistedCommandsWhileLocked();
+        this.blacklistedCommands = huskSync.getSettings().getSynchronization().getBlacklistedCommandsWhileLocked();
         Bukkit.getServer().getPluginManager().registerEvents(this, huskSync);
     }
 
     @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
@@ -92,7 +92,7 @@ public class BukkitEventListener extends EventListener implements BukkitJoinEven
         }
 
         // Handle saving player data snapshots on death
-        if (!plugin.getSettings().doSaveOnDeath()) {
+        if (!plugin.getSettings().getSynchronization().getSaveOnDeath().isEnabled()) {
             return;
         }
 
@@ -106,7 +106,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;
         }
 
@@ -118,7 +118,7 @@ public class BukkitEventListener extends EventListener implements BukkitJoinEven
 
     @EventHandler(ignoreCancelled = true)
     public void onMapInitialize(@NotNull MapInitializeEvent event) {
-        if (plugin.getSettings().doPersistLockedMaps() && event.getMap().isLocked()) {
+        if (plugin.getSettings().getSynchronization().isPersistLockedMaps() && event.getMap().isLocked()) {
             getPlugin().runAsync(() -> ((BukkitHuskSync) plugin).renderMapFromFile(event.getMap()));
         }
     }

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`
@@ -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;
             }

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

@@ -23,7 +23,6 @@ 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;
@@ -41,6 +40,8 @@ import java.util.Arrays;
 import java.util.function.Consumer;
 import java.util.logging.Level;
 
+import static net.william278.husksync.util.BukkitKeyedAdapter.matchMaterial;
+
 /**
  * Bukkit platform implementation of an {@link OnlineUser}
  */
@@ -77,17 +78,11 @@ public class BukkitUser extends OnlineUser implements BukkitUserDataHolder {
         return player == null || !player.isOnline();
     }
 
-    @NotNull
-    @Override
-    public Audience getAudience() {
-        return ((BukkitHuskSync) plugin).getAudiences().player(player);
-    }
-
     @Override
     public void sendToast(@NotNull MineDown title, @NotNull MineDown description,
                           @NotNull String iconMaterial, @NotNull String backgroundType) {
         try {
-            final Material material = Material.matchMaterial(iconMaterial);
+            final Material material = matchMaterial(iconMaterial);
             Toast.builder((BukkitHuskSync) plugin)
                     .setTitle(title.toComponent())
                     .setDescription(description.toComponent())

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

@@ -0,0 +1,74 @@
+/*
+ * 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.Keyed;
+import org.bukkit.Material;
+import org.bukkit.Statistic;
+import org.bukkit.entity.EntityType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+// Utility class for adapting "Keyed" Bukkit objects
+public final class BukkitKeyedAdapter {
+
+    @Nullable
+    public static Statistic matchStatistic(@NotNull String key) {
+        try {
+            return Arrays.stream(Statistic.values())
+                    .filter(stat -> stat.getKey().toString().equals(key))
+                    .findFirst().orElse(null);
+        } catch (Throwable e) {
+            return null;
+        }
+    }
+
+    @Nullable
+    public static EntityType matchEntityType(@NotNull String key) {
+        try {
+            return Arrays.stream(EntityType.values())
+                    .filter(entityType -> entityType.getKey().toString().equals(key))
+                    .findFirst().orElse(null);
+        } catch (Throwable e) {
+            return null;
+        }
+    }
+
+    @Nullable
+    public static Material matchMaterial(@NotNull String key) {
+        try {
+            return Material.matchMaterial(key);
+        } catch (Throwable e) {
+            return null;
+        }
+    }
+
+    public static Optional<String> getKeyName(@NotNull Keyed keyed) {
+        try {
+            return Optional.of(keyed.getKey().toString());
+        } catch (Throwable e) {
+            return Optional.empty();
+        }
+    }
+
+}

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

@@ -19,6 +19,8 @@
 
 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;
@@ -43,6 +45,8 @@ import java.time.OffsetDateTime;
 import java.util.*;
 import java.util.logging.Level;
 
+import static net.william278.husksync.util.BukkitKeyedAdapter.*;
+
 public class BukkitLegacyConverter extends LegacyConverter {
 
     public BukkitLegacyConverter(@NotNull HuskSync plugin) {
@@ -51,7 +55,7 @@ public class BukkitLegacyConverter extends LegacyConverter {
 
     @NotNull
     @Override
-    public DataSnapshot.Packed convert(@NotNull byte[] data, @NotNull UUID id,
+    public DataSnapshot.Packed convert(byte[] 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,7 +83,7 @@ public class BukkitLegacyConverter extends LegacyConverter {
         }
 
         final JSONObject status = object.getJSONObject("status_data");
-        final HashMap<Identifier, Data> containers = new HashMap<>();
+        final HashMap<Identifier, Data> containers = Maps.newHashMap();
         if (shouldImport(Identifier.HEALTH)) {
             containers.put(Identifier.HEALTH, BukkitData.Health.from(
                     status.getDouble("health"),
@@ -163,7 +167,7 @@ public class BukkitLegacyConverter extends LegacyConverter {
         }
 
         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");
@@ -197,36 +201,44 @@ 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<Statistic, Integer> genericStats = Maps.newHashMap();
+        untyped.keys().forEachRemaining(stat -> genericStats.put(matchStatistic(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<Statistic, Map<Material, Integer>> blockStats, itemStats;
+        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
+        final Map<Statistic, Map<EntityType, Integer>> 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<EntityType, Integer> entityMap = Maps.newHashMap();
+            entityStat.keys().forEachRemaining(entity -> entityMap.put(matchEntityType(entity), entityStat.getInt(entity)));
+            entityStats.put(matchStatistic(stat), entityMap);
         });
 
         return BukkitData.Statistics.from(genericStats, blockStats, itemStats, entityStats);
     }
 
+    @NotNull
+    private Map<Statistic, Map<Material, Integer>> readMaterialStatistics(@NotNull JSONObject items) {
+        final Map<Statistic, Map<Material, Integer>> itemStats = Maps.newHashMap();
+        items.keys().forEachRemaining(stat -> {
+            final JSONObject itemStat = items.getJSONObject(stat);
+            final Map<Material, Integer> itemMap = Maps.newHashMap();
+            itemStat.keys().forEachRemaining(item -> {
+                final Material material = matchMaterial(item);
+                if (material != null) {
+                    itemMap.put(material, itemStat.getInt(item));
+                }
+            });
+            itemStats.put(matchStatistic(stat), itemMap);
+        });
+        return itemStats;
+    }
+
     // Deserialize a legacy item stack array
     @NotNull
     public ItemStack[] deserializeLegacyItemStacks(@NotNull String items) {
@@ -258,6 +270,7 @@ 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;
@@ -265,7 +278,7 @@ public class BukkitLegacyConverter extends LegacyConverter {
 
 
     private boolean shouldImport(@NotNull Identifier type) {
-        return plugin.getSettings().isSyncFeatureEnabled(type);
+        return plugin.getSettings().getSynchronization().isFeatureEnabled(type);
     }
 
     @NotNull

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

@@ -19,6 +19,7 @@
 
 package net.william278.husksync.util;
 
+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.ReadableNBT;
@@ -62,7 +63,7 @@ public interface BukkitMapPersister {
      */
     @NotNull
     default ItemStack[] persistLockedMaps(@NotNull ItemStack[] items, @NotNull Player delegateRenderer) {
-        if (!getPlugin().getSettings().doPersistLockedMaps()) {
+        if (!getPlugin().getSettings().getSynchronization().isPersistLockedMaps()) {
             return items;
         }
         return forEachMap(items, map -> this.persistMapView(map, delegateRenderer));
@@ -76,7 +77,7 @@ public interface BukkitMapPersister {
      */
     @NotNull
     default ItemStack[] setMapViews(@NotNull ItemStack[] items) {
-        if (!getPlugin().getSettings().doPersistLockedMaps()) {
+        if (!getPlugin().getSettings().getSynchronization().isPersistLockedMaps()) {
             return items;
         }
         return forEachMap(items, this::applyMapView);
@@ -211,7 +212,8 @@ public interface BukkitMapPersister {
         }
 
         // Create a new map view renderer with the map data color at each pixel
-        view.getRenderers().clear();
+        // use view.removeRenderer() to remove all this maps renderers
+        view.getRenderers().forEach(view::removeRenderer);
         view.addRenderer(new PersistentMapRenderer(canvasData));
         view.setLocked(true);
         view.setScale(MapView.Scale.NORMAL);
@@ -306,6 +308,10 @@ public interface BukkitMapPersister {
 
             // 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);
         }
@@ -316,7 +322,7 @@ public interface BukkitMapPersister {
         return new MapCursor(
                 (byte) banner.getPosition().getX(),
                 (byte) banner.getPosition().getZ(),
-                (byte) 0,
+                (byte) 8, // Always rotate banners upright
                 switch (banner.getColor().toLowerCase(Locale.ENGLISH)) {
                     case "white" -> MapCursor.Type.BANNER_WHITE;
                     case "orange" -> MapCursor.Type.BANNER_ORANGE;
@@ -411,13 +417,14 @@ public interface BukkitMapPersister {
          */
         @NotNull
         private MapData extractMapData() {
-            final List<MapBanner> banners = new ArrayList<>();
+            final List<MapBanner> banners = Lists.newArrayList();
+            final String BANNER_PREFIX = "banner_";
             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_")) {
+                if (type.startsWith(BANNER_PREFIX)) {
                     banners.add(new MapBanner(
-                            type.replaceAll("banner_", ""),
+                            type.replaceAll(BANNER_PREFIX, ""),
                             cursor.getCaption() == null ? "" : cursor.getCaption(),
                             cursor.getX(),
                             mapView.getWorld() != null ? mapView.getWorld().getSeaLevel() : 128,

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

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

bukkit/src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: 'HuskSync'
 version: '${version}'
 main: 'net.william278.husksync.BukkitHuskSync'
-api-version: 1.16
+api-version: 1.17
 author: 'William278'
 description: '${description}'
 website: 'https://william278.net'

common/build.gradle

@@ -3,31 +3,36 @@ plugins {
 }
 
 dependencies {
-    api 'commons-io:commons-io:2.14.0'
-    api 'org.apache.commons:commons-text:1.10.0'
+    api 'commons-io:commons-io:2.15.1'
+    api 'org.apache.commons:commons-text:1.11.0'
     api 'de.themoep:minedown-adventure:1.7.2-SNAPSHOT'
-    api 'net.kyori:adventure-api:4.14.0'
-    api 'org.json:json:20230618'
+    api 'org.json:json:20231013'
     api 'com.google.code.gson:gson:2.10.1'
     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 'com.github.Exlll.ConfigLib:configlib-yaml:v4.4.0'
     api 'net.william278:DesertWell:2.0.4'
     api 'net.william278:PagineDown:1.1'
-    api('com.zaxxer:HikariCP:5.0.1') {
+    api('com.zaxxer:HikariCP:5.1.0') {
         exclude module: 'slf4j-api'
     }
 
-    compileOnly 'org.jetbrains:annotations:24.0.1'
+    compileOnly 'org.projectlombok:lombok:1.18.30'
+    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'net.kyori:adventure-api:4.15.0'
+    compileOnly 'net.kyori:adventure-platform-api:4.3.2'
+    compileOnly 'com.google.guava:guava:33.0.0-jre'
     compileOnly 'com.github.plan-player-analytics:Plan:5.5.2272'
     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.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.0.0-jre'
+    testImplementation 'com.github.plan-player-analytics:Plan:5.5.2272'
+    testCompileOnly 'com.github.Exlll.ConfigLib:configlib-yaml:v4.4.0'
+    testCompileOnly 'org.jetbrains:annotations:24.1.0'
+
+    annotationProcessor 'org.projectlombok:lombok:1.18.30'
 }

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

@@ -22,11 +22,13 @@ package net.william278.husksync;
 import com.fatboyindustrial.gsonjavatime.Converters;
 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.ConfigProvider;
 import net.william278.husksync.config.Locales;
 import net.william278.husksync.config.Server;
 import net.william278.husksync.config.Settings;
@@ -45,16 +47,15 @@ import net.william278.husksync.util.Task;
 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 {
 
     int SPIGOT_RESOURCE_ID = 97144;
 
@@ -192,7 +193,7 @@ public interface HuskSync extends Task.Supplier, EventDispatcher {
     @NotNull
     String getServerName();
 
-    void setServer(@NotNull Server server);
+    void setServerName(@NotNull Server serverName);
 
     /**
      * Returns the plugin {@link Locales}
@@ -244,18 +245,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
@@ -288,37 +318,6 @@ public interface HuskSync extends Task.Supplier, EventDispatcher {
      */
     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 server name
-            setServer(Annotaml.create(
-                    new File(getDataFolder(), "server.yml"),
-                    Server.getDefault(this)
-            ).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()
@@ -329,7 +328,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(
@@ -382,7 +381,7 @@ public interface HuskSync extends Task.Supplier, EventDispatcher {
                                 
                 1) Make sure you've entered your MySQL or MariaDB 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""";

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

@@ -38,14 +38,17 @@ import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
 /**
- * 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.
@@ -60,6 +63,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
      *

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

@@ -19,11 +19,11 @@
 
 package net.william278.husksync.command;
 
+import com.google.common.collect.Maps;
 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;
 
@@ -36,7 +36,7 @@ public abstract class Command extends Node {
                       @NotNull HuskSync plugin) {
         super(name, aliases, plugin);
         this.usage = usage;
-        this.additionalPermissions = new HashMap<>();
+        this.additionalPermissions = Maps.newHashMap();
     }
 
     @Override

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

@@ -81,9 +81,11 @@ public class EnderChestCommand extends ItemsCommand {
         // Create and pack the snapshot with the updated enderChest
         final DataSnapshot.Packed snapshot = latestData.get().copy();
         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(DataSnapshot.SaveCause.ENDERCHEST_COMMAND);
+            data.setPinned(
+                    plugin.getSettings().getSynchronization().doAutoPin(DataSnapshot.SaveCause.ENDERCHEST_COMMAND)
+            );
         });
         plugin.getDatabase().addSnapshot(user, snapshot);
         plugin.getRedisManager().sendUserDataUpdate(user, snapshot);

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

@@ -21,6 +21,9 @@ package net.william278.husksync.command;
 
 import de.themoep.minedown.adventure.MineDown;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.JoinConfiguration;
+import net.kyori.adventure.text.event.HoverEvent;
+import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextColor;
 import net.william278.desertwell.about.AboutMenu;
 import net.william278.desertwell.util.UpdateChecker;
@@ -28,10 +31,12 @@ import net.william278.husksync.HuskSync;
 import net.william278.husksync.migrator.Migrator;
 import net.william278.husksync.user.CommandUser;
 import net.william278.husksync.user.OnlineUser;
+import org.apache.commons.text.WordUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
@@ -39,6 +44,7 @@ public class HuskSyncCommand extends Command implements TabProvider {
 
     private static final Map<String, Boolean> SUB_COMMANDS = Map.of(
             "about", false,
+            "status", true,
             "reload", true,
             "migrate", true,
             "update", true
@@ -72,7 +78,10 @@ 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)"))
                 .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)),
@@ -91,9 +100,18 @@ public class HuskSyncCommand extends Command implements TabProvider {
 
         switch (subCommand) {
             case "about" -> executor.sendMessage(aboutMenu.toComponent());
+            case "status" -> {
+                getPlugin().getLocales().getLocale("system_status_header").ifPresent(executor::sendMessage);
+                executor.sendMessage(Component.join(
+                        JoinConfiguration.newlines(),
+                        Arrays.stream(StatusLine.values()).map(s -> s.get(plugin)).toList()
+                ));
+            }
             case "reload" -> {
                 try {
-                    plugin.loadConfigs();
+                    plugin.loadSettings();
+                    plugin.loadLocales();
+                    plugin.loadServer();
                     plugin.getLocales().getLocale("reload_complete").ifPresent(executor::sendMessage);
                 } catch (Throwable e) {
                     executor.sendMessage(new MineDown(
@@ -181,4 +199,75 @@ public class HuskSyncCommand extends Command implements TabProvider {
         };
     }
 
+    private enum StatusLine {
+        PLUGIN_VERSION(plugin -> Component.text("v" + plugin.getPluginVersion().toStringWithoutMetadata())
+                .appendSpace().append(plugin.getPluginVersion().getMetadata().isBlank() ? Component.empty()
+                        : Component.text("(build " + plugin.getPluginVersion().getMetadata() + ")"))),
+        PLATFORM_TYPE(plugin -> Component.text(WordUtils.capitalizeFully(plugin.getPlatformType()))),
+        LANGUAGE(plugin -> Component.text(plugin.getSettings().getLanguage())),
+        MINECRAFT_VERSION(plugin -> Component.text(plugin.getMinecraftVersion().toString())),
+        JAVA_VERSION(plugin -> Component.text(System.getProperty("java.version"))),
+        JAVA_VENDOR(plugin -> Component.text(System.getProperty("java.vendor"))),
+        SYNC_MODE(plugin -> Component.text(WordUtils.capitalizeFully(
+                plugin.getSettings().getSynchronization().getMode().toString()
+        ))),
+        DELAY_LATENCY(plugin -> Component.text(
+                plugin.getSettings().getSynchronization().getNetworkLatencyMilliseconds() + "ms"
+        )),
+        SERVER_NAME(plugin -> Component.text(plugin.getServerName())),
+        DATABASE_TYPE(plugin -> Component.text(plugin.getSettings().getDatabase().getType().getDisplayName())),
+        IS_DATABASE_LOCAL(plugin -> getLocalhostBoolean(plugin.getSettings().getDatabase().getCredentials().getHost())),
+        USING_REDIS_SENTINEL(plugin -> getBoolean(
+                !plugin.getSettings().getRedis().getSentinel().getMaster().isBlank()
+        )),
+        USING_REDIS_PASSWORD(plugin -> getBoolean(
+                !plugin.getSettings().getRedis().getCredentials().getPassword().isBlank()
+        )),
+        REDIS_USING_SSL(plugin -> getBoolean(
+                plugin.getSettings().getRedis().getCredentials().isUseSsl()
+        )),
+        IS_REDIS_LOCAL(plugin -> getLocalhostBoolean(
+                plugin.getSettings().getRedis().getCredentials().getHost()
+        )),
+        DATA_TYPES(plugin -> Component.join(
+                JoinConfiguration.commas(true),
+                plugin.getRegisteredDataTypes().stream().map(i -> {
+                    boolean enabled = plugin.getSettings().getSynchronization().isFeatureEnabled(i);
+                    return Component.textOfChildren(Component
+                                    .text(i.toString()).appendSpace().append(Component.text(enabled ? '✔' : '❌')))
+                            .color(enabled ? NamedTextColor.GREEN : NamedTextColor.RED)
+                            .hoverEvent(HoverEvent.showText(Component.text(enabled ? "Enabled" : "Disabled")));
+                }).toList()
+        ));
+
+        private final Function<HuskSync, Component> supplier;
+
+        StatusLine(@NotNull Function<HuskSync, Component> supplier) {
+            this.supplier = supplier;
+        }
+
+        @NotNull
+        private Component get(@NotNull HuskSync plugin) {
+            return Component
+                    .text("•").appendSpace()
+                    .append(Component.text(
+                            WordUtils.capitalizeFully(name().replaceAll("_", " ")),
+                            TextColor.color(0x848484)
+                    ))
+                    .append(Component.text(':')).append(Component.space().color(NamedTextColor.WHITE))
+                    .append(supplier.apply(plugin));
+        }
+
+        @NotNull
+        private static Component getBoolean(boolean value) {
+            return Component.text(value ? "Yes" : "No", value ? NamedTextColor.GREEN : NamedTextColor.RED);
+        }
+
+        @NotNull
+        private static Component getLocalhostBoolean(@NotNull String value) {
+            return getBoolean(value.equals("127.0.0.1") || value.equals("0.0.0.0")
+                    || value.equals("localhost") || value.equals("::1"));
+        }
+    }
+
 }

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

@@ -81,9 +81,11 @@ public class InventoryCommand extends ItemsCommand {
         // Create and pack the snapshot with the updated inventory
         final DataSnapshot.Packed snapshot = latestData.get().copy();
         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(DataSnapshot.SaveCause.INVENTORY_COMMAND);
+            data.setPinned(
+                    plugin.getSettings().getSynchronization().doAutoPin(DataSnapshot.SaveCause.INVENTORY_COMMAND)
+            );
         });
         plugin.getDatabase().addSnapshot(user, snapshot);
         plugin.getRedisManager().sendUserDataUpdate(user, snapshot);

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

@@ -147,7 +147,9 @@ public class UserDataCommand extends Command implements TabProvider {
                 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));
+                    unpacked.setPinned(
+                            plugin.getSettings().getSynchronization().doAutoPin(DataSnapshot.SaveCause.BACKUP_RESTORE)
+                    );
                 }));
 
                 // Set the user's data and send a message

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

@@ -0,0 +1,155 @@
+/*
+ * 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()
+        ));
+    }
+
+    /**
+     * 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 = """
+@SuppressWarnings("FieldMayBeFinal")
+@Configuration
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class Locales {
+
+    static final String CONFIG_HEADER = """
             ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-        ┃       HuskSync Locales       ┃
+            ┃      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""")
-public class Locales {
+            ┗╸ 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();
 
     /**
-     * The raw set of locales loaded from yaml
-     */
-    @NotNull
-    public Map<String, String> rawLocales = new HashMap<>();
-
-    /**
-     * Returns a raw, unformatted locale loaded from the Locales file
+     * Returns a raw, un-formatted locale loaded from the locales 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);
@@ -137,22 +152,7 @@ public class Locales {
 
             value.append(c);
         }
-        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;
+        return value.toString().replace("__", "_\\_");
     }
 
     /**
@@ -185,10 +185,6 @@ public class Locales {
                 .setSpaceBeforeFooter(false);
     }
 
-    @SuppressWarnings("unused")
-    public Locales() {
-    }
-
     /**
      * Determines the slot a system notification should be displayed in
      */

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

@@ -19,64 +19,43 @@
 
 package net.william278.husksync.config;
 
-import net.william278.annotaml.Annotaml;
-import net.william278.annotaml.YamlFile;
-import net.william278.annotaml.YamlKey;
-import net.william278.husksync.HuskSync;
+import de.exlll.configlib.Configuration;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.File;
 import java.nio.file.Path;
-import java.util.List;
 
-/**
- * Represents a server on a proxied network.
- */
-@YamlFile(header = """
+@Getter
+@Configuration
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class Server {
+
+    static final String CONFIG_HEADER = """
             ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-        ┃   HuskSync Server ID config  ┃
+            ┃     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)""")
-public class Server {
+            ┗╸ If you join it using /server alpha, then set it to 'alpha' (case-sensitive)""";
 
-    @YamlKey("name")
-    private String serverName;
-
-    private Server(@NotNull String serverName) {
-        this.serverName = serverName;
-    }
-
-    @SuppressWarnings("unused")
-    private Server() {
-    }
+    private String name = getDefault();
 
     @NotNull
-    public static Server getDefault(@NotNull HuskSync plugin) {
-        return new Server(getDefaultServerName(plugin));
+    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 getDefaultServerName(@NotNull HuskSync plugin) {
-        try {
-            // Fetch server default from supported plugins if present
-            for (String s : List.of("HuskHomes", "HuskTowns")) {
-                final File serverFile = Path.of(plugin.getDataFolder().getParent(), s, "server.yml").toFile();
-                if (serverFile.exists()) {
-                    return Annotaml.create(serverFile, Server.class).get().getName();
-                }
-            }
-
-            // Fetch server default from user dir name
-            final Path serverDirectory = Path.of(System.getProperty("user.dir"));
-            return serverDirectory.getFileName().toString().trim();
-        } catch (Throwable e) {
-            return "server";
-        }
+    private static String getDefault() {
+        final String serverFolder = System.getProperty("user.dir");
+        return serverFolder == null ? "server" : Path.of(serverFolder).getFileName().toString().trim();
     }
 
     @Override
@@ -88,12 +67,4 @@ public class Server {
         return super.equals(other);
     }
 
-    /**
-     * Proxy-defined name of this server.
-     */
-    @NotNull
-    public String getName() {
-        return serverName;
-    }
-
 }

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

@@ -19,9 +19,12 @@
 
 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.data.DataSnapshot;
 import net.william278.husksync.data.Identifier;
 import net.william278.husksync.database.Database;
@@ -29,129 +32,163 @@ 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 = """
+@SuppressWarnings("FieldMayBeFinal")
+@Getter
+@Configuration
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class Settings {
+
+    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""")
-public class Settings {
+            ┗╸ Documentation: https://william278.net/docs/husksync""";
 
     // Top-level settings
-    @YamlComment("Locale of the default language file to use. Docs: https://william278.net/docs/husksync/translations")
-    @YamlKey("language")
-    private String language = "en-gb";
+    @Comment({"Locale of the default language file to use.", "Docs: https://william278.net/docs/husksync/translations"})
+    private String language = Locales.DEFAULT_LOCALE;
 
-    @YamlComment("Whether to automatically check for plugin updates on startup")
-    @YamlKey("check_for_updates")
+    @Comment("Whether to automatically check for plugin updates on startup")
     private boolean checkForUpdates = true;
 
-    @YamlComment("Specify a common ID for grouping servers running HuskSync. "
+    @Comment("Specify a common ID for grouping servers running HuskSync. "
             + "Don't modify this unless you know what you're doing!")
-    @YamlKey("cluster_id")
     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")
+    @Comment("Whether to provide modern, rich TAB suggestions for commands (if available)")
     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;
 
 
     // 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)")
+        private Database.Type type = Database.Type.MYSQL;
 
-    @YamlKey("database.credentials.database")
-    private String mySqlDatabase = "HuskSync";
+        @Comment("Specify credentials here for your MYSQL or MARIADB 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";
+            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 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;
-
-    @YamlKey("database.connection_pool.minimum_idle")
-    private int mySqlConnectionPoolIdle = 10;
-
-    @YamlKey("database.connection_pool.maximum_lifetime")
-    private long mySqlConnectionPoolLifetime = 1800000;
-
-    @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("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();
 
+        @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 database here. 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;
+            private String password = "";
+            private boolean useSsl = false;
+        }
 
+        @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 mode of data synchronization to use (DELAY or LOCKSTEP). DELAY should be fine for most networks."
-            + " Docs: https://william278.net/docs/husksync/sync-modes")
-    @YamlKey("synchronization.mode")
-    private DataSyncer.Mode syncMode = DataSyncer.Mode.DELAY;
+    @Comment("Redis settings")
+    private SynchronizationSettings synchronization = new SynchronizationSettings();
 
-    @YamlComment("The number of data snapshot backups that should be kept at once per user")
-    @YamlKey("synchronization.max_user_data_snapshots")
+    @Getter
+    @Configuration
+    @NoArgsConstructor(access = AccessLevel.PRIVATE)
+    public static class SynchronizationSettings {
+
+        @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;
+
+        @Comment("The number of data snapshot backups that should be kept at once per user")
         private int maxUserDataSnapshots = 16;
 
-    @YamlComment("Number of hours between new snapshots being saved as backups (Use \"0\" to backup all snapshots)")
-    @YamlKey("synchronization.snapshot_backup_frequency")
+        @Comment("Number of hours between new snapshots being saved as backups (Use \"0\" to backup all snapshots)")
         private int snapshotBackupFrequency = 4;
 
-    @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")
+        @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(),
@@ -160,251 +197,28 @@ public class Settings {
                 DataSnapshot.SaveCause.MPDB_MIGRATION.name()
         );
 
-    @YamlComment("Whether to create a snapshot for users on a world when the server saves that world")
-    @YamlKey("synchronization.save_on_world_save")
+        @Comment("Whether to create a snapshot for users on a world when the server saves that world")
         private boolean saveOnWorldSave = true;
 
-    @YamlComment("Whether to create a snapshot for users when they die (containing their death drops)")
-    @YamlKey("synchronization.save_on_death.enabled")
-    private boolean saveOnDeath = false;
+        @Comment("Configuration for how and when to sync player data when they die")
+        private SaveOnDeathSettings saveOnDeath = new SaveOnDeathSettings();
 
-    @YamlComment("What items to save in death snapshots? (DROPS or ITEMS_TO_KEEP). "
+        @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;
+
+            @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.")
-    @YamlKey("synchronization.save_on_death.items_to_save")
-    private DeathItemsMode deathItemsMode = DeathItemsMode.DROPS;
+            private DeathItemsMode itemsToSave = DeathItemsMode.DROPS;
 
-    @YamlComment("Should a death snapshot still be created even if the items to save on the player's death are empty?")
-    @YamlKey("synchronization.save_on_death.save_empty_items")
-    private boolean saveEmptyDeathItems = 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("Whether dead players who log out and log in to a different server should have their items saved.")
-    @YamlKey("synchronization.save_on_death.sync_dead_players_changing_server")
-    private boolean synchronizeDeadPlayersChangingServer = true;
-
-    @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;
-
-    @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;
-
-    @YamlComment("(Experimental) Persist Cartography Table locked maps to let them be viewed on any server")
-    @YamlKey("synchronization.persist_locked_maps")
-    private boolean persistLockedMaps = true;
-
-    @YamlComment("Whether to synchronize player max health (requires health syncing to be enabled)")
-    @YamlKey("synchronization.synchronize_max_health")
-    private boolean synchronizeMaxHealth = true;
-
-    @YamlComment("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).")
-    @YamlKey("synchronization.network_latency_milliseconds")
-    private int networkLatencyMilliseconds = 500;
-
-    @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;
-    }
-
-    @NotNull
-    public DataSyncer.Mode getSyncMode() {
-        return syncMode;
-    }
-
-    public int getMaxUserDataSnapshots() {
-        return maxUserDataSnapshots;
-    }
-
-    public int getBackupFrequency() {
-        return snapshotBackupFrequency;
-    }
-
-    public boolean doSaveOnWorldSave() {
-        return saveOnWorldSave;
-    }
-
-    public boolean doSaveOnDeath() {
-        return saveOnDeath;
-    }
-
-    @NotNull
-    public DeathItemsMode getDeathItemsMode() {
-        return deathItemsMode;
-    }
-
-    public boolean doSaveEmptyDeathItems() {
-        return saveEmptyDeathItems;
-    }
-
-    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;
-        }
-    }
+            @Comment("Whether dead players who log out and log in to a different server should have their items saved.")
+            private boolean syncDeadPlayersChangingServer = true;
 
             /**
              * Represents the mode of saving items on death
@@ -413,31 +227,50 @@ public class Settings {
                 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, TOAST 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("Whether to synchronize player max health (requires health syncing to be enabled)")
+        private boolean synchronizeMaxHealth = 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("Event priorities for listeners (HIGHEST, NORMAL, LOWEST). Change if you encounter plugin conflicts")
+        @Getter(AccessLevel.NONE)
+        private Map<String, String> eventPriorities = EventListener.ListenerType.getDefaults();
+
+        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);
+        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;
             }
-
-        @SuppressWarnings("unchecked")
-        @NotNull
-        private 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/data/DataSnapshot.java

@@ -19,6 +19,7 @@
 
 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;
@@ -26,7 +27,6 @@ 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.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -304,7 +304,6 @@ public class DataSnapshot {
             );
         }
 
-        @NotNull
         @ApiStatus.Internal
         public byte[] asBytes(@NotNull HuskSync plugin) throws DataAdapter.AdaptionException {
             return plugin.getDataAdapter().toBytes(this);
@@ -427,7 +426,7 @@ 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();
@@ -503,7 +502,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;
@@ -715,7 +717,7 @@ public class DataSnapshot {
             }
             return new Unpacked(
                     id,
-                    pinned || plugin.getSettings().doAutoPin(saveCause),
+                    pinned || plugin.getSettings().getSynchronization().doAutoPin(saveCause),
                     timestamp,
                     saveCause,
                     serverName,
@@ -818,10 +820,14 @@ public class DataSnapshot {
 
         @NotNull
         public String getDisplayName() {
-            return Locales.truncate(name().toLowerCase(Locale.ENGLISH)
-                    .replaceAll("_", " "), 18);
+            return name().toLowerCase(Locale.ENGLISH);
         }
 
+        @NotNull
+        public String getLocale(@NotNull HuskSync plugin) {
+            return plugin.getLocales().getRawLocale("save_cause_" + name().toLowerCase())
+                    .orElse(getDisplayName());
+        }
     }
 
     /**

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

@@ -43,7 +43,7 @@ public interface UserDataHolder extends DataHolder {
     @NotNull
     default Map<Identifier, Data> getData() {
         return getPlugin().getRegisteredDataTypes().stream()
-                .filter(type -> type.isCustom() || getPlugin().getSettings().isSyncFeatureEnabled(type))
+                .filter(type -> type.isCustom() || getPlugin().getSettings().getSynchronization().isFeatureEnabled(type))
                 .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);
@@ -105,7 +105,7 @@ public interface UserDataHolder extends DataHolder {
             try {
                 for (Map.Entry<Identifier, Data> entry : unpacked.getData().entrySet()) {
                     final Identifier identifier = entry.getKey();
-                    if (plugin.getSettings().isSyncFeatureEnabled(identifier)) {
+                    if (plugin.getSettings().getSynchronization().isFeatureEnabled(identifier)) {
                         if (identifier.isCustom()) {
                             getCustomDataStore().put(identifier, entry.getValue());
                         }

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

@@ -19,6 +19,7 @@
 
 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;
@@ -31,10 +32,7 @@ import org.jetbrains.annotations.NotNull;
 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.*;
 
 /**
  * An abstract representation of the plugin database, storing player data.
@@ -71,8 +69,9 @@ public abstract class Database {
      */
     @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));
+        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));
     }
 
     /**
@@ -193,7 +192,7 @@ public abstract class Database {
      */
     @Blocking
     private void addAndRotateSnapshot(@NotNull User user, @NotNull DataSnapshot.Packed snapshot) {
-        final int backupFrequency = plugin.getSettings().getBackupFrequency();
+        final int backupFrequency = plugin.getSettings().getSynchronization().getSnapshotBackupFrequency();
         if (!snapshot.isPinned() && backupFrequency > 0) {
             this.rotateLatestSnapshot(user, snapshot.getTimestamp().minusHours(backupFrequency));
         }
@@ -297,4 +296,31 @@ public abstract class Database {
         }
     }
 
+    /**
+     * Represents the names of tables in the database
+     */
+    @Getter
+    public enum TableName {
+        USERS("husksync_users"),
+        USER_DATA("husksync_user_data");
+
+        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/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;
@@ -34,6 +35,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 +46,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 +71,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
@@ -245,7 +251,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`
@@ -306,7 +312,8 @@ public class MySqlDatabase extends Database {
     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 maxSnapshots = plugin.getSettings().getSynchronization().getMaxUserDataSnapshots();
+        if (unpinnedUserData.size() > maxSnapshots) {
             try (Connection connection = getConnection()) {
                 try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
                         DELETE FROM `%user_data_table%`
@@ -314,7 +321,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(unpinnedUserData.size() - maxSnapshots))))) {
                     statement.setString(1, user.getUuid().toString());
                     statement.executeUpdate();
                 }

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

@@ -30,6 +30,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import static net.william278.husksync.config.Settings.SynchronizationSettings.SaveOnDeathSettings;
+
 /**
  * Handles what should happen when events are fired
  */
@@ -65,7 +67,7 @@ public abstract class EventListener {
             return;
         }
         plugin.lockPlayer(user.getUuid());
-        plugin.runAsync(() -> plugin.getDataSyncer().saveUserData(user));
+        plugin.getDataSyncer().saveUserData(user);
     }
 
     /**
@@ -74,7 +76,7 @@ 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 (plugin.isDisabling() || !plugin.getSettings().doSaveOnWorldSave()) {
+        if (plugin.isDisabling() || !plugin.getSettings().getSynchronization().isSaveOnWorldSave()) {
             return;
         }
         usersInWorld.stream()
@@ -91,8 +93,9 @@ public abstract class EventListener {
      * @param items The items that should be saved for this user on their death
      */
     protected void saveOnPlayerDeath(@NotNull OnlineUser user, @NotNull Data.Items items) {
-        if (plugin.isDisabling() || !plugin.getSettings().doSaveOnDeath() || plugin.isLocked(user.getUuid())
-                || user.isNpc() || (!plugin.getSettings().doSaveEmptyDeathItems() && items.isEmpty())) {
+        final SaveOnDeathSettings settings = plugin.getSettings().getSynchronization().getSaveOnDeath();
+        if (plugin.isDisabling() || !settings.isEnabled() || plugin.isLocked(user.getUuid())
+                || user.isNpc() || (!settings.isSaveEmptyItems() && items.isEmpty())) {
             return;
         }
 

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

@@ -24,15 +24,13 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Locale;
 
 public enum RedisKeyType {
-    DATA_UPDATE(10),
-    SERVER_SWITCH(10),
-    DATA_CHECKOUT(60 * 60 * 24 * 7 * 52);
 
-    private final int timeToLive;
+    LATEST_SNAPSHOT,
+    SERVER_SWITCH,
+    DATA_CHECKOUT;
 
-    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 +42,4 @@ public enum RedisKeyType {
         );
     }
 
-    public int getTimeToLive() {
-        return timeToLive;
-    }
-
 }

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

@@ -20,18 +20,16 @@
 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 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 +37,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,45 +59,92 @@ 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();
+        final String password = credentials.getPassword();
+        final String host = credentials.getHost();
+        final int port = credentials.getPort();
+        final boolean useSSL = credentials.isUseSsl();
 
         // Create the jedis pool
         final JedisPoolConfig config = new JedisPoolConfig();
         config.setMaxIdle(0);
         config.setTestOnBorrow(true);
         config.setTestOnReturn(true);
+
+        final Settings.RedisSettings.RedisSentinel sentinel = plugin.getSettings().getRedis().getSentinel();
+        Set<String> redisSentinelNodes = new HashSet<>(sentinel.getNodes());
+        if (redisSentinelNodes.isEmpty()) {
             this.jedisPool = password.isEmpty()
                     ? new JedisPool(config, host, port, 0, useSSL)
                     : new JedisPool(config, host, port, 0, password, useSSL);
+        } else {
+            final String sentinelPassword = sentinel.getPassword();
+            this.jedisPool = new JedisSentinelPool(sentinel.getMaster(), redisSentinelNodes, password.isEmpty()
+                    ? null : password, sentinelPassword.isEmpty() ? null : sentinelPassword);
+        }
 
         // 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. "
+            throw new IllegalStateException("Failed to establish connection with Redis. "
                     + "Please check the supplied credentials in the config file", e);
         }
 
         // Subscribe using a thread (rather than a task)
+        enabled = true;
         new Thread(this::subscribe, "husksync:redis_subscriber").start();
     }
 
     @Blocking
     private void subscribe() {
+        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();
+            }
         }
     }
 
@@ -132,6 +181,16 @@ public class RedisManager extends JedisPubSub {
         }
     }
 
+    @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()) {
@@ -164,8 +223,9 @@ public class RedisManager extends JedisPubSub {
             );
             redisMessage.dispatch(plugin, RedisMessage.Type.REQUEST_USER_DATA);
         });
-        return future.orTimeout(
-                        plugin.getSettings().getNetworkLatencyMilliseconds(),
+        return future
+                .orTimeout(
+                        plugin.getSettings().getSynchronization().getNetworkLatencyMilliseconds(),
                         TimeUnit.MILLISECONDS
                 )
                 .exceptionally(throwable -> {
@@ -175,23 +235,23 @@ public class RedisManager extends JedisPubSub {
     }
 
     /**
-     * Set a user's data to the Redis server
+     * Set a user's data to Redis
      *
      * @param user       the user to set data for
      * @param data       the user's data to set
+     * @param timeToLive The time to cache the data for
      */
     @Blocking
-    public void setUserData(@NotNull User user, @NotNull DataSnapshot.Packed data) {
+    public void setUserData(@NotNull User user, @NotNull DataSnapshot.Packed data, int timeToLive) {
         try (Jedis jedis = jedisPool.getResource()) {
             jedis.setex(
-                    getKey(RedisKeyType.DATA_UPDATE, user.getUuid(), clusterId),
-                    RedisKeyType.DATA_UPDATE.getTimeToLive(),
+                    getKey(RedisKeyType.LATEST_SNAPSHOT, user.getUuid(), clusterId),
+                    timeToLive,
                     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())));
+            plugin.debug(String.format("[%s] Set %s key on Redis", user.getUsername(), RedisKeyType.LATEST_SNAPSHOT));
         } catch (Throwable e) {
-            plugin.log(Level.SEVERE, "An exception occurred setting a user's server switch", e);
+            plugin.log(Level.SEVERE, "An exception occurred setting user data on Redis", e);
         }
     }
 
@@ -206,11 +266,10 @@ public class RedisManager extends JedisPubSub {
             } else {
                 jedis.del(getKey(RedisKeyType.DATA_CHECKOUT, user.getUuid(), clusterId));
             }
-            plugin.debug(String.format("[%s] %s %s key to redis at: %s",
-                    checkedOut ? "set" : "removed", user.getUsername(), RedisKeyType.DATA_CHECKOUT.name(),
-                    new SimpleDateFormat("mm:ss.SSS").format(new Date())));
+            plugin.debug(String.format("[%s] %s %s key to/from Redis", user.getUsername(),
+                    checkedOut ? "Set" : "Removed", RedisKeyType.DATA_CHECKOUT));
         } catch (Throwable e) {
-            plugin.log(Level.SEVERE, "An exception occurred setting a user's server switch", e);
+            plugin.log(Level.SEVERE, "An exception occurred setting checkout to", e);
         }
     }
 
@@ -220,17 +279,16 @@ public class RedisManager extends JedisPubSub {
             final byte[] key = getKey(RedisKeyType.DATA_CHECKOUT, user.getUuid(), clusterId);
             final byte[] readData = jedis.get(key);
             if (readData != null) {
-                plugin.debug("[" + user.getUsername() + "] Successfully read "
-                        + RedisKeyType.DATA_CHECKOUT.name() + " key from redis at: " +
-                        new SimpleDateFormat("mm:ss.SSS").format(new Date()));
-                return Optional.of(new String(readData, StandardCharsets.UTF_8));
+                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.getUsername(), checkoutServer, RedisKeyType.DATA_CHECKOUT));
+                return Optional.of(checkoutServer);
             }
         } catch (Throwable e) {
-            plugin.log(Level.SEVERE, "An exception occurred fetching a user's checkout key from redis", e);
+            plugin.log(Level.SEVERE, "An exception occurred getting a user's checkout key from Redis", e);
         }
-        plugin.debug("[" + user.getUsername() + "] Could not read " +
-                RedisKeyType.DATA_CHECKOUT.name() + " key from redis at: " +
-                new SimpleDateFormat("mm:ss.SSS").format(new Date()));
+        plugin.debug(String.format("[%s] %s key not set on Redis", user.getUsername(),
+                RedisKeyType.DATA_CHECKOUT));
         return Optional.empty();
     }
 
@@ -240,7 +298,7 @@ public class RedisManager extends JedisPubSub {
         try (Jedis jedis = jedisPool.getResource()) {
             final Set<String> keys = jedis.keys(keyFormat);
             if (keys == null) {
-                plugin.log(Level.WARNING, "Checkout key set returned null from jedis during clearing");
+                plugin.log(Level.WARNING, "Checkout key returned null from Redis during clearing");
                 return;
             }
             for (String key : keys) {
@@ -249,12 +307,12 @@ public class RedisManager extends JedisPubSub {
                 }
             }
         } catch (Throwable e) {
-            plugin.log(Level.SEVERE, "An exception occurred clearing users checked out on this server", 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
      */
@@ -263,17 +321,18 @@ public class RedisManager extends JedisPubSub {
         try (Jedis jedis = jedisPool.getResource()) {
             jedis.setex(
                     getKey(RedisKeyType.SERVER_SWITCH, user.getUuid(), clusterId),
-                    RedisKeyType.SERVER_SWITCH.getTimeToLive(), new byte[0]
+                    RedisKeyType.TTL_10_SECONDS,
+                    new byte[0]
             );
-            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())));
+            plugin.debug(String.format("[%s] Set %s key to Redis",
+                    user.getUsername(), RedisKeyType.SERVER_SWITCH));
         } catch (Throwable e) {
-            plugin.log(Level.SEVERE, "An exception occurred setting a user's server switch", 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.
@@ -281,17 +340,15 @@ public class RedisManager extends JedisPubSub {
     @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.getUsername(), 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.getUsername(), RedisKeyType.LATEST_SNAPSHOT));
 
             // Consume the key (delete from redis)
             jedis.del(key);
@@ -299,7 +356,7 @@ 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();
         }
     }
@@ -310,26 +367,25 @@ public class RedisManager extends JedisPubSub {
             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.getUsername(), 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.getUsername(), 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 void terminate() {
+        enabled = false;
         if (jedisPool != null) {
             if (!jedisPool.isClosed()) {
                 jedisPool.close();

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

@@ -27,6 +27,7 @@ import net.william278.husksync.util.Task;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
@@ -89,7 +90,8 @@ public abstract class DataSyncer {
     // 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().getNetworkLatencyMilliseconds()) / 1000) * 20 / LISTEN_DELAY
+                (Math.max(100, plugin.getSettings().getSynchronization().getNetworkLatencyMilliseconds()) / 1000)
+                        * 20 / LISTEN_DELAY
         );
     }
 
@@ -107,20 +109,31 @@ public abstract class DataSyncer {
     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.isOffline()) {
                 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.getUsername(), 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();
@@ -132,8 +145,8 @@ public abstract class DataSyncer {
      * @since 3.1
      */
     public enum Mode {
-        DELAY(DelayDataSyncer::new),
-        LOCKSTEP(LockstepDataSyncer::new);
+        LOCKSTEP(LockstepDataSyncer::new),
+        DELAY(DelayDataSyncer::new);
 
         private final Function<HuskSync, ? extends DataSyncer> supplier;
 

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

@@ -21,6 +21,7 @@ package net.william278.husksync.sync;
 
 import net.william278.husksync.HuskSync;
 import net.william278.husksync.data.DataSnapshot;
+import net.william278.husksync.redis.RedisKeyType;
 import net.william278.husksync.user.OnlineUser;
 import org.jetbrains.annotations.NotNull;
 
@@ -52,7 +53,7 @@ public class DelayDataSyncer extends DataSyncer {
                             }).orElse(false)
                     );
                 },
-                Math.max(0, plugin.getSettings().getNetworkLatencyMilliseconds() / 50L)
+                Math.max(0, plugin.getSettings().getSynchronization().getNetworkLatencyMilliseconds() / 50L)
         );
     }
 
@@ -61,7 +62,7 @@ public class DelayDataSyncer extends DataSyncer {
         plugin.runAsync(() -> {
             plugin.getRedisManager().setUserServerSwitch(user);
             final DataSnapshot.Packed data = user.createSnapshot(DataSnapshot.SaveCause.DISCONNECT);
-            plugin.getRedisManager().setUserData(user, data);
+            plugin.getRedisManager().setUserData(user, data, RedisKeyType.TTL_10_SECONDS);
             plugin.getDatabase().addSnapshot(user, data);
         });
     }

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

@@ -21,6 +21,7 @@ package net.william278.husksync.sync;
 
 import net.william278.husksync.HuskSync;
 import net.william278.husksync.data.DataSnapshot;
+import net.william278.husksync.redis.RedisKeyType;
 import net.william278.husksync.user.OnlineUser;
 import org.jetbrains.annotations.NotNull;
 
@@ -60,7 +61,7 @@ public class LockstepDataSyncer extends DataSyncer {
     public void saveUserData(@NotNull OnlineUser user) {
         plugin.runAsync(() -> {
             final DataSnapshot.Packed data = user.createSnapshot(DataSnapshot.SaveCause.DISCONNECT);
-            plugin.getRedisManager().setUserData(user, data);
+            plugin.getRedisManager().setUserData(user, data, RedisKeyType.TTL_1_YEAR);
             plugin.getRedisManager().setUserCheckedOut(user, false);
             plugin.getDatabase().addSnapshot(user, data);
         });

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

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

@@ -50,13 +50,11 @@ public abstract class OnlineUser extends User implements CommandUser, UserDataHo
      */
     public abstract boolean isOffline();
 
-    /**
-     * 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
@@ -131,6 +129,9 @@ 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()) {
+                getPlugin().debug(String.format("Applying snapshot (%s) to %s (cause: %s)",
+                        snapshot.getShortId(), getUsername(), cause
+                ));
                 UserDataHolder.super.applySnapshot(
                         event.getData(), (succeeded) -> completeSync(succeeded, cause, getPlugin())
                 );
@@ -146,7 +147,7 @@ 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)

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

@@ -115,7 +115,7 @@ public class DataDumper {
             } else {
                 return "(Failed to upload to logs site, got: " + connection.getResponseCode() + ")";
             }
-        } catch (Exception e) {
+        } catch (Throwable e) {
             plugin.log(Level.SEVERE, "Failed to upload data to logs site", e);
         }
         return "(Failed to upload to logs site)";

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

@@ -56,7 +56,7 @@ public class DataSnapshotList {
                                                 .ofPattern("dd/MM/yyyy, HH:mm")),
                                         snapshot.getTimestamp().format(DateTimeFormatter
                                                 .ofPattern("MMM dd yyyy, HH:mm:ss.SSS")),
-                                        snapshot.getSaveCause().getDisplayName(),
+                                        snapshot.getSaveCause().getLocale(plugin),
                                         String.format("%.2fKiB", snapshot.getFileSize(plugin) / 1024f))
                                 .orElse("• " + snapshot.getId())).toList(),
                 plugin.getLocales().getBaseChatList(6)

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

@@ -68,7 +68,7 @@ public class DataSnapshotOverview {
             locales.getLocale("data_manager_pinned")
                     .ifPresent(user::sendMessage);
         }
-        locales.getLocale("data_manager_cause", snapshot.getSaveCause().getDisplayName())
+        locales.getLocale("data_manager_cause", snapshot.getSaveCause().getLocale(plugin))
                 .ifPresent(user::sendMessage);
         locales.getLocale("data_manager_server", snapshot.getServerName())
                 .ifPresent(user::sendMessage);

common/src/main/resources/locales/bg-bg.yml

@@ -1,3 +1,4 @@
+locales:
   synchronization_complete: '[⏵ Данните синхронизирани!](#00fb9a)'
   synchronization_failed: '[⏵ Провалихме се да синхронизираме Вашите данни! Моля свържете се с администратор.](#ff7e5e)'
   inventory_viewer_menu_title: '&0Инвентара на %1%'
@@ -11,7 +12,7 @@ data_manager_title: '[Преглеждане потребителският сн
   data_manager_timestamp: '[⌚ %1%](#ffc43b-#f5c962 show_text=&7Клеймо на Версията:\n&8Когато данните са били запазени)'
   data_manager_pinned: '[※ Закачен снапшот](#d8ff2b show_text=&7Закачен:\n&8Снапшота на този потребител няма да бъде автоматично завъртан.)'
   data_manager_cause: '[⚑ %1%](#23a825-#36f539 show_text=&7Причина на Запазване:\n&8Какво е накарало данните да бъдат запазени)'
-data_manager_server: '[Ⓢ %1%](#ff87b3-#f5538e show_text=&7Server:\n&8Name of the server the data was saved on)'
+  data_manager_server: '[☁ %1%](#ff87b3-#f5538e show_text=&7Server:\n&8Name of the server the data was saved on)'
   data_manager_size: '[⏏ %1%](color=#62a9f5-#7ab8fa show_text=&7Snapshot size:\n&8Estimated file size of the snapshot (in KiB))\n'
   data_manger_status: '[%1%](red)[/](gray)[%2%](red)[×](gray)[❤](red show_text=&7Точки кръв)   [%3%](yellow)[×](gray)[🍖](yellow show_text=&7Точки глад)   [ʟᴠ](green)[.](gray)[%4%](green show_text=&7Ниво опит)   [🏹 %5%](dark_aqua show_text=&7Режим на игра)'
   data_manager_advancements_statistics: '[⭐ Напредъци: %1%](color=#ffc43b-#f5c962 show_text=&7Напредъци, в които имате прогрес:\n&8%2%)   [⌛ Изиграно Време: %3%ʜʀs](color=#62a9f5-#7ab8fa show_text=&7Изиграно време в играта\n&8⚠ Базирано на статистики от играта)\n'
@@ -34,9 +35,21 @@ list_page_jumper_button: '[%1%](show_text=&7Jump to page %1% run_command=%2% %1%
   list_page_jumper_current_page: '[%1%](#00fb9a)'
   list_page_jumper_separator: ' '
   list_page_jumper_group_separator: '…'
+  save_cause_disconnect: 'disconnect'
+  save_cause_world_save: 'world save'
+  save_cause_death: 'death'
+  save_cause_server_shutdown: 'server shutdown'
+  save_cause_inventory_command: 'inventory command'
+  save_cause_enderchest_command: 'enderchest command'
+  save_cause_backup_restore: 'backup restore'
+  save_cause_api: 'API'
+  save_cause_mpdb_migration: 'MPDB migration'
+  save_cause_legacy_migration: 'legacy migration'
+  save_cause_converted_from_v2: 'converted from v2'
   up_to_date: '[HuskSync](#00fb9a bold) [| You are running the latest version of HuskSync (v%1%).](#00fb9a)'
   update_available: '[HuskSync](#ff7e5e bold) [| A new version of HuskSync is available: v%1% (running: v%2%).](#ff7e5e)'
   reload_complete: '[HuskSync](#00fb9a bold) [| Презаредихме конфигурацията и файловете със съобщения.](#00fb9a)\n[⚠ Ensure config files are up-to-date on all servers!](#00fb9a)\n[A restart is needed for config changes to take effect.](#00fb9a italic)'
+  system_status_header: '[HuskSync](#00fb9a bold) [| System status report:](#00fb9a)'
   error_invalid_syntax: '[Грешка:](#ff3300) [Неправилен синтаксис. Използвайте:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Click to suggest suggest_command=%1%)'
   error_invalid_player: '[Грешка:](#ff3300) [Не можахме да открием играч с това име.](#ff7e5e)'
   error_no_permission: '[Грешка:](#ff3300) [Нямате право да използвате тази команда](#ff7e5e)'

common/src/main/resources/locales/de-de.yml

@@ -1,3 +1,4 @@
+locales:
   synchronization_complete: '[⏵ Daten synchronisiert!](#00fb9a)'
   synchronization_failed: '[⏵ Ein Fehler ist beim Synchronisieren deiner Daten aufgetreten! Bitte kontaktiere einen Administrator.](#ff7e5e)'
   inventory_viewer_menu_title: '&0Inventar von %1%'
@@ -6,13 +7,13 @@ inventory_viewer_opened: '[Du siehst den Schnappschuss des Inventares von](#00fb
   ender_chest_viewer_opened: '[Du siehst den Schnappschuss der Endertruhe von](#00fb9a) [%1%](#00fb9a bold) [von ⌚ %2%](#00fb9a)'
   data_update_complete: '[🔔 Deine Daten wurden aktualisiert!](#00fb9a)'
   data_update_failed: '[🔔 Ein Fehler ist beim Aktualisieren deiner Daten aufgetreten! Bitte kontaktiere einen Administrator.](#ff7e5e)'
-user_registration_complete: '[⭐ User registration complete!](#00fb9a)'
+  user_registration_complete: '[⭐ Benutzer-Registrierung abgeschlossen!](#00fb9a)'
   data_manager_title: '[Du siehst den Nutzerdaten-Schnappschuss](#00fb9a) [%1%](#00fb9a show_text=&7Versions-UUID:\n&8%2%) [für %3%](#00fb9a bold show_text=&7Spieler-UUID:\n&8%4%)[:](#00fb9a)'
   data_manager_timestamp: '[⌚ %1%](#ffc43b-#f5c962 show_text=&7Versions-Zeitstempel:\n&8Zeitpunkt der Speicherung der Daten)'
   data_manager_pinned: '[※ Schnappschuss angeheftet](#d8ff2b show_text=&7Angeheftet:\n&8Dieser Nutzerdaten-Schnappschuss wird nicht automatisch rotiert.)'
   data_manager_cause: '[⚑ %1%](#23a825-#36f539 show_text=&7Speicherungsgrund:\n&8Der Grund für das Speichern der Daten)'
-data_manager_server: '[Ⓢ %1%](#ff87b3-#f5538e show_text=&7Server:\n&8Name of the server the data was saved on)'
-data_manager_size: '[⏏ %1%](color=#62a9f5-#7ab8fa show_text=&7Snapshot size:\n&8Estimated file size of the snapshot (in KiB))\n'
+  data_manager_server: '[☁ %1%](#ff87b3-#f5538e show_text=&7Server:\n&8Name des Servers, auf dem die Daten gespeichert wurden)'
+  data_manager_size: '[⏏ %1%](color=#62a9f5-#7ab8fa show_text=&7Schnappschuss-Größe:\n&8Geschätzte Dateigröße des Schnappschusses (in KiB))\n'
   data_manger_status: '[%1%](red)[/](gray)[%2%](red)[×](gray)[❤](red show_text=&7Lebenspunkte)   [%3%](yellow)[×](gray)[🍖](yellow show_text=&7Hungerpunkte)   [ʟᴠ](green)[.](gray)[%4%](green show_text=&7XP-Level)   [🏹 %5%](dark_aqua show_text=&7Spielmodus)'
   data_manager_advancements_statistics: '[⭐ Erfolge: %1%](color=#ffc43b-#f5c962 show_text=&7Erfolge in denen du Fortschritt gemacht hast:\n&8%2%)   [⌛ Spielzeit: %3%ʜʀs](color=#62a9f5-#7ab8fa show_text=&7Deine verbrachte Zeit im Spiel\n&8⚠ Basierend auf Spielstatistiken)\n'
   data_manager_item_buttons: '[Sehen:](gray) [[🪣 Inventar…]](color=#a17b5f-#f5b98c show_text=&7Klicke zum Ansehen run_command=/inventory %1% %2%)   [[⌀ Endertruhe…]](#b649c4-#d254ff show_text=&7Klicke zum Ansehen run_command=/enderchest %1% %2%)'
@@ -20,7 +21,7 @@ data_manager_management_buttons: '[Verwalten:](gray) [[❌ Löschen…]](#ff3300
   data_manager_system_buttons: '[System:](gray) [[⏷ Daten-Dump…]](dark_gray show_text=&7Klicke, um diesen rohen Nutzerdaten-Schnappschuss in eine Datei zu speichern.\n&8Daten-Dumps können unter ~/plugins/HuskSync/dumps/ gefunden werden. run_command=/husksync:userdata dump %1% %2% file)   [[☂ Web-Dump…]](dark_gray show_text=&7Klicke, um diesen rohen Nutzerdaten-Schnappschuss auf den mc-logs Service hochzuladen.\n&8Du erhältst dann eine URL, die die Daten enthält. run_command=/husksync:userdata dump %1% %2% web)'
   data_manager_advancements_preview_remaining: 'und %1% weitere…'
   data_list_title: '[Nutzerdaten-Schnappschüsse von %1%:](#00fb9a) [(%2%-%3% von](#00fb9a) [%4%](#00fb9a bold)[)](#00fb9a)\n'
-data_list_item: '[%1%](gray show_text=&7User Data Snapshot for %2%&8⚡ %4% run_command=/userdata view %2% %3%) [%5%](#d8ff2b show_text=&7Pinned:\n&8Pinned snapshots won''t be automatically rotated. run_command=/userdata view %2% %3%) [%6%](color=#ffc43b-#f5c962 show_text=&7Version timestamp:&7\n&8When the data was saved\n&8%7% run_command=/userdata view %2% %3%)   [⚑ %8%](#23a825-#36f539 show_text=&7Save cause:\n&8What caused the data to be saved run_command=/userdata view %2% %3%)   [⏏ %9%](color=#62a9f5-#7ab8fa show_text=&7Snapshot size:&7\n&8Estimated file size of the snapshot (in KiB) run_command=/userdata view %2% %3%)'
+  data_list_item: '[%1%](gray show_text=&7Nutzerdaten-Schnappschuss für %2%&8⚡ %4% run_command=/userdata view %2% %3%) [%5%](#d8ff2b show_text=&7Angeheftet:\n&8Angeheftete Schnappschüsse werden nicht automatisch rotiert. run_command=/userdata view %2% %3%) [%6%](color=#ffc43b-#f5c962 show_text=&7Versions-Zeitstempel:&7\n&8Zeitpunkt der Speicherung der Daten\n&8%7% run_command=/userdata view %2% %3%)   [⚑ %8%](#23a825-#36f539 show_text=&7Speicherungsgrund:\n&8Grund für das Speichern der Daten run_command=/userdata view %2% %3%)   [⏏ %9%](color=#62a9f5-#7ab8fa show_text=&7Schnappschuss-Größe:&7\n&8Geschätzte Dateigröße des Schnappschusses (in KiB) run_command=/userdata view %2% %3%)'
   data_deleted: '[❌ Nutzerdaten-Schnappschuss erfolgreich gelöscht](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%) [für](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\n&8%4%)'
   data_restored: '[⏪ Erfgreich wiederhergestellt](#00fb9a) [Aktuelle Nutzerdaten des Schnappschusses von %1%](#00fb9a show_text=&7Spieler-UUID:\n&8%2%) [%3%.](#00fb9a show_text=&7Versions-UUID:\n&8%4%)'
   data_pinned: '[※ Nutzerdaten-Schnappschuss erfolgreich angepinnt](#00fb9a) [%1%](#00fb9a show_text=&7Versions-UUID:\n&8%2%) [für](#00fb9a) [%3%.](#00fb9a show_text=&7Spieler-UUID:\n&8%4%)'
@@ -34,9 +35,21 @@ list_page_jumper_button: '[%1%](show_text=&7Springe zu Seite %1% run_command=%2%
   list_page_jumper_current_page: '[%1%](#00fb9a)'
   list_page_jumper_separator: ' '
   list_page_jumper_group_separator: '…'
-reload_complete: '[HuskSync](#00fb9a bold) [| Die Konfigurations- und Sprachdateien wurden neu geladen.](#00fb9a)\n[⚠ Ensure config files are up-to-date on all servers!](#00fb9a)\n[A restart is needed for config changes to take effect.](#00fb9a italic)'
-up_to_date: '[HuskSync](#00fb9a bold) [| You are running the latest version of HuskSync (v%1%).](#00fb9a)'
-update_available: '[HuskSync](#ff7e5e bold) [| A new version of HuskSync is available: v%1% (running: v%2%).](#ff7e5e)'
+  save_cause_disconnect: 'Server verlassen'
+  save_cause_world_save: 'Welt gespeichert'
+  save_cause_death: 'Tod'
+  save_cause_server_shutdown: 'Server gestoppt'
+  save_cause_inventory_command: 'Inventar Befehl'
+  save_cause_enderchest_command: 'Enderchest Befehl'
+  save_cause_backup_restore: 'Backup wiederhergestellt'
+  save_cause_api: 'API'
+  save_cause_mpdb_migration: 'MPDB Migration'
+  save_cause_legacy_migration: 'Legacy Migration'
+  save_cause_converted_from_v2: 'Import von v2'
+  reload_complete: '[HuskSync](#00fb9a bold) [| Die Konfigurations- und Sprachdateien wurden neu geladen.](#00fb9a)\n[⚠ Stelle sicher, dass die Konfigurationsdateien auf allen Servern aktuell sind!](#00fb9a)\n[Ein Neustart wird benötigt, damit Konfigurations-Änderungen wirkbar werden.](#00fb9a italic)'
+  up_to_date: '[HuskSync](#00fb9a bold) [| Du verwendest die neuste Version von HuskSync (v%1%).](#00fb9a)'
+  update_available: '[HuskSync](#ff7e5e bold) [| Eine neue Version von HuskSync ist verfügbar: v%1% (Aktuelle Version: v%2%).](#ff7e5e)'
+  system_status_header: '[HuskSync](#00fb9a bold) [| System status report:](#00fb9a)'
   error_invalid_syntax: '[Fehler:](#ff3300) [Falsche Syntax. Nutze:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Click to suggest suggest_command=%1%)'
   error_invalid_player: '[Fehler:](#ff3300) [Es konnte kein Spieler mit diesem Namen gefunden werden.](#ff7e5e)'
   error_no_permission: '[Fehler:](#ff3300) [Du hast nicht die benötigten Berechtigungen um diesen Befehl auszuführen](#ff7e5e)'
@@ -44,7 +57,7 @@ error_console_command_only: '[Fehler:](#ff3300) [Dieser Befehl kann nur über di
   error_in_game_command_only: 'Fehler: Dieser Befehl kann nur im Spiel genutzt werden.'
   error_no_data_to_display: '[Fehler:](#ff3300) [Es konnten keine Nutzerdaten zum Anzeigen gefunden werden.](#ff7e5e)'
   error_invalid_version_uuid: '[Fehler:](#ff3300) [Es konnten keine Nutzerdaten für diese Versions-UUID gefunden werden.](#ff7e5e)'
-husksync_command_description: 'Manage the HuskSync plugin'
-userdata_command_description: 'View, manage & restore player userdata'
-inventory_command_description: 'View & edit a player''s inventory'
-enderchest_command_description: 'View & edit a player''s Ender Chest'
+  husksync_command_description: 'Das HuskSync-Plugin verwalten'
+  userdata_command_description: 'Nutzerdaten eines Spielers anzeigen, verwalten und wiederherstellen'
+  inventory_command_description: 'Inventar eines Spielers ansehen und bearbeiten'
+  enderchest_command_description: 'Endertruhe eines Spielers ansehen und bearbeiten'

common/src/main/resources/locales/en-gb.yml

@@ -1,3 +1,4 @@
+locales:
   synchronization_complete: '[⏵ Data synchronized!](#00fb9a)'
   synchronization_failed: '[⏵ Failed to synchronize your data! Please contact an administrator.](#ff7e5e)'
   inventory_viewer_menu_title: '&0%1%''s Inventory'
@@ -11,7 +12,7 @@ data_manager_title: '[Viewing user data snapshot](#00fb9a) [%1%](#00fb9a show_te
   data_manager_timestamp: '[⌚ %1%](#ffc43b-#f5c962 show_text=&7Version timestamp:\n&8When the data was saved)'
   data_manager_pinned: '[※ Snapshot pinned](#d8ff2b show_text=&7Pinned:\n&8This user data snapshot won''t be automatically rotated.)'
   data_manager_cause: '[⚑ %1%](#23a825-#36f539 show_text=&7Save cause:\n&8What caused the data to be saved)'
-data_manager_server: '[Ⓢ %1%](#ff87b3-#f5538e show_text=&7Server:\n&8Name of the server the data was saved on)'
+  data_manager_server: '[☁ %1%](#ff87b3-#f5538e show_text=&7Server:\n&8Name of the server the data was saved on)'
   data_manager_size: '[⏏ %1%](color=#62a9f5-#7ab8fa show_text=&7Snapshot size:\n&8Estimated file size of the snapshot (in KiB))\n'
   data_manger_status: '[%1%](red)[/](gray)[%2%](red)[×](gray)[❤](red show_text=&7Health points)   [%3%](yellow)[×](gray)[🍖](yellow show_text=&7Hunger points)   [ʟᴠ](green)[.](gray)[%4%](green show_text=&7XP level)   [🏹 %5%](dark_aqua show_text=&7Game mode)'
   data_manager_advancements_statistics: '[⭐ Advancements: %1%](color=#ffc43b-#f5c962 show_text=&7Advancements you have progress in:\n&8%2%)   [⌛ Play Time: %3%ʜʀs](color=#62a9f5-#7ab8fa show_text=&7In-game play time\n&8⚠ Based on in-game statistics)\n'
@@ -34,9 +35,21 @@ list_page_jumper_button: '[%1%](show_text=&7Jump to page %1% run_command=%2% %1%
   list_page_jumper_current_page: '[%1%](#00fb9a)'
   list_page_jumper_separator: ' '
   list_page_jumper_group_separator: '…'
+  save_cause_disconnect: 'disconnect'
+  save_cause_world_save: 'world save'
+  save_cause_death: 'death'
+  save_cause_server_shutdown: 'server shutdown'
+  save_cause_inventory_command: 'inventory command'
+  save_cause_enderchest_command: 'enderchest command'
+  save_cause_backup_restore: 'backup restore'
+  save_cause_api: 'API'
+  save_cause_mpdb_migration: 'MPDB migration'
+  save_cause_legacy_migration: 'legacy migration'
+  save_cause_converted_from_v2: 'converted from v2'
   up_to_date: '[HuskSync](#00fb9a bold) [| You are running the latest version of HuskSync (v%1%).](#00fb9a)'
   update_available: '[HuskSync](#ff7e5e bold) [| A new version of HuskSync is available: v%1% (running: v%2%).](#ff7e5e)'
   reload_complete: '[HuskSync](#00fb9a bold) [| Reloaded config and message files.](#00fb9a)\n[⚠ Ensure config files are up-to-date on all servers!](#00fb9a)\n[A restart is needed for config changes to take effect.](#00fb9a italic)'
+  system_status_header: '[HuskSync](#00fb9a bold) [| System status report:](#00fb9a)'
   error_invalid_syntax: '[Error:](#ff3300) [Incorrect syntax. Usage:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Click to suggest suggest_command=%1%)'
   error_invalid_player: '[Error:](#ff3300) [Could not find a player by that name.](#ff7e5e)'
   error_no_permission: '[Error:](#ff3300) [You do not have permission to execute this command](#ff7e5e)'

common/src/main/resources/locales/es-es.yml

@@ -1,3 +1,4 @@
+locales:
   synchronization_complete: '[⏵ ¡Datos sincronizados!](#00fb9a)'
   synchronization_failed: '[⏵ Fallo al sincronizar los datos, por favor, contacte con un administrador.](#ff7e5e)'
   inventory_viewer_menu_title: '&0%1% Inventario de:'
@@ -11,7 +12,7 @@ data_manager_title: '[Viendo una snapshot sobre la informacion del jugador](#00f
   data_manager_timestamp: '[⌚ %1%](#ffc43b-#f5c962 show_text=&7Version del registro:\n&8Cuando los datos se han guardado)'
   data_manager_pinned: '[※ Snapshot anclada](#d8ff2b show_text=&Anclado:\n&8La informacion de este jugador no se rotará automaticamente.)'
   data_manager_cause: '[⚑ %1%](#23a825-#36f539 show_text=&7Motivo del guardado:\n&8Lo que ha causado que se guarde)'
-data_manager_server: '[Ⓢ %1%](#ff87b3-#f5538e show_text=&7Server:\n&8Name of the server the data was saved on)'
+  data_manager_server: '[☁ %1%](#ff87b3-#f5538e show_text=&7Server:\n&8Name of the server the data was saved on)'
   data_manager_size: '[⏏ %1%](color=#62a9f5-#7ab8fa show_text=&7Snapshot size:\n&8Estimated file size of the snapshot (in KiB))\n'
   data_manger_status: '[%1%](red)[/](gray)[%2%](red)[×](gray)[❤](red show_text=&7Puntos de vida)   [%3%](yellow)[×](gray)[🍖](yellow show_text=&7Puntos de hambre)   [ʟᴠ](green)[.](gray)[%4%](green show_text=&7Nivel de exp)   [🏹 %5%](dark_aqua show_text=&7Gamemode)'
   data_manager_advancements_statistics: '[⭐ Logros: %1%](color=#ffc43b-#f5c962 show_text=&7Logros que has conseguido:\n&8%2%)   [⌛ Tiempo de juego: %3%ʜʀs](color=#62a9f5-#7ab8fa show_text=&7In-game play time\n&8⚠ Based on in-game statistics)\n'
@@ -34,9 +35,21 @@ list_page_jumper_button: '[%1%](show_text=&7Jump to page %1% run_command=%2% %1%
   list_page_jumper_current_page: '[%1%](#00fb9a)'
   list_page_jumper_separator: ' '
   list_page_jumper_group_separator: '…'
+  save_cause_disconnect: 'disconnect'
+  save_cause_world_save: 'world save'
+  save_cause_death: 'death'
+  save_cause_server_shutdown: 'server shutdown'
+  save_cause_inventory_command: 'inventory command'
+  save_cause_enderchest_command: 'enderchest command'
+  save_cause_backup_restore: 'backup restore'
+  save_cause_api: 'API'
+  save_cause_mpdb_migration: 'MPDB migration'
+  save_cause_legacy_migration: 'legacy migration'
+  save_cause_converted_from_v2: 'converted from v2'
   up_to_date: '[HuskSync](#00fb9a bold) [| You are running the latest version of HuskSync (v%1%).](#00fb9a)'
   update_available: '[HuskSync](#ff7e5e bold) [| A new version of HuskSync is available: v%1% (running: v%2%).](#ff7e5e)'
   reload_complete: '[HuskSync](#00fb9a bold) [| Recargada la configuración y los archivos de lenguaje.](#00fb9a)\n[⚠ Ensure config files are up-to-date on all servers!](#00fb9a)\n[A restart is needed for config changes to take effect.](#00fb9a italic)'
+  system_status_header: '[HuskSync](#00fb9a bold) [| System status report:](#00fb9a)'
   error_invalid_syntax: '[Error:](#ff3300) [Sintanxis incorrecta. Usa:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Click to suggest suggest_command=%1%)'
   error_invalid_player: '[Error:](#ff3300) [No se ha podido encontrar un jugador con ese nombre.](#ff7e5e)'
   error_no_permission: '[Error:](#ff3300) [No tienes permisos para ejecutar este comando.](#ff7e5e)'

common/src/main/resources/locales/id-id.yml

@@ -0,0 +1,63 @@
+locales:
+  synchronization_complete: '[⏵ Data disinkronkan!](#00fb9a)'
+  synchronization_failed: '[⏵ Gagal menyinkronkan datamu! Mohon hubungi administrator.](#ff7e5e)'
+  inventory_viewer_menu_title: '&0Inventaris milik %1%'
+  ender_chest_viewer_menu_title: '&0Peti Ender milik %1%'
+  inventory_viewer_opened: '[Melihat cuplikan inventaris milik](#00fb9a) [%1%](#00fb9a bold)[pada ⌚ %2%](#00fb9a)'
+  ender_chest_viewer_opened: '[Melihat cuplikan Peti Ender milik](#00fb9a) [%1%](#00fb9a bold)[pada ⌚ %2%](#00fb9a)'
+  data_update_complete: '[🔔 Datamu telah diperbarui!](#00fb9a)'
+  data_update_failed: '[🔔 Gagal memperbarui datamu! Mohon hubungi administrator.](#ff7e5e)'
+  user_registration_complete: '[⭐ Pendaftaran pengguna selesai!](#00fb9a)'
+  data_manager_title: '[Melihat cuplikan data pengguna](#00fb9a) [%1%](#00fb9a show_text=&7Versi UUID:\n&8%2%) [untuk](#00fb9a) [%3%](#00fb9a bold show_text=&7UUID pemain:\n&8%4%)[:](#00fb9a)'
+  data_manager_timestamp: '[⌚ %1%](#ffc43b-#f5c962 show_text=&7Versi stempel waktu:\n&8Ketika data disimpan)'
+  data_manager_pinned: '[※ Cuplikan disematkan](#d8ff2b show_text=&7Disematkan:\n&8Cuplikan data pengguna ini tidak akan diputar secara otomatis.)'
+  data_manager_cause: '[⚑ %1%](#23a825-#36f539 show_text=&7Penyebab penyimpanan:\n&8Apa yang menyebabkan data disimpan)'
+  data_manager_server: '[☁ %1%](#ff87b3-#f5538e show_text=&7Server:\n&8Nama server tempat data disimpan)'
+  data_manager_size: '[⏏ %1%](color=#62a9f5-#7ab8fa show_text=&7Ukuran cuplikan:\n&8Perkiraan ukuran file cuplikan (dalam KiB))\n'
+  data_manger_status: '[%1%](red)[/](gray)[%2%](red)[×](gray)[❤](red show_text=&7Poin kesehatan)   [%3%](yellow)[×](gray)[🍖](yellow show_text=&7Poin kelaparan)   [ʟᴠ](green)[.](gray)[%4%](green show_text=&7Level XP)   [🏹 %5%](dark_aqua show_text=&7Mode game)'
+  data_manager_advancements_statistics: '[⭐ Kemajuan: %1%](color=#ffc43b-#f5c962 show_text=&7Kemajuan yang telah kamu capai:\n&8%2%)   [⌛ Waktu Bermain: %3%ʜʀs](color=#62a9f5-#7ab8fa show_text=&7Waktu bermain dalam game\n&8⚠ Statistik berdasarkan dalam game)\n'
+  data_manager_item_buttons: '[Lihat:](gray) [[🪣 Inventaris…]](color=#a17b5f-#f5b98c show_text=&7Klik untuk lihat run_command=/inventory %1% %2%)   [[⌀ Peti Ender…]](#b649c4-#d254ff show_text=&7Klik untuk lihat run_command=/enderchest %1% %2%)'
+  data_manager_management_buttons: '[Kelola:](gray) [[❌ Hapus…]](#ff3300 show_text=&7Klik untuk menghapus cuplikan data pengguna ini.\n&8Ini tidak akan berdampak pada data pengguna saat ini.\n&#ff3300&⚠ Hal ini tidak dapat dibatalkan! suggest_command=/husksync:userdata delete %1% %2%)   [[⏪ Pulihkan…]](#00fb9a show_text=&7Klik untuk memulihkan data pengguna ini.\n&8Ini akan mengatur data pengguna ke cuplikan ini.\n&#ff3300&⚠ Data %1% saat ini akan ditimpa! suggest_command=/husksync:userdata restore %1% %2%)   [[※ Sematkan/Tidak disematkan…]](#d8ff2b show_text=&7Klik untuk menyematkan atau tidak cuplikan data pengguna ini\n&8Cuplikan yang disematkan tidak akan diputar otomatis run_command=/userdata pin %1% %2%)'
+  data_manager_system_buttons: '[Sistem:](gray) [[⏷ Pembuangan File…]](dark_gray show_text=&7Klik untuk membuang cuplikan data mentah pengguna ini ke sebuah file.\n&8Data yang dibuang dapat ditemukan di ~/plugins/HuskSync/dumps/ run_command=/husksync:userdata dump %1% %2% file)   [[☂ Pembuangan Web…]](dark_gray show_text=&7Klik untuk membuang cuplikan data mentah pengguna ini ke layanan mc-logs\n&8Kamu akan diberikan URL yang berisi data. run_command=/husksync:userdata dump %1% %2% web)'
+  data_manager_advancements_preview_remaining: 'dan %1% lagi…'
+  data_list_title: '[Cuplikan data %1%:](#00fb9a) [(%2%-%3% dari](#00fb9a) [%4%](#00fb9a bold)[)](#00fb9a)\n'
+  data_list_item: '[%1%](gray show_text=&7Cuplikan data pengguna untuk %2%&8⚡ %4% run_command=/userdata view %2% %3%) [%5%](#d8ff2b show_text=&7Disematkan:\n&8Cuplikan yang disematkan tidak akan dirotasi otomatis. run_command=/userdata view %2% %3%) [%6%](color=#ffc43b-#f5c962 show_text=&7Versi stampel waktu:&7\n&8Saat data disimpan\n&8%7% run_command=/userdata view %2% %3%)   [⚑ %8%](#23a825-#36f539 show_text=&7Disimpan karena:\n&8Apa yang menyebabkan data disimpan run_command=/userdata view %2% %3%)   [⏏ %9%](color=#62a9f5-#7ab8fa show_text=&7Ukuran cuplikan:&7\n&8Perkiraan ukuran file cuplikan (dalam KiB) run_command=/userdata view %2% %3%)'
+  data_deleted: '[❌ Berhasil menghapus cuplikan data pengguna](#00fb9a) [%1%](#00fb9a show_text=&7Versi UUID:\n&8%2%) [untuk](#00fb9a) [%3%.](#00fb9a show_text=&7UUID Pemain:\n&8%4%)'
+  data_restored: '[⏪ Berhasil dipulihkan](#00fb9a) [%1%](#00fb9a show_text=&7UUID Pemain:\n&8%2%)[data pengguna saat ini dari cuplikan](#00fb9a) [%3%.](#00fb9a show_text=&7Versi UUID:\n&8%4%)'
+  data_pinned: '[※ Berhasil menyematkan cuplikan data pengguna](#00fb9a) [%1%](#00fb9a show_text=&7Versi UUID:\n&8%2%) [untuk](#00fb9a) [%3%.](#00fb9a show_text=&7UUID Pemain:\n&8%4%)'
+  data_unpinned: '[※ Berhasil melepaskan cuplikan data pengguna yang disematkan](#00fb9a) [%1%](#00fb9a show_text=&7Versi UUID:\n&8%2%) [untuk](#00fb9a) [%3%.](#00fb9a show_text=&7UUID Pemain:\n&8%4%)'
+  data_dumped: '[☂ Berhasil membuang cuplikan data pengguna %1% untuk %2% ke:](#00fb9a) &7%3%'
+  list_footer: '\n%1%[Halaman](#00fb9a) [%2%](#00fb9a)/[%3%](#00fb9a)%4%   %5%'
+  list_previous_page_button: '[◀](white show_text=&7Lihat halaman sebelumnya run_command=%2% %1%) '
+  list_next_page_button: ' [▶](white show_text=&7Lihat halaman selanjutnya run_command=%2% %1%)'
+  list_page_jumpers: '(%1%)'
+  list_page_jumper_button: '[%1%](show_text=&7Loncat ke halaman %1% run_command=%2% %1%)'
+  list_page_jumper_current_page: '[%1%](#00fb9a)'
+  list_page_jumper_separator: ' '
+  list_page_jumper_group_separator: '…'
+  save_cause_disconnect: 'memutuskan sambungan'
+  save_cause_world_save: 'penyimpanan dunia'
+  save_cause_death: 'kematian'
+  save_cause_server_shutdown: 'pematian server'
+  save_cause_inventory_command: 'perintah inventaris'
+  save_cause_enderchest_command: 'perintah enderchest'
+  save_cause_backup_restore: 'pemulihan cadangan'
+  save_cause_api: 'API'
+  save_cause_mpdb_migration: 'migrasi MPDB'
+  save_cause_legacy_migration: 'migrasi peninggalan'
+  save_cause_converted_from_v2: 'dikonversi dari v2'
+  up_to_date: '[HuskSync](#00fb9a bold) [| Kamu menjalankan versi terbaru dari HuskSync (v%1%).](#00fb9a)'
+  update_available: '[HuskSync](#ff7e5e bold) [| Versi baru HuskSync tersedia: v%1% (menjalankan: v%2%).](#ff7e5e)'
+  reload_complete: '[HuskSync](#00fb9a bold) [| Memuat ulang file konfigurasi dan pesan.](#00fb9a)\n[⚠ Pastikan file konfigurasi sudah diperbarui di semua server!](#00fb9a)\n[Diperlukan pengaktifan ulang agar perubahan konfigurasi dapat diterapkan.](#00fb9a italic)'
+  system_status_header: '[HuskSync](#00fb9a bold) [| Laporan status sistem:](#00fb9a)'
+  error_invalid_syntax: '[Kesalahan:](#ff3300) [Sintaks salah. Penggunaan:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Klik untuk menyarankan suggest_command=%1%)'
+  error_invalid_player: '[Kesalahan:](#ff3300) [Tidak dapat menemukan pemain dengan nama tersebut.](#ff7e5e)'
+  error_no_permission: '[Kesalahan:](#ff3300) [Kamu tidak memiliki izin untuk menjalankan perintah ini](#ff7e5e)'
+  error_console_command_only: '[Kesalahan:](#ff3300) [Perintah itu hanya dapat dijalankan melalui konsol](#ff7e5e)'
+  error_in_game_command_only: 'Kesalahan: Perintah itu hanya dapat dijalankan dalam game.'
+  error_no_data_to_display: '[Kesalahan:](#ff3300) [Tidak dapat menemukan data pengguna untuk ditampilkan.](#ff7e5e)'
+  error_invalid_version_uuid: '[Kesalahan:](#ff3300) [Tidak dapat menemukan data pengguna untuk versi UUID itu.](#ff7e5e)'
+  husksync_command_description: 'Mengelola plugin HuskSync'
+  userdata_command_description: 'Lihat, kelola & pulihkan data pengguna pemain'
+  inventory_command_description: 'Lihat & edit inventaris pemain'
+  enderchest_command_description: 'Lihat & edit Ender Chest pemain'

common/src/main/resources/locales/it-it.yml

@@ -1,3 +1,4 @@
+locales:
   synchronization_complete: '[⏵ Dati sincronizzati!](#00fb9a)'
   synchronization_failed: '[⏵ Sincronizzazione fallita! Perfavore contatta un amministratore.](#ff7e5e)'
   inventory_viewer_menu_title: '&0Inventario di %1%'
@@ -11,7 +12,7 @@ data_manager_title: '[Stai vedendo l''istantanea](#00fb9a) [%1%](#00fb9a show_te
   data_manager_timestamp: '[⌚ %1%](#ffc43b-#f5c962 show_text=&7:\n&8Quando i dati sono stati salvati)'
   data_manager_pinned: '[※ Istantanea fissata](#d8ff2b show_text=&7Pinned:\n&8Quest''istantanea non sarà cancellata automaticamente.)'
   data_manager_cause: '[⚑ %1%](#23a825-#36f539 show_text=&7Causa di salvataggio:\n&8Cosa ha causato il salvataggio dei dati)'
-data_manager_server: '[Ⓢ %1%](#ff87b3-#f5538e show_text=&7Server:\n&8Name of the server the data was saved on)'
+  data_manager_server: '[☁ %1%](#ff87b3-#f5538e show_text=&7Server:\n&8Name of the server the data was saved on)'
   data_manager_size: '[⏏ %1%](color=#62a9f5-#7ab8fa show_text=&7Peso dell''istantanea:\n&8Peso stimato del file (in KiB))\n'
   data_manger_status: '[%1%](red)[/](gray)[%2%](red)[×](gray)[❤](red show_text=&7Vita)   [%3%](yellow)[×](gray)[🍖](yellow show_text=&7Fame)   [ʟᴠ](green)[.](gray)[%4%](green show_text=&7Livello di XP)   [🏹 %5%](dark_aqua show_text=&7Modalità di gioco)'
   data_manager_advancements_statistics: '[⭐ Progressi: %1%](color=#ffc43b-#f5c962 show_text=&7Progressi compiuti in:\n&8%2%)   [⌛ Tempo di gioco: %3%ʜʀs](color=#62a9f5-#7ab8fa show_text=&7Tempo di gioco\n&8⚠ Basato sulle statistiche di gioco)\n'
@@ -34,9 +35,21 @@ list_page_jumper_button: '[%1%](show_text=&7Vai alla pagina %1% run_command=%2%
   list_page_jumper_current_page: '[%1%](#00fb9a)'
   list_page_jumper_separator: ' '
   list_page_jumper_group_separator: '…'
+  save_cause_disconnect: 'disconnect'
+  save_cause_world_save: 'world save'
+  save_cause_death: 'death'
+  save_cause_server_shutdown: 'server shutdown'
+  save_cause_inventory_command: 'inventory command'
+  save_cause_enderchest_command: 'enderchest command'
+  save_cause_backup_restore: 'backup restore'
+  save_cause_api: 'API'
+  save_cause_mpdb_migration: 'MPDB migration'
+  save_cause_legacy_migration: 'legacy migration'
+  save_cause_converted_from_v2: 'converted from v2'
   up_to_date: '[HuskSync](#00fb9a bold) [| Il plugin è all''ultima versione disponibile (v%1%).](#00fb9a)'
   update_available: '[HuskSync](#ff7e5e bold) [| Disponibile una nuova versione: v%1% (running: v%2%).](#ff7e5e)'
   reload_complete: '[HuskSync](#00fb9a bold) [| Configurazione e messaggi ricaricati.](#00fb9a)\n[⚠ Ensure config files are up-to-date on all servers!](#00fb9a)\n[A restart is needed for config changes to take effect.](#00fb9a italic)'
+  system_status_header: '[HuskSync](#00fb9a bold) [| System status report:](#00fb9a)'
   error_invalid_syntax: '[Errore:](#ff3300) [Sintassi errata. Usa:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Click to suggest suggest_command=%1%)'
   error_invalid_player: '[Errore:](#ff3300) [Impossibile trovare un giocatore con questo nome.](#ff7e5e)'
   error_no_permission: '[Errore:](#ff3300) [Non hai il permesso di usare questo comando](#ff7e5e)'

common/src/main/resources/locales/ja-jp.yml

@@ -1,3 +1,4 @@
+locales:
   synchronization_complete: '[⏵データが同期されました！](#00fb9a)'
   synchronization_failed: '[⏵ データの同期に失敗しました！管理者に連絡してください。](#ff7e5e)'
   inventory_viewer_menu_title: '&0%1%のインベントリ'
@@ -11,7 +12,7 @@ data_manager_title: '[%3%](#00fb9a bold show_text=&7プレイヤーUUID:\n&8%4%)
   data_manager_timestamp: '[⌚ %1%](#ffc43b-#f5c962 show_text=&7バージョンタイムスタンプ:\n&8データの保存時期)'
   data_manager_pinned: '[※ ピン留めされたスナップショット](#d8ff2b show_text=&7ピン留め:\n&8このユーザーデータのスナップショットは自動的にローテーションされません。)'
   data_manager_cause: '[⚑ %1%](#23a825-#36f539 show_text=&7保存理由:\n&8データが保存された理由)'
-data_manager_server: '[Ⓢ %1%](#ff87b3-#f5538e show_text=&7Server:\n&8Name of the server the data was saved on)'
+  data_manager_server: '[☁ %1%](#ff87b3-#f5538e show_text=&7Server:\n&8Name of the server the data was saved on)'
   data_manager_size: '[⏏ %1%](color=#62a9f5-#7ab8fa show_text=&7スナップショットサイズ:\n&8スナップショットの推定ファイルサイズ（単位:KiB）)\n'
   data_manger_status: '[%1%](red)[/](gray)[%2%](red)[×](gray)[❤](red show_text=&7体力)   [%3%](yellow)[×](gray)[🍖](yellow show_text=&7空腹度)   [ʟᴠ](green)[.](gray)[%4%](green show_text=&7経験値レベル)   [🏹 %5%](dark_aqua show_text=&7ゲームモード)'
   data_manager_advancements_statistics: '[⭐ 進捗: %1%](color=#ffc43b-#f5c962 show_text=&7達成した進捗:\n&8%2%)   [⌛ プレイ時間: %3%ʜʀs](color=#62a9f5-#7ab8fa show_text=&7ゲーム内のプレイ時間\n&8⚠ ゲーム内の統計に基づく)\n'
@@ -34,9 +35,21 @@ list_page_jumper_button: '[%1%](show_text=&7%1% ページ目へ run_command=%2%
   list_page_jumper_current_page: '[%1%](#00fb9a)'
   list_page_jumper_separator: ' '
   list_page_jumper_group_separator: '…'
+  save_cause_disconnect: 'disconnect'
+  save_cause_world_save: 'world save'
+  save_cause_death: 'death'
+  save_cause_server_shutdown: 'server shutdown'
+  save_cause_inventory_command: 'inventory command'
+  save_cause_enderchest_command: 'enderchest command'
+  save_cause_backup_restore: 'backup restore'
+  save_cause_api: 'API'
+  save_cause_mpdb_migration: 'MPDB migration'
+  save_cause_legacy_migration: 'legacy migration'
+  save_cause_converted_from_v2: 'converted from v2'
   up_to_date: '[HuskSync](#00fb9a bold) [| HuskSyncの最新バージョンを実行しています(v%1%).](#00fb9a)'
   update_available: '[HuskSync](#ff7e5e bold) [| HuskSyncの最新バージョンが更新されています: v%1% (実行中: v%2%).](#ff7e5e)'
   reload_complete: '[HuskSync](#00fb9a bold) [| 設定ファイルとメッセージファイルを再読み込みしました。](#00fb9a)\n[⚠ すべてのサーバーで設定ファイルが最新であることを確認してください！](#00fb9a)\n[設定の変更を有効にするには再起動が必要です。](#00fb9a italic)'
+  system_status_header: '[HuskSync](#00fb9a bold) [| System status report:](#00fb9a)'
   error_invalid_syntax: '[Error:](#ff3300) [構文が正しくありません。使用法:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&クリックでサジェスト suggest_command=%1%)'
   error_invalid_player: '[Error:](#ff3300) [そのプレイヤーは見つかりませんでした](#ff7e5e)'
   error_no_permission: '[Error:](#ff3300) [このコマンドを実行する権限がありません](#ff7e5e)'

common/src/main/resources/locales/ko-kr.yml

@@ -0,0 +1,63 @@
+locales:
+  synchronization_complete: '[⏵ 데이터 연동됨!](#00fb9a)'
+  synchronization_failed: '[⏵ 데이터 연동에 실패하였습니다! 관리자에게 문의해 주세요.](#ff7e5e)'
+  inventory_viewer_menu_title: '&0%1%님의 인벤토리'
+  ender_chest_viewer_menu_title: '&0%1%님의 엔더상자'
+  inventory_viewer_opened: '[%1%](#00fb9a bold)[님의 ⌚ %2%의 인벤토리를 엽니다](#00fb9a)'
+  ender_chest_viewer_opened: '[%1%](#00fb9a bold)[님의 ⌚ %2%의 엔더상자를 엽니다](#00fb9a)'
+  data_update_complete: '[🔔 당신의 데이터가 업데이트 되었습니다!](#00fb9a)'
+  data_update_failed: '[🔔 데이터 업데이트에 실패하였습니다! 관리자에게 문의해 주세요.](#ff7e5e)'
+  user_registration_complete: '[⭐ 유저 등록이 완료되었습니다!](#00fb9a)'
+  data_manager_title: '[%3%](#00fb9a bold show_text=&7플레이어 UUID:\n&8%4%)[님의 ](#00fb9a) [%1%](#00fb9a show_text=&7버전 UUID:\n&8%2%) [데이터 스냅샷을 표시합니다](#00fb9a)[:](#00fb9a)'
+  data_manager_timestamp: '[⌚ %1%](#ffc43b-#f5c962 show_text=&7저장 시각:\n&8데이터가 저장된 시각)'
+  data_manager_pinned: '[※ 스냅샷 고정됨](#d8ff2b show_text=&7고정됨:\n&8이 유저의 데이터 스냅샷은 자동으로 갱신되지 않습니다.)'
+  data_manager_cause: '[⚑ %1%](#23a825-#36f539 show_text=&7저장 사유:\n&8데이터가 저장된 사유입니다.)'
+  data_manager_server: '[☁ %1%](#ff87b3-#f5538e show_text=&7서버:\n&8데이터 저장이 이루어진 서버입니다.)'
+  data_manager_size: '[⏏ %1%](color=#62a9f5-#7ab8fa show_text=&7스냅샷 크기:\n&8스냅샷 파일의 대략적인 크기입니다. (단위 KiB))\n'
+  data_manger_status: '[%1%](red)[/](gray)[%2%](red)[×](gray)[❤](red show_text=&7체력)   [%3%](yellow)[×](gray)[🍖](yellow show_text=&7허기)   [ʟᴠ](green)[.](gray)[%4%](green show_text=&7경험치 레벨)   [🏹 %5%](dark_aqua show_text=&7게임 모드)'
+  data_manager_advancements_statistics: '[⭐ 도전 과제: %1%](color=#ffc43b-#f5c962 show_text=&7진행한 도전 과제:\n&8%2%)   [⌛ 플레이 타임: %3%ʜʀs](color=#62a9f5-#7ab8fa show_text=&7인게임 플레이 시간\n&8⚠ 인게임 통계에 기반합니다.)\n'
+  data_manager_item_buttons: '[보기:](gray) [[🪣 인벤토리…]](color=#a17b5f-#f5b98c show_text=&7클릭하여 확인 run_command=/inventory %1% %2%)   [[⌀ 엔더상자…]](#b649c4-#d254ff show_text=&7클릭하여 확인 run_command=/enderchest %1% %2%)'
+  data_manager_management_buttons: '[관리:](gray) [[❌ 삭제…]](#ff3300 show_text=&7클릭하여 이 유저 스냅샷 데이터를 삭제\n&8이 기능은 현재 유저의 인벤토리 데이터에는 영향을 미치지 않습니다.\n&#ff3300&⚠ 이 작업은 되돌릴 수 없습니다! suggest_command=/husksync:userdata delete %1% %2%)   [[⏪ 복구…]](#00fb9a show_text=&7클릭하여 유저 데이터 복구\n&8유저의 데이터가 이 스냅샷의 데이터로 변경됩니다.\n&#ff3300&⚠ %1%님의 현재 데이터에 덧씌워 집니다! suggest_command=/husksync:userdata restore %1% %2%)   [[※ 고정/고정 해제…]](#d8ff2b show_text=&7클릭하여 유저 데이터를 고정 또는 고정 해제\n&8고정된 스냅샷은 자동적으로 갱신되지 않습니다. run_command=/userdata pin %1% %2%)'
+  data_manager_system_buttons: '[시스템:](gray) [[⏷ 파일 덤프…]](dark_gray show_text=&7클릭하여 이 유저 데이터 스냅샷을 덤프하기\n&8데이터 덤프 파일은 ~/plugins/HuskSync/dumps/ 에서 찾을 수 있습니다. run_command=/husksync:userdata dump %1% %2% file)   [[☂ 웹 덤프…]](dark_gray show_text=&7클릭하여 유저 데이터 스냅샷을 mc-log 서비스에 덤프하기\n&8데이터를 포함한 URL이 제공됩니다. run_command=/husksync:userdata dump %1% %2% web)'
+  data_manager_advancements_preview_remaining: '외 %1%개...'
+  data_list_title: '[%1%님의 유저 데이터 스냅샷 목록:](#00fb9a) [(%2%-%3% 중](#00fb9a) [%4%](#00fb9a bold)[)](#00fb9a)\n'
+  data_list_item: '[%1%](gray show_text=&7%2%&7님의 유저 데이터 스냅샷&8⚡ %4% run_command=/userdata view %2% %3%) [%5%](#d8ff2b show_text=&7고정됨:\n&8고정된 스냅샷은 자동적으로 갱신되지 않습니다. run_command=/userdata view %2% %3%) [%6%](color=#ffc43b-#f5c962 show_text=&7저장 시각:&7\n&8데이터가 저장된 시각입니다.\n&8%7% run_command=/userdata view %2% %3%)   [⚑ %8%](#23a825-#36f539 show_text=&7저장 사유:\n&8데이터가 저장된 사유입니다. run_command=/userdata view %2% %3%)   [⏏ %9%](color=#62a9f5-#7ab8fa show_text=&7스냅샷 크기:&7\n&8스냅샷 파일의 대략적인 크기입니다. (단위 KiB) run_command=/userdata view %2% %3%)'
+  data_deleted: '[❌ 성공적으로](#00fb9a) [%3%](#00fb9a show_text=&7플레이어 UUID:\n&8%4%) [님의 유저 데이터 스냅샷](#00fb9a) [%1%](#00fb9a show_text=&7버전 UUID:\n&8%2%)[을 삭제하였습니다.](#00fb9a)'
+  data_restored: '[⏪ 성공적으로 복구되었습니다.](#00fb9a) [%1%](#00fb9a show_text=&7플레이어 UUID:\n&8%2%)[님의 현재 유저 데이터 스냅샷이](#00fb9a) [%3%](#00fb9a show_text=&7버전 UUID:\n&8%4%)[으로 변경되었습니다.](#00fb9a)'
+  data_pinned: '[※ 성공적으로](#00fb9a) [%3%](#00fb9a show_text=&7플레이어 UUID:\n&8%4%)[님의 유저 데이터 스냅샷](#00fb9a) [%1%](#00fb9a show_text=&7버전 UUID:\n&8%2%)[을 고정하였습니다.](#00fb9a)'
+  data_unpinned: '[※ 성공적으로](#00fb9a) [%3%](#00fb9a show_text=&7플레이어 UUID:\n&8%4%) [님의 유저 데이터 스냅샷](#00fb9a) [%1%](#00fb9a show_text=&7버전 UUID:\n&8%2%)[을 고정 해제하였습니다.](#00fb9a)'
+  data_dumped: '[☂ 성공적으로 %2%님의 유저 데이터 스냅샷 %1%를 다음으로 덤프하였습니다:](#00fb9a) &7%3%'
+  list_footer: '\n%1%[페이지](#00fb9a) [%2%](#00fb9a)/[%3%](#00fb9a)%4%   %5%'
+  list_previous_page_button: '[◀](white show_text=&7이전 페이지 보기 run_command=%2% %1%) '
+  list_next_page_button: ' [▶](white show_text=&7다음 페이지 보기 run_command=%2% %1%)'
+  list_page_jumpers: '(%1%)'
+  list_page_jumper_button: '[%1%](show_text=&7%1% 페이지 보기 run_command=%2% %1%)'
+  list_page_jumper_current_page: '[%1%](#00fb9a)'
+  list_page_jumper_separator: ' '
+  list_page_jumper_group_separator: '…'
+  save_cause_disconnect: 'disconnect'
+  save_cause_world_save: 'world save'
+  save_cause_death: 'death'
+  save_cause_server_shutdown: 'server shutdown'
+  save_cause_inventory_command: 'inventory command'
+  save_cause_enderchest_command: 'enderchest command'
+  save_cause_backup_restore: 'backup restore'
+  save_cause_api: 'API'
+  save_cause_mpdb_migration: 'MPDB migration'
+  save_cause_legacy_migration: 'legacy migration'
+  save_cause_converted_from_v2: 'converted from v2'
+  up_to_date: '[HuskSync](#00fb9a bold) [| 가장 최신 버전의 HuskSync를 실행 중입니다 (v%1%).](#00fb9a)'
+  update_available: '[HuskSync](#ff7e5e bold) [| 새로운 버전의 HuskSync가 존재합니다: v%1% (현재 버전: v%2%).](#ff7e5e)'
+  reload_complete: '[HuskSync](#00fb9a bold) [| 콘피그와 메시지 파일을 다시 불러왔습니다.](#00fb9a)\n[⚠ 모든 서버의 컨피그 파일을 변경하였는지 확인하세요!](#00fb9a)\n[몇몇 설정은 재시작 후에 적용됩니다.](#00fb9a italic)'
+  system_status_header: '[HuskSync](#00fb9a bold) [| System status report:](#00fb9a)'
+  error_invalid_syntax: '[오류:](#ff3300) [잘못된 사용법. 사용법:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&클릭하여 입력할 수 있습니다. suggest_command=%1%)'
+  error_invalid_player: '[오류:](#ff3300) [해당 이름의 사용자를 찾을 수 없습니다.](#ff7e5e)'
+  error_no_permission: '[오류:](#ff3300) [해당 명령어를 사용할 권한이 없습니다.](#ff7e5e)'
+  error_console_command_only: '[오류:](#ff3300) [해당 명령어는 콘솔을 통해서만 사용할 수 있습니다.](#ff7e5e)'
+  error_in_game_command_only: '오류: 해당 명령어는 게임 내부에서만 사용할 수 있습니다.'
+  error_no_data_to_display: '[오류:](#ff3300) [표시할 유저 데이터를 찾을 수 없습니다.](#ff7e5e)'
+  error_invalid_version_uuid: '[오류:](#ff3300) [해당 버전 UUID의 유저 데이터 스냅샷을 찾을 수 없습니다.](#ff7e5e)'
+  husksync_command_description: 'HuskSync 플러그인을 관리합니다.'
+  userdata_command_description: '확인, 관리 또는 복구합니다.'
+  inventory_command_description: '플레이어의 인벤토리를 열람 또는 편집합니다.'
+  enderchest_command_description: '플레이어의 엔더상자를 열람 또는 편집합니다.'

common/src/main/resources/locales/nl-nl.yml

@@ -1,3 +1,4 @@
+locales:
   synchronization_complete: '[⏵ Data gesynchroniseerd!](#00fb9a)'
   synchronization_failed: '[⏵ Synchroniseren van jouw gegevens is niet gelukt! Neem contact op met een beheerder.](#ff7e5e)'
   inventory_viewer_menu_title: '&0%1%''s Inventaris'
@@ -11,7 +12,7 @@ data_manager_title: '[Momentopname van gebruikersgegevens bekijken](#00fb9a) [%1
   data_manager_timestamp: '[⌚ %1%](#ffc43b-#f5c962 show_text=&7Versie tijdmarkering:\n&8Toen de gegevens werden opgeslagen)'
   data_manager_pinned: '[※ Momentopname vastgezet](#d8ff2b show_text=&7Vastgezet:\n&8Deze momentopname van gebruikersgegevens wordt niet automatisch gerouleerd.)'
   data_manager_cause: '[⚑ %1%](#23a825-#36f539 show_text=&7Reden opslaan:\n&8Waarom de data is opgeslagen)'
-data_manager_server: '[Ⓢ %1%](#ff87b3-#f5538e show_text=&7Server:\n&8Name of the server the data was saved on)'
+  data_manager_server: '[☁ %1%](#ff87b3-#f5538e show_text=&7Server:\n&8Name of the server the data was saved on)'
   data_manager_size: '[⏏ %1%](color=#62a9f5-#7ab8fa show_text=&7Grootte van momentopname:\n&8Geschatte bestandsgrootte van de momentopname (in KiB))\n'
   data_manger_status: '[%1%](red)[/](gray)[%2%](red)[×](gray)[❤](red show_text=&7Gezondheids punten)   [%3%](yellow)[×](gray)[🍖](yellow show_text=&7Honger punten)   [ʟᴠ](green)[.](gray)[%4%](green show_text=&7XP level)   [🏹 %5%](dark_aqua show_text=&7Speltype)'
   data_manager_advancements_statistics: '[⭐ Advancements: %1%](color=#ffc43b-#f5c962 show_text=&7Advancements waarin je voortgang hebt:\n&8%2%)   [⌛ Speeltijd: %3%uren](color=#62a9f5-#7ab8fa show_text=&7In-game speeltijd\n&8⚠ Gebaseerd op in-game statistieken)\n'
@@ -34,9 +35,21 @@ list_page_jumper_button: '[%1%](show_text=&7Ga naar pagina %1% run_command=%2% %
   list_page_jumper_current_page: '[%1%](#00fb9a)'
   list_page_jumper_separator: ' '
   list_page_jumper_group_separator: '…'
+  save_cause_disconnect: 'disconnect'
+  save_cause_world_save: 'world save'
+  save_cause_death: 'death'
+  save_cause_server_shutdown: 'server shutdown'
+  save_cause_inventory_command: 'inventory command'
+  save_cause_enderchest_command: 'enderchest command'
+  save_cause_backup_restore: 'backup restore'
+  save_cause_api: 'API'
+  save_cause_mpdb_migration: 'MPDB migration'
+  save_cause_legacy_migration: 'legacy migration'
+  save_cause_converted_from_v2: 'converted from v2'
   up_to_date: '[HuskSync](#00fb9a bold) [| Je gebruikt de nieuwste versie van HuskSync (v%1%).](#00fb9a)'
   update_available: '[HuskSync](#ff7e5e bold) [| Er is een nieuwe versie van HuskSync beschikbaar: v%1% (huidige versie: v%2%).](#ff7e5e)'
   reload_complete: '[HuskSync](#00fb9a bold) [| Configuratie- en berichtbestanden opnieuw geladen.](#00fb9a)\n[⚠ Controleer of de configuratiebestanden up-to-date zijn op alle servers!](#00fb9a)\n[Een herstart is nodig voor de configuratiewijzigingen van kracht te laten worden.](#00fb9a italic)'
+  system_status_header: '[HuskSync](#00fb9a bold) [| System status report:](#00fb9a)'
   error_invalid_syntax: '[Error:](#ff3300) [Onjuiste syntaxis. Gebruik:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Click to suggest suggest_command=%1%)'
   error_invalid_player: '[Error:](#ff3300) [Kan geen speler met die naam vinden.](#ff7e5e)'
   error_no_permission: '[Error:](#ff3300) [Je hebt geen toestemming om deze opdracht uit te voeren](#ff7e5e)'

common/src/main/resources/locales/pt-br.yml

@@ -1,3 +1,4 @@
+locales:
   synchronization_complete: '[⏵ Dados sincronizados!](#00fb9a)'
   synchronization_failed: '[⏵ Falha na sincronização de seus dados! Por favor entre em contato com um administrador.](#ff7e5e)'
   inventory_viewer_menu_title: '&0%1%''s Inventory'
@@ -11,7 +12,7 @@ data_manager_title: '[Visualizando snapshot dos dados do usuário](#00fb9a) [%1%
   data_manager_timestamp: '[⌚ %1%](#ffc43b-#f5c962 show_text=&7Version timestamp:\n&8Quando os dados foram salvos)'
   data_manager_pinned: '[※ Snapshot marcada](#d8ff2b show_text=&7Marcada:\n&8Essa snapshot de dados do usuário não será girada automaticamente.)'
   data_manager_cause: '[⚑ %1%](#23a825-#36f539 show_text=&7Causa do salvamento:\n&8O motivo para que os dados fossem salvos)'
-data_manager_server: '[Ⓢ %1%](#ff87b3-#f5538e show_text=&7Server:\n&8Name of the server the data was saved on)'
+  data_manager_server: '[☁ %1%](#ff87b3-#f5538e show_text=&7Server:\n&8Name of the server the data was saved on)'
   data_manager_size: '[⏏ %1%](color=#62a9f5-#7ab8fa show_text=&7Snapshot size:\n&8Estimated file size of the snapshot (in KiB))\n'
   data_manger_status: '[%1%](red)[/](gray)[%2%](red)[×](gray)[❤](red show_text=&7Pontos de Vida)   [%3%](yellow)[×](gray)[🍖](yellow show_text=&7Pontos de vida)   [ʟᴠ](green)[.](gray)[%4%](green show_text=&7XP level)   [🏹 %5%](dark_aqua show_text=&7Game mode)'
   data_manager_advancements_statistics: '[⭐ Progressos: %1%](color=#ffc43b-#f5c962 show_text=&7Progressos que você tem realizado em:\n&8%2%)   [⌛ Tempo de jogo: %3%ʜʀs](color=#62a9f5-#7ab8fa show_text=&7Tempo de jogo dentro do jogo\n&8⚠ Com base em estatísticas dentro do jogo)\n'
@@ -34,9 +35,21 @@ list_page_jumper_button: '[%1%](show_text=&7Jump to page %1% run_command=%2% %1%
   list_page_jumper_current_page: '[%1%](#00fb9a)'
   list_page_jumper_separator: ' '
   list_page_jumper_group_separator: '…'
+  save_cause_disconnect: 'disconnect'
+  save_cause_world_save: 'world save'
+  save_cause_death: 'death'
+  save_cause_server_shutdown: 'server shutdown'
+  save_cause_inventory_command: 'inventory command'
+  save_cause_enderchest_command: 'enderchest command'
+  save_cause_backup_restore: 'backup restore'
+  save_cause_api: 'API'
+  save_cause_mpdb_migration: 'MPDB migration'
+  save_cause_legacy_migration: 'legacy migration'
+  save_cause_converted_from_v2: 'converted from v2'
   up_to_date: '[HuskSync](#00fb9a bold) [| You are running the latest version of HuskSync (v%1%).](#00fb9a)'
   update_available: '[HuskSync](#ff7e5e bold) [| A new version of HuskSync is available: v%1% (running: v%2%).](#ff7e5e)'
   reload_complete: '[HuskSync](#00fb9a bold) [| Arquivos de configuração e mensagens recarregados.](#00fb9a)\n[⚠ Ensure config files are up-to-date on all servers!](#00fb9a)\n[A restart is needed for config changes to take effect.](#00fb9a italic)'
+  system_status_header: '[HuskSync](#00fb9a bold) [| System status report:](#00fb9a)'
   error_invalid_syntax: '[Error:](#ff3300) [Sintaxe incorreta. Utilize:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Click to suggest suggest_command=%1%)'
   error_invalid_player: '[Error:](#ff3300) [Não foi possível encontrar um jogador com esse nome.](#ff7e5e)'
   error_no_permission: '[Error:](#ff3300) [Você não tem permissão para executar este comando](#ff7e5e)'

common/src/main/resources/locales/ru-ru.yml

@@ -0,0 +1,63 @@
+locales:
+  synchronization_complete: '[⏵ Данные синхронизированы!](#00fb9a)'
+  synchronization_failed: '[⏵ Не удалось синхронизировать данные! Пожалуйста, обратитесь к администратору.](#ff7e5e)'
+  inventory_viewer_menu_title: '&0Инвентарь %1%'
+  ender_chest_viewer_menu_title: '&0Эндер-сундук %1%'
+  inventory_viewer_opened: '[Просмотр снимка инвентаря](#00fb9a) [%1%](#00fb9a bold) [во время ⌚ %2%](#00fb9a)'
+  ender_chest_viewer_opened: '[Просмотр снимка эндер-сундука](#00fb9a) [%1%](#00fb9a bold) [во время ⌚ %2%](#00fb9a)'
+  data_update_complete: '[🔔 Ваши данные обновлены!](#00fb9a)'
+  data_update_failed: '[🔔 Не удалось обновить ваши данные! Пожалуйста, обратитесь к администратору.](#ff7e5e)'
+  user_registration_complete: '[⭐ Регистрация пользователя завершена!](#00fb9a)'
+  data_manager_title: '[Просмотр снимка данных](#00fb9a) [%1%](#00fb9a show_text=&7UUID снимка:\n&8%2%) [пользователя](#00fb9a) [%3%](#00fb9a bold show_text=&7UUID игрока:\n&8%4%)[:](#00fb9a)'
+  data_manager_timestamp: '[⌚ %1%](#ffc43b-#f5c962 show_text=&7Время:\n&8Когда данные были сохранены)'
+  data_manager_pinned: '[※ Снимок закреплен](#d8ff2b show_text=&7Закреплен:\n&8Этот снимок данных пользователя не будет автоматически применено.)'
+  data_manager_cause: '[⚑ %1%](#23a825-#36f539 show_text=&7Причина сохранения:\n&8Что привело к сохранению данных)'
+  data_manager_server: '[☁ %1%](#ff87b3-#f5538e show_text=&7Сервер:\n&8Название сервера где данные были сохранены)'
+  data_manager_size: '[⏏ %1%](color=#62a9f5-#7ab8fa show_text=&7Размер:\n&8Предполагаемый размер снимка (в килобайтах))\n'
+  data_manger_status: '[%1%](red)[/](gray)[%2%](red)[×](gray)[❤](red show_text=&7Здоровье)   [%3%](yellow)[×](gray)[🍖](yellow show_text=&7Голод)   [ʟᴠ](green)[.](gray)[%4%](green show_text=&7Уровень опыта)   [🏹 %5%](dark_aqua show_text=&7Игровой режим)'
+  data_manager_advancements_statistics: '[⭐ Достижения: %1%](color=#ffc43b-#f5c962 show_text=&7Полученные вами достижения:\n&8%2%)   [⌛ Отыгранное время: %3%ʜʀs](color=#62a9f5-#7ab8fa show_text=&7Сколько времени вы отыграли\n&8⚠ Строится по внутреигровой статистике)\n'
+  data_manager_item_buttons: '[Просмотр:](gray) [[🪣 Инвентарь…]](color=#a17b5f-#f5b98c show_text=&7Нажмите для просмотра run_command=/inventory %1% %2%)   [[⌀ Эндер-сундук…]](#b649c4-#d254ff show_text=&7Нажмите для просмотра run_command=/enderchest %1% %2%)'
+  data_manager_management_buttons: '[Управление:](gray) [[❌ Удалить…]](#ff3300 show_text=&7Нажмите для удаления этого снимка данных пользователя\n&8Не влияет на текущие данные пользователя.\n&#ff3300&⚠ Необратимое действие! suggest_command=/husksync:userdata delete %1% %2%)   [[⏪ Восстановить…]](#00fb9a show_text=&7Нажмите для восстановления данных пользователя\n&8Это восстановит данные пользователя до этого снимка.\n&#ff3300&⚠ Текущие данные %1% будут перезаписаны! suggest_command=/husksync:userdata restore %1% %2%)   [[※ Закрепить/Открепить…]](#d8ff2b show_text=&7Нажмите для закрепления или открепления снимка данных пользователя\n&8Закрепленные снимки данных не удаляются автоматически. run_command=/userdata pin %1% %2%)'
+  data_manager_system_buttons: '[Система:](gray) [[⏷ Дамп в файл…]](dark_gray show_text=&7Нажмите для дампа исходного снимка данных пользователя в файл\n&8Файлы дампов данных находятся в ~/plugins/HuskSync/dumps/ run_command=/husksync:userdata dump %1% %2% file)   [[☂ Выгрузить дамп…]](dark_gray show_text=&7Нажмите для дампа исходного снимка данных пользователя с помощью сервиса mc-logs\n&8Вы получите ссылку с дампом данных. run_command=/husksync:userdata dump %1% %2% web)'
+  data_manager_advancements_preview_remaining: 'и еще %1%…'
+  data_list_title: '[Снимки данных %1%:](#00fb9a) [(%2%-%3% из](#00fb9a) [%4%](#00fb9a bold)[)](#00fb9a)\n'
+  data_list_item: '[%1%](gray show_text=&7Снимок данных %4% пользователя %2%&8⚡ run_command=/userdata view %2% %3%) [%5%](#d8ff2b show_text=&7Закреплен:\n&8Закрепленные снимки данных не удаляются автоматически run_command=/userdata view %2% %3%) [%6%](color=#ffc43b-#f5c962 show_text=&7Время:&7\n&8Когда данные были сохранены\n&8%7% run_command=/userdata view %2% %3%)   [⚑ %8%](#23a825-#36f539 show_text=&7Причина сохранения:\n&8Что привело к сохранению данных run_command=/userdata view %2% %3%)   [⏏ %9%](color=#62a9f5-#7ab8fa show_text=&7Размер:&7\n&8Предполагаемый размер снимка (в килобайтах) run_command=/userdata view %2% %3%)'
+  data_deleted: '[❌ Снимок данных](#00fb9a) [%1%](#00fb9a show_text=&7UUID снимка:\n&8%2%) [пользователя](#00fb9a) [%3%](#00fb9a show_text=&7UUID игрока:\n&8%4%) [удален.](#00fb9a)'
+  data_restored: '[⏪ Данные пользователя](#00fb9a) [%1%](#00fb9a show_text=&7UUID игрока:\n&8%2%) [из снимка](#00fb9a) [%3%](#00fb9a show_text=&7UUID снимка:\n&8%4%) [успешно восстановлены.](#00fb9a)'
+  data_pinned: '[※ Снимок данных](#00fb9a) [%1%](#00fb9a show_text=&7UUID снимка:\n&8%2%) [пользователя](#00fb9a) [%3%](#00fb9a show_text=&7UUID игрока:\n&8%4%) [успешно закреплен.](#00fb9a)'
+  data_unpinned: '[※ Снимок данных](#00fb9a) [%1%](#00fb9a show_text=&7UUID снимка:\n&8%2%) [пользователя](#00fb9a) [%3%](#00fb9a show_text=&7UUID пользователя:\n&8%4%) [успешно откреплен.](#00fb9a)'
+  data_dumped: '[☂ Дамп снимка данных %1% пользователя %2% успешно выгружен:](#00fb9a) &7%3%'
+  list_footer: '\n%1%[Страница](#00fb9a) [%2%](#00fb9a)/[%3%](#00fb9a)%4%   %5%\n'
+  list_previous_page_button: '[◀](white show_text=&7Просмотр предыдущей страницы run_command=%2% %1%) '
+  list_next_page_button: ' [▶](white show_text=&7Просмотр следующей страницы run_command=%2% %1%)'
+  list_page_jumpers: '(%1%)'
+  list_page_jumper_button: '[%1%](show_text=&7Перейти на страницу %1% run_command=%2% %1%)'
+  list_page_jumper_current_page: '[%1%](#00fb9a)'
+  list_page_jumper_separator: ' '
+  list_page_jumper_group_separator: '…'
+  save_cause_disconnect: 'отключение с сервера'
+  save_cause_world_save: 'сохранение мира'
+  save_cause_death: 'смерть'
+  save_cause_server_shutdown: 'отключение сервера'
+  save_cause_inventory_command: 'команда inventory'
+  save_cause_enderchest_command: 'команда enderchest'
+  save_cause_backup_restore: 'восстановление из снимка'
+  save_cause_api: 'API'
+  save_cause_mpdb_migration: 'миграция из MPDB'
+  save_cause_legacy_migration: 'миграция с legacy'
+  save_cause_converted_from_v2: 'конвертация с v2'
+  up_to_date: '[HuskSync](#00fb9a bold) [| Вы используете последнюю версию HuskSync (v%1%).](#00fb9a)'
+  update_available: '[HuskSync](#ff7e5e bold) [| Доступна новая версия HuskSync: v%1% (текущая: v%2%).](#ff7e5e)'
+  reload_complete: '[HuskSync](#00fb9a bold) [| Конфигурация и файлы локализации перезагружены.](#00fb9a)\n[⚠ Убедитесь, что файлы конфигурации обновлены на всех серверах!](#00fb9a)\n[Необходима перезагрузка для вступления изменений конфигурации в силу.](#00fb9a italic)'
+  system_status_header: '[HuskSync](#00fb9a bold) [| System status report:](#00fb9a)'
+  error_invalid_syntax: '[Ошибка:](#ff3300) [Неправильный синтаксис. Используйте:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Click to suggest suggest_command=%1%)'
+  error_invalid_player: '[Ошибка:](#ff3300) [Не удалось найти игрока с данным именем.](#ff7e5e)'
+  error_no_permission: '[Ошибка:](#ff3300) [У вас недостаточно прав для выполнения данной команды.](#ff7e5e)'
+  error_console_command_only: '[Ошибка:](#ff3300) [Данная команда может быть выполнена только из консоли.](#ff7e5e)'
+  error_in_game_command_only: 'Ошибка: Данная команда может быть выполнена только в игре.'
+  error_no_data_to_display: '[Ошибка:](#ff3300) [Не удалось найти никаких пользовательских данных для отображения.](#ff7e5e)'
+  error_invalid_version_uuid: '[Ошибка:](#ff3300) [Не удалось найти никаких пользовательских данных с этим UUID снимка.](#ff7e5e)'
+  husksync_command_description: 'Управление плагином HuskSync'
+  userdata_command_description: 'Просмотр, редактирование и восстановление пользовательских данных игрока'
+  inventory_command_description: 'Просмотр и редактирование инвентаря игрока'
+  enderchest_command_description: 'Просмотр и редактирование эндер-сундука игрока'

common/src/main/resources/locales/tr-tr.yml

@@ -0,0 +1,63 @@
+locales:
+  synchronization_complete: '[⏵ Veri senkronize edildi!](#00fb9a)'
+  synchronization_failed: '[⏵ Veriler senkronize edilemedi! Lütfen bir yönetici ile iletişime geçin.](#ff7e5e)'
+  inventory_viewer_menu_title: '&0%1%''ın Envanteri'
+  ender_chest_viewer_menu_title: '&0%1%''ın Ender Sandığı'
+  inventory_viewer_opened: '[Görüntülenen anlık](#00fb9a) [%1%](#00fb9a bold)[''ın envanteri ⌚ %2% tarihine kadar](#00fb9a)'
+  ender_chest_viewer_opened: '[Görüntülenen anlık](#00fb9a) [%1%](#00fb9a bold)[''ın Ender Sandığı ⌚ %2% tarihine kadar](#00fb9a)'
+  data_update_complete: '[🔔 Verileriniz güncellendi!](#00fb9a)'
+  data_update_failed: '[🔔 Verileriniz güncellenirken bir hata oluştu! Lütfen bir yönetici ile iletişime geçin.](#ff7e5e)'
+  user_registration_complete: '[⭐ Kullanıcı kaydı tamamlandı!](#00fb9a)'
+  data_manager_title: '[Kullanıcı veri anlık görünümü](#00fb9a) [%1%](#00fb9a show_text=&7Versiyon UUID:\n&8%2%) [için](#00fb9a) [%3%](#00fb9a bold show_text=&7Oyuncu UUID:\n&8%4%)[:](#00fb9a)'
+  data_manager_timestamp: '[⌚ %1%](#ffc43b-#f5c962 show_text=&7Versiyon zaman damgası:\n&8Verinin ne zaman kaydedildiği)'
+  data_manager_pinned: '[※ Anlık sabitlendi](#d8ff2b show_text=&7Sabitlendi:\n&8Bu kullanıcı veri anlığı otomatik olarak döndürülmeyecek.)'
+  data_manager_cause: '[⚑ %1%](#23a825-#36f539 show_text=&7Kaydetme sebebi:\n&8Verinin kaydedilme nedeni)'
+  data_manager_server: '[☁ %1%](#ff87b3-#f5538e show_text=&7Sunucu:\n&8Verinin kaydedildiği sunucu adı)'
+  data_manager_size: '[⏏ %1%](color=#62a9f5-#7ab8fa show_text=&7Anlık boyutu:\n&8Anlının tahmini dosya boyutu (KiB cinsinden))\n'
+  data_manger_status: '[%1%](red)[/](gray)[%2%](red)[×](gray)[❤](red show_text=&7Can puanı)   [%3%](yellow)[×](gray)[🍖](yellow show_text=&7Açlık puanı)   [ʟᴠ](green)[.](gray)[%4%](green show_text=&7XP seviyesi)   [🏹 %5%](dark_aqua show_text=&7Oyun modu)'
+  data_manager_advancements_statistics: '[⭐ Gelişmeler: %1%](color=#ffc43b-#f5c962 show_text=&7Gelişmelerdeki ilerlemeniz:\n&8%2%)   [⌛ Oynama Süresi: %3%s](color=#62a9f5-#7ab8fa show_text=&7Oyunda geçen süre\n&8⚠ Oyun içi istatistiklere dayanır)\n'
+  data_manager_item_buttons: '[Görünüm:](gray) [[🪣 Envanter…]](color=#a17b5f-#f5b98c show_text=&7Görüntülemek için tıklayın run_command=/inventory %1% %2%)   [[⌀ Ender Sandığı…]](#b649c4-#d254ff show_text=&7Görüntülemek için tıklayın run_command=/enderchest %1% %2%)'
+  data_manager_management_buttons: '[Yönet:](gray) [[❌ Sil…]](#ff3300 show_text=&7Bu kullanıcı veri anlığını silmek için tıklayın.\n&8Bu, kullanıcının mevcut verilerini etkilemez.\n&#ff3300&⚠ Geri alınamaz! suggest_command=/husksync:userdata delete %1% %2%)   [[⏪ Geri Yükle…]](#00fb9a show_text=&7Bu kullanıcı verisini geri yüklemek için tıklayın.\n&8Bu, kullanıcının verisini bu anlığa ayarlar.\n&#ff3300&⚠ %1%''nın mevcut verisi üzerine yazılacak! suggest_command=/husksync:userdata restore %1% %2%)   [[※ Sabitle/Çöz…]](#d8ff2b show_text=&7Bu kullanıcı veri anlığını sabitlemek veya çözmek için tıklayın\n&8Sabitlenmiş anlıklar otomatik olarak döndürülmez run_command=/userdata pin %1% %2%)'
+  data_manager_system_buttons: '[Sistem:](gray) [[⏷ Dosya Dök…]](dark_gray show_text=&7Bu ham kullanıcı veri anlığını bir dosyaya dökmek için tıklayın.\n&8Veri dökümleri ~/plugins/HuskSync/dumps/ klasöründe bulunabilir. run_command=/husksync:userdata dump %1% %2% file)   [[☂ Web Dök…]](dark_gray show_text=&7Bu ham kullanıcı veri anlığını mc-logs servisine dökme için tıklayın\n&8Verileri içeren bir URL ile sağlanacaksınız. run_command=/husksync:userdata dump %1% %2% web)'
+  data_manager_advancements_preview_remaining: 've %1% daha fazla…'
+  data_list_title: '[%1%''ın kullanıcı veri anlıkları:](#00fb9a) [(%2%-%3% /](#00fb9a) [%4%](#00fb9a bold)[)](#00fb9a)\n'
+  data_list_item: '[%1%](gray show_text=&7Oyuncu Veri Anlığı %2% için %3%&8⚡ %4% run_command=/userdata view %2% %3%) [%5%](#d8ff2b show_text=&7Sabitlendi:\n&8Sabitlenmiş anlıklar otomatik olarak döndürülmez. run_command=/userdata view %2% %3%) [%6%](color=#ffc43b-#f5c962 show_text=&7Versiyon zaman damgası:&7\n&8Verinin ne zaman kaydedildiği\n&8%7% run_command=/userdata view %2% %3%)   [⚑ %8%](#23a825-#36f539 show_text=&7Kaydetme sebebi:\n&8Verinin kaydedilme nedeni run_command=/userdata view %2% %3%)   [⏏ %9%](color=#62a9f5-#7ab8fa show_text=&7Anlık boyutu:&7\n&8Anlının tahmini dosya boyutu (KiB cinsinden) run_command=/userdata view %2% %3%)'
+  data_deleted: '[❌ Kullanıcı veri anlığı başarıyla silindi](#00fb9a) [%1%](#00fb9a show_text=&7Versiyon UUID:\n&8%2%) [için](#00fb9a) [%3%.](#00fb9a show_text=&7Oyuncu UUID:\n&8%4%)'
+  data_restored: '[⏪ Başarıyla geri yüklendi](#00fb9a) [%1%](#00fb9a show_text=&7Oyuncu UUID:\n&8%2%)[''ın mevcut kullanıcı verisi anlığından](#00fb9a) [%3%.](#00fb9a show_text=&7Versiyon UUID:\n&8%4%)'
+  data_pinned: '[※ Kullanıcı veri anlığı başarıyla sabitlendi](#00fb9a) [%1%](#00fb9a show_text=&7Versiyon UUID:\n&8%2%) [için](#00fb9a) [%3%.](#00fb9a show_text=&7Oyuncu UUID:\n&8%4%)'
+  data_unpinned: '[※ Kullanıcı veri anlığı başarıyla çözüldü](#00fb9a) [%1%](#00fb9a show_text=&7Versiyon UUID:\n&8%2%) [için](#00fb9a) [%3%.](#00fb9a show_text=&7Oyuncu UUID:\n&8%4%)'
+  data_dumped: '[☂ Kullanıcı veri anlığı başarıyla döküldü %1% için %2%:](#00fb9a) &7%3%'
+  list_footer: '\n%1%[Sayfa](#00fb9a) [%2%](#00fb9a)/[%3%](#00fb9a)%4%   %5%'
+  list_previous_page_button: '[◀](white show_text=&7Önceki sayfayı görüntüle run_command=%2% %1%) '
+  list_next_page_button: ' [▶](white show_text=&7Sonraki sayfayı görüntüle run_command=%2% %1%)'
+  list_page_jumpers: '(%1%)'
+  list_page_jumper_button: '[%1%](show_text=&7Sayfaya git %1% run_command=%2% %1%)'
+  list_page_jumper_current_page: '[%1%](#00fb9a)'
+  list_page_jumper_separator: ' '
+  list_page_jumper_group_separator: '…'
+  save_cause_disconnect: 'bağlantı kesilmesi'
+  save_cause_world_save: 'dünya kaydı'
+  save_cause_death: 'ölüm'
+  save_cause_server_shutdown: 'sunucu kapatma'
+  save_cause_inventory_command: 'envanter komutu'
+  save_cause_enderchest_command: 'ender sandığı komutu'
+  save_cause_backup_restore: 'yedek geri yükleme'
+  save_cause_api: 'API'
+  save_cause_mpdb_migration: 'MPDB migration'
+  save_cause_legacy_migration: 'legacy migration'
+  save_cause_converted_from_v2: 'v2 den dönüştürüldü'
+  up_to_date: '[HuskSync](#00fb9a bold) [| HuskSync\''in en son sürümünü kullanıyorsunuz (v%1%).](#00fb9a)'
+  update_available: '[HuskSync](#ff7e5e bold) [| HuskSync\''in yeni bir sürümü mevcut: v%1% (kullanılan sürüm: v%2%).](#ff7e5e)'
+  reload_complete: '[HuskSync](#00fb9a bold) [| Yapılandırma ve mesaj dosyaları yeniden yüklendi.](#00fb9a)\n[⚠ Lütfen yapılandırma dosyalarının tüm sunucularda güncel olduğundan emin olun!](#00fb9a)\n[Yapılandırma değişikliklerinin etkili olabilmesi için bir yeniden başlatma gereklidir.](#00fb9a italic)'
+  system_status_header: '[HuskSync](#00fb9a bold) [| Sistem durumu raporu:](#00fb9a)'
+  error_invalid_syntax: '[Hata:](#ff3300) [Yanlış sözdizimi. Kullanım:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Öneri için tıklayın Suggest_command=%1%)'
+  error_invalid_player: '[Hata:](#ff3300) [Bu isimde bir oyuncu bulunamadı.](#ff7e5e)'
+  error_no_permission: '[Hata:](#ff3300) [Bu komutu gerçekleştirmek için izniniz yok](#ff7e5e)'
+  error_console_command_only: '[Hata:](#ff3300) [Bu komut yalnızca konsoldan çalıştırılabilir](#ff7e5e)'
+  error_in_game_command_only: 'Hata: Bu komut yalnızca oyun içinde kullanılabilir.'
+  error_no_data_to_display: '[Hata:](#ff3300) [Görüntülenecek kullanıcı verisi bulunamadı.](#ff7e5e)'
+  error_invalid_version_uuid: '[Hata:](#ff3300) [Bu sürüm UUID''si için kullanıcı verisi bulunamadı.](#ff7e5e)'
+  husksync_command_description: 'HuskSync eklentisini yönet'
+  userdata_command_description: 'Oyuncu verilerini görüntüle, yönet ve geri yükle'
+  inventory_command_description: 'Oyuncunun envanterini görüntüle ve düzenle'
+  enderchest_command_description: 'Oyuncunun Ender Chest''ini görüntüle ve düzenle'

common/src/main/resources/locales/uk-ua.yml

@@ -1,3 +1,4 @@
+locales:
   synchronization_complete: '[⏵ Дані синхронізовано!](#00fb9a)'
   synchronization_failed: '[⏵ Failed to synchronize your data! Please contact an administrator.](#ff7e5e)'
   inventory_viewer_menu_title: '&0%1%''s Inventory'
@@ -11,7 +12,7 @@ data_manager_title: '[Viewing user data snapshot](#00fb9a) [%1%](#00fb9a show_te
   data_manager_timestamp: '[⌚ %1%](#ffc43b-#f5c962 show_text=&7Version timestamp:\n&8When the data was saved)'
   data_manager_pinned: '[※ Snapshot pinned](#d8ff2b show_text=&7Pinned:\n&8This user data snapshot won''t be automatically rotated.)'
   data_manager_cause: '[⚑ %1%](#23a825-#36f539 show_text=&7Save cause:\n&8What caused the data to be saved)'
-data_manager_server: '[Ⓢ %1%](#ff87b3-#f5538e show_text=&7Server:\n&8Name of the server the data was saved on)'
+  data_manager_server: '[☁ %1%](#ff87b3-#f5538e show_text=&7Server:\n&8Name of the server the data was saved on)'
   data_manager_size: '[⏏ %1%](color=#62a9f5-#7ab8fa show_text=&7Snapshot size:\n&8Estimated file size of the snapshot (in KiB))\n'
   data_manger_status: '[%1%](red)[/](gray)[%2%](red)[×](gray)[❤](red show_text=&7Health points)   [%3%](yellow)[×](gray)[🍖](yellow show_text=&7Hunger points)   [ʟᴠ](green)[.](gray)[%4%](green show_text=&7XP level)   [🏹 %5%](dark_aqua show_text=&7Game mode)'
   data_manager_advancements_statistics: '[⭐ Advancements: %1%](color=#ffc43b-#f5c962 show_text=&7Advancements you have progress in:\n&8%2%)   [⌛ Play Time: %3%ʜʀs](color=#62a9f5-#7ab8fa show_text=&7In-game play time\n&8⚠ Based on in-game statistics)\n'
@@ -34,9 +35,21 @@ list_page_jumper_button: '[%1%](show_text=&7Jump to page %1% run_command=%2% %1%
   list_page_jumper_current_page: '[%1%](#00fb9a)'
   list_page_jumper_separator: ' '
   list_page_jumper_group_separator: '…'
+  save_cause_disconnect: 'disconnect'
+  save_cause_world_save: 'world save'
+  save_cause_death: 'death'
+  save_cause_server_shutdown: 'server shutdown'
+  save_cause_inventory_command: 'inventory command'
+  save_cause_enderchest_command: 'enderchest command'
+  save_cause_backup_restore: 'backup restore'
+  save_cause_api: 'API'
+  save_cause_mpdb_migration: 'MPDB migration'
+  save_cause_legacy_migration: 'legacy migration'
+  save_cause_converted_from_v2: 'converted from v2'
   up_to_date: '[HuskSync](#00fb9a bold) [| You are running the latest version of HuskSync (v%1%).](#00fb9a)'
   update_available: '[HuskSync](#ff7e5e bold) [| A new version of HuskSync is available: v%1% (running: v%2%).](#ff7e5e)'
   reload_complete: '[HuskSync](#00fb9a bold) [| Перезавантажено конфіґ та файли повідомлень.](#00fb9a)\n[⚠ Ensure config files are up-to-date on all servers!](#00fb9a)\n[A restart is needed for config changes to take effect.](#00fb9a italic)'
+  system_status_header: '[HuskSync](#00fb9a bold) [| System status report:](#00fb9a)'
   error_invalid_syntax: '[Помилка:](#ff3300) [Неправильний синтакс. Використання:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Click to suggest suggest_command=%1%)'
   error_invalid_player: '[Помилка:](#ff3300) [Гравця не знайдено](#ff7e5e)'
   error_no_permission: '[Помилка:](#ff3300) [Ввас немає дозволу на використання цієї команди](#ff7e5e)'

common/src/main/resources/locales/zh-cn.yml

@@ -1,50 +1,63 @@
+locales:
   synchronization_complete: '[⏵ 数据同步完成!](#00fb9a)'
-synchronization_failed: '[⏵ 无法同步数据! 请联系管理员.](#ff7e5e)'
+  synchronization_failed: '[⏵ 无法同步你的数据! 请联系管理员.](#ff7e5e)'
   inventory_viewer_menu_title: '&0%1% 的背包'
   ender_chest_viewer_menu_title: '&0%1% 的末影箱'
-inventory_viewer_opened: '[正在查看玩家](#00fb9a) [%1%](#00fb9a bold) [于 ⌚ %2% 的背包备份](#00fb9a)'
-ender_chest_viewer_opened: '[正在查看玩家](#00fb9a) [%1%](#00fb9a bold) [于 ⌚ %2% 的末影箱备份](#00fb9a)'
-data_update_complete: '[🔔 你的用户数据已更新!](#00fb9a)'
-data_update_failed: '[🔔 无法更新你的用户数据! 请联系管理员.](#ff7e5e)'
-user_registration_complete: '[⭐ User registration complete!](#00fb9a)'
+  inventory_viewer_opened: '[查看备份](#00fb9a) [%1%](#00fb9a bold) [于 ⌚ %2% 的背包备份](#00fb9a)'
+  ender_chest_viewer_opened: '[查看备份](#00fb9a) [%1%](#00fb9a bold) [于 ⌚ %2% 的末影箱备份](#00fb9a)'
+  data_update_complete: '[🔔 你的数据已更新!](#00fb9a)'
+  data_update_failed: '[🔔 无法更新你的数据! 请联系管理员.](#ff7e5e)'
+  user_registration_complete: '[⭐ 用户注册完成!](#00fb9a)'
   data_manager_title: '[正在查看玩家](#00fb9a) [%3%](#00fb9a bold show_text=&7玩家UUID:\n&8%4%) [的数据备份](#00fb9a) [%1%](#00fb9a show_text=&7备份版本UUID:\n&8%2%)[:](#00fb9a)'
-data_manager_timestamp: '[⌚ %1%](#ffc43b-#f5c962 show_text=&7备份时间:\n&7何时保存了此数据)'
-data_manager_pinned: '[※ 置顶备份](#d8ff2b show_text=&7置顶:\n&8此数据备份不会按照备份时间自动排序.)'
-data_manager_cause: '[⚑ %1%](#23a825-#36f539 show_text=&7备份原因:\n&7为何保存了此数据)'
-data_manager_server: '[Ⓢ %1%](#ff87b3-#f5538e show_text=&7Server:\n&8Name of the server the data was saved on)'
-data_manager_size: '[⏏ %1%](color=#62a9f5-#7ab8fa show_text=&7Snapshot size:\n&8Estimated file size of the snapshot (in KiB))\n'
-data_manger_status: '[%1%](red)[/](gray)[%2%](red)[×](gray)[❤](red show_text=&7血量)   [%3%](yellow)[×](gray)[🍖](yellow show_text=&7饱食度)   [ʟᴠ](green)[.](gray)[%4%](green show_text=&7经验等级)   [🏹 %5%](dark_aqua show_text=&7游戏模式)'
-data_manager_advancements_statistics: '[⭐ 成就: %1%](color=#ffc43b-#f5c962 show_text=&7%2%)   [⌛ 游玩时间: %3%ʜʀs](color=#62a9f5-#7ab8fa show_text=&7⚠ 基于游戏内的统计)\n'
-data_manager_item_buttons: '[View:](gray) [[🪣 背包…]](color=#a17b5f-#f5b98c show_text=&7点击查看 run_command=/inventory %1% %2%)   [[⌀ 末影箱…]](#b649c4-#d254ff show_text=&7点击查看 run_command=/enderchest %1% %2%)'
-data_manager_management_buttons: '[Manage:](gray) [[❌ 删除…]](#ff3300 show_text=&7点击删除此数据备份.\n这不会影响玩家当前的数据.\n&#ff3300&⚠ 此操作不可撤销! suggest_command=/husksync:userdata delete %1% %2%)   [[⏪ 恢复…]](#00fb9a show_text=&7点击让玩家恢复到此数据备份.\n这将会使玩家的数据恢复到这个备份.\n&#ff3300&⚠ %1% 当前的用户数据会被备份数据所覆盖! suggest_command=/husksync:userdata restore %1% %2%)   [[※ Pin/Unpin…]](#d8ff2b show_text=&7Click to pin or unpin this user data snapshot\n&8Pinned snapshots won''t be automatically rotated run_command=/userdata pin %1% %2%)'
-data_manager_system_buttons: '[System:](gray) [[⏷ File Dump…]](dark_gray show_text=&7Click to dump this raw user data snapshot to a file.\n&8Data dumps can be found in ~/plugins/HuskSync/dumps/ run_command=/husksync:userdata dump %1% %2% file)   [[☂ Web Dump…]](dark_gray show_text=&7Click to dump this raw user data snapshot to the mc-logs service\n&8You will be provided with a URL containing the data. run_command=/husksync:userdata dump %1% %2% web)'
-data_manager_advancements_preview_remaining: '还有 %1% …'
-data_list_title: '[%1%''s user data snapshots:](#00fb9a) [(%2%-%3% of](#00fb9a) [%4%](#00fb9a bold)[)](#00fb9a)\n'
-data_list_item: '[%1%](gray show_text=&7User Data Snapshot for %2%&8⚡ %4% run_command=/userdata view %2% %3%) [%5%](#d8ff2b show_text=&7Pinned:\n&8Pinned snapshots won''t be automatically rotated. run_command=/userdata view %2% %3%) [%6%](color=#ffc43b-#f5c962 show_text=&7Version timestamp:&7\n&8When the data was saved\n&8%7% run_command=/userdata view %2% %3%)   [⚑ %8%](#23a825-#36f539 show_text=&7Save cause:\n&8What caused the data to be saved run_command=/userdata view %2% %3%)   [⏏ %9%](color=#62a9f5-#7ab8fa show_text=&7Snapshot size:&7\n&8Estimated file size of the snapshot (in KiB) run_command=/userdata view %2% %3%)'
+  data_manager_timestamp: '[⌚ %1%](#ffc43b-#f5c962 show_text=&7备份时间:\n&8数据保存时间)'
+  data_manager_pinned: '[※ 置顶备份](#d8ff2b show_text=&7已置顶:\n&8此玩家数据备份不会按照备份时间自动排序.)'
+  data_manager_cause: '[⚑ %1%](#23a825-#36f539 show_text=&7保存原因:\n&8导致数据保存的原因)'
+  data_manager_server: '[☁ %1%](#ff87b3-#f5538e show_text=&7服务器:\n&8数据保存所在服务器的名称)'
+  data_manager_size: '[⏏ %1%](color=#62a9f5-#7ab8fa show_text=&7备份大小:\n&8预计备份的文件大小(以KiB为单位))\n'
+  data_manger_status: '[%1%](red)[/](gray)[%2%](red)[×](gray)[❤](red show_text=&7生命值)   [%3%](yellow)[×](gray)[🍖](yellow show_text=&7饥饿值)   [ʟᴠ](green)[.](gray)[%4%](green show_text=&7经验等级)   [🏹 %5%](dark_aqua show_text=&7游戏模式)'
+  data_manager_advancements_statistics: '[⭐ 进度: %1%](color=#ffc43b-#f5c962 show_text=&7你已经取得的进度:\n&8%2%)   [⌛ 游玩时间: %3%小时](color=#62a9f5-#7ab8fa show_text=&7在游戏内游玩的时间\n&8⚠ 基于游戏内的统计信息)\n'
+  data_manager_item_buttons: '[查看:](gray) [[🪣 背包…]](color=#a17b5f-#f5b98c show_text=&7点击查看 run_command=/inventory %1% %2%)   [[⌀ 末影箱…]](#b649c4-#d254ff show_text=&7点击查看 run_command=/enderchest %1% %2%)'
+  data_manager_management_buttons: '[管理:](gray) [[❌ 删除…]](#ff3300 show_text=&7点击删除此玩家数据备份.\n&8这不会影响用户的当前数据.\n&#ff3300&⚠ 此操作无法撤消! suggest_command=/husksync:userdata delete %1% %2%)   [[⏪ 恢复…]](#00fb9a show_text=&7点击还原此玩家数据.\n&8这将使用户的数据恢复到此备份.\n&#ff3300&⚠ %1%当前数据将被覆盖! suggest_command=/husksync:userdata restore %1% %2%)   [[※ 置顶/取消置顶…]](#d8ff2b show_text=&7点击置顶或取消置顶此玩家数据备份\n&8已置顶的备份不会按照备份时间自动排序 run_command=/userdata pin %1% %2%)'
+  data_manager_system_buttons: '[系统:](gray) [[⏷ 文件转储…]](dark_gray show_text=&7点击将此原始玩家数据备份转储到文件中.\n&8数据转储可以在~/plugins/HuskSync/dumps/中找到 run_command=/husksync:userdata dump %1% %2% file)   [[☂ 网络转储…]](dark_gray show_text=&7点击将此原始玩家数据备份转储到mc-logs服务中\n&8你将获得包含数据的网址. run_command=/husksync:userdata dump %1% %2% web)'
+  data_manager_advancements_preview_remaining: '以及其他 %1%…'
+  data_list_title: '[%1%的玩家数据备份:](#00fb9a) [(%2%-%3% of](#00fb9a) [%4%](#00fb9a bold)[)](#00fb9a)\n'
+  data_list_item: '[%1%](gray show_text=&7玩家数据备份 %2%&8⚡ %4% run_command=/userdata view %2% %3%) [%5%](#d8ff2b show_text=&7已置顶:\n&8已置顶的备份不会按照备份时间自动排序 run_command=/userdata view %2% %3%) [%6%](color=#ffc43b-#f5c962 show_text=&7备份时间:&7\n&8数据保存时间\n&8%7% run_command=/userdata view %2% %3%)   [⚑ %8%](#23a825-#36f539 show_text=&7保存原因:\n&8导致数据保存的原因 run_command=/userdata view %2% %3%)   [⏏ %9%](color=#62a9f5-#7ab8fa show_text=&7备份大小:&7\n&8预计备份文件大小(以KiB为单位) run_command=/userdata view %2% %3%)'
   data_deleted: '[❌ 成功删除玩家](#00fb9a) [%3%](#00fb9a show_text=&7玩家 UUID:\n&7%4%) [的数据备份](#00fb9a) [%1%.](#00fb9a show_text=&7备份版本UUID:\n&7%2%)'
   data_restored: '[⏪ 成功恢复玩家](#00fb9a) [%1%](#00fb9a show_text=&7玩家 UUID:\n&7%2%)[的数据备份](#00fb9a) [%3%.](#00fb9a show_text=&7备份版本UUID:\n&7%4%)'
   data_pinned: '[※ 成功置顶玩家](#00fb9a) [%3%](#00fb9a show_text=&7玩家 UUID:\n&8%4%) [的数据备份](#00fb9a) [%1%.](#00fb9a show_text=&7备份版本UUID:\n&8%2%)'
   data_unpinned: '[※ 成功取消置顶玩家](#00fb9a) [%3%](#00fb9a show_text=&7玩家 UUID:\n&8%4%) [的数据备份](#00fb9a) [%1%.](#00fb9a show_text=&7备份版本UUID:\n&8%2%)'
-data_dumped: '[☂ Successfully dumped the user data snapshot %1% for %2% to:](#00fb9a) &7%3%'
-list_footer: '\n%1%[Page](#00fb9a) [%2%](#00fb9a)/[%3%](#00fb9a)%4%   %5%'
-list_previous_page_button: '[◀](white show_text=&7View previous page run_command=%2% %1%) '
-list_next_page_button: ' [▶](white show_text=&7View next page run_command=%2% %1%)'
+  data_dumped: '[☂ 已成功将 %1% 的玩家数据快照 %2% 转储到:](#00fb9a) &7%3%'
+  list_footer: '\n%1%[页数](#00fb9a) [%2%](#00fb9a)/[%3%](#00fb9a)%4%   %5%'
+  list_previous_page_button: '[◀](white show_text=&7查看上一页 run_command=%2% %1%) '
+  list_next_page_button: ' [▶](white show_text=&7查看下一页 run_command=%2% %1%)'
   list_page_jumpers: '(%1%)'
-list_page_jumper_button: '[%1%](show_text=&7Jump to page %1% run_command=%2% %1%)'
+  list_page_jumper_button: '[%1%](show_text=&7跳转至第 %1% 页 run_command=%2% %1%)'
   list_page_jumper_current_page: '[%1%](#00fb9a)'
   list_page_jumper_separator: ' '
   list_page_jumper_group_separator: '…'
-up_to_date: '[HuskSync](#00fb9a bold) [| 你正在使用最新版本的HuskSync (v%1%)](#00fb9a)'
-update_available: '[HuskSync](#ff7e5e bold) [| 一个新版本的HuskSync已经可以更新: v%1% (当前: v%2%)](#ff7e5e)'
-reload_complete: '[HuskSync](#00fb9a bold) [| 插件配置和语言文件已重载.](#00fb9a)\n[⚠ Ensure config files are up-to-date on all servers!](#00fb9a)\n[A restart is needed for config changes to take effect.](#00fb9a italic)'
-error_invalid_syntax: ':](#ff3300) [格式错误, 使用方法:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Click to suggest suggest_command=%1%)'
-error_invalid_player: '[错误:](#ff3300) [无法找到目标玩家.](#ff7e5e)'
-error_no_permission: '[错误:](#ff3300) [你没有执行此指令的权限](#ff7e5e)'
-error_console_command_only: '[错误:](#ff3300) [该指令只能在控制台运行](#ff7e5e)'
-error_in_game_command_only: 'Error: 该指令只能在游戏内运行.'
-error_no_data_to_display: '[错误:](#ff3300) [无法找到用户数据显示.](#ff7e5e)'
-error_invalid_version_uuid: '[错误:](#ff3300) [无法找到该备份的 UUID .](#ff7e5e)'
-husksync_command_description: 'Manage the HuskSync plugin'
-userdata_command_description: 'View, manage & restore player userdata'
-inventory_command_description: 'View & edit a player''s inventory'
-enderchest_command_description: 'View & edit a player''s Ender Chest'
+  save_cause_disconnect: '断开连接'
+  save_cause_world_save: '保存世界'
+  save_cause_death: '死亡'
+  save_cause_server_shutdown: '服务器关闭'
+  save_cause_inventory_command: '背包命令'
+  save_cause_enderchest_command: '末影箱命令'
+  save_cause_backup_restore: '备份还原'
+  save_cause_api: 'API'
+  save_cause_mpdb_migration: 'MPDB迁移'
+  save_cause_legacy_migration: '旧版迁移'
+  save_cause_converted_from_v2: '从v2转换'
+  up_to_date: '[HuskSync](#00fb9a bold) [| 你正在运行最新版本的HuskSync(v%1%).](#00fb9a)'
+  update_available: '[HuskSync](#ff7e5e bold) [| 检测到HuskSync有新版本可以更新了:v%1%(当前版本:v%2%).](#ff7e5e)'
+  reload_complete: '[HuskSync](#00fb9a bold) [| 重新加载配置和消息文件完成.](#00fb9a)\n[⚠ 确保在所有服务器上更新配置文件!](#00fb9a)\n[需要重新启动才能使配置更改生效.](#00fb9a italic)'
+  system_status_header: '[HuskSync](#00fb9a bold) [| 系统状态报告:](#00fb9a)'
+  error_invalid_syntax: '[错误:](#ff3300) [语法错误.用法:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&点击建议 suggest_command=%1%)'
+  error_invalid_player: '[错误:](#ff3300) [找不到这个名称的玩家.](#ff7e5e)'
+  error_no_permission: '[错误:](#ff3300) [你没有执行此命令的权限](#ff7e5e)'
+  error_console_command_only: '[错误:](#ff3300) [该命令只能在控制台中运行](#ff7e5e)'
+  error_in_game_command_only: '错误: 该命令只能在游戏中使用.'
+  error_no_data_to_display: '[错误:](#ff3300) [找不到要显示的任何玩家数据.](#ff7e5e)'
+  error_invalid_version_uuid: '[错误:](#ff3300) [找不到该版本UUID的任何玩家数据.](#ff7e5e)'
+  husksync_command_description: '管理HuskSync插件'
+  userdata_command_description: '查看、管理和还原玩家玩家数据'
+  inventory_command_description: '查看和编辑玩家的背包'
+  enderchest_command_description: '查看和编辑玩家的末影箱'

common/src/main/resources/locales/zh-tw.yml

@@ -1,3 +1,4 @@
+locales:
   synchronization_complete: '[⏵資料已同步!](#00fb9a)'
   synchronization_failed: '[⏵ 無法同步您的資料! 請聯繫管理員](#ff7e5e)'
   inventory_viewer_menu_title: '&0%1% 的背包'
@@ -11,7 +12,7 @@ data_manager_title: '[查看](#00fb9a) [%3%](#00fb9a bold show_text=&7玩家 UUI
   data_manager_timestamp: '[⌚ %1%](#ffc43b-#f5c962 show_text=&7快照時間:\n&8何時保存的資料)'
   data_manager_pinned: '[※ 被標記的快照](#d8ff2b show_text=&7標記:\n&8此快照資料不會自動輪換更新)'
   data_manager_cause: '[⚑ %1%](#23a825-#36f539 show_text=&7保存原因:\n&8保存此快照的原因)'
-data_manager_server: '[Ⓢ %1%](#ff87b3-#f5538e show_text=&7Server:\n&8Name of the server the data was saved on)'
+  data_manager_server: '[☁ %1%](#ff87b3-#f5538e show_text=&7Server:\n&8Name of the server the data was saved on)'
   data_manager_size: '[⏏ %1%](color=#62a9f5-#7ab8fa show_text=&7Snapshot size:\n&8Estimated file size of the snapshot (in KiB))\n'
   data_manger_status: '[%1%](red)[/](gray)[%2%](red)[×](gray)[❤](red show_text=&7血量)   [%3%](yellow)[×](gray)[🍖](yellow show_text=&7飽食度)   [ʟᴠ](green)[.](gray)[%4%](green show_text=&7經驗等級)   [🏹 %5%](dark_aqua show_text=&7遊戲模式)'
   data_manager_advancements_statistics: '[⭐ 成就: %1%](color=#ffc43b-#f5c962 show_text=&7已獲得的成就:\n&8%2%)   [⌛ 遊戲時間: %3%ʜʀs](color=#62a9f5-#7ab8fa show_text=&7遊戲內的遊玩時間\n&8⚠ 根據遊戲內統計)\n'
@@ -34,9 +35,21 @@ list_page_jumper_button: '[%1%](show_text=&7跳至第 %1% 頁 run_command=%2% %1
   list_page_jumper_current_page: '[%1%](#00fb9a)'
   list_page_jumper_separator: ' '
   list_page_jumper_group_separator: '…'
+  save_cause_disconnect: 'disconnect'
+  save_cause_world_save: 'world save'
+  save_cause_death: 'death'
+  save_cause_server_shutdown: 'server shutdown'
+  save_cause_inventory_command: 'inventory command'
+  save_cause_enderchest_command: 'enderchest command'
+  save_cause_backup_restore: 'backup restore'
+  save_cause_api: 'API'
+  save_cause_mpdb_migration: 'MPDB migration'
+  save_cause_legacy_migration: 'legacy migration'
+  save_cause_converted_from_v2: 'converted from v2'
   up_to_date: '[HuskSync](#00fb9a bold) [| 您運行的是最新版本的 HuskSync (v%1%).](#00fb9a)'
   update_available: '[HuskSync](#ff7e5e bold) [| 發現可用的新版本: v%1% (running: v%2%).](#ff7e5e)'
   reload_complete: '[HuskSync](#00fb9a bold) [| 已重新載入配置和訊息文件](#00fb9a)\n[⚠ Ensure config files are up-to-date on all servers!](#00fb9a)\n[A restart is needed for config changes to take effect.](#00fb9a italic)'
+  system_status_header: '[HuskSync](#00fb9a bold) [| System status report:](#00fb9a)'
   error_invalid_syntax: '[錯誤:](#ff3300) [語法不正確，用法:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Click to suggest suggest_command=%1%)'
   error_invalid_player: '[錯誤:](#ff3300) [找不到這位玩家](#ff7e5e)'
   error_no_permission: '[錯誤:](#ff3300) [您沒有權限執行這個指令](#ff7e5e)'

common/src/test/java/net/william278/husksync/config/LocalesTests.java

@@ -19,9 +19,8 @@
 
 package net.william278.husksync.config;
 
-import net.william278.annotaml.Annotaml;
+import de.exlll.configlib.YamlConfigurations;
 import org.jetbrains.annotations.NotNull;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -30,14 +29,14 @@ import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Stream;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 @DisplayName("Locales Tests")
 public class LocalesTests {
 
@@ -48,10 +47,10 @@ public class LocalesTests {
     @Test
     public void testLoadEnglishLocales() {
         try (InputStream locales = LocalesTests.class.getClassLoader().getResourceAsStream("locales/en-gb.yml")) {
-            Assertions.assertNotNull(locales, "en-gb.yml is missing from the locales folder");
-            englishLocales = Annotaml.create(Locales.class, locales).get();
-        } catch (IOException | InvocationTargetException | InstantiationException | IllegalAccessException e) {
-            throw new RuntimeException(e);
+            assertNotNull(locales, "en-gb.yml is missing from the locales folder");
+            englishLocales = YamlConfigurations.read(locales, Locales.class);
+        } catch (Throwable e) {
+            fail("Failed to load en-gb.yml", e);
         }
     }
 
@@ -59,23 +58,20 @@ public class LocalesTests {
     @DisplayName("Test All Locale Keys Present")
     @MethodSource("provideLocaleFiles")
     public void testAllLocaleKeysPresent(@NotNull File file, @SuppressWarnings("unused") @NotNull String keyName) {
-        try {
-            final Set<String> fileKeys = Annotaml.create(file, Locales.class).get().rawLocales.keySet();
-            englishLocales.rawLocales.keySet()
-                    .forEach(key -> Assertions.assertTrue(fileKeys.contains(key),
-                            "Locale key " + key + " is missing from " + file.getName()));
-        } catch (IOException | InvocationTargetException | InstantiationException | IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
+        final Set<String> fileKeys = YamlConfigurations.load(file.toPath(), Locales.class).locales.keySet();
+        englishLocales.locales.keySet().forEach(key -> assertTrue(
+                fileKeys.contains(key), "Locale key " + key + " is missing from " + file.getName()
+        ));
     }
 
     @NotNull
     private static Stream<Arguments> provideLocaleFiles() {
-        URL url = LocalesTests.class.getClassLoader().getResource("locales");
-        Assertions.assertNotNull(url, "locales folder is missing");
-        return Stream.of(Objects.requireNonNull(new File(url.getPath())
-                        .listFiles(file -> file.getName().endsWith("yml") && !file.getName().equals("en-gb.yml"))))
-                .map(file -> Arguments.of(file, file.getName().replace(".yml", "")));
+        final URL url = LocalesTests.class.getClassLoader().getResource("locales");
+        assertNotNull(url, "locales folder is missing");
+
+        return Stream.of(Objects.requireNonNull(new File(url.getPath()).listFiles(
+                file -> file.getName().endsWith("yml") && !file.getName().equals("en-gb.yml")
+        ))).map(file -> Arguments.of(file, file.getName().replace(".yml", "")));
     }
 
 }

common/src/test/java/net/william278/husksync/hook/PlanHookTests.java

@@ -24,11 +24,11 @@ import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
 @DisplayName("Plan Hook Tests")
-public class PlanDataExtensionTests {
+public class PlanHookTests {
 
     @Test
-    @DisplayName("Test Plan Hook Implementation")
-    public void testPlanHookImplementation() {
+    @DisplayName("Test Plan Data Extension")
+    public void testPlanDataExtension() {
         new ExtensionExtractor(new PlanHook.PlanDataExtension()).validateAnnotations();
     }
 

docs/API-Events.md

@@ -1,8 +1,10 @@
 HuskSync provides three API events your plugin can listen to when certain parts of the data synchronization process are performed. These events deal with HuskSync class types, so you may want to familiarize yourself with the [API basics](API) first. Two of the events can be cancelled (thus aborting the synchronization process at certain stages), and some events expose methods letting you affect their outcome (such as modifying the data that is saved during the process).
 
-Consult the Javadocs for more information—and don't forget to register your listener when listening for these event calls. Please note that carrying out expensive blocking operations during these events is strongly discouraged as this may affect plugin performance.
+Consult the Javadocs for more information. Please note that carrying out expensive blocking operations during these events is strongly discouraged as this may affect plugin performance.
 
-## List of API Events
+## Bukkit Platform Events
+> **Tip:** Don't forget to register your listener when listening for these event calls.
+> 
 | Bukkit Event class        | Cancellable | Description                                                                                 |
 |---------------------------|:-----------:|---------------------------------------------------------------------------------------------|
 | `BukkitDataSaveEvent`     |      ✅      | Called when player data snapshot is created, saved and cached due to a DataSaveCause        |

docs/API.md

@@ -1,7 +1,7 @@
 The HuskSync API (v3) provides methods for retrieving and updating [data snapshots](Data-Snapshot-API), a number of [[API Events]] for tracking when user data is synced and saved, and infrastructure for registering serializers to [synchronise custom data types](Custom-Data-API).
 
 ## Compatibility
-[![Maven](https://repo.william278.net/api/badge/latest/releases/net/william278/husksync?color=00fb9a&name=Maven&prefix=v)](https://repo.william278.net/#/releases/net/william278/husksync/)
+[![Maven](https://repo.william278.net/api/badge/latest/releases/net/william278/husksync/husksync-common?color=00fb9a&name=Maven&prefix=v)](https://repo.william278.net/#/releases/net/william278/husksync/)
 
 The HuskSync API shares version numbering with the plugin itself for consistency and convenience. Please note minor and patch plugin releases may make API additions and deprecations, but will not introduce breaking changes without notice.
 
@@ -11,10 +11,20 @@ The HuskSync API shares version numbering with the plugin itself for consistency
 |    v2.x     | _v2.0—v2.2.8_  |     ❌     |
 |    v1.x     | _v1.0—v1.4.1_  |    ❌️     |
 
+### Platforms
+> **Note:** For versions older than `v3.3`, the HuskSync API was only distributed for the Bukkit platform (as `net.william278:husksync`) 
+
+The HuskSync API is available for the following platforms:
+
+* `bukkit` - Bukkit, Spigot, Paper, etc. Provides Bukkit API event listeners and adapters to `org.bukkit` objects.
+* `common` - Common API for all platforms.
+
+
 <details>
 <summary>Targeting older versions</summary>
 
-HuskSync versions prior to `v2.2.5` are distributed on [JitPack](https://jitpack.io/#/net/william278/HuskSync), and you will need to use the `https://jitpack.io` repository instead.
+* The HuskSync API was only distributed for the Bukkit module prior to `v3.3`; the artifact ID was `net.william278:husksync` instead of `net.william278.husksync:husksync-PLATFORM`. 
+* HuskSync versions prior to `v2.2.5` are distributed on [JitPack](https://jitpack.io/#/net/william278/HuskSync), and you will need to use the `https://jitpack.io` repository instead.
 </details>
 
 ## Table of Contents
@@ -44,8 +54,8 @@ Add the repository to your `pom.xml` as per below. You can alternatively specify
 Add the dependency to your `pom.xml` as per below. Replace `VERSION` with the latest version of HuskSync (without the v): ![Latest version](https://img.shields.io/github/v/tag/WiIIiam278/HuskSync?color=%23282828&label=%20&style=flat-square)
 ```xml
 <dependency>
-    <groupId>net.william278</groupId>
-    <artifactId>husksync</artifactId>
+    <groupId>net.william278.husksync</groupId>
+    <artifactId>husksync-PLATFORM</artifactId>
     <version>VERSION</version>
     <scope>provided</scope>
 </dependency>
@@ -68,7 +78,7 @@ Add the dependency as per below. Replace `VERSION` with the latest version of Hu
 
 ```groovy
 dependencies {
-    compileOnly 'net.william278:husksync:VERSION'
+    compileOnly 'net.william278.husksync:husksync-PLATFORM:VERSION'
 }
 ```
 </details>
@@ -117,9 +127,10 @@ public class MyPlugin extends JavaPlugin {
 
 ## 5. Getting an instance of the API
 - You can now get the API instance by calling `HuskSyncAPI#getInstance()`
+- If targeting the Bukkit platform, you can also use `BukkitHuskSyncAPI#getBukkitInstance()` to get the Bukkit-extended API instance (recommended)
 
 ```java
-import net.william278.husksync.api.BukkitHuskSyncAPI;
+import net.william278.husksync.api.HuskSyncAPI;
 
 public class HuskSyncAPIHook {
 

docs/Commands.md

@@ -11,7 +11,7 @@ This page contains a table of HuskSync commands and their required permission no
     <tbody>
         <!-- /husksync command -->
         <tr>
-            <td rowspan="5"><code>/husksync</code></td>
+            <td rowspan="6"><code>/husksync</code></td>
             <td><code>/husksync</code></td>
             <td>View & manage plugin system information</td>
             <td><code>husksync.command.husksync</code></td>
@@ -21,6 +21,11 @@ This page contains a table of HuskSync commands and their required permission no
             <td>View information about the plugin</td>
             <td><code>husksync.command.husksync.about</code></td>
         </tr>
+        <tr>
+            <td><code>/husksync status</code></td>
+            <td>View plugin system status information</td>
+            <td><code>husksync.command.husksync.status</code></td>
+        </tr>
         <tr>
             <td><code>/husksync reload</code></td>
             <td>Reload the plugin configuration</td>

docs/Config-File.md

@@ -18,7 +18,9 @@ This page contains the configuration structure for HuskSync.
 # ┣╸ Information: https://william278.net/project/husksync
 # ┣╸ Config Help: https://william278.net/docs/husksync/config-file/
 # ┗╸ Documentation: https://william278.net/docs/husksync
-# Locale of the default language file to use. Docs: https://william278.net/docs/husksync/translations
+
+# Locale of the default language file to use.
+# Docs: https://william278.net/docs/husksync/translations
 language: en-gb
 # Whether to automatically check for plugin updates on startup
 check_for_updates: true
@@ -28,21 +30,23 @@ cluster_id: ''
 debug_logging: false
 # Whether to provide modern, rich TAB suggestions for commands (if available)
 brigadier_tab_completion: false
-# Whether to enable the Player Analytics hook. Docs: https://william278.net/docs/husksync/plan-hook
+# Whether to enable the Player Analytics hook.
+# Docs: https://william278.net/docs/husksync/plan-hook
 enable_plan_hook: true
+# Database settings
 database:
   # Type of database to use (MYSQL, MARIADB)
   type: MYSQL
-  credentials:
   # Specify credentials here for your MYSQL or MARIADB database
+  credentials:
     host: localhost
     port: 3306
     database: HuskSync
     username: root
     password: pa55w0rd
     parameters: ?autoReconnect=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
-  connection_pool:
   # MYSQL / MARIADB database Hikari connection pool properties. Don't modify this unless you know what you're doing!
+  connection_pool:
     maximum_pool_size: 10
     minimum_idle: 10
     maximum_lifetime: 1800000
@@ -52,21 +56,32 @@ database:
   table_names:
     users: husksync_users
     user_data: husksync_user_data
+# Redis settings
 redis:
-  credentials:
   # Specify the credentials of your Redis database here. Set "password" to '' if you don't have one
+  credentials:
     host: localhost
     port: 6379
     password: ''
     use_ssl: false
+  # Options for if you're using Redis sentinel. Don't modify this unless you know what you're doing!
+  sentinel:
+    # The master set name for the Redis sentinel.
+    master: ''
+    # List of host:port pairs
+    nodes: []
+    password: ''
+# Redis settings
 synchronization:
-  # The mode of data synchronization to use (DELAY or LOCKSTEP). DELAY should be fine for most networks. Docs: https://william278.net/docs/husksync/sync-modes
-  mode: DELAY
+  # The data synchronization mode to use (LOCKSTEP or DELAY). LOCKSTEP is recommended for most networks.
+  # Docs: https://william278.net/docs/husksync/sync-modes
+  mode: LOCKSTEP
   # The number of data snapshot backups that should be kept at once per user
   max_user_data_snapshots: 16
   # Number of hours between new snapshots being saved as backups (Use "0" to backup all snapshots)
   snapshot_backup_frequency: 4
-  # 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
+  # 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
   auto_pinned_save_causes:
     - INVENTORY_COMMAND
     - ENDERCHEST_COMMAND
@@ -75,29 +90,30 @@ synchronization:
     - MPDB_MIGRATION
   # Whether to create a snapshot for users on a world when the server saves that world
   save_on_world_save: true
+  # Configuration for how and when to sync player data when they die
   save_on_death:
     # Whether to create a snapshot for users when they die (containing their death drops)
-    enabled: true
-    # 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
+    enabled: false
+    # 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.
     items_to_save: DROPS
     # Should a death snapshot still be created even if the items to save on the player's death are empty?
-    save_empty_items: false
+    save_empty_items: true
     # Whether dead players who log out and log in to a different server should have their items saved.
     sync_dead_players_changing_server: true
   # Whether to use the snappy data compression algorithm. Keep on unless you know what you're doing
   compress_data: true
   # Where to display sync notifications (ACTION_BAR, CHAT, TOAST or NONE)
   notification_display_slot: ACTION_BAR
-  # (Experimental) Persist Cartography Table locked maps to let them be viewed on any server
+  # Persist maps locked in a Cartography Table to let them be viewed on any server
   persist_locked_maps: true
   # Whether to synchronize player max health (requires health syncing to be enabled)
   synchronize_max_health: true
   # 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).
   network_latency_milliseconds: 500
-  # Which data types to synchronize (Docs: https://william278.net/docs/husksync/sync-features)
+  # Which data types to synchronize.
+  # Docs: https://william278.net/docs/husksync/sync-features
   features:
-    hunger: true
-    persistent_data: false
+    persistent_data: true
     inventory: true
     game_mode: true
     advancements: true
@@ -107,6 +123,7 @@ synchronization:
     location: false
     statistics: true
     health: true
+    hunger: true
   # Commands which should be blocked before a player has finished syncing (Use * to block all commands)
   blacklisted_commands_while_locked:
     - '*'
@@ -124,11 +141,12 @@ synchronization:
 
 ```yaml
 # ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-# ┃   HuskSync Server ID config  ┃
+# ┃     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)
+
 name: beta
 ```
 

docs/Custom-Data-API.md

@@ -1,4 +1,4 @@
-HuskSync allows you to save and synchronize custom data through the existing versatile DataSnapshot format. This page assumes you've read the [[API]] introduction and are familiar with the aforementioned [[Data Snapshot API]].
+HuskSync allows you to save and synchronize custom data through the existing versatile DataSnapshot format. This page assumes you've read the [[API]] introduction and are familiar with the aforementioned [[Data Snapshot API]]. This page discusses API implementations that target the Bukkit platform.
 
 To do this, you create and register an implementation of a platform `Data` class (e.g., `BukkitData`) and a corresponding `Serializer` class (e.g., `BukkitSerializer`). You can then apply your custom data type to a user using the `OnlineUser#setData(Identifier, Data)` method.
 
@@ -12,6 +12,7 @@ If you'd like to have a look at an example of a data extension for HuskSync that
 2. [Extending the BukkitSerializer Class](#2-extending-the-bukkitserializer-class)
 3. [Identifiers and registering our Serializer](#3-identifiers--registering-our-serializer)
 4. [Setting and Getting our Data to/from a User](#4-setting-and-getting-our-data-tofrom-a-user)
+   1. [Persisting custom data on the DataSaveEvent](#41-persisting-custom-data-on-the-datasaveevent) 
 
 ## 1. Extending the BukkitData Class
 * HuskSync provides a `Data` interface that you must implement that will represent your custom data.
@@ -131,3 +132,13 @@ huskSyncAPI.getUser(player).setData(LOGIN_PARTICLES_ID, loginParticleData);
 // Get our data from a player
 LoginParticleData loginParticleData = (LoginParticleData) huskSyncAPI.getUser(player).getData(LOGIN_PARTICLES_ID);
 ```
+
+### 4.1 Persisting custom data on the DataSaveEvent
+Add an EventListener to the `DataSaveEvent` and use the `#editData` consumer method to apply custom data during standard DataSaves. This will persist data to users any time the data save routine executes (on user logout, server shutdownm, world save, etc).
+
+```java
+@EventHandler
+public void onDataSave(BukkitDataSaveEvent event) {
+    event.editData((unpacked) -> unpacked.setData(LOGIN_PARTICLES_ID, new LoginParticleData("FIREWORKS_SPARK", 10)));
+}
+```

docs/MPDB-Migration.md

@@ -1,4 +1,4 @@
-This guide will walk you through how to migrate from MySQLPlayerDataBridge (MPDB) to HuskSync v2.x.
+This guide will walk you through how to migrate from MySQLPlayerDataBridge (MPDB) to HuskSync v3.x.
 
 > **Warning:** Please note that due to MPDB changes, HuskSync only supports migrating from MySQLPlayerDataBridge `<= v4.9.2`. Support for newer versions will be added in the future.
 
@@ -6,13 +6,13 @@ This guide will walk you through how to migrate from MySQLPlayerDataBridge (MPDB
 - Spigot servers with MySQLPlayerDataBridge *still installed*
 
 ## Migration Instructions
-### 1. Install HuskSync v2.x on all Spigot servers
+### 1. Install HuskSync v3.x on all Spigot servers
 - Download, then install HuskSync on all your servers. Don't uninstall MySQLPlayerDataBridge yet.
-- Follow the setup instructions [here](Setup).
+- Follow the setup instructions [here](setup).
 - Start your servers again when done.
 
 ### 2. Configure the migrator
-- With your servers back on and correctly configured to run HuskSync v2.x, ensure nobody is online.
+- With your servers back on and correctly configured to run HuskSync v3.x, ensure nobody is online.
 - Use the console on one of your Spigot servers to enter: `husksync migrate mpdb`. If the MPDB migrator is not available, ensure MySQLPlayerDataBridge is still installed.
 - Adjust the migration setting as needed using the following command: `husksync migrate mpdb set <setting> <value>`.
 - Note that migration will be carried out *from* the database you specify with the settings in console *to* the database configured in `config.yml`.

docs/Setup.md

@@ -5,7 +5,7 @@ This will walk you through installing HuskSync on your network of Spigot servers
 
 * A MySQL Database (v8.0+)
 * A Redis Database (v5.0+) — see [[FAQs]] for more details.
-* Any number of Spigot servers, connected by a BungeeCord or Velocity-based proxy (Minecraft v1.16.5+, running Java 16+)
+* Any number of Spigot servers, connected by a BungeeCord or Velocity-based proxy (Minecraft v1.17.1+, running Java 17+)
 
 ## Setup Instructions
 ### 1. Install the jar

docs/Sync-Modes.md

@@ -3,8 +3,8 @@ HuskSync offers two built-in **synchronization modes** that utilise Redis and My
 ![Overall architecture of the synchronisation systems](https://raw.githubusercontent.com/WiIIiam278/HuskSync/master/images/system-diagram.png)
 
 ## Available Modes
-* The `DELAY` sync mode is the default sync mode, that use the `network_latency_miliseconds` value to apply a delay before listening to Redis data
-* The `LOCKSTEP` sync mode uses a data checkout system to ensure that all servers are in sync regardless of network latency or tick rate fluctuations. This mode was introduced in HuskSync v3.1
+* The `LOCKSTEP` sync mode is the default sync mode. It uses a data checkout system to ensure that all servers are in sync regardless of network latency or tick rate fluctuations. This mode was introduced in HuskSync v3.1, and was made the default in v3.2.
+* The `DELAY` sync mode uses the `network_latency_miliseconds` value to apply a delay before listening to Redis data
 
 You can change which sync mode you are using by editing the `sync_mode` setting under `synchronization` in `config.yml`. 
 
@@ -15,24 +15,11 @@ You can change which sync mode you are using by editing the `sync_mode` setting
 
 ```yaml
 synchronization:
-  # The mode of data synchronization to use (DELAY or LOCKSTEP). DELAY should be fine for most networks. Docs: https://william278.net/docs/husksync/sync-modes
-  mode: DELAY
+  # The data synchronization mode to use (LOCKSTEP or DELAY). LOCKSTEP is recommended for most networks. Docs: https://william278.net/docs/husksync/sync-modes
+  mode: LOCKSTEP
 ```
 </details>
 
-## Delay
-The `DELAY` sync mode works as described below:
-* When a user disconnects from a server, a `SERVER_SWITCH` key is immediately set on Redis, followed by a `DATA_UPDATE` key which contains the user's packed and serialized Data Snapshot.
-* When the user connects to a server, they are marked as locked (unable to break blocks, use containers, etc.)
-* The server asynchronously waits for the `network_latency_miliseconds` value (default: 500ms) to allow the source server time to serialize & set their key.
-* After waiting, the server checks for the `SERVER_SWITCH` key. 
-  * If present, it will continuously attempt to read for a `DATA_UPDATE` key; when read, their data will be set from the snapshot deserialized from Redis.
-  * If not present, their data will be pulled from the database (as though they joined the network)
-
-`DELAY` has been the default sync mode since HuskSync v2.0. In HuskSync v3.1, `LOCKSTEP` was introduced. Since the delay mode has been tested and deployed for the longest, it is still the default, though note this may change in the future.
-
-However, if your network has a fluctuating tick rate or significant latency (especially if you have servers on different hardware/locations), you may wish to use `LOCKSTEP` instead for a more reliable sync system.
-
 ## Lockstep
 The `LOCKSTEP` sync mode works as described below:
 * When a user connects to a server, the server will continuously asynchronously check if a `DATA_CHECKOUT` key is present.
@@ -43,3 +30,16 @@ The `LOCKSTEP` sync mode works as described below:
 * When a user disconnects from a server, their data is serialized and set to Redis with a `DATA_UPDATE` key. After this key has been set, the user's current `DATA_CHECKOUT` key will be removed from Redis.
 
 Additionally, note that `DATA_CHECKOUT` keys are set with the server ID of the server which "checked out" the data (taken from the `server.yml` config file). On both shutdown and startup, the plugin will clear all `DATA_CHECKOUT` keys for the current server ID (to prevent stale keys in the event of a server crash for instance)
+
+`LOCKSTEP` has been the default sync mode since HuskSync v3.2, and is recommended for most networks.
+
+## Delay
+The `DELAY` sync mode works as described below:
+* When a user disconnects from a server, a `SERVER_SWITCH` key is immediately set on Redis, followed by a `DATA_UPDATE` key which contains the user's packed and serialized Data Snapshot.
+* When the user connects to a server, they are marked as locked (unable to break blocks, use containers, etc.)
+* The server asynchronously waits for the `network_latency_miliseconds` value (default: 500ms) to allow the source server time to serialize & set their key.
+* After waiting, the server checks for the `SERVER_SWITCH` key. 
+  * If present, it will continuously attempt to read for a `DATA_UPDATE` key; when read, their data will be set from the snapshot deserialized from Redis.
+  * If not present, their data will be pulled from the database (as though they joined the network)
+
+If your network has a fluctuating tick rate or significant latency (especially if you have servers on different hardware/locations), you may wish to use `LOCKSTEP` instead for a more reliable sync system.

docs/Unsupported-Versions.md

@@ -5,6 +5,7 @@ This plugin does not support the following software-Minecraft version combinatio
 |--------------------|-------------------------------------------|----------------------------------------|
 | 1.19.4             | Only: `Purpur, Pufferfish`†        | Older Paper builds also not supported. |
 | 1.19.3             | Only: `Paper, Purpur, Pufferfish`† | Upgrade to 1.19.4 or use Spigot        |
-| below 1.16.5       | _All_                                     | Upgrade to 1.16.5                      |
+| 1.16.5             | _All_                                     | Please use v3.3.1 or lower             |
+| below 1.16.5       | _All_                                     | Upgrade Minecraft 1.16.5               |
 
 †Further downstream forks of this server software are also affected.

docs/_Sidebar.md

@@ -28,4 +28,5 @@
   * 🚰 [Spigot](https://www.spigotmc.org/resources/husksync.97144/)
   * 🛒 [Polymart](https://polymart.org/resource/husksync.1634)
   * ⚒️ [Craftaro](https://craftaro.com/marketplace/product/husksync.758)
+  * 🛒 [BuiltByBit](https://craftaro.com/marketplace/product/husksync.758)
 * 💬 [Discord Support](https://discord.gg/tVYhJfyDWG)

gradle.properties

@@ -1,13 +1,13 @@
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
 
 org.gradle.daemon=true
-javaVersion=16
+javaVersion=17
 
-plugin_version=3.1
+plugin_version=3.3
 plugin_archive=husksync
 plugin_description=A modern, cross-server player data synchronization system
 
-jedis_version=5.0.0
-mysql_driver_version=8.1.0
-mariadb_driver_version=3.2.0
-snappy_version=1.1.10.3
+jedis_version=5.1.0
+mysql_driver_version=8.3.0
+mariadb_driver_version=3.3.2
+snappy_version=1.1.10.5

jitpack.yml

@@ -1,12 +0,0 @@
-# This file ensures jitpack builds HuskSync correctly by setting the JDK to 16
-jdk:
-  - 'openjdk16'
-before_install:
-  - 'git clone https://github.com/WiIIiam278/HuskSync.git --recurse-submodules'
-  - 'chmod +x gradlew'
-  - 'chmod +x ./.scripts/ensure-java-16'
-  - 'bash ./.scripts/ensure-java-16 install'
-install:
-  - 'if ! ./.scripts/ensure-java-16 use; then source ~/.sdkman/bin/sdkman-init.sh; fi'
-  - 'java -version'
-  - './gradlew publishToMavenLocal'

paper/build.gradle

@@ -3,6 +3,10 @@ dependencies {
     compileOnly project(':common')
 
     compileOnly 'io.papermc.paper:paper-api:1.19.4-R0.1-SNAPSHOT'
+    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.projectlombok:lombok:1.18.30'
+
+    annotationProcessor 'org.projectlombok:lombok:1.18.30'
 }
 
 shadowJar {
@@ -14,28 +18,26 @@ 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.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.huskclaims.libraries'
     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 'me.lucko.commodore', 'net.william278.husksync.libraries.commodore'
+    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()
 }

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

@@ -19,10 +19,14 @@
 
 package net.william278.husksync;
 
+import net.kyori.adventure.audience.Audience;
 import net.william278.husksync.listener.BukkitEventListener;
 import net.william278.husksync.listener.PaperEventListener;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.UUID;
+
 @SuppressWarnings("unused")
 public class PaperHuskSync extends BukkitHuskSync {
 
@@ -32,4 +36,11 @@ public class PaperHuskSync extends BukkitHuskSync {
         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;
+    }
+
 }

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

@@ -19,12 +19,12 @@
 
 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 net.william278.annotaml.Annotaml;
-import net.william278.annotaml.YamlFile;
-import net.william278.annotaml.YamlKey;
+import lombok.NoArgsConstructor;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.graph.Dependency;
 import org.eclipse.aether.repository.RemoteRepository;
@@ -35,12 +35,13 @@ import java.io.InputStream;
 import java.util.List;
 import java.util.Objects;
 
-@SuppressWarnings({"UnstableApiUsage", "unused"})
+@NoArgsConstructor
+@SuppressWarnings("UnstableApiUsage")
 public class PaperHuskSyncLoader implements PluginLoader {
 
     @Override
     public void classloader(@NotNull PluginClasspathBuilder classpathBuilder) {
-        MavenLibraryResolver resolver = new MavenLibraryResolver();
+        final MavenLibraryResolver resolver = new MavenLibraryResolver();
 
         resolveLibraries(classpathBuilder).stream()
                 .map(DefaultArtifact::new)
@@ -55,8 +56,11 @@ public class PaperHuskSyncLoader implements PluginLoader {
     @NotNull
     private static List<String> resolveLibraries(@NotNull PluginClasspathBuilder classpathBuilder) {
         try (InputStream input = getLibraryListFile()) {
-            return Annotaml.create(PaperLibraries.class, Objects.requireNonNull(input)).get().libraries;
-        } catch (Exception e) {
+            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();
@@ -67,16 +71,12 @@ public class PaperHuskSyncLoader implements PluginLoader {
         return PaperHuskSyncLoader.class.getClassLoader().getResourceAsStream("paper-libraries.yml");
     }
 
-    @YamlFile(header = "Dependencies for HuskSync on Paper")
+    @Configuration
+    @NoArgsConstructor
     public static class PaperLibraries {
 
-        @YamlKey("libraries")
         private List<String> libraries;
 
-        @SuppressWarnings("unused")
-        private PaperLibraries() {
-        }
-
     }
 
 }

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

@@ -29,6 +29,8 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
+import static net.william278.husksync.config.Settings.SynchronizationSettings.SaveOnDeathSettings;
+
 public class PaperEventListener extends BukkitEventListener {
 
     public PaperEventListener(@NotNull BukkitHuskSync plugin) {
@@ -46,13 +48,14 @@ public class PaperEventListener extends BukkitEventListener {
         }
 
         // Handle saving player data snapshots on death
-        if (!plugin.getSettings().doSaveOnDeath()) {
+        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 (plugin.getSettings().getDeathItemsMode()) {
+        final List<ItemStack> itemsToSave = switch (settings.getItemsToSave()) {
             case DROPS -> event.getDrops();
             case ITEMS_TO_KEEP -> event.getItemsToKeep();
         };

plugin/build.gradle

@@ -1,4 +0,0 @@
-dependencies {
-    implementation project(path: ':bukkit', configuration: 'shadow')
-    runtimeOnly project(path: ':paper')
-}

settings.gradle

@@ -8,6 +8,5 @@ rootProject.name = 'HuskSync'
 include(
         'common',
         'bukkit',
-        'paper',
-        'plugin'
+        'paper'
 )

test/requirements.txt

@@ -4,4 +4,4 @@ colorama==0.4.6
 idna==3.4
 requests==2.31.0
 tqdm==4.66.1
-urllib3==2.0.6
+urllib3==2.0.7

test/spin_network.py

@@ -13,14 +13,14 @@ from tqdm import tqdm
 class Parameters:
     root_dir = './servers/'
     proxy_version = "1.20"
-    minecraft_version = '1.20.2'
+    minecraft_version = '1.20.4'
     eula_agreement = 'true'
 
     backend_names = ['alpha', 'beta']
     backend_ports = [25567, 25568]
     backend_type = 'paper'
     backend_ram = 2048
-    backend_plugins = ['../target/HuskSync-Plugin-*.jar']
+    backend_plugins = ['../target/HuskSync-Paper-*.jar']
     backend_plugin_folders = ['./HuskSync']
     operator_names = ['William278']
     operator_uuids = ['5dfb0558-e306-44f4-bb9a-f9218d4eb787']