Encapsulate Settings, tweak keys, add empty dead player save option, close #73

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: William <will27528@gmail.com>

.github/dependabot.yml

@@ -0,0 +1,7 @@
+# Dependabot configuration file for GitHub
+version: 2
+updates:
+  - package-ecosystem: "gradle" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

.github/funding.yml

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

LICENSE

@@ -1,4 +1,4 @@
-Copyright © William278 2022. All rights reserved
+Copyright © William278 2023. All rights reserved
 
 LICENSE
 This source code is provided as reference to licensed individuals that have purchased the HuskSync

README.md

@@ -1,33 +1,59 @@
-# [![HuskSync Banner](images/banner-graphic.png)](https://github.com/WiIIiam278/HuskSync)
-![Github Actions](https://github.com/WiIIiam278/HuskSync/workflows/Java%20CI/badge.svg)
-[![Discord](https://img.shields.io/discord/818135932103557162?color=7289da&logo=discord)](https://discord.gg/tVYhJfyDWG)
-
-[Documentation, Guides & API](https://william278.net/docs/husksync/Home) · [Resource Page](https://www.spigotmc.org/resources/husksync.97144/) · [Bug Reports](https://github.com/WiIIiam278/HuskSync/issues)
+<p align="center">
+    <img src="images/banner.png" alt="HuskSync" />
+    <a href="https://github.com/WiIIiam278/HuskSync/actions/workflows/java_ci.yml">
+        <img src="https://img.shields.io/github/actions/workflow/status/WiIIiam278/HuskSync/java_ci.yml?branch=master&logo=github"/>
+    </a> 
+    <a href="https://jitpack.io/#net.william278/HuskSync">
+        <img src="https://img.shields.io/jitpack/version/net.william278/HuskSync?color=%2300fb9a&label=api&logo=gradle" />
+    </a> 
+    <a href="https://discord.gg/tVYhJfyDWG">
+        <img src="https://img.shields.io/discord/818135932103557162.svg?label=&logo=discord&logoColor=fff&color=7389D8&labelColor=6A7EC2" />
+    </a> 
+    <br/>
+    <b>
+        <a href="https://www.spigotmc.org/resources/husksync.97144/">Spigot</a>
+    </b> —
+    <b>
+        <a href="https://william278.net/docs/husksync/setup">Setup</a>
+    </b> — 
+    <b>
+        <a href="https://william278.net/docs/husksync/">Docs</a>
+    </b> — 
+    <b>
+        <a href="https://github.com/WiIIiam278/HuskSync/issues">Issues</a>
+    </b>
+</p>
+<br/>
 
 **HuskSync** is a modern, cross-server player data synchronisation system that enables the comprehensive synchronisation of your user's data across multiple proxied servers. It does this by making use of Redis and MySQL to optimally cache data while players change servers.
 
 ## Features
-- Synchronise inventories, ender chests, advancements, statistics, experience points, health, max health, hunger, saturation, potion effects, persistent data container tags, game mode, location and more across multiple proxied servers. 
-- Create and manage "snapshot" backups of user data and roll back users to previous states on-the-fly. (`/userdata`)
-- Preview, list, delete, restore & pin user data snapshots in-game with an intuitive menu.
-- Examine the contents of player's inventories and ender chests on-the-fly. (`/inventory`, `/enderchest`)
-- Hooks with your [Player Analytics](https://github.com/plan-player-analytics/Plan) web panel to provide an overview of user data.
-- Supports segregating synchronisation across multiple distinct clusters on one network.
+**⭐ Seamless synchronisation** &mdash; Utilises optimised Redis caching when players change server to sync player data super quickly for a seamless experience.
 
-## Requirements
-* A MySQL Database (v8.0+)
-* A Redis Database (v5.0+)
-* Any number of proxied Spigot servers (Minecraft v1.16.5+)
+**⭐ Complete player synchronisation** &mdash; Sync inventories, Ender Chests, health, hunger, effects, advancements, statistics, locked maps & [more](https://william278.net/docs/husksync/sync-features)—no data left behind!
+
+**⭐ Backup, restore & rotate** &mdash; Something gone wrong? Restore players back to a previous data state. Rotate and manage data snapshots in-game!
+
+**⭐ Import existing data** &mdash; Import your MySQLPlayerDataBridge data—or from your existing world data! No server reset needed!
+
+**⭐ Works great with Plan** &mdash; Stay in touch with your community through HuskSync analytics on your Plan web panel.
+
+**⭐ Extensible API & open-source** &mdash; Need more? Extend the plugin with the Developer API. Or, submit a pull request through our code bounty system!
+
+**Ready?** [Let's head down town!](https://william278.net/docs/husksync/setup)
 
 ## Setup
-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.
+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+.
+
+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.
-3. Navigate to the HuskSync config file on each server (`~/plugins/HuskSync/config.yml`) and fill in both the MySQL and Redis database credentials.
-4. Start every server again and synchronistaion will begin.
+3. Navigate to the HuskSync config file on each server (~/plugins/HuskSync/config.yml) and fill in both the MySQL and Redis database credentials.
+4. Start every server again and synchronization will begin.
 
 ## Building
 To build HuskSync, simply run the following in the root of the repository:
-```
+
+```bash
 ./gradlew clean build
 ```
 
@@ -37,25 +63,20 @@ HuskSync is a premium resource. This source code is provided as reference only f
 - [License](https://github.com/WiIIiam278/HuskSync/blob/master/LICENSE)
 
 ## Contributing
-A code bounty program is in place for HuskSync, where developers making significant code contributions to HuskSync may be entitled to a license at my discretion to use HuskSync in commercial contexts without having to purchase the resource. Please read the information for contributors in the LICENSE file before submitting a pull request. 
+A code bounty program is in place for HuskSync, where developers making significant code contributions to HuskSync may be entitled to a license at my discretion to use HuskSync in commercial contexts without having to purchase the resource. Please read the information for contributors in the LICENSE file before submitting a pull request.
 
-## Translation
+## 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/locales)
-- [English Locales](https://github.com/WiIIiam278/HuskSync/tree/master/common/src/main/resources/locales/en-gb.yml)
-
-## bStats
-This plugin uses bStats to provide me with metrics about its usage:
-- [bStats Metrics](https://bstats.org/plugin/bukkit/HuskSync%20-%20Bukkit/13140)
-
-You can turn metric collection off by navigating to `~/plugins/bStats/config.yml` and editing the config to disable plugin metrics.
+- [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)
 
 ## Links
-- [Documentation, Guides & API](https://william278.net/docs/husksync/Home)
-- [Resource Page](https://www.spigotmc.org/resources/husksync.97144/)
-- [Bug Reports](https://github.com/WiIIiam278/HuskSync/issues)
-- [Discord Support](https://discord.gg/tVYhJfyDWG) (Proof of purchase required)
+- [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), [Songoda](https://marketplace.songoda.com/marketplace/product/husksync-a-modern-cross-server-player-data-synchronization-system.758))
+- [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 (Proof of purchase required)
+- [bStats](https://bstats.org/plugin/bukkit/HuskSync%20-%20Bukkit/13140) &mdash; View plugin metrics
 
 ---
-&copy; [William278](https://william278.net/), 2022. All rights reserved.
+&copy; [William278](https://william278.net/), 2023. All rights reserved.

api/build.gradle

@@ -1,29 +0,0 @@
-dependencies {
-    implementation project(path: ':bukkit')
-    compileOnly project(path: ':common')
-
-    compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT'
-    compileOnly 'org.jetbrains:annotations:23.0.0'
-}
-
-shadowJar {
-    relocate 'org.apache', 'net.william278.husksync.libraries'
-    relocate 'dev.dejvokep', 'net.william278.husksync.libraries'
-    relocate 'de.themoep', '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 'com.google', 'net.william278.husksync.libraries'
-    relocate 'redis.clients', 'net.william278.husksync.libraries'
-    relocate 'org.json', 'net.william278.husksync.libraries.json'
-
-    relocate 'net.byteflux.libby', 'net.william278.husksync.libraries.libby'
-    relocate 'org.bstats', 'net.william278.husksync.libraries.bstats'
-    relocate 'net.william278.mpdbconverter', 'net.william278.husksync.libraries.mpdbconverter'
-    relocate 'net.william278.hslmigrator', 'net.william278.husksync.libraries.hslconverter'
-}
-
-java {
-    withSourcesJar()
-    withJavadocJar()
-}

build.gradle

@@ -1,15 +1,19 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
+    id 'com.github.johnrengelman.shadow' version '8.1.0'
     id 'org.ajoberstar.grgit' version '5.0.0'
     id 'java'
     id 'maven-publish'
 }
 
 group 'net.william278'
-version "$ext.plugin_version+${versionMetadata()}"
+version "$ext.plugin_version-${versionMetadata()}"
 
 ext {
     set 'version', version.toString()
+    set 'jedis_version', jedis_version.toString()
+    set 'mysql_driver_version', mysql_driver_version.toString()
+    set 'snappy_version', snappy_version.toString()
+    set 'commons_text_version', commons_text_version.toString()
 }
 
 import org.apache.tools.ant.filters.ReplaceTokens
@@ -30,12 +34,14 @@ allprojects {
         maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
         maven { url 'https://repo.minebench.de/' }
         maven { url 'https://repo.alessiodp.com/releases/' }
+        maven { url 'https://repo.mattstudios.me/artifactory/public/' }
         maven { url 'https://jitpack.io' }
+        maven { url 'https://libraries.minecraft.net/' }
     }
 
     dependencies {
-        testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
-        testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+        testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
+        testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
     }
 
     test {
@@ -52,14 +58,14 @@ subprojects {
     version rootProject.version
     archivesBaseName = "${rootProject.name}-${project.name.capitalize()}"
 
-    if (['bukkit', 'api', 'plugin'].contains(project.name)) {
+    if (['bukkit', 'plugin'].contains(project.name)) {
         shadowJar {
             destinationDirectory.set(file("$rootDir/target"))
             archiveClassifier.set('')
         }
 
         // API publishing
-        if ('api'.contains(project.name)) {
+        if ('bukkit'.contains(project.name)) {
             java {
                 withSourcesJar()
                 withJavadocJar()
@@ -98,5 +104,5 @@ def versionMetadata() {
     if (grgit == null) {
         return System.getenv("GITHUB_RUN_NUMBER") ? 'build.' + System.getenv("GITHUB_RUN_NUMBER") : 'unknown'
     }
-    return 'rev.' + grgit.head().abbreviatedId + (grgit.status().clean ? '' : '-indev')
+    return grgit.head().abbreviatedId + (grgit.status().clean ? '' : '-indev')
 }

bukkit/build.gradle

@@ -1,29 +1,50 @@
 dependencies {
     implementation project(path: ':common')
-    implementation 'org.bstats:bstats-bukkit:3.0.0'
+    implementation 'org.bstats:bstats-bukkit:3.0.1'
     implementation 'net.william278:mpdbdataconverter:1.0.1'
     implementation 'net.william278:hsldataconverter:1.0'
+    implementation 'net.william278:MapDataAPI:1.0.2'
+    implementation 'net.william278:AndJam:1.0.2'
+    implementation 'me.lucko:commodore:2.2'
+    implementation 'net.kyori:adventure-platform-bukkit:4.2.0'
+    implementation 'dev.triumphteam:triumph-gui:3.1.4'
 
-    compileOnly 'redis.clients:jedis:4.2.3'
-    compileOnly 'commons-io:commons-io:2.11.0'
-    compileOnly 'de.themoep:minedown:1.7.1-SNAPSHOT'
-    compileOnly 'dev.dejvokep:boosted-yaml:1.2'
     compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT'
+    compileOnly 'commons-io:commons-io:2.11.0'
+    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 'redis.clients:jedis:' + jedis_version
+    compileOnly 'net.william278:DesertWell:1.1.1'
+    compileOnly 'net.william278:Annotaml:2.0.1'
+    compileOnly 'net.william278:AdvancementAPI:97a9583413'
 }
 
 shadowJar {
-    relocate 'org.apache', 'net.william278.husksync.libraries'
+    dependencies {
+        exclude(dependency('com.mojang:brigadier'))
+    }
+
+    relocate 'org.apache.commons.io', 'net.william278.husksync.libraries.commons.io'
+    relocate 'com.google.gson', 'net.william278.husksync.libraries.gson'
     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 'com.google', 'net.william278.husksync.libraries'
-    relocate 'redis.clients', 'net.william278.husksync.libraries'
-    relocate 'org.json', 'net.william278.husksync.libraries.json'
+    relocate 'dev.dejvokep', 'net.william278.husksync.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.nbt'
+    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'
 }

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

@@ -1,11 +1,8 @@
 package net.william278.husksync;
 
-import dev.dejvokep.boostedyaml.YamlDocument;
-import dev.dejvokep.boostedyaml.dvs.versioning.BasicVersioning;
-import dev.dejvokep.boostedyaml.settings.dumper.DumperSettings;
-import dev.dejvokep.boostedyaml.settings.general.GeneralSettings;
-import dev.dejvokep.boostedyaml.settings.loader.LoaderSettings;
-import dev.dejvokep.boostedyaml.settings.updater.UpdaterSettings;
+import net.kyori.adventure.platform.bukkit.BukkitAudiences;
+import net.william278.annotaml.Annotaml;
+import net.william278.desertwell.Version;
 import net.william278.husksync.command.BukkitCommand;
 import net.william278.husksync.command.BukkitCommandType;
 import net.william278.husksync.command.Permission;
@@ -16,7 +13,6 @@ import net.william278.husksync.data.DataAdapter;
 import net.william278.husksync.data.JsonDataAdapter;
 import net.william278.husksync.database.Database;
 import net.william278.husksync.database.MySqlDatabase;
-import net.william278.husksync.editor.DataEditor;
 import net.william278.husksync.event.BukkitEventCannon;
 import net.william278.husksync.event.EventCannon;
 import net.william278.husksync.hook.PlanHook;
@@ -28,7 +24,6 @@ import net.william278.husksync.migrator.MpdbMigrator;
 import net.william278.husksync.player.BukkitPlayer;
 import net.william278.husksync.player.OnlineUser;
 import net.william278.husksync.redis.RedisManager;
-import net.william278.husksync.util.*;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.command.PluginCommand;
@@ -40,6 +35,7 @@ import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -54,15 +50,14 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync {
     private static final int METRICS_ID = 13140;
     private Database database;
     private RedisManager redisManager;
-    private Logger logger;
-    private ResourceReader resourceReader;
     private EventListener eventListener;
     private DataAdapter dataAdapter;
-    private DataEditor dataEditor;
     private EventCannon eventCannon;
     private Settings settings;
     private Locales locales;
     private List<Migrator> availableMigrators;
+
+    private BukkitAudiences audiences;
     private static BukkitHuskSync instance;
 
     /**
@@ -84,22 +79,20 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync {
         // Initialize HuskSync
         final AtomicBoolean initialized = new AtomicBoolean(true);
         try {
-            // Set the logging adapter and resource reader
-            this.logger = new BukkitLogger(this.getLogger());
-            this.resourceReader = new BukkitResourceReader(this);
+            // Create adventure audience
+            this.audiences = BukkitAudiences.create(this);
 
             // Load settings and locales
-            getLoggingAdapter().log(Level.INFO, "Loading plugin configuration settings & locales...");
+            log(Level.INFO, "Loading plugin configuration settings & locales...");
             initialized.set(reload().join());
             if (initialized.get()) {
-                logger.showDebugLogs(settings.getBooleanValue(Settings.ConfigOption.DEBUG_LOGGING));
-                getLoggingAdapter().log(Level.INFO, "Successfully loaded plugin configuration settings & locales");
+                log(Level.INFO, "Successfully loaded plugin configuration settings & locales");
             } else {
                 throw new HuskSyncInitializationException("Failed to load plugin configuration settings and/or locales");
             }
 
             // Prepare data adapter
-            if (settings.getBooleanValue(Settings.ConfigOption.SYNCHRONIZATION_COMPRESS_DATA)) {
+            if (settings.doCompressData()) {
                 dataAdapter = new CompressedDataAdapter();
             } else {
                 dataAdapter = new JsonDataAdapter();
@@ -108,9 +101,6 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync {
             // Prepare event cannon
             eventCannon = new BukkitEventCannon();
 
-            // Prepare data editor
-            dataEditor = new DataEditor(locales);
-
             // Prepare migrators
             availableMigrators = new ArrayList<>();
             availableMigrators.add(new LegacyMigrator(this));
@@ -120,11 +110,11 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync {
             }
 
             // Prepare database connection
-            this.database = new MySqlDatabase(settings, resourceReader, logger, dataAdapter, eventCannon);
-            getLoggingAdapter().log(Level.INFO, "Attempting to establish connection to the database...");
+            this.database = new MySqlDatabase(this);
+            log(Level.INFO, "Attempting to establish connection to the database...");
             initialized.set(this.database.initialize());
             if (initialized.get()) {
-                getLoggingAdapter().log(Level.INFO, "Successfully established a connection to the database");
+                log(Level.INFO, "Successfully established a connection to the database");
             } else {
                 throw new HuskSyncInitializationException("Failed to establish a connection to the database. " +
                                                           "Please check the supplied database credentials in the config file");
@@ -132,22 +122,22 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync {
 
             // Prepare redis connection
             this.redisManager = new RedisManager(this);
-            getLoggingAdapter().log(Level.INFO, "Attempting to establish connection to the Redis server...");
-            initialized.set(this.redisManager.initialize().join());
+            log(Level.INFO, "Attempting to establish connection to the Redis server...");
+            initialized.set(this.redisManager.initialize());
             if (initialized.get()) {
-                getLoggingAdapter().log(Level.INFO, "Successfully established a connection to the Redis server");
+                log(Level.INFO, "Successfully established a connection to the Redis server");
             } else {
                 throw new HuskSyncInitializationException("Failed to establish a connection to the Redis server. " +
                                                           "Please check the supplied Redis credentials in the config file");
             }
 
             // Register events
-            getLoggingAdapter().log(Level.INFO, "Registering events...");
+            log(Level.INFO, "Registering events...");
             this.eventListener = new BukkitEventListener(this);
-            getLoggingAdapter().log(Level.INFO, "Successfully registered events listener");
+            log(Level.INFO, "Successfully registered events listener");
 
             // Register permissions
-            getLoggingAdapter().log(Level.INFO, "Registering permissions & commands...");
+            log(Level.INFO, "Registering permissions & commands...");
             Arrays.stream(Permission.values()).forEach(permission -> getServer().getPluginManager()
                     .addPermission(new org.bukkit.permissions.Permission(permission.node, switch (permission.defaultAccess) {
                         case EVERYONE -> PermissionDefault.TRUE;
@@ -162,39 +152,54 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync {
                     new BukkitCommand(bukkitCommandType.commandBase, this).register(pluginCommand);
                 }
             }
-            getLoggingAdapter().log(Level.INFO, "Successfully registered permissions & commands");
+            log(Level.INFO, "Successfully registered permissions & commands");
 
             // Hook into plan
             if (Bukkit.getPluginManager().getPlugin("Plan") != null) {
-                getLoggingAdapter().log(Level.INFO, "Enabling Plan integration...");
-                new PlanHook(database, logger).hookIntoPlan();
-                getLoggingAdapter().log(Level.INFO, "Plan integration enabled!");
+                log(Level.INFO, "Enabling Plan integration...");
+                new PlanHook(this).hookIntoPlan();
+                log(Level.INFO, "Plan integration enabled!");
             }
 
             // Hook into bStats metrics
             try {
                 new Metrics(this, METRICS_ID);
             } catch (final Exception e) {
-                getLoggingAdapter().log(Level.WARNING, "Skipped bStats metrics initialization due to an exception.");
+                log(Level.WARNING, "Skipped bStats metrics initialization due to an exception.");
             }
 
             // Check for updates
-            if (settings.getBooleanValue(Settings.ConfigOption.CHECK_FOR_UPDATES)) {
-                getLoggingAdapter().log(Level.INFO, "Checking for updates...");
-                CompletableFuture.runAsync(() -> new UpdateChecker(getPluginVersion(), getLoggingAdapter()).logToConsole());
+            if (settings.doCheckForUpdates()) {
+                log(Level.INFO, "Checking for updates...");
+                getLatestVersionIfOutdated().thenAccept(newestVersion ->
+                        newestVersion.ifPresent(newVersion -> log(Level.WARNING,
+                                "An update is available for HuskSync, v" + newVersion
+                                + " (Currently running v" + getPluginVersion() + ")")));
             }
         } catch (HuskSyncInitializationException exception) {
-            getLoggingAdapter().log(Level.SEVERE, exception.getMessage());
+            log(Level.SEVERE, """
+                    ***************************************************
+                               
+                              Failed to initialize HuskSync!
+                               
+                    ***************************************************
+                    The plugin was disabled due to an error. Please check
+                    the logs below for details.
+                    No user data will be synchronised.
+                    ***************************************************
+                    Caused by: %error_message%
+                    """
+                    .replaceAll("%error_message%", exception.getMessage()));
             initialized.set(false);
         } catch (Exception exception) {
-            getLoggingAdapter().log(Level.SEVERE, "An unhandled exception occurred initializing HuskSync!", exception);
+            log(Level.SEVERE, "An unhandled exception occurred initializing HuskSync!", exception);
             initialized.set(false);
         } finally {
             // Validate initialization
             if (initialized.get()) {
-                getLoggingAdapter().log(Level.INFO, "Successfully enabled HuskSync v" + getPluginVersion());
+                log(Level.INFO, "Successfully enabled HuskSync v" + getPluginVersion());
             } else {
-                getLoggingAdapter().log(Level.SEVERE, "Failed to initialize HuskSync. The plugin will now be disabled");
+                log(Level.SEVERE, "Failed to initialize HuskSync. The plugin will now be disabled");
                 getServer().getPluginManager().disablePlugin(this);
             }
         }
@@ -205,7 +210,7 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync {
         if (this.eventListener != null) {
             this.eventListener.handlePluginDisable();
         }
-        getLoggingAdapter().log(Level.INFO, "Successfully disabled HuskSync v" + getPluginVersion());
+        log(Level.INFO, "Successfully disabled HuskSync v" + getPluginVersion());
     }
 
     @Override
@@ -237,11 +242,6 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync {
         return dataAdapter;
     }
 
-    @Override
-    public @NotNull DataEditor getDataEditor() {
-        return dataEditor;
-    }
-
     @Override
     public @NotNull EventCannon getEventCannon() {
         return eventCannon;
@@ -264,30 +264,53 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync {
     }
 
     @Override
-    public @NotNull Logger getLoggingAdapter() {
-        return logger;
+    public void log(@NotNull Level level, @NotNull String message, @NotNull Throwable... throwable) {
+        getLogger().log(level, message, throwable);
+    }
+
+    @NotNull
+    @Override
+    public Version getPluginVersion() {
+        return Version.fromString(getDescription().getVersion(), "-");
+    }
+
+    @NotNull
+    @Override
+    public Version getMinecraftVersion() {
+        return Version.fromMinecraftVersionString(Bukkit.getBukkitVersion());
+    }
+
+    /**
+     * Returns the adventure Bukkit audiences
+     *
+     * @return The adventure Bukkit audiences
+     */
+    @NotNull
+    public BukkitAudiences getAudiences() {
+        return audiences;
     }
 
     @Override
-    public @NotNull Version getPluginVersion() {
-        return Version.pluginVersion(getDescription().getVersion());
-    }
-
-    @Override
-    public @NotNull Version getMinecraftVersion() {
-        return Version.minecraftVersion(Bukkit.getBukkitVersion());
+    public Set<UUID> getLockedPlayers() {
+        return this.eventListener.getLockedPlayers();
     }
 
     @Override
     public CompletableFuture<Boolean> reload() {
         return CompletableFuture.supplyAsync(() -> {
             try {
-                this.settings = Settings.load(YamlDocument.create(new File(getDataFolder(), "config.yml"), Objects.requireNonNull(resourceReader.getResource("config.yml")), GeneralSettings.builder().setUseDefaults(false).build(), LoaderSettings.builder().setAutoUpdate(true).build(), DumperSettings.builder().setEncoding(DumperSettings.Encoding.UNICODE).build(), UpdaterSettings.builder().setVersioning(new BasicVersioning("config_version")).build()));
+                // Load plugin settings
+                this.settings = Annotaml.create(new File(getDataFolder(), "config.yml"), new Settings()).get();
 
-                this.locales = Locales.load(YamlDocument.create(new File(getDataFolder(), "messages-" + settings.getStringValue(Settings.ConfigOption.LANGUAGE) + ".yml"), Objects.requireNonNull(resourceReader.getResource("locales/" + settings.getStringValue(Settings.ConfigOption.LANGUAGE) + ".yml"))));
+                // Load locales from language preset default
+                final Locales languagePresets = Annotaml.create(Locales.class,
+                        Objects.requireNonNull(getResource("locales/" + settings.getLanguage() + ".yml"))).get();
+                this.locales = Annotaml.create(new File(getDataFolder(), "messages_" + settings.getLanguage() + ".yml"),
+                        languagePresets).get();
                 return true;
-            } catch (IOException | NullPointerException e) {
-                getLoggingAdapter().log(Level.SEVERE, "Failed to load data from the config", e);
+            } catch (IOException | NullPointerException | InvocationTargetException | IllegalAccessException |
+                     InstantiationException e) {
+                log(Level.SEVERE, "Failed to load data from the config", e);
                 return false;
             }
         });

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

@@ -66,7 +66,7 @@ public class HuskSyncAPI extends BaseHuskSyncAPI {
         return CompletableFuture.runAsync(() -> getUserData(user).thenAccept(userData ->
                 userData.ifPresent(data -> serializeItemStackArray(inventoryContents)
                         .thenAccept(serializedInventory -> {
-                            data.getInventoryData().serializedItems = serializedInventory;
+                            data.getInventory().orElse(ItemData.empty()).serializedItems = serializedInventory;
                             setUserData(user, data).join();
                         }))));
     }
@@ -95,7 +95,7 @@ public class HuskSyncAPI extends BaseHuskSyncAPI {
         return CompletableFuture.runAsync(() -> getUserData(user).thenAccept(userData ->
                 userData.ifPresent(data -> serializeItemStackArray(enderChestContents)
                         .thenAccept(serializedInventory -> {
-                            data.getEnderChestData().serializedItems = serializedInventory;
+                            data.getEnderChest().orElse(ItemData.empty()).serializedItems = serializedInventory;
                             setUserData(user, data).join();
                         }))));
     }
@@ -106,12 +106,14 @@ public class HuskSyncAPI extends BaseHuskSyncAPI {
      * @param user the {@link User} to get the {@link BukkitInventoryMap} for
      * @return future returning the {@link BukkitInventoryMap} for the given {@link User} if they exist,
      * otherwise an empty {@link Optional}
+     * @apiNote If the {@link UserData} does not contain an inventory (i.e. inventory synchronisation is disabled), the
+     * returned {@link BukkitInventoryMap} will be equivalent an empty inventory.
      * @since 2.0
      */
     public CompletableFuture<Optional<BukkitInventoryMap>> getPlayerInventory(@NotNull User user) {
         return CompletableFuture.supplyAsync(() -> getUserData(user).join()
-                .map(userData -> deserializeInventory(userData
-                        .getInventoryData().serializedItems).join()));
+                .map(userData -> deserializeInventory(userData.getInventory()
+                        .orElse(ItemData.empty()).serializedItems).join()));
     }
 
     /**
@@ -120,12 +122,14 @@ public class HuskSyncAPI extends BaseHuskSyncAPI {
      * @param user the {@link User} to get the Ender Chest contents of
      * @return future returning the {@link ItemStack} array of Ender Chest items for the user if they exist,
      * otherwise an empty {@link Optional}
+     * @apiNote If the {@link UserData} does not contain an Ender Chest (i.e. Ender Chest synchronisation is disabled),
+     * the returned {@link BukkitInventoryMap} will be equivalent to an empty inventory.
      * @since 2.0
      */
     public CompletableFuture<Optional<ItemStack[]>> getPlayerEnderChest(@NotNull User user) {
         return CompletableFuture.supplyAsync(() -> getUserData(user).join()
-                .map(userData -> deserializeItemStackArray(userData
-                        .getEnderChestData().serializedItems).join()));
+                .map(userData -> deserializeItemStackArray(userData.getEnderChest()
+                        .orElse(ItemData.empty()).serializedItems).join()));
     }
 
     /**

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

@@ -0,0 +1,31 @@
+package net.william278.husksync.command;
+
+import me.lucko.commodore.CommodoreProvider;
+import me.lucko.commodore.file.CommodoreFileReader;
+import net.william278.husksync.BukkitHuskSync;
+import org.bukkit.command.PluginCommand;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.logging.Level;
+
+/**
+ * Used for registering Brigadier hooks on platforms that support commodore for rich command syntax
+ */
+public class BrigadierUtil {
+
+    protected static void registerCommodore(@NotNull BukkitHuskSync plugin, @NotNull PluginCommand pluginCommand,
+                                            @NotNull CommandBase command) {
+        // Register command descriptions via commodore (brigadier wrapper)
+        try (InputStream pluginFile = plugin.getResource("commodore/" + command.command + ".commodore")) {
+            CommodoreProvider.getCommodore(plugin).register(pluginCommand,
+                    CommodoreFileReader.INSTANCE.parse(pluginFile),
+                    player -> player.hasPermission(command.permission));
+        } catch (IOException e) {
+            plugin.log(Level.SEVERE,
+                    "Failed to load " + command.command + ".commodore command definitions", e);
+        }
+    }
+
+}

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

@@ -1,6 +1,7 @@
 package net.william278.husksync.command;
 
-import net.william278.husksync.HuskSync;
+import me.lucko.commodore.CommodoreProvider;
+import net.william278.husksync.BukkitHuskSync;
 import net.william278.husksync.player.BukkitPlayer;
 import org.bukkit.command.*;
 import org.bukkit.entity.Player;
@@ -18,14 +19,14 @@ public class BukkitCommand implements CommandExecutor, TabExecutor {
     /**
      * The {@link CommandBase} that will be executed
      */
-    private final CommandBase command;
+    protected final CommandBase command;
 
     /**
      * The implementing plugin
      */
-    private final HuskSync plugin;
+    private final BukkitHuskSync plugin;
 
-    public BukkitCommand(@NotNull CommandBase command, @NotNull HuskSync implementor) {
+    public BukkitCommand(@NotNull CommandBase command, @NotNull BukkitHuskSync implementor) {
         this.command = command;
         this.plugin = implementor;
     }
@@ -40,6 +41,9 @@ public class BukkitCommand implements CommandExecutor, TabExecutor {
         pluginCommand.setTabCompleter(this);
         pluginCommand.setPermission(command.permission);
         pluginCommand.setDescription(command.getDescription());
+        if (CommodoreProvider.isSupported()) {
+            BrigadierUtil.registerCommodore(plugin, pluginCommand, command);
+        }
     }
 
     @Override
@@ -51,8 +55,9 @@ public class BukkitCommand implements CommandExecutor, TabExecutor {
             if (this.command instanceof ConsoleExecutable consoleExecutable) {
                 consoleExecutable.onConsoleExecute(args);
             } else {
-                plugin.getLocales().getLocale("error_in_game_command_only").
-                        ifPresent(locale -> sender.spigot().sendMessage(locale.toComponent()));
+                plugin.getLocales().getLocale("error_in_game_command_only")
+                        .ifPresent(locale -> plugin.getAudiences().sender(sender)
+                                .sendMessage(locale.toComponent()));
             }
         }
         return true;

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

@@ -11,6 +11,8 @@ import java.util.Optional;
 @SuppressWarnings("unused")
 public class BukkitInventoryMap {
 
+    public static final int INVENTORY_SLOT_COUNT = 41;
+
     private ItemStack[] contents;
 
     /**

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

@@ -0,0 +1,207 @@
+package net.william278.husksync.data;
+
+import net.william278.husksync.BukkitHuskSync;
+import net.william278.mapdataapi.MapData;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.MapMeta;
+import org.bukkit.map.*;
+import org.bukkit.persistence.PersistentDataType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.awt.*;
+import java.io.IOException;
+import java.util.Objects;
+import java.util.logging.Level;
+
+/**
+ * Handles the persistence of {@link MapData} into {@link ItemStack}s.
+ */
+public class BukkitMapHandler {
+
+    private static final BukkitHuskSync plugin = BukkitHuskSync.getInstance();
+    private static final NamespacedKey MAP_DATA_KEY = new NamespacedKey(plugin, "map_data");
+
+    /**
+     * Get the {@link MapData} from the given {@link ItemStack} and persist it in its' data container
+     *
+     * @param itemStack the {@link ItemStack} to get the {@link MapData} from
+     */
+    @SuppressWarnings("ConstantConditions")
+    public static void persistMapData(@Nullable ItemStack itemStack) {
+        if (itemStack == null || itemStack.getType() != Material.FILLED_MAP) {
+            return;
+        }
+        final MapMeta mapMeta = (MapMeta) itemStack.getItemMeta();
+        if (mapMeta == null || !mapMeta.hasMapView()) {
+            return;
+        }
+
+        // Get the map view from the map
+        final MapView mapView = mapMeta.getMapView();
+        if (mapView == null || !mapView.isLocked() || mapView.isVirtual()) {
+            return;
+        }
+
+        // Get the map data
+        plugin.debug("Rendering map view onto canvas for locked map");
+        final LockedMapCanvas canvas = new LockedMapCanvas(mapView);
+        for (MapRenderer renderer : mapView.getRenderers()) {
+            renderer.render(mapView, canvas, Bukkit.getServer()
+                    .getOnlinePlayers().stream()
+                    .findAny()
+                    .orElse(null));
+        }
+
+        // Save the extracted rendered map data
+        plugin.debug("Saving pixel canvas data for locked map");
+        if (!mapMeta.getPersistentDataContainer().has(MAP_DATA_KEY, PersistentDataType.BYTE_ARRAY)) {
+            mapMeta.getPersistentDataContainer().set(MAP_DATA_KEY, PersistentDataType.BYTE_ARRAY,
+                    canvas.extractMapData().toBytes());
+            itemStack.setItemMeta(mapMeta);
+        }
+    }
+
+    /**
+     * Set the map data of the given {@link ItemStack} to the given {@link MapData}, applying a map view to the item stack
+     *
+     * @param itemStack the {@link ItemStack} to set the map data of
+     */
+    public static void setMapRenderer(@Nullable ItemStack itemStack) {
+        if (itemStack == null || itemStack.getType() != Material.FILLED_MAP) {
+            return;
+        }
+
+        final MapMeta mapMeta = (MapMeta) itemStack.getItemMeta();
+        if (mapMeta == null) {
+            return;
+        }
+
+        if (!itemStack.getItemMeta().getPersistentDataContainer().has(MAP_DATA_KEY, PersistentDataType.BYTE_ARRAY)) {
+            return;
+        }
+
+        try {
+            final byte[] serializedData = itemStack.getItemMeta().getPersistentDataContainer()
+                    .get(MAP_DATA_KEY, PersistentDataType.BYTE_ARRAY);
+            final MapData mapData = MapData.fromByteArray(Objects.requireNonNull(serializedData));
+            plugin.debug("Setting deserialized map data for an item stack");
+
+            // Create a new map view renderer with the map data color at each pixel
+            final MapView view = Bukkit.createMap(Bukkit.getWorlds().get(0));
+            view.getRenderers().clear();
+            view.addRenderer(new PersistentMapRenderer(mapData));
+            view.setLocked(true);
+            view.setScale(MapView.Scale.NORMAL);
+            view.setTrackingPosition(false);
+            view.setUnlimitedTracking(false);
+            mapMeta.setMapView(view);
+            itemStack.setItemMeta(mapMeta);
+            plugin.debug("Successfully applied renderer to map item stack");
+        } catch (IOException | NullPointerException e) {
+            plugin.getLogger().log(Level.WARNING, "Failed to deserialize map data for a player", e);
+        }
+    }
+
+    /**
+     * A {@link MapRenderer} that can be used to render persistently serialized {@link MapData} to a {@link MapView}
+     */
+    public static class PersistentMapRenderer extends MapRenderer {
+
+        private final MapData mapData;
+
+        private PersistentMapRenderer(@NotNull MapData mapData) {
+            super(false);
+            this.mapData = mapData;
+        }
+
+        @Override
+        public void render(@NotNull MapView map, @NotNull MapCanvas canvas, @NotNull Player player) {
+            for (int i = 0; i < 128; i++) {
+                for (int j = 0; j < 128; j++) {
+                    // We set the pixels in this order to avoid the map being rendered upside down
+                    canvas.setPixel(j, i, (byte) mapData.getColorAt(i, j));
+                }
+            }
+        }
+    }
+
+    /**
+     * A {@link MapCanvas} implementation used for pre-rendering maps to be converted into {@link MapData}
+     */
+    public static class LockedMapCanvas implements MapCanvas {
+
+        private final MapView mapView;
+        private final int[][] pixels = new int[128][128];
+        private MapCursorCollection cursors;
+
+        private LockedMapCanvas(@NotNull MapView mapView) {
+            this.mapView = mapView;
+        }
+
+        @NotNull
+        @Override
+        public MapView getMapView() {
+            return mapView;
+        }
+
+        @NotNull
+        @Override
+        public MapCursorCollection getCursors() {
+            return cursors == null ? (cursors = new MapCursorCollection()) : cursors;
+        }
+
+        @Override
+        public void setCursors(@NotNull MapCursorCollection cursors) {
+            this.cursors = cursors;
+        }
+
+        @Override
+        public void setPixel(int x, int y, byte color) {
+            pixels[x][y] = color;
+        }
+
+        @Override
+        public byte getPixel(int x, int y) {
+            return (byte) pixels[x][y];
+        }
+
+        @Override
+        public byte getBasePixel(int x, int y) {
+            return getPixel(x, y);
+        }
+
+        @Override
+        public void drawImage(int x, int y, @NotNull Image image) {
+            // Not implemented
+        }
+
+        @Override
+        public void drawText(int x, int y, @NotNull MapFont font, @NotNull String text) {
+            // Not implemented
+        }
+
+        @NotNull
+        private String getDimension() {
+            return mapView.getWorld() == null ? "minecraft:overworld"
+                    : switch (mapView.getWorld().getEnvironment()) {
+                case NETHER -> "minecraft:the_nether";
+                case THE_END -> "minecraft:the_end";
+                default -> "minecraft:overworld";
+            };
+        }
+
+        /**
+         * Extract the map data from the canvas. Must be rendered first
+         * @return the extracted map data
+         */
+        @NotNull
+        private MapData extractMapData() {
+            return MapData.fromPixels(pixels, getDimension(), (byte) 2);
+        }
+    }
+}

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

@@ -0,0 +1,54 @@
+package net.william278.husksync.data;
+
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Player;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Objects;
+import java.util.Optional;
+
+public record BukkitPersistentTypeMapping<T, Z>(PersistentDataTagType type, PersistentDataType<T, Z> bukkitType) {
+
+    public static final BukkitPersistentTypeMapping<?, ?>[] PRIMITIVE_TYPE_MAPPINGS = new BukkitPersistentTypeMapping<?, ?>[]{
+            new BukkitPersistentTypeMapping<>(PersistentDataTagType.BYTE, PersistentDataType.BYTE),
+            new BukkitPersistentTypeMapping<>(PersistentDataTagType.SHORT, PersistentDataType.SHORT),
+            new BukkitPersistentTypeMapping<>(PersistentDataTagType.INTEGER, PersistentDataType.INTEGER),
+            new BukkitPersistentTypeMapping<>(PersistentDataTagType.LONG, PersistentDataType.LONG),
+            new BukkitPersistentTypeMapping<>(PersistentDataTagType.FLOAT, PersistentDataType.FLOAT),
+            new BukkitPersistentTypeMapping<>(PersistentDataTagType.DOUBLE, PersistentDataType.DOUBLE),
+            new BukkitPersistentTypeMapping<>(PersistentDataTagType.STRING, PersistentDataType.STRING),
+            new BukkitPersistentTypeMapping<>(PersistentDataTagType.BYTE_ARRAY, PersistentDataType.BYTE_ARRAY),
+            new BukkitPersistentTypeMapping<>(PersistentDataTagType.INTEGER_ARRAY, PersistentDataType.INTEGER_ARRAY),
+            new BukkitPersistentTypeMapping<>(PersistentDataTagType.LONG_ARRAY, PersistentDataType.LONG_ARRAY),
+            new BukkitPersistentTypeMapping<>(PersistentDataTagType.TAG_CONTAINER_ARRAY, PersistentDataType.TAG_CONTAINER_ARRAY),
+            new BukkitPersistentTypeMapping<>(PersistentDataTagType.TAG_CONTAINER, PersistentDataType.TAG_CONTAINER)
+    };
+
+    public BukkitPersistentTypeMapping(@NotNull PersistentDataTagType type, @NotNull PersistentDataType<T, Z> bukkitType) {
+        this.type = type;
+        this.bukkitType = bukkitType;
+    }
+
+    @NotNull
+    public PersistentDataTag<Z> getContainerValue(@NotNull PersistentDataContainer container, @NotNull NamespacedKey key) throws NullPointerException {
+        return new PersistentDataTag<>(type, Objects.requireNonNull(container.get(key, bukkitType)));
+    }
+
+    public void setContainerValue(@NotNull PersistentDataContainerData container, @NotNull Player player, @NotNull NamespacedKey key) throws NullPointerException {
+        container.getTagValue(key.toString(), bukkitType.getPrimitiveType())
+                .ifPresent(value -> player.getPersistentDataContainer().set(key, bukkitType, (Z) value));
+    }
+
+    public static Optional<BukkitPersistentTypeMapping<?, ?>> getMapping(@NotNull PersistentDataTagType type) {
+        for (BukkitPersistentTypeMapping<?, ?> mapping : PRIMITIVE_TYPE_MAPPINGS) {
+            if (mapping.type().equals(type)) {
+                return Optional.of(mapping);
+            }
+        }
+        return Optional.empty();
+    }
+
+
+}

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

@@ -1,5 +1,7 @@
 package net.william278.husksync.data;
 
+import net.william278.husksync.BukkitHuskSync;
+import net.william278.husksync.config.Settings;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.util.io.BukkitObjectInputStream;
@@ -13,6 +15,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
+import java.util.logging.Level;
 
 public class BukkitSerializer {
 
@@ -38,13 +41,18 @@ public class BukkitSerializer {
                 bukkitOutputStream.writeInt(inventoryContents.length);
 
                 // Write each serialize each ItemStack to the output stream
+                final boolean persistLockedMaps = BukkitHuskSync.getInstance().getSettings().getSynchronizationFeature(Settings.SynchronizationFeature.LOCKED_MAPS);
                 for (ItemStack inventoryItem : inventoryContents) {
+                    if (persistLockedMaps) {
+                        BukkitMapHandler.persistMapData(inventoryItem);
+                    }
                     bukkitOutputStream.writeObject(serializeItemStack(inventoryItem));
                 }
 
                 // Return encoded data, using the encoder from SnakeYaml to get a ByteArray conversion
                 return Base64Coder.encodeLines(byteOutputStream.toByteArray());
             } catch (IOException e) {
+                BukkitHuskSync.getInstance().log(Level.SEVERE, "Failed to serialize item stack data", e);
                 throw new DataSerializationException("Failed to serialize item stack data", e);
             }
         });
@@ -86,8 +94,13 @@ public class BukkitSerializer {
 
                     // Set the ItemStacks in the array from deserialized ItemStack data
                     int slotIndex = 0;
+                    final boolean persistLockedMaps = BukkitHuskSync.getInstance().getSettings().getSynchronizationFeature(Settings.SynchronizationFeature.LOCKED_MAPS);
                     for (ItemStack ignored : inventoryContents) {
-                        inventoryContents[slotIndex] = deserializeItemStack(bukkitInputStream.readObject());
+                        final ItemStack deserialized = deserializeItemStack(bukkitInputStream.readObject());
+                        if (persistLockedMaps) {
+                            BukkitMapHandler.setMapRenderer(deserialized);
+                        }
+                        inventoryContents[slotIndex] = deserialized;
                         slotIndex++;
                     }
 
@@ -95,6 +108,7 @@ public class BukkitSerializer {
                     return inventoryContents;
                 }
             } catch (IOException | ClassNotFoundException e) {
+                BukkitHuskSync.getInstance().log(Level.SEVERE, "Failed to deserialize item stack data", e);
                 throw new DataSerializationException("Failed to deserialize item stack data", e);
             }
         });
@@ -151,6 +165,7 @@ public class BukkitSerializer {
                 // Return encoded data, using the encoder from SnakeYaml to get a ByteArray conversion
                 return Base64Coder.encodeLines(byteOutputStream.toByteArray());
             } catch (IOException e) {
+                BukkitHuskSync.getInstance().log(Level.SEVERE, "Failed to serialize potion effect data", e);
                 throw new DataSerializationException("Failed to serialize potion effect data", e);
             }
         });
@@ -186,6 +201,7 @@ public class BukkitSerializer {
                     return potionEffects;
                 }
             } catch (IOException | ClassNotFoundException e) {
+                BukkitHuskSync.getInstance().log(Level.SEVERE, "Failed to deserialize potion effect data", e);
                 throw new DataSerializationException("Failed to deserialize potion effects", e);
             }
         });

bukkit/src/main/java/net/william278/husksync/event/BukkitDataSaveEvent.java

@@ -7,6 +7,7 @@ import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
+@SuppressWarnings("unused")
 public class BukkitDataSaveEvent extends BukkitEvent implements DataSaveEvent, Cancellable {
     private static final HandlerList HANDLER_LIST = new HandlerList();
     private boolean cancelled = false;
@@ -57,4 +58,8 @@ public class BukkitDataSaveEvent extends BukkitEvent implements DataSaveEvent, C
     public HandlerList getHandlers() {
         return HANDLER_LIST;
     }
+
+    public static HandlerList getHandlerList() {
+        return HANDLER_LIST;
+    }
 }

bukkit/src/main/java/net/william278/husksync/event/BukkitEvent.java

@@ -3,11 +3,16 @@ package net.william278.husksync.event;
 import net.william278.husksync.BukkitHuskSync;
 import org.bukkit.Bukkit;
 import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.concurrent.CompletableFuture;
 
+@SuppressWarnings("unused")
 public abstract class BukkitEvent extends Event implements net.william278.husksync.event.Event {
 
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+
     protected BukkitEvent() {
     }
 
@@ -26,4 +31,14 @@ public abstract class BukkitEvent extends Event implements net.william278.husksy
         return eventFireFuture;
     }
 
+    @NotNull
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLER_LIST;
+    }
+
+    public static HandlerList getHandlerList() {
+        return HANDLER_LIST;
+    }
+
 }

bukkit/src/main/java/net/william278/husksync/event/BukkitPlayerEvent.java

@@ -5,12 +5,16 @@ import net.william278.husksync.player.BukkitPlayer;
 import net.william278.husksync.player.OnlineUser;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.concurrent.CompletableFuture;
 
+@SuppressWarnings("unused")
 public abstract class BukkitPlayerEvent extends BukkitEvent implements PlayerEvent {
 
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+
     protected final Player player;
 
     protected BukkitPlayerEvent(@NotNull Player player) {
@@ -32,4 +36,15 @@ public abstract class BukkitPlayerEvent extends BukkitEvent implements PlayerEve
         return eventFireFuture;
     }
 
+    @NotNull
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLER_LIST;
+    }
+
+    public static HandlerList getHandlerList() {
+        return HANDLER_LIST;
+    }
+
+
 }

bukkit/src/main/java/net/william278/husksync/event/BukkitPreSyncEvent.java

@@ -6,6 +6,7 @@ import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
+@SuppressWarnings("unused")
 public class BukkitPreSyncEvent extends BukkitPlayerEvent implements PreSyncEvent, Cancellable {
     private static final HandlerList HANDLER_LIST = new HandlerList();
     private boolean cancelled = false;
@@ -41,4 +42,8 @@ public class BukkitPreSyncEvent extends BukkitPlayerEvent implements PreSyncEven
     public HandlerList getHandlers() {
         return HANDLER_LIST;
     }
+
+    public static HandlerList getHandlerList() {
+        return HANDLER_LIST;
+    }
 }

bukkit/src/main/java/net/william278/husksync/event/BukkitSyncCompleteEvent.java

@@ -4,6 +4,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
+@SuppressWarnings("unused")
 public class BukkitSyncCompleteEvent extends BukkitPlayerEvent implements SyncCompleteEvent {
     private static final HandlerList HANDLER_LIST = new HandlerList();
 
@@ -16,4 +17,8 @@ public class BukkitSyncCompleteEvent extends BukkitPlayerEvent implements SyncCo
     public HandlerList getHandlers() {
         return HANDLER_LIST;
     }
+
+    public static HandlerList getHandlerList() {
+        return HANDLER_LIST;
+    }
 }

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

@@ -0,0 +1,37 @@
+package net.william278.husksync.listener;
+
+import net.william278.husksync.config.Settings;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.PlayerDeathEvent;
+import org.jetbrains.annotations.NotNull;
+
+public interface BukkitDeathEventListener extends Listener {
+
+    boolean handleEvent(@NotNull Settings.EventType type, @NotNull Settings.EventPriority priority);
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    default void onPlayerDeathHighest(@NotNull PlayerDeathEvent event) {
+        if (handleEvent(Settings.EventType.DEATH_LISTENER, Settings.EventPriority.HIGHEST)) {
+            handlePlayerDeath(event);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
+    default void onPlayerDeath(@NotNull PlayerDeathEvent event) {
+        if (handleEvent(Settings.EventType.DEATH_LISTENER, Settings.EventPriority.NORMAL)) {
+            handlePlayerDeath(event);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+    default void onPlayerDeathLowest(@NotNull PlayerDeathEvent event) {
+        if (handleEvent(Settings.EventType.DEATH_LISTENER, Settings.EventPriority.LOWEST)) {
+            handlePlayerDeath(event);
+        }
+    }
+
+    void handlePlayerDeath(@NotNull PlayerDeathEvent player);
+
+}

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

@@ -1,130 +1,172 @@
 package net.william278.husksync.listener;
 
 import net.william278.husksync.BukkitHuskSync;
+import net.william278.husksync.config.Settings;
+import net.william278.husksync.data.BukkitInventoryMap;
 import net.william278.husksync.data.BukkitSerializer;
-import net.william278.husksync.data.DataSerializationException;
 import net.william278.husksync.data.ItemData;
-import net.william278.husksync.editor.ItemEditorMenuType;
 import net.william278.husksync.player.BukkitPlayer;
 import net.william278.husksync.player.OnlineUser;
 import org.bukkit.Bukkit;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityPickupItemEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.entity.ProjectileLaunchEvent;
 import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.inventory.InventoryOpenEvent;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.world.WorldSaveEvent;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
-import java.util.logging.Level;
 import java.util.stream.Collectors;
 
-public class BukkitEventListener extends EventListener implements Listener {
+public class BukkitEventListener extends EventListener implements BukkitJoinEventListener, BukkitQuitEventListener,
+        BukkitDeathEventListener, Listener {
+    protected final List<String> blacklistedCommands;
 
     public BukkitEventListener(@NotNull BukkitHuskSync huskSync) {
         super(huskSync);
+        this.blacklistedCommands = huskSync.getSettings().getBlacklistedCommandsWhileLocked();
         Bukkit.getServer().getPluginManager().registerEvents(this, huskSync);
     }
 
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onPlayerJoin(@NotNull PlayerJoinEvent event) {
-        super.handlePlayerJoin(BukkitPlayer.adapt(event.getPlayer()));
+    @Override
+    public boolean handleEvent(@NotNull Settings.EventType type, @NotNull Settings.EventPriority priority) {
+        return plugin.getSettings().getEventPriority(type).equals(priority);
     }
 
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onPlayerQuit(@NotNull PlayerQuitEvent event) {
-        super.handlePlayerQuit(BukkitPlayer.adapt(event.getPlayer()));
+    @Override
+    public void handlePlayerQuit(@NotNull BukkitPlayer bukkitPlayer) {
+        final Player player = bukkitPlayer.getPlayer();
+        if (!bukkitPlayer.isLocked() && !player.getItemOnCursor().getType().isAir()) {
+            player.getWorld().dropItem(player.getLocation(), player.getItemOnCursor());
+            player.setItemOnCursor(null);
+        }
+        super.handlePlayerQuit(bukkitPlayer);
+    }
+
+    @Override
+    public void handlePlayerJoin(@NotNull BukkitPlayer bukkitPlayer) {
+        super.handlePlayerJoin(bukkitPlayer);
+    }
+
+    @Override
+    public void handlePlayerDeath(@NotNull PlayerDeathEvent event) {
+        final OnlineUser user = BukkitPlayer.adapt(event.getEntity());
+
+        // If the player is locked or the plugin disabling, clear their drops
+        if (cancelPlayerEvent(user.uuid)) {
+            event.getDrops().clear();
+            return;
+        }
+
+        // Handle saving player data snapshots on death
+        if (!plugin.getSettings().doSaveOnDeath()) return;
+
+        // Truncate the drops list to the inventory size and save the player's inventory
+        final int maxInventorySize = BukkitInventoryMap.INVENTORY_SLOT_COUNT;
+        if (event.getDrops().size() > maxInventorySize) {
+            event.getDrops().subList(maxInventorySize, event.getDrops().size()).clear();
+        }
+        BukkitSerializer.serializeItemStackArray(event.getDrops().toArray(new ItemStack[0]))
+                .thenAccept(serializedDrops -> super.saveOnPlayerDeath(user, new ItemData(serializedDrops)));
     }
 
     @EventHandler(ignoreCancelled = true)
     public void onWorldSave(@NotNull WorldSaveEvent event) {
-        CompletableFuture.runAsync(() -> super.handleAsyncWorldSave(event.getWorld().getPlayers().stream()
-                .map(BukkitPlayer::adapt).collect(Collectors.toList())));
+        // Handle saving player data snapshots when the world saves
+        if (!plugin.getSettings().doSaveOnWorldSave()) return;
+
+        CompletableFuture.runAsync(() -> super.saveOnWorldSave(event.getWorld().getPlayers()
+                .stream().map(BukkitPlayer::adapt)
+                .collect(Collectors.toList())));
     }
 
-    @EventHandler(ignoreCancelled = true)
-    public void onInventoryClose(@NotNull InventoryCloseEvent event) {
-        CompletableFuture.runAsync(() -> {
-            if (event.getPlayer() instanceof Player player) {
-                final OnlineUser user = BukkitPlayer.adapt(player);
-                plugin.getDataEditor().getEditingInventoryData(user).ifPresent(menu -> {
-                    try {
-                        BukkitSerializer.serializeItemStackArray(Arrays.copyOf(event.getInventory().getContents(),
-                                menu.itemEditorMenuType == ItemEditorMenuType.INVENTORY_VIEWER
-                                        ? player.getInventory().getSize()
-                                        : player.getEnderChest().getSize())).thenAccept(
-                                serializedInventory -> super.handleMenuClose(user, new ItemData(serializedInventory)));
-                    } catch (DataSerializationException e) {
-                        plugin.getLoggingAdapter().log(Level.SEVERE,
-                                "Failed to serialize inventory data during menu close", e);
-                    }
-                });
-            }
-        });
-    }
 
     /*
      * Events to cancel if the player has not been set yet
      */
 
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onProjectileLaunch(@NotNull ProjectileLaunchEvent event) {
+        final Projectile projectile = event.getEntity();
+        if (projectile.getShooter() instanceof Player player && projectile.getType() == EntityType.TRIDENT) {
+            event.setCancelled(cancelPlayerEvent(player.getUniqueId()));
+        }
+    }
+
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onDropItem(@NotNull PlayerDropItemEvent event) {
-        event.setCancelled(cancelPlayerEvent(BukkitPlayer.adapt(event.getPlayer())));
+        event.setCancelled(cancelPlayerEvent(event.getPlayer().getUniqueId()));
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onPickupItem(@NotNull EntityPickupItemEvent event) {
         if (event.getEntity() instanceof Player player) {
-            event.setCancelled(cancelPlayerEvent(BukkitPlayer.adapt(player)));
+            event.setCancelled(cancelPlayerEvent(player.getUniqueId()));
         }
-
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onPlayerInteract(@NotNull PlayerInteractEvent event) {
-        event.setCancelled(cancelPlayerEvent(BukkitPlayer.adapt(event.getPlayer())));
+        event.setCancelled(cancelPlayerEvent(event.getPlayer().getUniqueId()));
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerInteractEntity(@NotNull PlayerInteractEntityEvent event) {
+        event.setCancelled(cancelPlayerEvent(event.getPlayer().getUniqueId()));
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onBlockPlace(@NotNull BlockPlaceEvent event) {
-        event.setCancelled(cancelPlayerEvent(BukkitPlayer.adapt(event.getPlayer())));
+        event.setCancelled(cancelPlayerEvent(event.getPlayer().getUniqueId()));
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onBlockBreak(@NotNull BlockBreakEvent event) {
-        event.setCancelled(cancelPlayerEvent(BukkitPlayer.adapt(event.getPlayer())));
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onInventoryClick(@NotNull InventoryClickEvent event) {
-        if (event.getWhoClicked() instanceof Player player) {
-            event.setCancelled(cancelInventoryClick(BukkitPlayer.adapt(player)));
-        }
+        event.setCancelled(cancelPlayerEvent(event.getPlayer().getUniqueId()));
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onInventoryOpen(@NotNull InventoryOpenEvent event) {
         if (event.getPlayer() instanceof Player player) {
-            event.setCancelled(cancelPlayerEvent(BukkitPlayer.adapt(player)));
+            event.setCancelled(cancelPlayerEvent(player.getUniqueId()));
         }
     }
 
-    @EventHandler(ignoreCancelled = true)
-    public void onPlayerDeath(PlayerDeathEvent event) {
-        if (cancelPlayerEvent(BukkitPlayer.adapt(event.getEntity()))) {
-            event.getDrops().clear();
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onInventoryClick(@NotNull InventoryClickEvent event) {
+        event.setCancelled(cancelPlayerEvent(event.getWhoClicked().getUniqueId()));
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerTakeDamage(@NotNull EntityDamageEvent event) {
+        if (event.getEntity() instanceof Player player) {
+            event.setCancelled(cancelPlayerEvent(player.getUniqueId()));
+        }
+    }
+
+    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+    public void onPermissionCommand(@NotNull PlayerCommandPreprocessEvent event) {
+        String[] commandArgs = event.getMessage().substring(1).split(" ");
+        String commandLabel = commandArgs[0].toLowerCase();
+
+        if (blacklistedCommands.contains(commandLabel)) {
+            event.setCancelled(cancelPlayerEvent(event.getPlayer().getUniqueId()));
         }
     }
 

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

@@ -0,0 +1,38 @@
+package net.william278.husksync.listener;
+
+import net.william278.husksync.config.Settings;
+import net.william278.husksync.player.BukkitPlayer;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.jetbrains.annotations.NotNull;
+
+public interface BukkitJoinEventListener extends Listener {
+
+    boolean handleEvent(@NotNull Settings.EventType type, @NotNull Settings.EventPriority priority);
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    default void onPlayerJoinHighest(@NotNull PlayerJoinEvent event) {
+        if (handleEvent(Settings.EventType.JOIN_LISTENER, Settings.EventPriority.HIGHEST)) {
+            handlePlayerJoin(BukkitPlayer.adapt(event.getPlayer()));
+        }
+    }
+
+    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
+    default void onPlayerJoin(@NotNull PlayerJoinEvent event) {
+        if (handleEvent(Settings.EventType.JOIN_LISTENER, Settings.EventPriority.NORMAL)) {
+            handlePlayerJoin(BukkitPlayer.adapt(event.getPlayer()));
+        }
+    }
+
+    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+    default void onPlayerJoinLowest(@NotNull PlayerJoinEvent event) {
+        if (handleEvent(Settings.EventType.JOIN_LISTENER, Settings.EventPriority.LOWEST)) {
+            handlePlayerJoin(BukkitPlayer.adapt(event.getPlayer()));
+        }
+    }
+
+    void handlePlayerJoin(@NotNull BukkitPlayer player);
+
+}

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

@@ -0,0 +1,38 @@
+package net.william278.husksync.listener;
+
+import net.william278.husksync.config.Settings;
+import net.william278.husksync.player.BukkitPlayer;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.jetbrains.annotations.NotNull;
+
+public interface BukkitQuitEventListener extends Listener {
+
+    boolean handleEvent(@NotNull Settings.EventType type, @NotNull Settings.EventPriority priority);
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    default void onPlayerQuitHighest(@NotNull PlayerQuitEvent event) {
+        if (handleEvent(Settings.EventType.QUIT_LISTENER, Settings.EventPriority.HIGHEST)) {
+            handlePlayerQuit(BukkitPlayer.adapt(event.getPlayer()));
+        }
+    }
+
+    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
+    default void onPlayerQuit(@NotNull PlayerQuitEvent event) {
+        if (handleEvent(Settings.EventType.QUIT_LISTENER, Settings.EventPriority.NORMAL)) {
+            handlePlayerQuit(BukkitPlayer.adapt(event.getPlayer()));
+        }
+    }
+
+    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+    default void onPlayerQuitLowest(@NotNull PlayerQuitEvent event) {
+        if (handleEvent(Settings.EventType.QUIT_LISTENER, Settings.EventPriority.LOWEST)) {
+            handlePlayerQuit(BukkitPlayer.adapt(event.getPlayer()));
+        }
+    }
+
+    void handlePlayerQuit(@NotNull BukkitPlayer player);
+
+}

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

@@ -4,7 +4,6 @@ import com.zaxxer.hikari.HikariDataSource;
 import me.william278.husksync.bukkit.data.DataSerializer;
 import net.william278.hslmigrator.HSLConverter;
 import net.william278.husksync.HuskSync;
-import net.william278.husksync.config.Settings;
 import net.william278.husksync.data.*;
 import net.william278.husksync.player.User;
 import org.bukkit.Material;
@@ -18,6 +17,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.regex.Pattern;
 
@@ -37,11 +37,11 @@ public class LegacyMigrator extends Migrator {
     public LegacyMigrator(@NotNull HuskSync plugin) {
         super(plugin);
         this.hslConverter = HSLConverter.getInstance();
-        this.sourceHost = plugin.getSettings().getStringValue(Settings.ConfigOption.DATABASE_HOST);
-        this.sourcePort = plugin.getSettings().getIntegerValue(Settings.ConfigOption.DATABASE_PORT);
-        this.sourceUsername = plugin.getSettings().getStringValue(Settings.ConfigOption.DATABASE_USERNAME);
-        this.sourcePassword = plugin.getSettings().getStringValue(Settings.ConfigOption.DATABASE_PASSWORD);
-        this.sourceDatabase = plugin.getSettings().getStringValue(Settings.ConfigOption.DATABASE_NAME);
+        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();
         this.sourcePlayersTable = "husksync_players";
         this.sourceDataTable = "husksync_data";
         this.minecraftVersion = plugin.getMinecraftVersion().toString();
@@ -49,33 +49,34 @@ public class LegacyMigrator extends Migrator {
 
     @Override
     public CompletableFuture<Boolean> start() {
-        plugin.getLoggingAdapter().log(Level.INFO, "Starting migration of legacy HuskSync v1.x data...");
+        plugin.log(Level.INFO, "Starting migration of legacy HuskSync v1.x data...");
         final long startTime = System.currentTimeMillis();
         return CompletableFuture.supplyAsync(() -> {
             // Wipe the existing database, preparing it for data import
-            plugin.getLoggingAdapter().log(Level.INFO, "Preparing existing database (wiping)...");
+            plugin.log(Level.INFO, "Preparing existing database (wiping)...");
             plugin.getDatabase().wipeDatabase().join();
-            plugin.getLoggingAdapter().log(Level.INFO, "Successfully wiped user data database (took " + (System.currentTimeMillis() - startTime) + "ms)");
+            plugin.log(Level.INFO, "Successfully wiped user data database (took " + (System.currentTimeMillis() - startTime) + "ms)");
 
             // Create jdbc driver connection url
             final String jdbcUrl = "jdbc:mysql://" + sourceHost + ":" + sourcePort + "/" + sourceDatabase;
 
             // Create a new data source for the mpdb converter
             try (final HikariDataSource connectionPool = new HikariDataSource()) {
-                plugin.getLoggingAdapter().log(Level.INFO, "Establishing connection to legacy database...");
+                plugin.log(Level.INFO, "Establishing connection to legacy database...");
                 connectionPool.setJdbcUrl(jdbcUrl);
                 connectionPool.setUsername(sourceUsername);
                 connectionPool.setPassword(sourcePassword);
                 connectionPool.setPoolName((getIdentifier() + "_migrator_pool").toUpperCase());
 
-                plugin.getLoggingAdapter().log(Level.INFO, "Downloading raw data from the legacy database...");
+                plugin.log(Level.INFO, "Downloading raw data from the legacy database (this might take a while)...");
                 final List<LegacyData> dataToMigrate = new ArrayList<>();
                 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`
                             FROM `%source_players_table%`
                             INNER JOIN `%source_data_table%`
-                                ON `%source_players_table%`.`id` = `%source_data_table%`.`player_id`;
+                            ON `%source_players_table%`.`id` = `%source_data_table%`.`player_id`
+                            WHERE `username` IS NOT NULL;
                             """.replaceAll(Pattern.quote("%source_players_table%"), sourcePlayersTable)
                             .replaceAll(Pattern.quote("%source_data_table%"), sourceDataTable))) {
                         try (final ResultSet resultSet = statement.executeQuery()) {
@@ -104,26 +105,34 @@ public class LegacyMigrator extends Migrator {
                                         resultSet.getString("location")
                                 ));
                                 playersMigrated++;
-                                if (playersMigrated % 25 == 0) {
-                                    plugin.getLoggingAdapter().log(Level.INFO, "Downloaded legacy data for " + playersMigrated + " players...");
+                                if (playersMigrated % 50 == 0) {
+                                    plugin.log(Level.INFO, "Downloaded legacy data for " + playersMigrated + " players...");
                                 }
                             }
                         }
                     }
                 }
-                plugin.getLoggingAdapter().log(Level.INFO, "Completed download of " + dataToMigrate.size() + " entries from the legacy database!");
-                plugin.getLoggingAdapter().log(Level.INFO, "Converting HuskSync 1.x data to the latest HuskSync user data format...");
-                dataToMigrate.forEach(data -> data.toUserData(hslConverter, minecraftVersion).thenAccept(convertedData ->
-                        plugin.getDatabase().ensureUser(data.user()).thenRun(() ->
-                                plugin.getDatabase().setUserData(data.user(), convertedData, DataSaveCause.LEGACY_MIGRATION)
-                                        .exceptionally(exception -> {
-                                            plugin.getLoggingAdapter().log(Level.SEVERE, "Failed to migrate legacy data for " + data.user().username + ": " + exception.getMessage());
-                                            return null;
-                                        }))));
-                plugin.getLoggingAdapter().log(Level.INFO, "Migration complete for " + dataToMigrate.size() + " users in " + ((System.currentTimeMillis() - startTime) / 1000) + " seconds!");
+                plugin.log(Level.INFO, "Completed download of " + dataToMigrate.size() + " entries from the legacy database!");
+                plugin.log(Level.INFO, "Converting HuskSync 1.x data to the new user data format (this might take a while)...");
+
+                final AtomicInteger playersConverted = new AtomicInteger();
+                dataToMigrate.forEach(data -> data.toUserData(hslConverter, minecraftVersion).thenAccept(convertedData -> {
+                    plugin.getDatabase().ensureUser(data.user()).thenRun(() ->
+                            plugin.getDatabase().setUserData(data.user(), convertedData, DataSaveCause.LEGACY_MIGRATION)
+                                    .exceptionally(exception -> {
+                                        plugin.log(Level.SEVERE, "Failed to migrate legacy data for " + data.user().username + ": " + exception.getMessage());
+                                        return null;
+                                    })).join();
+
+                    playersConverted.getAndIncrement();
+                    if (playersConverted.get() % 50 == 0) {
+                        plugin.log(Level.INFO, "Converted legacy data for " + playersConverted + " players...");
+                    }
+                }).join());
+                plugin.log(Level.INFO, "Migration complete for " + dataToMigrate.size() + " users in " + ((System.currentTimeMillis() - startTime) / 1000) + " seconds!");
                 return true;
             } catch (Exception e) {
-                plugin.getLoggingAdapter().log(Level.SEVERE, "Error while migrating legacy data: " + e.getMessage() + " - are your source database credentials correct?");
+                plugin.log(Level.SEVERE, "Error while migrating legacy data: " + e.getMessage() + " - are your source database credentials correct?");
                 return false;
             }
         });
@@ -167,15 +176,15 @@ public class LegacyMigrator extends Migrator {
                 }
                 default -> false;
             }) {
-                plugin.getLoggingAdapter().log(Level.INFO, getHelpMenu());
-                plugin.getLoggingAdapter().log(Level.INFO, "Successfully set " + args[0] + " to " +
+                plugin.log(Level.INFO, getHelpMenu());
+                plugin.log(Level.INFO, "Successfully set " + args[0] + " to " +
                                                            obfuscateDataString(args[1]));
             } else {
-                plugin.getLoggingAdapter().log(Level.INFO, "Invalid operation, could not set " + args[0] + " to " +
+                plugin.log(Level.INFO, "Invalid operation, could not set " + args[0] + " to " +
                                                            obfuscateDataString(args[1]) + " (is it a valid option?)");
             }
         } else {
-            plugin.getLoggingAdapter().log(Level.INFO, getHelpMenu());
+            plugin.log(Level.INFO, getHelpMenu());
         }
     }
 
@@ -277,13 +286,16 @@ public class LegacyMigrator extends Migrator {
                             legacyLocationData == null ? 90f : legacyLocationData.yaw(),
                             legacyLocationData == null ? 180f : legacyLocationData.pitch());
 
-                    return new UserData(new StatusData(health, maxHealth, healthScale, hunger, saturation,
-                            saturationExhaustion, selectedSlot, totalExp, expLevel, expProgress, gameMode, isFlying),
-                            new ItemData(serializedInventory), new ItemData(serializedEnderChest),
-                            new PotionEffectData(serializedPotionEffects), convertedAdvancements,
-                            convertedStatisticData, convertedLocationData,
-                            new PersistentDataContainerData(new HashMap<>()),
-                            minecraftVersion);
+                    return UserData.builder(minecraftVersion)
+                            .setStatus(new StatusData(health, maxHealth, healthScale, hunger, saturation,
+                                    saturationExhaustion, selectedSlot, totalExp, expLevel, expProgress, gameMode, isFlying))
+                            .setInventory(new ItemData(serializedInventory))
+                            .setEnderChest(new ItemData(serializedEnderChest))
+                            .setPotionEffects(new PotionEffectData(serializedPotionEffects))
+                            .setAdvancements(convertedAdvancements)
+                            .setStatistics(convertedStatisticData)
+                            .setLocation(convertedLocationData)
+                            .build();
                 } catch (IOException e) {
                     throw new RuntimeException(e);
                 }

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

@@ -2,7 +2,6 @@ package net.william278.husksync.migrator;
 
 import com.zaxxer.hikari.HikariDataSource;
 import net.william278.husksync.BukkitHuskSync;
-import net.william278.husksync.config.Settings;
 import net.william278.husksync.data.*;
 import net.william278.husksync.player.User;
 import net.william278.mpdbconverter.MPDBConverter;
@@ -16,8 +15,11 @@ import org.jetbrains.annotations.NotNull;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+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;
 
@@ -40,11 +42,11 @@ public class MpdbMigrator extends Migrator {
     public MpdbMigrator(@NotNull BukkitHuskSync plugin, @NotNull Plugin mySqlPlayerDataBridge) {
         super(plugin);
         this.mpdbConverter = MPDBConverter.getInstance(mySqlPlayerDataBridge);
-        this.sourceHost = plugin.getSettings().getStringValue(Settings.ConfigOption.DATABASE_HOST);
-        this.sourcePort = plugin.getSettings().getIntegerValue(Settings.ConfigOption.DATABASE_PORT);
-        this.sourceUsername = plugin.getSettings().getStringValue(Settings.ConfigOption.DATABASE_USERNAME);
-        this.sourcePassword = plugin.getSettings().getStringValue(Settings.ConfigOption.DATABASE_PASSWORD);
-        this.sourceDatabase = plugin.getSettings().getStringValue(Settings.ConfigOption.DATABASE_NAME);
+        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();
         this.sourceInventoryTable = "mpdb_inventory";
         this.sourceEnderChestTable = "mpdb_enderchest";
         this.sourceExperienceTable = "mpdb_experience";
@@ -54,26 +56,26 @@ public class MpdbMigrator extends Migrator {
 
     @Override
     public CompletableFuture<Boolean> start() {
-        plugin.getLoggingAdapter().log(Level.INFO, "Starting migration from MySQLPlayerDataBridge to HuskSync...");
+        plugin.log(Level.INFO, "Starting migration from MySQLPlayerDataBridge to HuskSync...");
         final long startTime = System.currentTimeMillis();
         return CompletableFuture.supplyAsync(() -> {
             // Wipe the existing database, preparing it for data import
-            plugin.getLoggingAdapter().log(Level.INFO, "Preparing existing database (wiping)...");
+            plugin.log(Level.INFO, "Preparing existing database (wiping)...");
             plugin.getDatabase().wipeDatabase().join();
-            plugin.getLoggingAdapter().log(Level.INFO, "Successfully wiped user data database (took " + (System.currentTimeMillis() - startTime) + "ms)");
+            plugin.log(Level.INFO, "Successfully wiped user data database (took " + (System.currentTimeMillis() - startTime) + "ms)");
 
             // Create jdbc driver connection url
             final String jdbcUrl = "jdbc:mysql://" + sourceHost + ":" + sourcePort + "/" + sourceDatabase;
 
             // Create a new data source for the mpdb converter
             try (final HikariDataSource connectionPool = new HikariDataSource()) {
-                plugin.getLoggingAdapter().log(Level.INFO, "Establishing connection to MySQLPlayerDataBridge database...");
+                plugin.log(Level.INFO, "Establishing connection to MySQLPlayerDataBridge database...");
                 connectionPool.setJdbcUrl(jdbcUrl);
                 connectionPool.setUsername(sourceUsername);
                 connectionPool.setPassword(sourcePassword);
                 connectionPool.setPoolName((getIdentifier() + "_migrator_pool").toUpperCase());
 
-                plugin.getLoggingAdapter().log(Level.INFO, "Downloading raw data from the MySQLPlayerDataBridge database...");
+                plugin.log(Level.INFO, "Downloading raw data from the MySQLPlayerDataBridge database (this might take a while)...");
                 final List<MpdbData> dataToMigrate = new ArrayList<>();
                 try (final Connection connection = connectionPool.getConnection()) {
                     try (final PreparedStatement statement = connection.prepareStatement("""
@@ -101,25 +103,32 @@ public class MpdbMigrator extends Migrator {
                                 ));
                                 playersMigrated++;
                                 if (playersMigrated % 25 == 0) {
-                                    plugin.getLoggingAdapter().log(Level.INFO, "Downloaded MySQLPlayerDataBridge data for " + playersMigrated + " players...");
+                                    plugin.log(Level.INFO, "Downloaded MySQLPlayerDataBridge data for " + playersMigrated + " players...");
                                 }
                             }
                         }
                     }
                 }
-                plugin.getLoggingAdapter().log(Level.INFO, "Completed download of " + dataToMigrate.size() + " entries from the MySQLPlayerDataBridge database!");
-                plugin.getLoggingAdapter().log(Level.INFO, "Converting raw MySQLPlayerDataBridge data to HuskSync user data...");
-                dataToMigrate.forEach(data -> data.toUserData(mpdbConverter, minecraftVersion).thenAccept(convertedData ->
-                        plugin.getDatabase().ensureUser(data.user()).thenRun(() ->
-                                        plugin.getDatabase().setUserData(data.user(), convertedData, DataSaveCause.MPDB_MIGRATION))
-                                .exceptionally(exception -> {
-                                    plugin.getLoggingAdapter().log(Level.SEVERE, "Failed to migrate MySQLPlayerDataBridge data for " + data.user().username + ": " + exception.getMessage());
-                                    return null;
-                                })));
-                plugin.getLoggingAdapter().log(Level.INFO, "Migration complete for " + dataToMigrate.size() + " users in " + ((System.currentTimeMillis() - startTime) / 1000) + " seconds!");
+                plugin.log(Level.INFO, "Completed download of " + dataToMigrate.size() + " entries from the MySQLPlayerDataBridge database!");
+                plugin.log(Level.INFO, "Converting raw MySQLPlayerDataBridge data to HuskSync user data (this might take a while)...");
+
+                final AtomicInteger playersConverted = new AtomicInteger();
+                dataToMigrate.forEach(data -> data.toUserData(mpdbConverter, minecraftVersion).thenAccept(convertedData -> {
+                    plugin.getDatabase().ensureUser(data.user()).thenRun(() ->
+                                    plugin.getDatabase().setUserData(data.user(), convertedData, DataSaveCause.MPDB_MIGRATION))
+                            .exceptionally(exception -> {
+                                plugin.log(Level.SEVERE, "Failed to migrate MySQLPlayerDataBridge data for " + data.user().username + ": " + exception.getMessage());
+                                return null;
+                            }).join();
+                    playersConverted.getAndIncrement();
+                    if (playersConverted.get() % 50 == 0) {
+                        plugin.log(Level.INFO, "Converted MySQLPlayerDataBridge data for " + playersConverted + " players...");
+                    }
+                }).join());
+                plugin.log(Level.INFO, "Migration complete for " + dataToMigrate.size() + " users in " + ((System.currentTimeMillis() - startTime) / 1000) + " seconds!");
                 return true;
             } catch (Exception e) {
-                plugin.getLoggingAdapter().log(Level.SEVERE, "Error while migrating data: " + e.getMessage() + " - are your source database credentials correct?");
+                plugin.log(Level.SEVERE, "Error while migrating data: " + e.getMessage() + " - are your source database credentials correct?");
                 return false;
             }
         });
@@ -167,15 +176,15 @@ public class MpdbMigrator extends Migrator {
                 }
                 default -> false;
             }) {
-                plugin.getLoggingAdapter().log(Level.INFO, getHelpMenu());
-                plugin.getLoggingAdapter().log(Level.INFO, "Successfully set " + args[0] + " to " +
+                plugin.log(Level.INFO, getHelpMenu());
+                plugin.log(Level.INFO, "Successfully set " + args[0] + " to " +
                                                            obfuscateDataString(args[1]));
             } else {
-                plugin.getLoggingAdapter().log(Level.INFO, "Invalid operation, could not set " + args[0] + " to " +
+                plugin.log(Level.INFO, "Invalid operation, could not set " + args[0] + " to " +
                                                            obfuscateDataString(args[1]) + " (is it a valid option?)");
             }
         } else {
-            plugin.getLoggingAdapter().log(Level.INFO, getHelpMenu());
+            plugin.log(Level.INFO, getHelpMenu());
         }
     }
 
@@ -272,18 +281,14 @@ public class MpdbMigrator extends Migrator {
                 }
 
                 // Create user data record
-                return new UserData(new StatusData(20, 20, 0, 20, 10,
-                        1, 0, totalExp, expLevel, expProgress, "SURVIVAL",
-                        false),
-                        new ItemData(BukkitSerializer.serializeItemStackArray(inventory.getContents()).join()),
-                        new ItemData(BukkitSerializer.serializeItemStackArray(converter
-                                .getItemStackFromSerializedData(serializedEnderChest)).join()),
-                        new PotionEffectData(""), new ArrayList<>(),
-                        new StatisticsData(new HashMap<>(), new HashMap<>(), new HashMap<>(), new HashMap<>()),
-                        new LocationData("world", UUID.randomUUID(), "NORMAL", 0, 0, 0,
-                                0f, 0f),
-                        new PersistentDataContainerData(new HashMap<>()),
-                        minecraftVersion);
+                return UserData.builder(minecraftVersion)
+                        .setStatus(new StatusData(20, 20, 0, 20, 10,
+                                1, 0, totalExp, expLevel, expProgress, "SURVIVAL",
+                                false))
+                        .setInventory(new ItemData(BukkitSerializer.serializeItemStackArray(inventory.getContents()).join()))
+                        .setEnderChest(new ItemData(BukkitSerializer.serializeItemStackArray(converter
+                                .getItemStackFromSerializedData(serializedEnderChest)).join()))
+                        .build();
             });
         }
     }

bukkit/src/main/java/net/william278/husksync/player/BukkitPlayer.java

@@ -1,13 +1,17 @@
 package net.william278.husksync.player;
 
-import de.themoep.minedown.MineDown;
-import net.md_5.bungee.api.ChatMessageType;
-import net.md_5.bungee.api.chat.BaseComponent;
+import de.themoep.minedown.adventure.MineDown;
+import de.themoep.minedown.adventure.MineDownParser;
+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.desertwell.Version;
 import net.william278.husksync.BukkitHuskSync;
+import net.william278.husksync.config.Settings;
 import net.william278.husksync.data.*;
-import net.william278.husksync.editor.ItemEditorMenu;
-import net.william278.husksync.util.Version;
-import org.apache.commons.lang.ArrayUtils;
 import org.bukkit.*;
 import org.bukkit.advancement.Advancement;
 import org.bukkit.advancement.AdvancementProgress;
@@ -16,8 +20,9 @@ import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.persistence.PersistentDataContainer;
-import org.bukkit.persistence.PersistentDataType;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import org.jetbrains.annotations.NotNull;
@@ -33,13 +38,17 @@ import java.util.logging.Level;
  */
 public class BukkitPlayer extends OnlineUser {
 
+
     private final Player player;
+    private final Audience audience;
 
     private BukkitPlayer(@NotNull Player player) {
         super(player.getUniqueId(), player.getName());
         this.player = player;
+        this.audience = BukkitHuskSync.getInstance().getAudiences().player(player);
     }
 
+    @NotNull
     public static BukkitPlayer adapt(@NotNull Player player) {
         return new BukkitPlayer(player);
     }
@@ -68,54 +77,64 @@ public class BukkitPlayer extends OnlineUser {
     }
 
     @Override
-    public CompletableFuture<Void> setStatus(@NotNull StatusData statusData,
-                                             @NotNull List<StatusDataFlag> statusDataFlags) {
+    public CompletableFuture<Void> setStatus(@NotNull StatusData statusData, @NotNull Settings settings) {
         return CompletableFuture.runAsync(() -> {
-            double currentMaxHealth = Objects.requireNonNull(player.getAttribute(Attribute.GENERIC_MAX_HEALTH))
-                    .getBaseValue();
-            if (statusDataFlags.contains(StatusDataFlag.SET_MAX_HEALTH)) {
+            // Set max health
+            double currentMaxHealth = Objects.requireNonNull(player.getAttribute(Attribute.GENERIC_MAX_HEALTH)).getBaseValue();
+            if (settings.getSynchronizationFeature(Settings.SynchronizationFeature.MAX_HEALTH)) {
                 if (statusData.maxHealth != 0d) {
                     Objects.requireNonNull(player.getAttribute(Attribute.GENERIC_MAX_HEALTH))
                             .setBaseValue(statusData.maxHealth);
                     currentMaxHealth = statusData.maxHealth;
                 }
             }
-            if (statusDataFlags.contains(StatusDataFlag.SET_HEALTH)) {
+            if (settings.getSynchronizationFeature(Settings.SynchronizationFeature.HEALTH)) {
+                // Set health
                 final double currentHealth = player.getHealth();
                 if (statusData.health != currentHealth) {
                     final double healthToSet = currentHealth > currentMaxHealth ? currentMaxHealth : statusData.health;
-                    if (healthToSet <= 0) {
-                        Bukkit.getScheduler().runTask(BukkitHuskSync.getInstance(), () -> player.setHealth(healthToSet));
-                    } else {
-                        player.setHealth(healthToSet);
-                    }
+                    final double maxHealth = currentMaxHealth;
+                    Bukkit.getScheduler().runTask(BukkitHuskSync.getInstance(), () -> {
+                        try {
+                            player.setHealth(Math.min(healthToSet, maxHealth));
+                        } catch (IllegalArgumentException e) {
+                            BukkitHuskSync.getInstance().getLogger().log(Level.WARNING,
+                                    "Failed to set health of player " + player.getName() + " to " + healthToSet);
+                        }
+                    });
                 }
 
-                if (statusData.healthScale != 0d) {
-                    player.setHealthScale(statusData.healthScale);
-                } else {
-                    player.setHealthScale(statusData.maxHealth);
+                // Set health scale
+                try {
+                    if (statusData.healthScale != 0d) {
+                        player.setHealthScale(statusData.healthScale);
+                    } else {
+                        player.setHealthScale(statusData.maxHealth);
+                    }
+                    player.setHealthScaled(statusData.healthScale != 0D);
+                } catch (IllegalArgumentException e) {
+                    BukkitHuskSync.getInstance().getLogger().log(Level.WARNING,
+                            "Failed to set health scale of player " + player.getName() + " to " + statusData.healthScale);
                 }
-                player.setHealthScaled(statusData.healthScale != 0D);
             }
-            if (statusDataFlags.contains(StatusDataFlag.SET_HUNGER)) {
+            if (settings.getSynchronizationFeature(Settings.SynchronizationFeature.HUNGER)) {
                 player.setFoodLevel(statusData.hunger);
                 player.setSaturation(statusData.saturation);
                 player.setExhaustion(statusData.saturationExhaustion);
             }
-            if (statusDataFlags.contains(StatusDataFlag.SET_SELECTED_ITEM_SLOT)) {
+            if (settings.getSynchronizationFeature(Settings.SynchronizationFeature.INVENTORIES)) {
                 player.getInventory().setHeldItemSlot(statusData.selectedItemSlot);
             }
-            if (statusDataFlags.contains(StatusDataFlag.SET_EXPERIENCE)) {
+            if (settings.getSynchronizationFeature(Settings.SynchronizationFeature.EXPERIENCE)) {
                 player.setTotalExperience(statusData.totalExperience);
                 player.setLevel(statusData.expLevel);
                 player.setExp(statusData.expProgress);
             }
-            if (statusDataFlags.contains(StatusDataFlag.SET_GAME_MODE)) {
+            if (settings.getSynchronizationFeature(Settings.SynchronizationFeature.GAME_MODE)) {
                 Bukkit.getScheduler().runTask(BukkitHuskSync.getInstance(), () ->
                         player.setGameMode(GameMode.valueOf(statusData.gameMode)));
             }
-            if (statusDataFlags.contains(StatusDataFlag.SET_FLYING)) {
+            if (settings.getSynchronizationFeature(Settings.SynchronizationFeature.LOCATION)) {
                 Bukkit.getScheduler().runTask(BukkitHuskSync.getInstance(), () -> {
                     if (statusData.isFlying) {
                         player.setAllowFlight(true);
@@ -129,7 +148,11 @@ public class BukkitPlayer extends OnlineUser {
 
     @Override
     public CompletableFuture<ItemData> getInventory() {
-        return BukkitSerializer.serializeItemStackArray(player.getInventory().getContents())
+        final PlayerInventory inventory = player.getInventory();
+        if (inventory.isEmpty()) {
+            return CompletableFuture.completedFuture(ItemData.empty());
+        }
+        return BukkitSerializer.serializeItemStackArray(inventory.getContents())
                 .thenApply(ItemData::new);
     }
 
@@ -138,7 +161,9 @@ public class BukkitPlayer extends OnlineUser {
         return BukkitSerializer.deserializeInventory(itemData.serializedItems).thenApplyAsync(contents -> {
             final CompletableFuture<Void> inventorySetFuture = new CompletableFuture<>();
             Bukkit.getScheduler().runTask(BukkitHuskSync.getInstance(), () -> {
+                player.setItemOnCursor(null);
                 player.getInventory().setContents(contents.getContents());
+                player.updateInventory();
                 inventorySetFuture.complete(null);
             });
             return inventorySetFuture.join();
@@ -147,7 +172,11 @@ public class BukkitPlayer extends OnlineUser {
 
     @Override
     public CompletableFuture<ItemData> getEnderChest() {
-        return BukkitSerializer.serializeItemStackArray(player.getEnderChest().getContents())
+        final Inventory enderChest = player.getEnderChest();
+        if (enderChest.isEmpty()) {
+            return CompletableFuture.completedFuture(ItemData.empty());
+        }
+        return BukkitSerializer.serializeItemStackArray(enderChest.getContents())
                 .thenApply(ItemData::new);
     }
 
@@ -334,32 +363,52 @@ public class BukkitPlayer extends OnlineUser {
     @Override
     public CompletableFuture<Void> setStatistics(@NotNull StatisticsData statisticsData) {
         return CompletableFuture.runAsync(() -> {
-            // Set untyped statistics
+            // Set generic statistics
             for (String statistic : statisticsData.untypedStatistics.keySet()) {
-                player.setStatistic(Statistic.valueOf(statistic), statisticsData.untypedStatistics.get(statistic));
+                try {
+                    player.setStatistic(Statistic.valueOf(statistic), statisticsData.untypedStatistics.get(statistic));
+                } catch (IllegalArgumentException e) {
+                    BukkitHuskSync.getInstance().getLogger().log(Level.WARNING,
+                            "Failed to set generic statistic " + statistic + " for " + username);
+                }
             }
 
             // Set block statistics
             for (String statistic : statisticsData.blockStatistics.keySet()) {
                 for (String blockMaterial : statisticsData.blockStatistics.get(statistic).keySet()) {
-                    player.setStatistic(Statistic.valueOf(statistic), Material.valueOf(blockMaterial),
-                            statisticsData.blockStatistics.get(statistic).get(blockMaterial));
+                    try {
+                        player.setStatistic(Statistic.valueOf(statistic), Material.valueOf(blockMaterial),
+                                statisticsData.blockStatistics.get(statistic).get(blockMaterial));
+                    } catch (IllegalArgumentException e) {
+                        BukkitHuskSync.getInstance().getLogger().log(Level.WARNING,
+                                "Failed to set " + blockMaterial + " statistic " + statistic + " for " + username);
+                    }
                 }
             }
 
             // Set item statistics
             for (String statistic : statisticsData.itemStatistics.keySet()) {
                 for (String itemMaterial : statisticsData.itemStatistics.get(statistic).keySet()) {
-                    player.setStatistic(Statistic.valueOf(statistic), Material.valueOf(itemMaterial),
-                            statisticsData.itemStatistics.get(statistic).get(itemMaterial));
+                    try {
+                        player.setStatistic(Statistic.valueOf(statistic), Material.valueOf(itemMaterial),
+                                statisticsData.itemStatistics.get(statistic).get(itemMaterial));
+                    } catch (IllegalArgumentException e) {
+                        BukkitHuskSync.getInstance().getLogger().log(Level.WARNING,
+                                "Failed to set " + itemMaterial + " statistic " + statistic + " for " + username);
+                    }
                 }
             }
 
             // Set entity statistics
             for (String statistic : statisticsData.entityStatistics.keySet()) {
                 for (String entityType : statisticsData.entityStatistics.get(statistic).keySet()) {
-                    player.setStatistic(Statistic.valueOf(statistic), EntityType.valueOf(entityType),
-                            statisticsData.entityStatistics.get(statistic).get(entityType));
+                    try {
+                        player.setStatistic(Statistic.valueOf(statistic), EntityType.valueOf(entityType),
+                                statisticsData.entityStatistics.get(statistic).get(entityType));
+                    } catch (IllegalArgumentException e) {
+                        BukkitHuskSync.getInstance().getLogger().log(Level.WARNING,
+                                "Failed to set " + entityType + " statistic " + statistic + " for " + username);
+                    }
                 }
             }
         });
@@ -397,40 +446,51 @@ public class BukkitPlayer extends OnlineUser {
 
     @Override
     public CompletableFuture<PersistentDataContainerData> getPersistentDataContainer() {
+        final Map<String, PersistentDataTag<?>> persistentDataMap = new HashMap<>();
+        final PersistentDataContainer container = player.getPersistentDataContainer();
         return CompletableFuture.supplyAsync(() -> {
-            final PersistentDataContainer container = player.getPersistentDataContainer();
-            if (container.isEmpty()) {
-                return new PersistentDataContainerData(new HashMap<>());
-            }
-            final HashMap<String, Byte[]> persistentDataMap = new HashMap<>();
-            // Set persistent data keys; ignore keys that we cannot synchronise as byte arrays
-            for (final NamespacedKey key : container.getKeys()) {
-                try {
-                    persistentDataMap.put(key.toString(), ArrayUtils.toObject(container.get(key, PersistentDataType.BYTE_ARRAY)));
-                } catch (IllegalArgumentException | NullPointerException ignored) {
+            container.getKeys().forEach(key -> {
+                BukkitPersistentTypeMapping<?, ?> type = null;
+                for (BukkitPersistentTypeMapping<?, ?> dataType : BukkitPersistentTypeMapping.PRIMITIVE_TYPE_MAPPINGS) {
+                    if (container.has(key, dataType.bukkitType())) {
+                        type = dataType;
+                        break;
+                    }
                 }
-            }
+                if (type != null) {
+                    persistentDataMap.put(key.toString(), type.getContainerValue(container, key));
+                }
+            });
             return new PersistentDataContainerData(persistentDataMap);
         }).exceptionally(throwable -> {
-            BukkitHuskSync.getInstance().getLoggingAdapter().log(Level.WARNING, "Could not read " + player.getName() + "'s persistent data map, skipping!");
+            BukkitHuskSync.getInstance().log(Level.WARNING,
+                    "Could not read " + player.getName() + "'s persistent data map, skipping!");
             throwable.printStackTrace();
             return new PersistentDataContainerData(new HashMap<>());
         });
     }
 
     @Override
-    public CompletableFuture<Void> setPersistentDataContainer(@NotNull PersistentDataContainerData persistentDataContainerData) {
+    public CompletableFuture<Void> setPersistentDataContainer(@NotNull PersistentDataContainerData container) {
         return CompletableFuture.runAsync(() -> {
             player.getPersistentDataContainer().getKeys().forEach(namespacedKey ->
                     player.getPersistentDataContainer().remove(namespacedKey));
-            persistentDataContainerData.persistentDataMap.keySet().forEach(keyString -> {
+            container.getTags().forEach(keyString -> {
                 final NamespacedKey key = NamespacedKey.fromString(keyString);
                 if (key != null) {
-                    final byte[] data = ArrayUtils.toPrimitive(persistentDataContainerData
-                            .persistentDataMap.get(keyString));
-                    player.getPersistentDataContainer().set(key, PersistentDataType.BYTE_ARRAY, data);
+                    container.getTagType(keyString)
+                            .flatMap(BukkitPersistentTypeMapping::getMapping)
+                            .ifPresentOrElse(mapping -> mapping.setContainerValue(container, player, key),
+                                    () -> BukkitHuskSync.getInstance().log(Level.WARNING,
+                                            "Could not set " + player.getName() + "'s persistent data key " + keyString +
+                                            " as it has an invalid type. Skipping!"));
                 }
             });
+        }).exceptionally(throwable -> {
+            BukkitHuskSync.getInstance().log(Level.WARNING,
+                    "Could not write " + player.getName() + "'s persistent data map, skipping!");
+            throwable.printStackTrace();
+            return null;
         });
     }
 
@@ -447,7 +507,7 @@ public class BukkitPlayer extends OnlineUser {
     @NotNull
     @Override
     public Version getMinecraftVersion() {
-        return Version.minecraftVersion(Bukkit.getBukkitVersion());
+        return Version.fromMinecraftVersionString(Bukkit.getBukkitVersion());
     }
 
     @Override
@@ -456,23 +516,89 @@ public class BukkitPlayer extends OnlineUser {
     }
 
     @Override
-    public void showMenu(@NotNull ItemEditorMenu menu) {
-        BukkitSerializer.deserializeItemStackArray(menu.itemData.serializedItems).thenAccept(inventoryContents -> {
-            final Inventory inventory = Bukkit.createInventory(player, menu.itemEditorMenuType.slotCount,
-                    BaseComponent.toLegacyText(menu.menuTitle.toComponent()));
-            inventory.setContents(inventoryContents);
-            Bukkit.getScheduler().runTask(BukkitHuskSync.getInstance(), () -> player.openInventory(inventory));
+    public CompletableFuture<Optional<ItemData>> showMenu(@NotNull ItemData itemData, boolean editable,
+                                                          int minimumRows, @NotNull MineDown title) {
+        final CompletableFuture<Optional<ItemData>> updatedData = new CompletableFuture<>();
+
+        // Deserialize the item data to be shown and show it in a triumph GUI
+        BukkitSerializer.deserializeItemStackArray(itemData.serializedItems).thenAccept(items -> {
+            // Build the GUI and populate with items
+            final int itemCount = items.length;
+            final StorageBuilder guiBuilder = Gui.storage()
+                    .title(title.toComponent())
+                    .rows(Math.max(minimumRows, (int) Math.ceil(itemCount / 9.0)))
+                    .disableAllInteractions()
+                    .enableOtherActions();
+            final StorageGui gui = editable ? guiBuilder.enableAllInteractions().create() : guiBuilder.create();
+            for (int i = 0; i < itemCount; i++) {
+                if (items[i] != null) {
+                    gui.getInventory().setItem(i, items[i]);
+                }
+            }
+
+            // Complete the future with updated data (if editable) when the GUI is closed
+            gui.setCloseGuiAction(event -> {
+                if (!editable) {
+                    updatedData.complete(Optional.empty());
+                    return;
+                }
+
+                // Get and save the updated items
+                final ItemStack[] updatedItems = Arrays.copyOf(event.getPlayer().getOpenInventory()
+                        .getTopInventory().getContents().clone(), itemCount);
+                BukkitSerializer.serializeItemStackArray(updatedItems).thenAccept(serializedItems -> {
+                    if (serializedItems.equals(itemData.serializedItems)) {
+                        updatedData.complete(Optional.empty());
+                        return;
+                    }
+                    updatedData.complete(Optional.of(new ItemData(serializedItems)));
+                });
+            });
+
+            // Display the GUI (synchronously; on the main server thread)
+            Bukkit.getScheduler().runTask(BukkitHuskSync.getInstance(), () -> gui.open(player));
+        }).exceptionally(throwable -> {
+            // Handle exceptions
+            updatedData.completeExceptionally(throwable);
+            return null;
         });
+        return updatedData;
+    }
+
+    @Override
+    public boolean isDead() {
+        return player.getHealth() <= 0;
     }
 
     @Override
     public void sendActionBar(@NotNull MineDown mineDown) {
-        player.spigot().sendMessage(ChatMessageType.ACTION_BAR, mineDown.replace().toComponent());
+        audience.sendActionBar(mineDown
+                .disable(MineDownParser.Option.SIMPLE_FORMATTING)
+                .replace().toComponent());
+    }
+
+    @Override
+    public void sendToast(@NotNull MineDown title, @NotNull MineDown description,
+                          @NotNull String iconMaterial, @NotNull String backgroundType) {
+        try {
+            final Material material = Material.matchMaterial(iconMaterial);
+            Toast.builder(BukkitHuskSync.getInstance())
+                    .setTitle(title.toComponent())
+                    .setDescription(description.toComponent())
+                    .setIcon(material != null ? material : Material.BARRIER)
+                    .setFrameType(FrameType.valueOf(backgroundType))
+                    .build()
+                    .show(player);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     @Override
     public void sendMessage(@NotNull MineDown mineDown) {
-        player.spigot().sendMessage(mineDown.replace().toComponent());
+        audience.sendMessage(mineDown
+                .disable(MineDownParser.Option.SIMPLE_FORMATTING)
+                .replace().toComponent());
     }
 
     /**
@@ -494,4 +620,14 @@ public class BukkitPlayer extends OnlineUser {
         return maxHealth;
     }
 
+    @Override
+    public boolean isLocked() {
+        return BukkitHuskSync.getInstance().getLockedPlayers().contains(player.getUniqueId());
+    }
+
+    @Override
+    public boolean isNpc() {
+        return player.hasMetadata("NPC");
+    }
+
 }

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

@@ -1,47 +0,0 @@
-package net.william278.husksync.util;
-
-import de.themoep.minedown.MineDown;
-import net.md_5.bungee.api.chat.TextComponent;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.logging.Level;
-
-public class BukkitLogger extends Logger {
-
-    private final java.util.logging.Logger logger;
-
-    public BukkitLogger(@NotNull java.util.logging.Logger logger) {
-        this.logger = logger;
-    }
-
-    @Override
-    public void log(@NotNull Level level, @NotNull String message, @NotNull Exception e) {
-        logger.log(level, message, e);
-    }
-
-    @Override
-    public void log(@NotNull Level level, @NotNull String message) {
-        logger.log(level, message);
-    }
-
-    @Override
-    public void log(@NotNull Level level, @NotNull MineDown mineDown) {
-        logger.log(level, TextComponent.toLegacyText(mineDown.toComponent()));
-    }
-
-    @Override
-    public void info(@NotNull String message) {
-        logger.info(message);
-    }
-
-    @Override
-    public void severe(@NotNull String message) {
-        logger.severe(message);
-    }
-
-    @Override
-    public void config(@NotNull String message) {
-        logger.config(message);
-    }
-
-}

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

@@ -1,28 +0,0 @@
-package net.william278.husksync.util;
-
-import net.william278.husksync.BukkitHuskSync;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-import java.io.InputStream;
-import java.util.Objects;
-
-public class BukkitResourceReader implements ResourceReader {
-
-    private final BukkitHuskSync plugin;
-
-    public BukkitResourceReader(BukkitHuskSync plugin) {
-        this.plugin = plugin;
-    }
-
-    @Override
-    public @NotNull InputStream getResource(String fileName) {
-        return Objects.requireNonNull(plugin.getResource(fileName));
-    }
-
-    @Override
-    public @NotNull File getDataFolder() {
-        return plugin.getDataFolder();
-    }
-
-}

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

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

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

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

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

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

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

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

bukkit/src/main/resources/plugin.yml

@@ -9,15 +9,17 @@ softdepend:
   - MysqlPlayerDataBridge
   - Plan
 libraries:
-  - 'mysql:mysql-connector-java:8.0.29'
-  - 'org.xerial.snappy:snappy-java:1.1.8.4'
-  - 'dev.dejvokep:boosted-yaml:1.2'
+  - 'redis.clients:jedis:${jedis_version}'
+  - 'mysql:mysql-connector-java:${mysql_driver_version}'
+  - 'org.xerial.snappy:snappy-java:${snappy_version}'
+  - 'org.apache.commons:commons-text:${commons_text_version}'
+
 commands:
   husksync:
     usage: '/husksync <update/info/reload/migrate>'
     description: 'Manage the HuskSync plugin'
   userdata:
-    usage: '/userdata <view/list/delete/restore/pin> <username> [version_uuid]'
+    usage: '/userdata <view/list/delete/restore/pin/dump> <username> [version_uuid]'
     description: 'View, manage & restore player userdata'
   inventory:
     usage: '/inventory <username> [version_uuid]'

common/build.gradle

@@ -1,31 +1,40 @@
 dependencies {
     implementation 'commons-io:commons-io:2.11.0'
-    implementation 'de.themoep:minedown:1.7.1-SNAPSHOT'
-    implementation 'com.google.code.gson:gson:2.9.0'
-    implementation('redis.clients:jedis:4.2.3') {
-        exclude module: 'slf4j-api'
-    }
-    implementation ('com.zaxxer:HikariCP:5.0.1') {
+    implementation 'de.themoep:minedown-adventure:1.7.2-SNAPSHOT'
+    implementation 'net.kyori:adventure-api:4.12.0'
+    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation 'dev.dejvokep:boosted-yaml:1.3.1'
+    implementation 'net.william278:Annotaml:2.0.1'
+    implementation 'net.william278:DesertWell:1.1.1'
+    implementation 'net.william278:PagineDown:1.1'
+    implementation('com.zaxxer:HikariCP:5.0.1') {
         exclude module: 'slf4j-api'
     }
 
-    compileOnly 'dev.dejvokep:boosted-yaml:1.2'
-    compileOnly 'org.xerial.snappy:snappy-java:1.1.8.4'
-    compileOnly 'org.jetbrains:annotations:23.0.0'
-    compileOnly 'com.github.plan-player-analytics:Plan:5.4.1690'
+    compileOnly 'org.jetbrains:annotations:24.0.1'
+    compileOnly 'com.github.plan-player-analytics:Plan:5.5.2272'
+    compileOnly 'redis.clients:jedis:' + jedis_version
+    compileOnly 'org.xerial.snappy:snappy-java:' + snappy_version
+    compileOnly 'org.apache.commons:commons-text:' + commons_text_version
 
-    testImplementation 'org.xerial.snappy:snappy-java:1.1.8.4'
-    testImplementation 'com.github.plan-player-analytics:Plan:5.4.1690'
-    testCompileOnly 'org.jetbrains:annotations:23.0.0'
+    testImplementation 'com.github.plan-player-analytics:Plan:5.5.2272'
+    testImplementation 'redis.clients:jedis:' + jedis_version
+    testImplementation 'org.xerial.snappy:snappy-java:' + snappy_version
+    testImplementation 'org.apache.commons:commons-text:' + commons_text_version
+    testCompileOnly 'dev.dejvokep:boosted-yaml:1.3.1'
+    testCompileOnly 'org.jetbrains:annotations:24.0.1'
 }
 
 shadowJar {
-    relocate 'org.apache', 'net.william278.husksync.libraries'
+    relocate 'org.apache.commons.io', 'net.william278.husksync.libraries.commons.io'
+    relocate 'com.google.gson', 'net.william278.husksync.libraries.gson'
     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 'com.google', 'net.william278.husksync.libraries'
-    relocate 'redis.clients', 'net.william278.husksync.libraries'
-    relocate 'org.json', 'net.william278.husksync.libraries.json'
+    relocate 'dev.dejvokep', 'net.william278.husksync.libraries'
+    relocate 'net.william278.desertwell', 'net.william278.husksync.libraries.desertwell'
+    relocate 'net.william278.paginedown', 'net.william278.husksync.libraries.paginedown'
+    relocate 'net.william278.annotaml', 'net.william278.husksync.libraries.annotaml'
 }

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

@@ -1,29 +1,33 @@
 package net.william278.husksync;
 
+import net.william278.desertwell.UpdateChecker;
 import net.william278.husksync.config.Locales;
 import net.william278.husksync.config.Settings;
 import net.william278.husksync.data.DataAdapter;
-import net.william278.husksync.editor.DataEditor;
 import net.william278.husksync.database.Database;
 import net.william278.husksync.event.EventCannon;
 import net.william278.husksync.migrator.Migrator;
 import net.william278.husksync.player.OnlineUser;
 import net.william278.husksync.redis.RedisManager;
-import net.william278.husksync.util.Logger;
-import net.william278.husksync.util.Version;
+import net.william278.desertwell.Version;
 import org.jetbrains.annotations.NotNull;
 
+import java.io.File;
+import java.io.InputStream;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
+import java.util.logging.Level;
 
 /**
  * Abstract implementation of the HuskSync plugin.
  */
 public interface HuskSync {
 
+    int SPIGOT_RESOURCE_ID = 97144;
+
     /**
      * Returns a set of online players.
      *
@@ -66,14 +70,6 @@ public interface HuskSync {
     @NotNull
     DataAdapter getDataAdapter();
 
-    /**
-     * Returns the data editor implementation
-     *
-     * @return the {@link DataEditor} implementation
-     */
-    @NotNull
-    DataEditor getDataEditor();
-
     /**
      * Returns the event firing cannon
      *
@@ -107,12 +103,33 @@ public interface HuskSync {
     Locales getLocales();
 
     /**
-     * Returns the plugin {@link Logger}
+     * Get a resource as an {@link InputStream} from the plugin jar
      *
-     * @return the {@link Logger}
+     * @param name the path to the resource
+     * @return the {@link InputStream} of the resource
      */
-    @NotNull
-    Logger getLoggingAdapter();
+    InputStream getResource(@NotNull String name);
+
+    /**
+     * Log a message to the console
+     *
+     * @param level     the level of the message
+     * @param message   the message to log
+     * @param throwable a throwable to log
+     */
+    void log(@NotNull Level level, @NotNull String message, @NotNull Throwable... throwable);
+
+    /**
+     * Send a debug message to the console, if debug logging is enabled
+     *
+     * @param message   the message to log
+     * @param throwable a throwable to log
+     */
+    default void debug(@NotNull String message, @NotNull Throwable... throwable) {
+        if (getSettings().doDebugLogging()) {
+            log(Level.INFO, "[DEBUG] " + message, throwable);
+        }
+    }
 
     /**
      * Returns the plugin version
@@ -122,6 +139,30 @@ public interface HuskSync {
     @NotNull
     Version getPluginVersion();
 
+    /**
+     * Returns the plugin data folder
+     *
+     * @return the plugin data folder as a {@link File}
+     */
+    @NotNull
+    File getDataFolder();
+
+    /**
+     * Returns a future returning the latest plugin {@link Version} if the plugin is out-of-date
+     *
+     * @return a {@link CompletableFuture} returning the latest {@link Version} if the current one is out-of-date
+     */
+    default CompletableFuture<Optional<Version>> getLatestVersionIfOutdated() {
+        final UpdateChecker updateChecker = UpdateChecker.create(getPluginVersion(), SPIGOT_RESOURCE_ID);
+        return updateChecker.isUpToDate().thenApply(upToDate -> {
+            if (upToDate) {
+                return Optional.empty();
+            } else {
+                return Optional.of(updateChecker.getLatestVersion().join());
+            }
+        });
+    }
+
     /**
      * Returns the Minecraft version implementation
      *
@@ -137,4 +178,6 @@ public interface HuskSync {
      */
     CompletableFuture<Boolean> reload();
 
+    Set<UUID> getLockedPlayers();
+
 }

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

@@ -72,7 +72,7 @@ public abstract class BaseHuskSyncAPI {
     public final CompletableFuture<Optional<UserData>> getUserData(@NotNull User user) {
         return CompletableFuture.supplyAsync(() -> {
             if (user instanceof OnlineUser) {
-                return ((OnlineUser) user).getUserData(plugin.getLoggingAdapter()).join();
+                return ((OnlineUser) user).getUserData(plugin).join();
             } else {
                 return plugin.getDatabase().getCurrentUserData(user).join().map(UserDataSnapshot::userData);
             }
@@ -103,8 +103,9 @@ public abstract class BaseHuskSyncAPI {
      * @since 2.0
      */
     public final CompletableFuture<Void> saveUserData(@NotNull OnlineUser user) {
-        return CompletableFuture.runAsync(() -> user.getUserData(plugin.getLoggingAdapter()).thenAccept(optionalUserData -> optionalUserData.ifPresent(
-                userData -> plugin.getDatabase().setUserData(user, userData, DataSaveCause.API).join())));
+        return CompletableFuture.runAsync(() -> user.getUserData(plugin)
+                .thenAccept(optionalUserData -> optionalUserData.ifPresent(
+                        userData -> plugin.getDatabase().setUserData(user, userData, DataSaveCause.API).join())));
     }
 
     /**

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

@@ -52,7 +52,7 @@ public abstract class CommandBase {
      */
     public String getDescription() {
         return plugin.getLocales().getRawLocale(command + "_command_description")
-                .orElse("A HuskHomes command");
+                .orElse("A HuskSync command");
     }
 
 }

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

@@ -1,19 +1,21 @@
 package net.william278.husksync.command;
 
+import de.themoep.minedown.adventure.MineDown;
 import net.william278.husksync.HuskSync;
 import net.william278.husksync.data.DataSaveCause;
 import net.william278.husksync.data.UserData;
+import net.william278.husksync.data.UserDataBuilder;
 import net.william278.husksync.data.UserDataSnapshot;
-import net.william278.husksync.editor.ItemEditorMenu;
 import net.william278.husksync.player.OnlineUser;
 import net.william278.husksync.player.User;
 import org.jetbrains.annotations.NotNull;
 
-import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.List;
-import java.util.Locale;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
+import java.util.logging.Level;
 import java.util.stream.Collectors;
 
 public class EnderChestCommand extends CommandBase implements TabCompletable {
@@ -44,9 +46,10 @@ public class EnderChestCommand extends CommandBase implements TabCompletable {
                                     "/enderchest <player> [version_uuid]").ifPresent(player::sendMessage);
                         }
                     } else {
-                        // View latest user data
+                        // View (and edit) the latest user data
                         plugin.getDatabase().getCurrentUserData(user).thenAccept(optionalData -> optionalData.ifPresentOrElse(
-                                versionedUserData -> showEnderChestMenu(player, versionedUserData, user, true),
+                                versionedUserData -> showEnderChestMenu(player, versionedUserData, user,
+                                        player.hasPermission(Permission.COMMAND_ENDER_CHEST_EDIT.node)),
                                 () -> plugin.getLocales().getLocale("error_no_data_to_display")
                                         .ifPresent(player::sendMessage)));
                     }
@@ -55,29 +58,48 @@ public class EnderChestCommand extends CommandBase implements TabCompletable {
     }
 
     private void showEnderChestMenu(@NotNull OnlineUser player, @NotNull UserDataSnapshot userDataSnapshot,
-                                    @NotNull User dataOwner, final boolean allowEdit) {
+                                    @NotNull User dataOwner, boolean allowEdit) {
         CompletableFuture.runAsync(() -> {
             final UserData data = userDataSnapshot.userData();
-            final ItemEditorMenu menu = ItemEditorMenu.createEnderChestMenu(data.getEnderChestData(),
-                    dataOwner, player, plugin.getLocales(), allowEdit);
-            plugin.getLocales().getLocale("viewing_ender_chest_of", dataOwner.username,
-                            DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, Locale.getDefault())
-                                    .format(userDataSnapshot.versionTimestamp()))
-                    .ifPresent(player::sendMessage);
-            plugin.getDataEditor().openItemEditorMenu(player, menu).thenAccept(enderChestDataOnClose -> {
-                if (!menu.canEdit) {
-                    return;
-                }
-                final UserData updatedUserData = new UserData(data.getStatusData(), data.getInventoryData(),
-                        enderChestDataOnClose, data.getPotionEffectsData(), data.getAdvancementData(),
-                        data.getStatisticsData(), data.getLocationData(),
-                        data.getPersistentDataContainerData(),
-                        plugin.getMinecraftVersion().toString());
-                plugin.getDatabase().setUserData(dataOwner, updatedUserData, DataSaveCause.ENDERCHEST_COMMAND).join();
-                plugin.getRedisManager().sendUserDataUpdate(dataOwner, updatedUserData).join();
+            data.getEnderChest().ifPresent(itemData -> {
+                // Show message
+                plugin.getLocales().getLocale("ender_chest_viewer_opened", dataOwner.username,
+                                new SimpleDateFormat("MMM dd yyyy, HH:mm:ss.sss")
+                                        .format(userDataSnapshot.versionTimestamp()))
+                        .ifPresent(player::sendMessage);
+
+                // Show inventory menu
+                player.showMenu(itemData, allowEdit, 3, plugin.getLocales()
+                                .getLocale("ender_chest_viewer_menu_title", dataOwner.username)
+                                .orElse(new MineDown("Ender Chest Viewer")))
+                        .exceptionally(throwable -> {
+                            plugin.log(Level.WARNING, "Exception displaying inventory menu to " + player.username, throwable);
+                            return Optional.empty();
+                        })
+                        .thenAccept(dataOnClose -> {
+                            if (dataOnClose.isEmpty() || !allowEdit) {
+                                return;
+                            }
+
+                            // Create the updated data
+                            final UserDataBuilder builder = UserData.builder(plugin.getMinecraftVersion());
+                            data.getStatus().ifPresent(builder::setStatus);
+                            data.getAdvancements().ifPresent(builder::setAdvancements);
+                            data.getLocation().ifPresent(builder::setLocation);
+                            data.getPersistentDataContainer().ifPresent(builder::setPersistentDataContainer);
+                            data.getStatistics().ifPresent(builder::setStatistics);
+                            data.getPotionEffects().ifPresent(builder::setPotionEffects);
+                            data.getInventory().ifPresent(builder::setInventory);
+                            builder.setEnderChest(dataOnClose.get());
+
+                            // Set the updated data
+                            final UserData updatedUserData = builder.build();
+                            plugin.getDatabase()
+                                    .setUserData(dataOwner, updatedUserData, DataSaveCause.INVENTORY_COMMAND)
+                                    .thenRun(() -> plugin.getRedisManager().sendUserDataUpdate(dataOwner, updatedUserData));
+                        });
             });
         });
-
     }
 
     @Override

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

@@ -1,14 +1,14 @@
 package net.william278.husksync.command;
 
-import de.themoep.minedown.MineDown;
+import de.themoep.minedown.adventure.MineDown;
+import net.william278.desertwell.AboutMenu;
 import net.william278.husksync.HuskSync;
-import net.william278.husksync.config.Locales;
 import net.william278.husksync.migrator.Migrator;
 import net.william278.husksync.player.OnlineUser;
-import net.william278.husksync.util.UpdateChecker;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.logging.Level;
@@ -16,16 +16,41 @@ import java.util.stream.Collectors;
 
 public class HuskSyncCommand extends CommandBase implements TabCompletable, ConsoleExecutable {
 
-    private final String[] COMMAND_ARGUMENTS = {"update", "about", "reload", "migrate"};
+    private final String[] SUB_COMMANDS = {"update", "about", "reload", "migrate"};
+    private final AboutMenu aboutMenu;
 
     public HuskSyncCommand(@NotNull HuskSync implementor) {
         super("husksync", Permission.COMMAND_HUSKSYNC, implementor);
+        this.aboutMenu = AboutMenu.create("HuskSync")
+                .withDescription("A modern, cross-server player data synchronization system")
+                .withVersion(implementor.getPluginVersion())
+                .addAttribution("Author",
+                        AboutMenu.Credit.of("William278").withDescription("Click to visit website").withUrl("https://william278.net"))
+                .addAttribution("Contributors",
+                        AboutMenu.Credit.of("HarvelsX").withDescription("Code"),
+                        AboutMenu.Credit.of("HookWoods").withDescription("Code"))
+                .addAttribution("Translators",
+                        AboutMenu.Credit.of("Namiu").withDescription("Japanese (ja-jp)"),
+                        AboutMenu.Credit.of("anchelthe").withDescription("Spanish (es-es)"),
+                        AboutMenu.Credit.of("Melonzio").withDescription("Spanish (es-es)"),
+                        AboutMenu.Credit.of("Ceddix").withDescription("German (de-de)"),
+                        AboutMenu.Credit.of("Pukejoy_1").withDescription("Bulgarian (bg-bg)"),
+                        AboutMenu.Credit.of("mateusneresrb").withDescription("Brazilian Portuguese (pt-br)"),
+                        AboutMenu.Credit.of("小蔡").withDescription("Traditional Chinese (zh-tw)"),
+                        AboutMenu.Credit.of("Ghost-chu").withDescription("Simplified Chinese (zh-cn)"),
+                        AboutMenu.Credit.of("DJelly4K").withDescription("Simplified Chinese (zh-cn)"),
+                        AboutMenu.Credit.of("Thourgard").withDescription("Ukrainian (uk-ua)"),
+                        AboutMenu.Credit.of("xF3d3").withDescription("Italian (it-it)"))
+                .addButtons(
+                        AboutMenu.Link.of("https://william278.net/docs/husksync").withText("Documentation").withIcon("⛏"),
+                        AboutMenu.Link.of("https://github.com/WiIIiam278/HuskSync/issues").withText("Issues").withIcon("❌").withColor("#ff9f0f"),
+                        AboutMenu.Link.of("https://discord.gg/tVYhJfyDWG").withText("Discord").withIcon("⭐").withColor("#6773f5"));
     }
 
     @Override
     public void onExecute(@NotNull OnlineUser player, @NotNull String[] args) {
         if (args.length < 1) {
-            displayPluginInformation(player);
+            sendAboutMenu(player);
             return;
         }
         switch (args[0].toLowerCase()) {
@@ -34,18 +59,16 @@ public class HuskSyncCommand extends CommandBase implements TabCompletable, Cons
                     plugin.getLocales().getLocale("error_no_permission").ifPresent(player::sendMessage);
                     return;
                 }
-                final UpdateChecker updateChecker = new UpdateChecker(plugin.getPluginVersion(), plugin.getLoggingAdapter());
-                updateChecker.fetchLatestVersion().thenAccept(latestVersion -> {
-                    if (updateChecker.isUpdateAvailable(latestVersion)) {
-                        player.sendMessage(new MineDown("[HuskSync](#00fb9a bold) [| A new update is available:](#00fb9a) [HuskSync " + latestVersion + "](#00fb9a bold)" +
-                                                        "[•](white) [Currently running:](#00fb9a) [Version " + updateChecker.getCurrentVersion() + "](gray)" +
-                                                        "[•](white) [Download links:](#00fb9a) [[⏩ Spigot]](gray open_url=https://www.spigotmc.org/resources/husksync.97144/updates) [•](#262626) [[⏩ Polymart]](gray open_url=https://polymart.org/resource/husksync.1634/updates) [•](#262626) [[⏩ Songoda]](gray open_url=https://songoda.com/marketplace/product/husksync-a-modern-cross-server-player-data-synchronization-system.758)"));
-                    } else {
-                        player.sendMessage(new MineDown("[HuskSync](#00fb9a bold) [| HuskSync is up-to-date, running version " + updateChecker.getCurrentVersion() + "](#00fb9a)"));
-                    }
-                });
+                plugin.getLatestVersionIfOutdated().thenAccept(newestVersion ->
+                        newestVersion.ifPresentOrElse(
+                                newVersion -> player.sendMessage(
+                                        new MineDown("[HuskSync](#00fb9a bold) [| A new version of HuskSync is available!"
+                                                     + " (v" + newVersion + " (Running: v" + plugin.getPluginVersion() + ")](#00fb9a)")),
+                                () -> player.sendMessage(
+                                        new MineDown("[HuskSync](#00fb9a bold) [| HuskSync is up-to-date."
+                                                     + " (Running: v" + plugin.getPluginVersion() + ")](#00fb9a)"))));
             }
-            case "info", "about" -> displayPluginInformation(player);
+            case "about", "info" -> sendAboutMenu(player);
             case "reload" -> {
                 if (!player.hasPermission(Permission.COMMAND_HUSKSYNC_RELOAD.node)) {
                     plugin.getLocales().getLocale("error_no_permission").ifPresent(player::sendMessage);
@@ -65,22 +88,25 @@ public class HuskSyncCommand extends CommandBase implements TabCompletable, Cons
     @Override
     public void onConsoleExecute(@NotNull String[] args) {
         if (args.length < 1) {
-            plugin.getLoggingAdapter().log(Level.INFO, "Console usage: \"husksync <update/about/reload/migrate>\"");
+            plugin.log(Level.INFO, "Console usage: \"husksync <update/about/reload/migrate>\"");
             return;
         }
         switch (args[0].toLowerCase()) {
-            case "update", "version" ->
-                    new UpdateChecker(plugin.getPluginVersion(), plugin.getLoggingAdapter()).logToConsole();
-            case "info", "about" ->
-                    plugin.getLoggingAdapter().log(Level.INFO, new MineDown(plugin.getLocales().stripMineDown(
-                            Locales.PLUGIN_INFORMATION.replace("%version%", plugin.getPluginVersion().toString()))));
+            case "update", "version" -> plugin.getLatestVersionIfOutdated().thenAccept(newestVersion ->
+                    newestVersion.ifPresentOrElse(newVersion -> plugin.log(Level.WARNING,
+                                    "An update is available for HuskSync, v" + newVersion
+                                    + " (Running v" + plugin.getPluginVersion() + ")"),
+                            () -> plugin.log(Level.INFO,
+                                    "HuskSync is up to date" +
+                                    " (Running v" + plugin.getPluginVersion() + ")")));
+            case "about", "info" -> aboutMenu.toString().lines().forEach(line -> plugin.log(Level.INFO, line));
             case "reload" -> {
                 plugin.reload();
-                plugin.getLoggingAdapter().log(Level.INFO, "Reloaded config & message files.");
+                plugin.log(Level.INFO, "Reloaded config & message files.");
             }
             case "migrate" -> {
                 if (args.length < 2) {
-                    plugin.getLoggingAdapter().log(Level.INFO,
+                    plugin.log(Level.INFO,
                             "Please choose a migrator, then run \"husksync migrate <migrator>\"");
                     logMigratorsList();
                     return;
@@ -89,35 +115,35 @@ public class HuskSyncCommand extends CommandBase implements TabCompletable, Cons
                         availableMigrator.getIdentifier().equalsIgnoreCase(args[1])).findFirst();
                 selectedMigrator.ifPresentOrElse(migrator -> {
                     if (args.length < 3) {
-                        plugin.getLoggingAdapter().log(Level.INFO, migrator.getHelpMenu());
+                        plugin.log(Level.INFO, migrator.getHelpMenu());
                         return;
                     }
                     switch (args[2]) {
                         case "start" -> migrator.start().thenAccept(succeeded -> {
                             if (succeeded) {
-                                plugin.getLoggingAdapter().log(Level.INFO, "Migration completed successfully!");
+                                plugin.log(Level.INFO, "Migration completed successfully!");
                             } else {
-                                plugin.getLoggingAdapter().log(Level.WARNING, "Migration failed!");
+                                plugin.log(Level.WARNING, "Migration failed!");
                             }
                         });
                         case "set" -> migrator.handleConfigurationCommand(Arrays.copyOfRange(args, 3, args.length));
-                        default -> plugin.getLoggingAdapter().log(Level.INFO,
+                        default -> plugin.log(Level.INFO,
                                 "Invalid syntax. Console usage: \"husksync migrate " + args[1] + " <start/set>");
                     }
                 }, () -> {
-                    plugin.getLoggingAdapter().log(Level.INFO,
+                    plugin.log(Level.INFO,
                             "Please specify a valid migrator.\n" +
                             "If a migrator is not available, please verify that you meet the prerequisites to use it.");
                     logMigratorsList();
                 });
             }
-            default -> plugin.getLoggingAdapter().log(Level.INFO,
+            default -> plugin.log(Level.INFO,
                     "Invalid syntax. Console usage: \"husksync <update/about/reload/migrate>\"");
         }
     }
 
     private void logMigratorsList() {
-        plugin.getLoggingAdapter().log(Level.INFO,
+        plugin.log(Level.INFO,
                 "List of available migrators:\nMigrator ID / Migrator Name:\n" +
                 plugin.getAvailableMigrators().stream()
                         .map(migrator -> migrator.getIdentifier() + " - " + migrator.getName())
@@ -126,16 +152,19 @@ public class HuskSyncCommand extends CommandBase implements TabCompletable, Cons
 
     @Override
     public List<String> onTabComplete(@NotNull String[] args) {
-        return Arrays.stream(COMMAND_ARGUMENTS)
-                .filter(argument -> argument.startsWith(args.length >= 1 ? args[0] : ""))
-                .sorted().collect(Collectors.toList());
+        if (args.length <= 1) {
+            return Arrays.stream(SUB_COMMANDS)
+                    .filter(argument -> argument.startsWith(args.length == 1 ? args[0] : ""))
+                    .sorted().collect(Collectors.toList());
+        }
+        return Collections.emptyList();
     }
 
-    private void displayPluginInformation(@NotNull OnlineUser player) {
-        if (!player.hasPermission(Permission.COMMAND_HUSKSYNC_INFO.node)) {
+    private void sendAboutMenu(@NotNull OnlineUser player) {
+        if (!player.hasPermission(Permission.COMMAND_HUSKSYNC_ABOUT.node)) {
             plugin.getLocales().getLocale("error_no_permission").ifPresent(player::sendMessage);
             return;
         }
-        player.sendMessage(new MineDown(Locales.PLUGIN_INFORMATION.replace("%version%", plugin.getPluginVersion().toString())));
+        player.sendMessage(aboutMenu.toMineDown());
     }
 }

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

@@ -1,19 +1,21 @@
 package net.william278.husksync.command;
 
+import de.themoep.minedown.adventure.MineDown;
 import net.william278.husksync.HuskSync;
 import net.william278.husksync.data.DataSaveCause;
 import net.william278.husksync.data.UserData;
+import net.william278.husksync.data.UserDataBuilder;
 import net.william278.husksync.data.UserDataSnapshot;
-import net.william278.husksync.editor.ItemEditorMenu;
 import net.william278.husksync.player.OnlineUser;
 import net.william278.husksync.player.User;
 import org.jetbrains.annotations.NotNull;
 
-import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.List;
-import java.util.Locale;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
+import java.util.logging.Level;
 import java.util.stream.Collectors;
 
 public class InventoryCommand extends CommandBase implements TabCompletable {
@@ -44,9 +46,10 @@ public class InventoryCommand extends CommandBase implements TabCompletable {
                                     "/inventory <player> [version_uuid]").ifPresent(player::sendMessage);
                         }
                     } else {
-                        // View latest user data
+                        // View (and edit) the latest user data
                         plugin.getDatabase().getCurrentUserData(user).thenAccept(optionalData -> optionalData.ifPresentOrElse(
-                                versionedUserData -> showInventoryMenu(player, versionedUserData, user, true),
+                                versionedUserData -> showInventoryMenu(player, versionedUserData, user,
+                                        player.hasPermission(Permission.COMMAND_INVENTORY_EDIT.node)),
                                 () -> plugin.getLocales().getLocale("error_no_data_to_display")
                                         .ifPresent(player::sendMessage)));
                     }
@@ -58,23 +61,43 @@ public class InventoryCommand extends CommandBase implements TabCompletable {
                                    @NotNull User dataOwner, boolean allowEdit) {
         CompletableFuture.runAsync(() -> {
             final UserData data = userDataSnapshot.userData();
-            final ItemEditorMenu menu = ItemEditorMenu.createInventoryMenu(data.getInventoryData(),
-                    dataOwner, player, plugin.getLocales(), allowEdit);
-            plugin.getLocales().getLocale("viewing_inventory_of", dataOwner.username,
-                            DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, Locale.getDefault())
-                                    .format(userDataSnapshot.versionTimestamp()))
-                    .ifPresent(player::sendMessage);
-            plugin.getDataEditor().openItemEditorMenu(player, menu).thenAccept(inventoryDataOnClose -> {
-                if (!menu.canEdit) {
-                    return;
-                }
-                final UserData updatedUserData = new UserData(data.getStatusData(), inventoryDataOnClose,
-                        data.getEnderChestData(), data.getPotionEffectsData(), data.getAdvancementData(),
-                        data.getStatisticsData(), data.getLocationData(),
-                        data.getPersistentDataContainerData(),
-                        plugin.getMinecraftVersion().toString());
-                plugin.getDatabase().setUserData(dataOwner, updatedUserData, DataSaveCause.INVENTORY_COMMAND).join();
-                plugin.getRedisManager().sendUserDataUpdate(dataOwner, updatedUserData).join();
+            data.getInventory().ifPresent(itemData -> {
+                // Show message
+                plugin.getLocales().getLocale("inventory_viewer_opened", dataOwner.username,
+                                new SimpleDateFormat("MMM dd yyyy, HH:mm:ss.sss")
+                                        .format(userDataSnapshot.versionTimestamp()))
+                        .ifPresent(player::sendMessage);
+
+                // Show inventory menu
+                player.showMenu(itemData, allowEdit, 5, plugin.getLocales()
+                                .getLocale("inventory_viewer_menu_title", dataOwner.username)
+                                .orElse(new MineDown("Inventory Viewer")))
+                        .exceptionally(throwable -> {
+                            plugin.log(Level.WARNING, "Exception displaying inventory menu to " + player.username, throwable);
+                            return Optional.empty();
+                        })
+                        .thenAccept(dataOnClose -> {
+                            if (dataOnClose.isEmpty() || !allowEdit) {
+                                return;
+                            }
+
+                            // Create the updated data
+                            final UserDataBuilder builder = UserData.builder(plugin.getMinecraftVersion());
+                            data.getStatus().ifPresent(builder::setStatus);
+                            data.getAdvancements().ifPresent(builder::setAdvancements);
+                            data.getLocation().ifPresent(builder::setLocation);
+                            data.getPersistentDataContainer().ifPresent(builder::setPersistentDataContainer);
+                            data.getStatistics().ifPresent(builder::setStatistics);
+                            data.getPotionEffects().ifPresent(builder::setPotionEffects);
+                            data.getEnderChest().ifPresent(builder::setEnderChest);
+                            builder.setInventory(dataOnClose.get());
+
+                            // Set the updated data
+                            final UserData updatedUserData = builder.build();
+                            plugin.getDatabase()
+                                    .setUserData(dataOwner, updatedUserData, DataSaveCause.INVENTORY_COMMAND)
+                                    .thenRun(() -> plugin.getRedisManager().sendUserDataUpdate(dataOwner, updatedUserData));
+                        });
             });
         });
     }

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

@@ -18,7 +18,7 @@ public enum Permission {
     /**
      * Lets the user view plugin info {@code /husksync info}
      */
-    COMMAND_HUSKSYNC_INFO("husksync.command.husksync.info", DefaultAccess.EVERYONE),
+    COMMAND_HUSKSYNC_ABOUT("husksync.command.husksync.info", DefaultAccess.EVERYONE),
     /**
      * Lets the user reload the plugin {@code /husksync reload}
      */
@@ -41,6 +41,11 @@ public enum Permission {
      */
     COMMAND_USER_DATA_MANAGE("husksync.command.userdata.manage", DefaultAccess.OPERATORS),
 
+    /**
+     * Lets the user dump user data to a file or the web {@code /userdata dump (player) (version_uuid)}
+     */
+    COMMAND_USER_DATA_DUMP("husksync.command.userdata.dump", DefaultAccess.NOBODY),
+
     /*
      * /inventory command permissions
      */

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

@@ -2,19 +2,24 @@ package net.william278.husksync.command;
 
 import net.william278.husksync.HuskSync;
 import net.william278.husksync.data.DataSaveCause;
+import net.william278.husksync.data.UserData;
+import net.william278.husksync.util.DataSnapshotList;
 import net.william278.husksync.player.OnlineUser;
+import net.william278.husksync.util.DataDumper;
 import org.jetbrains.annotations.NotNull;
 
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
+import java.util.logging.Level;
 import java.util.stream.Collectors;
 
 public class UserDataCommand extends CommandBase implements TabCompletable {
 
-    private final String[] COMMAND_ARGUMENTS = {"view", "list", "delete", "restore", "pin"};
+    private final String[] COMMAND_ARGUMENTS = {"view", "list", "delete", "restore", "pin", "dump"};
 
     public UserDataCommand(@NotNull HuskSync implementor) {
         super("userdata", Permission.COMMAND_USER_DATA, implementor, "playerdata");
@@ -24,7 +29,7 @@ public class UserDataCommand extends CommandBase implements TabCompletable {
     public void onExecute(@NotNull OnlineUser player, @NotNull String[] args) {
         if (args.length < 1) {
             plugin.getLocales().getLocale("error_invalid_syntax",
-                            "/userdata <view/list/delete/restore/pin> <username> [version_uuid]")
+                            "/userdata <view/list/delete/restore/pin/dump> <username> [version_uuid]")
                     .ifPresent(player::sendMessage);
             return;
         }
@@ -41,31 +46,32 @@ public class UserDataCommand extends CommandBase implements TabCompletable {
                 if (args.length >= 3) {
                     try {
                         final UUID versionUuid = UUID.fromString(args[2]);
-                        CompletableFuture.runAsync(() -> plugin.getDatabase().getUserByName(username.toLowerCase()).thenAccept(
-                                optionalUser -> optionalUser.ifPresentOrElse(
-                                        user -> plugin.getDatabase().getUserData(user, versionUuid).thenAccept(data ->
-                                                data.ifPresentOrElse(userData -> plugin.getDataEditor()
-                                                                .displayDataOverview(player, userData, user),
-                                                        () -> plugin.getLocales().getLocale("error_invalid_version_uuid")
-                                                                .ifPresent(player::sendMessage))),
-                                        () -> plugin.getLocales().getLocale("error_invalid_player")
-                                                .ifPresent(player::sendMessage))));
+                        CompletableFuture.runAsync(() -> plugin.getDatabase()
+                                .getUserByName(username.toLowerCase())
+                                .thenAccept(optionalUser -> optionalUser
+                                        .ifPresentOrElse(user -> plugin.getDatabase().getUserData(user, versionUuid)
+                                                        .thenAccept(data -> data.ifPresentOrElse(
+                                                                userData -> userData.displayDataOverview(player, user, plugin.getLocales()),
+                                                                () -> plugin.getLocales().getLocale("error_invalid_version_uuid")
+                                                                        .ifPresent(player::sendMessage))),
+                                                () -> plugin.getLocales().getLocale("error_invalid_player")
+                                                        .ifPresent(player::sendMessage))));
                     } catch (IllegalArgumentException e) {
                         plugin.getLocales().getLocale("error_invalid_syntax",
                                         "/userdata view <username> [version_uuid]")
                                 .ifPresent(player::sendMessage);
                     }
                 } else {
-                    CompletableFuture.runAsync(() -> plugin.getDatabase().getUserByName(username.toLowerCase()).thenAccept(
-                            optionalUser -> optionalUser.ifPresentOrElse(
-                                    user -> plugin.getDatabase().getCurrentUserData(user).thenAccept(
-                                            latestData -> latestData.ifPresentOrElse(
-                                                    userData -> plugin.getDataEditor()
-                                                            .displayDataOverview(player, userData, user),
-                                                    () -> plugin.getLocales().getLocale("error_no_data_to_display")
-                                                            .ifPresent(player::sendMessage))),
-                                    () -> plugin.getLocales().getLocale("error_invalid_player")
-                                            .ifPresent(player::sendMessage))));
+                    CompletableFuture.runAsync(() -> plugin.getDatabase()
+                            .getUserByName(username.toLowerCase())
+                            .thenAccept(optionalUser -> optionalUser
+                                    .ifPresentOrElse(user -> plugin.getDatabase().getCurrentUserData(user)
+                                                    .thenAccept(latestData -> latestData.ifPresentOrElse(
+                                                            userData -> userData.displayDataOverview(player, user, plugin.getLocales()),
+                                                            () -> plugin.getLocales().getLocale("error_no_data_to_display")
+                                                                    .ifPresent(player::sendMessage))),
+                                            () -> plugin.getLocales().getLocale("error_invalid_player")
+                                                    .ifPresent(player::sendMessage))));
                 }
             }
             case "list" -> {
@@ -75,20 +81,38 @@ public class UserDataCommand extends CommandBase implements TabCompletable {
                 }
                 if (args.length < 2) {
                     plugin.getLocales().getLocale("error_invalid_syntax",
-                                    "/userdata list <username>")
+                                    "/userdata list <username> [page]")
                             .ifPresent(player::sendMessage);
                     return;
                 }
                 final String username = args[1];
-                CompletableFuture.runAsync(() -> plugin.getDatabase().getUserByName(username.toLowerCase()).thenAccept(
-                        optionalUser -> optionalUser.ifPresentOrElse(
+                CompletableFuture.runAsync(() -> plugin.getDatabase()
+                        .getUserByName(username.toLowerCase())
+                        .thenAccept(optionalUser -> optionalUser.ifPresentOrElse(
                                 user -> plugin.getDatabase().getUserData(user).thenAccept(dataList -> {
+                                    // Check if there is data to display
                                     if (dataList.isEmpty()) {
                                         plugin.getLocales().getLocale("error_no_data_to_display")
                                                 .ifPresent(player::sendMessage);
                                         return;
                                     }
-                                    plugin.getDataEditor().displayDataList(player, dataList, user);
+
+                                    // Determine page to display
+                                    int page = 1;
+                                    if (args.length >= 3) {
+                                        try {
+                                            page = Integer.parseInt(args[2]);
+                                        } catch (NumberFormatException e) {
+                                            plugin.getLocales().getLocale("error_invalid_syntax",
+                                                            "/userdata list <username> [page]")
+                                                    .ifPresent(player::sendMessage);
+                                            return;
+                                        }
+                                    }
+
+                                    // Show the list to the player
+                                    DataSnapshotList.create(dataList, user, plugin.getLocales())
+                                            .displayPage(player, page);
                                 }),
                                 () -> plugin.getLocales().getLocale("error_invalid_player")
                                         .ifPresent(player::sendMessage))));
@@ -108,8 +132,9 @@ public class UserDataCommand extends CommandBase implements TabCompletable {
                 final String username = args[1];
                 try {
                     final UUID versionUuid = UUID.fromString(args[2]);
-                    CompletableFuture.runAsync(() -> plugin.getDatabase().getUserByName(username.toLowerCase()).thenAccept(
-                            optionalUser -> optionalUser.ifPresentOrElse(
+                    CompletableFuture.runAsync(() -> plugin.getDatabase()
+                            .getUserByName(username.toLowerCase())
+                            .thenAccept(optionalUser -> optionalUser.ifPresentOrElse(
                                     user -> plugin.getDatabase().deleteUserData(user, versionUuid).thenAccept(deleted -> {
                                         if (deleted) {
                                             plugin.getLocales().getLocale("data_deleted",
@@ -146,16 +171,22 @@ public class UserDataCommand extends CommandBase implements TabCompletable {
                 final String username = args[1];
                 try {
                     final UUID versionUuid = UUID.fromString(args[2]);
-                    CompletableFuture.runAsync(() -> plugin.getDatabase().getUserByName(username.toLowerCase()).thenAccept(
-                            optionalUser -> optionalUser.ifPresentOrElse(
+                    CompletableFuture.runAsync(() -> plugin.getDatabase()
+                            .getUserByName(username.toLowerCase())
+                            .thenAccept(optionalUser -> optionalUser.ifPresentOrElse(
                                     user -> plugin.getDatabase().getUserData(user, versionUuid).thenAccept(data -> {
                                         if (data.isEmpty()) {
                                             plugin.getLocales().getLocale("error_invalid_version_uuid")
                                                     .ifPresent(player::sendMessage);
                                             return;
                                         }
-                                        plugin.getDatabase().setUserData(user, data.get().userData(),
-                                                DataSaveCause.BACKUP_RESTORE);
+
+                                        // Restore users with a minimum of one health (prevent restoring players with <=0 health)
+                                        final UserData userData = data.get().userData();
+                                        userData.getStatus().ifPresent(status -> status.health = Math.max(1, status.health));
+
+                                        // Set the users data and send a message
+                                        plugin.getDatabase().setUserData(user, userData, DataSaveCause.BACKUP_RESTORE);
                                         plugin.getRedisManager().sendUserDataUpdate(user, data.get().userData()).join();
                                         plugin.getLocales().getLocale("data_restored",
                                                         user.username,
@@ -183,11 +214,13 @@ public class UserDataCommand extends CommandBase implements TabCompletable {
                             .ifPresent(player::sendMessage);
                     return;
                 }
+
                 final String username = args[1];
                 try {
                     final UUID versionUuid = UUID.fromString(args[2]);
-                    CompletableFuture.runAsync(() -> plugin.getDatabase().getUserByName(username.toLowerCase()).thenAccept(
-                            optionalUser -> optionalUser.ifPresentOrElse(
+                    CompletableFuture.runAsync(() -> plugin.getDatabase()
+                            .getUserByName(username.toLowerCase())
+                            .thenAccept(optionalUser -> optionalUser.ifPresentOrElse(
                                     user -> plugin.getDatabase().getUserData(user, versionUuid).thenAccept(
                                             optionalUserData -> optionalUserData.ifPresentOrElse(userData -> {
                                                 if (userData.pinned()) {
@@ -217,6 +250,46 @@ public class UserDataCommand extends CommandBase implements TabCompletable {
                             .ifPresent(player::sendMessage);
                 }
             }
+            case "dump" -> {
+                if (!player.hasPermission(Permission.COMMAND_USER_DATA_DUMP.node)) {
+                    plugin.getLocales().getLocale("error_no_permission").ifPresent(player::sendMessage);
+                    return;
+                }
+                if (args.length < 3) {
+                    plugin.getLocales().getLocale("error_invalid_syntax",
+                                    "/userdata dump <username> <version_uuid>")
+                            .ifPresent(player::sendMessage);
+                    return;
+                }
+
+                final boolean toWeb = args.length > 3 && args[3].equalsIgnoreCase("web");
+                final String username = args[1];
+                try {
+                    final UUID versionUuid = UUID.fromString(args[2]);
+                    CompletableFuture.runAsync(() -> plugin.getDatabase()
+                            .getUserByName(username.toLowerCase())
+                            .thenAccept(optionalUser -> optionalUser.ifPresentOrElse(
+                                    user -> plugin.getDatabase().getUserData(user, versionUuid).thenAccept(
+                                            optionalUserData -> optionalUserData.ifPresentOrElse(userData -> {
+                                                try {
+                                                    final DataDumper dumper = DataDumper.create(userData, user, plugin);
+                                                    final String result = toWeb ? dumper.toWeb() : dumper.toFile();
+                                                    plugin.getLocales().getLocale("data_dumped", versionUuid.toString()
+                                                                    .split("-")[0], user.username, result)
+                                                            .ifPresent(player::sendMessage);
+                                                } catch (IOException e) {
+                                                    plugin.log(Level.SEVERE, "Failed to dump user data", e);
+                                                }
+                                            }, () -> plugin.getLocales().getLocale("error_invalid_version_uuid")
+                                                    .ifPresent(player::sendMessage))),
+                                    () -> plugin.getLocales().getLocale("error_invalid_player")
+                                            .ifPresent(player::sendMessage))));
+                } catch (IllegalArgumentException e) {
+                    plugin.getLocales().getLocale("error_invalid_syntax",
+                                    "/userdata dump <username> <version_uuid>")
+                            .ifPresent(player::sendMessage);
+                }
+            }
         }
     }
 
@@ -225,7 +298,7 @@ public class UserDataCommand extends CommandBase implements TabCompletable {
         switch (args.length) {
             case 0, 1 -> {
                 return Arrays.stream(COMMAND_ARGUMENTS)
-                        .filter(argument -> argument.startsWith(args.length >= 1 ? args[0] : ""))
+                        .filter(argument -> argument.startsWith(args.length == 1 ? args[0] : ""))
                         .sorted().collect(Collectors.toList());
             }
             case 2 -> {

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

@@ -1,54 +1,49 @@
 package net.william278.husksync.config;
 
-import de.themoep.minedown.MineDown;
-import dev.dejvokep.boostedyaml.YamlDocument;
+import de.themoep.minedown.adventure.MineDown;
+import net.william278.annotaml.YamlFile;
+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;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
- * Loaded locales used by the plugin to display various locales
+ * Loaded locales used by the plugin to display styled messages
  */
+@YamlFile(rootedMap = true, header = """
+        ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+        ┃      HuskHomes 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 {
 
-    public static final String PLUGIN_INFORMATION = """
-            [HuskSync](#00fb9a bold) [| Version %version%](#00fb9a)
-            [A modern, cross-server player data synchronization system](gray)
-            [• Author:](white) [William278](gray show_text=&7Click to visit website open_url=https://william278.net)
-            [• Contributors:](white) [HarvelsX](gray show_text=&7Code), [HookWoods](gray show_text=&7Code)
-            [• Translators:](white) [Namiu](gray show_text=&7\\(うにたろう\\) - Japanese, ja-jp), [anchelthe](gray show_text=&7Spanish, es-es), [Melonzio](gray show_text=&7Spanish, es-es), [Ceddix](gray show_text=&7German, de-de), [mateusneresrb](gray show_text=&7Brazilian Portuguese, pt-br], [小蔡](gray show_text=&7Traditional Chinese, zh-tw), [Ghost-chu](gray show_text=&7Simplified Chinese, zh-cn), [DJelly4K](gray show_text=&7Simplified Chinese, zh-cn), [Thourgard](gray show_text=&7Ukrainian, uk-ua), [xF3d3](gray show_text=&7Italian, it-it)
-            [• Documentation:](white) [[Link]](#00fb9a show_text=&7Click to open link open_url=https://william278.net/docs/husksync/Home/)
-            [• Bug reporting:](white) [[Link]](#00fb9a show_text=&7Click to open link open_url=https://github.com/WiIIiam278/HuskSync/issues)
-            [• Discord support:](white) [[Link]](#00fb9a show_text=&7Click to join open_url=https://discord.gg/tVYhJfyDWG)""";
-
+    /**
+     * The raw set of locales loaded from yaml
+     */
     @NotNull
-    private final HashMap<String, String> rawLocales;
-
-    private Locales(@NotNull YamlDocument localesConfig) {
-        this.rawLocales = new HashMap<>();
-        for (String localeId : localesConfig.getRoutesAsStrings(false)) {
-            rawLocales.put(localeId, localesConfig.getString(localeId));
-        }
-    }
+    public Map<String, String> rawLocales = new HashMap<>();
 
     /**
-     * Returns an un-formatted 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) {
-        if (rawLocales.containsKey(localeId)) {
-            return Optional.of(rawLocales.get(localeId).replaceAll(Pattern.quote("\\n"), "\n"));
-        }
-        return Optional.empty();
+        return Optional.ofNullable(rawLocales.get(localeId)).map(StringEscapeUtils::unescapeJava);
     }
 
     /**
-     * Returns an un-formatted 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
      *
      * @param localeId     String identifier of the locale, corresponding to a key in the file
      * @param replacements Ordered array of replacement strings to fill in placeholders with
@@ -70,13 +65,16 @@ public class Locales {
 
     /**
      * 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 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, replacements).map(MineDown::new);
+        return getRawLocale(localeId, Arrays.stream(replacements).map(Locales::escapeMineDown)
+                .toArray(String[]::new)).map(MineDown::new);
     }
 
     /**
@@ -86,54 +84,90 @@ public class Locales {
      * @param replacements Ordered array of replacement strings to fill in placeholders with
      * @return the raw locale, with inserted placeholders
      */
+    @NotNull
     private String applyReplacements(@NotNull String rawLocale, @NotNull String... replacements) {
         int replacementIndexer = 1;
         for (String replacement : replacements) {
             String replacementString = "%" + replacementIndexer + "%";
             rawLocale = rawLocale.replace(replacementString, replacement);
-            replacementIndexer = replacementIndexer + 1;
+            replacementIndexer += 1;
         }
         return rawLocale;
     }
 
     /**
-     * Load the locales from a BoostedYaml {@link YamlDocument} locales file
+     * 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 localesConfig The loaded {@link YamlDocument} locales.yml file
-     * @return the loaded {@link Locales}
+     * @param string The string to escape
+     * @return The escaped string
      */
-    public static Locales load(@NotNull YamlDocument localesConfig) {
-        return new Locales(localesConfig);
+    @NotNull
+    public static String escapeMineDown(@NotNull String string) {
+        final StringBuilder value = new StringBuilder();
+        for (int i = 0; i < string.length(); ++i) {
+            char c = string.charAt(i);
+            boolean isEscape = c == '\\';
+            boolean isColorCode = i + 1 < string.length() && (c == 167 || c == '&');
+            boolean isEvent = c == '[' || c == ']' || c == '(' || c == ')';
+            if (isEscape || isColorCode || isEvent) {
+                value.append('\\');
+            }
+
+            value.append(c);
+        }
+        return value.toString();
     }
 
     /**
-     * Strips a string of basic MineDown formatting, used for displaying plugin info to console
+     * Truncates a String to a specified length, and appends an ellipsis if it is longer than the specified length
      *
-     * @param string The string to strip
-     * @return The MineDown-stripped string
+     * @param string The string to truncate
+     * @param length The maximum length of the string
+     * @return The truncated string
      */
-    public String stripMineDown(@NotNull String string) {
-        final String[] in = string.split("\n");
-        final StringBuilder out = new StringBuilder();
-        String regex = "[^\\[\\]() ]*\\[([^()]+)]\\([^()]+open_url=(\\S+).*\\)";
-
-        for (int i = 0; i < in.length; i++) {
-            Pattern pattern = Pattern.compile(regex);
-            Matcher m = pattern.matcher(in[i]);
-
-            if (m.find()) {
-                out.append(in[i].replace(m.group(0), ""));
-                out.append(m.group(2));
-            } else {
-                out.append(in[i]);
-            }
-
-            if (i + 1 != in.length) {
-                out.append("\n");
-            }
+    @NotNull
+    public static String truncate(@NotNull String string, int length) {
+        if (string.length() > length) {
+            return string.substring(0, length) + "…";
         }
+        return string;
+    }
 
-        return out.toString();
+    /**
+     * Returns the base list options to use for a paginated chat list
+     *
+     * @param itemsPerPage The number of items to display per page
+     * @return The list options
+     */
+    @NotNull
+    public ListOptions.Builder getBaseChatList(int itemsPerPage) {
+        return new ListOptions.Builder()
+                .setFooterFormat(getRawLocale("list_footer",
+                        "%previous_page_button%", "%current_page%",
+                        "%total_pages%", "%next_page_button%", "%page_jumpers%").orElse(""))
+                .setNextButtonFormat(getRawLocale("list_next_page_button",
+                        "%next_page_index%", "%command%").orElse(""))
+                .setPreviousButtonFormat(getRawLocale("list_previous_page_button",
+                        "%previous_page_index%", "%command%").orElse(""))
+                .setPageJumpersFormat(getRawLocale("list_page_jumpers",
+                        "%page_jump_buttons%").orElse(""))
+                .setPageJumperPageFormat(getRawLocale("list_page_jumper_button",
+                        "%target_page_index%", "%command%").orElse(""))
+                .setPageJumperCurrentPageFormat(getRawLocale("list_page_jumper_current_page",
+                        "%current_page%").orElse(""))
+                .setPageJumperPageSeparator(getRawLocale("list_page_jumper_separator").orElse(""))
+                .setPageJumperGroupSeparator(getRawLocale("list_page_jumper_group_separator").orElse(""))
+                .setItemsPerPage(itemsPerPage)
+                .setEscapeItemsMineDown(false)
+                .setSpaceAfterHeader(false)
+                .setSpaceBeforeFooter(false);
+    }
+
+    @SuppressWarnings("unused")
+    public Locales() {
     }
 
 }

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

@@ -1,273 +1,417 @@
 package net.william278.husksync.config;
 
-import dev.dejvokep.boostedyaml.YamlDocument;
+import net.william278.annotaml.YamlComment;
+import net.william278.annotaml.YamlFile;
+import net.william278.annotaml.YamlKey;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
- * Settings used for the plugin, as read from the config file
+ * Plugin settings, read from config.yml
  */
+@YamlFile(header = """
+        ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+        ┃        HuskSync Config       ┃
+        ┃    Developed by William278   ┃
+        ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+        ┣╸ Information: https://william278.net/project/husksync
+        ┗╸ Documentation: https://william278.net/docs/husksync""",
+        versionField = "config_version", versionNumber = 4)
 public class Settings {
 
-    /**
-     * Map of {@link ConfigOption}s read from the config file
-     */
-    private final HashMap<ConfigOption, Object> configOptions;
+    // Top-level settings
+    @YamlKey("language")
+    private String language = "en-gb";
 
-    // Load the settings from the document
-    private Settings(@NotNull YamlDocument config) {
-        this.configOptions = new HashMap<>();
-        Arrays.stream(ConfigOption.values()).forEach(configOption -> configOptions
-                .put(configOption, switch (configOption.optionType) {
-                    case BOOLEAN -> configOption.getBooleanValue(config);
-                    case STRING -> configOption.getStringValue(config);
-                    case DOUBLE -> configOption.getDoubleValue(config);
-                    case FLOAT -> configOption.getFloatValue(config);
-                    case INTEGER -> configOption.getIntValue(config);
-                    case STRING_LIST -> configOption.getStringListValue(config);
-                }));
-    }
+    @YamlKey("check_for_updates")
+    private boolean checkForUpdates = true;
 
-    /**
-     * Get the value of the specified {@link ConfigOption}
-     *
-     * @param option the {@link ConfigOption} to check
-     * @return the value of the {@link ConfigOption} as a boolean
-     * @throws ClassCastException if the option is not a boolean
-     */
-    public boolean getBooleanValue(@NotNull ConfigOption option) throws ClassCastException {
-        return (Boolean) configOptions.get(option);
-    }
+    @YamlKey("cluster_id")
+    private String clusterId = "";
 
-    /**
-     * Get the value of the specified {@link ConfigOption}
-     *
-     * @param option the {@link ConfigOption} to check
-     * @return the value of the {@link ConfigOption} as a string
-     * @throws ClassCastException if the option is not a string
-     */
-    public String getStringValue(@NotNull ConfigOption option) throws ClassCastException {
-        return (String) configOptions.get(option);
-    }
+    @YamlKey("debug_logging")
+    private boolean debugLogging = false;
 
-    /**
-     * Get the value of the specified {@link ConfigOption}
-     *
-     * @param option the {@link ConfigOption} to check
-     * @return the value of the {@link ConfigOption} as a double
-     * @throws ClassCastException if the option is not a double
-     */
-    public double getDoubleValue(@NotNull ConfigOption option) throws ClassCastException {
-        return (Double) configOptions.get(option);
-    }
 
-    /**
-     * Get the value of the specified {@link ConfigOption}
-     *
-     * @param option the {@link ConfigOption} to check
-     * @return the value of the {@link ConfigOption} as a float
-     * @throws ClassCastException if the option is not a float
-     */
-    public double getFloatValue(@NotNull ConfigOption option) throws ClassCastException {
-        return (Float) configOptions.get(option);
-    }
+    // Database settings
+    @YamlComment("Database connection settings")
+    @YamlKey("database.credentials.host")
+    private String mySqlHost = "localhost";
 
-    /**
-     * Get the value of the specified {@link ConfigOption}
-     *
-     * @param option the {@link ConfigOption} to check
-     * @return the value of the {@link ConfigOption} as an integer
-     * @throws ClassCastException if the option is not an integer
-     */
-    public int getIntegerValue(@NotNull ConfigOption option) throws ClassCastException {
-        return (Integer) configOptions.get(option);
-    }
+    @YamlKey("database.credentials.port")
+    private int mySqlPort = 3306;
 
-    /**
-     * Get the value of the specified {@link ConfigOption}
-     *
-     * @param option the {@link ConfigOption} to check
-     * @return the value of the {@link ConfigOption} as a string {@link List}
-     * @throws ClassCastException if the option is not a string list
-     */
-    @SuppressWarnings("unchecked")
-    public List<String> getStringListValue(@NotNull ConfigOption option) throws ClassCastException {
-        return (List<String>) configOptions.get(option);
+    @YamlKey("database.credentials.database")
+    private String mySqlDatabase = "HuskSync";
+
+    @YamlKey("database.credentials.username")
+    private String mySqlUsername = "root";
+
+    @YamlKey("database.credentials.password")
+    private String mySqlPassword = "pa55w0rd";
+
+    @YamlKey("database.credentials.parameters")
+    private String mySqlConnectionParameters = "?autoReconnect=true&useSSL=false";
+
+    @YamlComment("MySQL connection pool properties")
+    @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;
+
+    @YamlKey("database.table_names")
+    private Map<String, String> tableNames = TableName.getDefaults();
+
+
+    // Redis settings
+    @YamlComment("Redis connection settings")
+    @YamlKey("redis.credentials.host")
+    private String redisHost = "localhost";
+
+    @YamlKey("redis.credentials.port")
+    private int redisPort = 6379;
+
+    @YamlKey("redis.credentials.password")
+    private String redisPassword = "";
+
+    @YamlKey("redis.use_ssl")
+    private boolean redisUseSsl = false;
+
+
+    // Synchronization settings
+    @YamlComment("Synchronization settings")
+    @YamlKey("synchronization.max_user_data_snapshots")
+    private int maxUserDataSnapshots = 5;
+
+    @YamlKey("synchronization.save_on_world_save")
+    private boolean saveOnWorldSave = true;
+
+    @YamlKey("synchronization.save_on_death")
+    private boolean saveOnDeath = false;
+
+    @YamlKey("synchronization.save_empty_drops_on_death")
+    private boolean saveEmptyDropsOnDeath = true;
+
+    @YamlKey("synchronization.compress_data")
+    private boolean compressData = true;
+
+    @YamlKey("synchronization.notification_display_slot")
+    private NotificationDisplaySlot notificationDisplaySlot = NotificationDisplaySlot.ACTION_BAR;
+
+    @YamlKey("synchronization.synchronise_dead_players_changing_server")
+    private boolean synchroniseDeadPlayersChangingServer = true;
+
+    @YamlKey("synchronization.network_latency_milliseconds")
+    private int networkLatencyMilliseconds = 500;
+
+    @YamlKey("synchronization.features")
+    private Map<String, Boolean> synchronizationFeatures = SynchronizationFeature.getDefaults();
+
+    @YamlKey("synchronization.blacklisted_commands_while_locked")
+    private List<String> blacklistedCommandsWhileLocked = new ArrayList<>();
+
+    @YamlKey("synchronization.event_priorities")
+    private Map<String, String> synchronizationEventPriorities = EventType.getDefaults();
+
+
+    // Zero-args constructor for instantiation via Annotaml
+    public Settings() {
     }
 
 
-    /**
-     * Load the settings from a BoostedYaml {@link YamlDocument} config file
-     *
-     * @param config The loaded {@link YamlDocument} config.yml file
-     * @return the loaded {@link Settings}
-     */
-    public static Settings load(@NotNull YamlDocument config) {
-        return new Settings(config);
+    @NotNull
+    public String getLanguage() {
+        return language;
+    }
+
+    public boolean doCheckForUpdates() {
+        return checkForUpdates;
+    }
+
+    @NotNull
+    public String getClusterId() {
+        return clusterId;
+    }
+
+    public boolean doDebugLogging() {
+        return debugLogging;
+    }
+
+    @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(), 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 isRedisUseSsl() {
+        return redisUseSsl;
+    }
+
+    public int getMaxUserDataSnapshots() {
+        return maxUserDataSnapshots;
+    }
+
+    public boolean doSaveOnWorldSave() {
+        return saveOnWorldSave;
+    }
+
+    public boolean doSaveOnDeath() {
+        return saveOnDeath;
+    }
+
+    public boolean doSaveEmptyDropsOnDeath() {
+        return saveEmptyDropsOnDeath;
+    }
+
+    public boolean doCompressData() {
+        return compressData;
+    }
+
+    @NotNull
+    public NotificationDisplaySlot getNotificationDisplaySlot() {
+        return notificationDisplaySlot;
+    }
+
+    public boolean isSynchroniseDeadPlayersChangingServer() {
+        return synchroniseDeadPlayersChangingServer;
+    }
+
+    public int getNetworkLatencyMilliseconds() {
+        return networkLatencyMilliseconds;
+    }
+
+    @NotNull
+    public Map<String, Boolean> getSynchronizationFeatures() {
+        return synchronizationFeatures;
+    }
+
+    public boolean getSynchronizationFeature(@NotNull SynchronizationFeature feature) {
+        return getSynchronizationFeatures().getOrDefault(feature.name().toLowerCase(), feature.enabledByDefault);
+    }
+
+    @NotNull
+    public List<String> getBlacklistedCommandsWhileLocked() {
+        return blacklistedCommandsWhileLocked;
+    }
+
+    @NotNull
+    public EventPriority getEventPriority(@NotNull Settings.EventType eventType) {
+        try {
+            return EventPriority.valueOf(synchronizationEventPriorities.get(eventType.name().toLowerCase()));
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+            return EventPriority.NORMAL;
+        }
     }
 
     /**
-     * Represents an option stored by a path in config.yml
+     * Represents the names of tables in the database
      */
-    public enum ConfigOption {
-        LANGUAGE("language", OptionType.STRING, "en-gb"),
-        CHECK_FOR_UPDATES("check_for_updates", OptionType.BOOLEAN, true),
+    public enum TableName {
+        USERS("husksync_users"),
+        USER_DATA("husksync_user_data");
 
-        CLUSTER_ID("cluster_id", OptionType.STRING, ""),
-        DEBUG_LOGGING("debug_logging", OptionType.BOOLEAN, false),
+        private final String defaultName;
 
-        DATABASE_HOST("database.credentials.host", OptionType.STRING, "localhost"),
-        DATABASE_PORT("database.credentials.port", OptionType.INTEGER, 3306),
-        DATABASE_NAME("database.credentials.database", OptionType.STRING, "HuskSync"),
-        DATABASE_USERNAME("database.credentials.username", OptionType.STRING, "root"),
-        DATABASE_PASSWORD("database.credentials.password", OptionType.STRING, "pa55w0rd"),
-        DATABASE_CONNECTION_PARAMS("database.credentials.params", OptionType.STRING, "?autoReconnect=true&useSSL=false"),
-        DATABASE_CONNECTION_POOL_MAX_SIZE("database.connection_pool.maximum_pool_size", OptionType.INTEGER, 10),
-        DATABASE_CONNECTION_POOL_MIN_IDLE("database.connection_pool.minimum_idle", OptionType.INTEGER, 10),
-        DATABASE_CONNECTION_POOL_MAX_LIFETIME("database.connection_pool.maximum_lifetime", OptionType.INTEGER, 1800000),
-        DATABASE_CONNECTION_POOL_KEEPALIVE("database.connection_pool.keepalive_time", OptionType.INTEGER, 0),
-        DATABASE_CONNECTION_POOL_TIMEOUT("database.connection_pool.connection_timeout", OptionType.INTEGER, 5000),
-        DATABASE_USERS_TABLE_NAME("database.table_names.users_table", OptionType.STRING, "husksync_users"),
-        DATABASE_USER_DATA_TABLE_NAME("database.table_names.user_data_table", OptionType.STRING, "husksync_user_data"),
+        TableName(@NotNull String defaultName) {
+            this.defaultName = defaultName;
+        }
 
-        REDIS_HOST("redis.credentials.host", OptionType.STRING, "localhost"),
-        REDIS_PORT("redis.credentials.port", OptionType.INTEGER, 6379),
-        REDIS_PASSWORD("redis.credentials.password", OptionType.STRING, ""),
-        REDIS_USE_SSL("redis.use_ssl", OptionType.BOOLEAN, false),
-
-        SYNCHRONIZATION_MAX_USER_DATA_SNAPSHOTS("synchronization.max_user_data_snapshots", OptionType.INTEGER, 5),
-        SYNCHRONIZATION_SAVE_ON_WORLD_SAVE("synchronization.save_on_world_save", OptionType.BOOLEAN, true),
-        SYNCHRONIZATION_COMPRESS_DATA("synchronization.compress_data", OptionType.BOOLEAN, true),
-        SYNCHRONIZATION_NETWORK_LATENCY_MILLISECONDS("synchronization.network_latency_milliseconds", OptionType.INTEGER, 500),
-        SYNCHRONIZATION_SYNC_INVENTORIES("synchronization.features.inventories", OptionType.BOOLEAN, true),
-        SYNCHRONIZATION_SYNC_ENDER_CHESTS("synchronization.features.ender_chests", OptionType.BOOLEAN, true),
-        SYNCHRONIZATION_SYNC_HEALTH("synchronization.features.health", OptionType.BOOLEAN, true),
-        SYNCHRONIZATION_SYNC_MAX_HEALTH("synchronization.features.max_health", OptionType.BOOLEAN, true),
-        SYNCHRONIZATION_SYNC_HUNGER("synchronization.features.hunger", OptionType.BOOLEAN, true),
-        SYNCHRONIZATION_SYNC_EXPERIENCE("synchronization.features.experience", OptionType.BOOLEAN, true),
-        SYNCHRONIZATION_SYNC_POTION_EFFECTS("synchronization.features.potion_effects", OptionType.BOOLEAN, true),
-        SYNCHRONIZATION_SYNC_ADVANCEMENTS("synchronization.features.advancements", OptionType.BOOLEAN, true),
-        SYNCHRONIZATION_SYNC_GAME_MODE("synchronization.features.game_mode", OptionType.BOOLEAN, true),
-        SYNCHRONIZATION_SYNC_STATISTICS("synchronization.features.statistics", OptionType.BOOLEAN, true),
-        SYNCHRONIZATION_SYNC_PERSISTENT_DATA_CONTAINER("synchronization.features.persistent_data_container", OptionType.BOOLEAN, true),
-        SYNCHRONIZATION_SYNC_LOCATION("synchronization.features.location", OptionType.BOOLEAN, true);
-
-        /**
-         * The path in the config.yml file to the value
-         */
         @NotNull
-        public final String configPath;
+        private Map.Entry<String, String> toEntry() {
+            return Map.entry(name().toLowerCase(), defaultName);
+        }
 
-        /**
-         * The {@link OptionType} of this option
-         */
+        @SuppressWarnings("unchecked")
         @NotNull
-        public final OptionType optionType;
-
-        /**
-         * The default value of this option if not set in config
-         */
-        @Nullable
-        private final Object defaultValue;
-
-        ConfigOption(@NotNull String configPath, @NotNull OptionType optionType, @Nullable Object defaultValue) {
-            this.configPath = configPath;
-            this.optionType = optionType;
-            this.defaultValue = defaultValue;
-        }
-
-        ConfigOption(@NotNull String configPath, @NotNull OptionType optionType) {
-            this.configPath = configPath;
-            this.optionType = optionType;
-            this.defaultValue = null;
-        }
-
-        /**
-         * Get the value at the path specified (or return default if set), as a string
-         *
-         * @param config The {@link YamlDocument} config file
-         * @return the value defined in the config, as a string
-         */
-        public String getStringValue(@NotNull YamlDocument config) {
-            return defaultValue != null
-                    ? config.getString(configPath, (String) defaultValue)
-                    : config.getString(configPath);
-        }
-
-        /**
-         * Get the value at the path specified (or return default if set), as a boolean
-         *
-         * @param config The {@link YamlDocument} config file
-         * @return the value defined in the config, as a boolean
-         */
-        public boolean getBooleanValue(@NotNull YamlDocument config) {
-            return defaultValue != null
-                    ? config.getBoolean(configPath, (Boolean) defaultValue)
-                    : config.getBoolean(configPath);
-        }
-
-        /**
-         * Get the value at the path specified (or return default if set), as a double
-         *
-         * @param config The {@link YamlDocument} config file
-         * @return the value defined in the config, as a double
-         */
-        public double getDoubleValue(@NotNull YamlDocument config) {
-            return defaultValue != null
-                    ? config.getDouble(configPath, (Double) defaultValue)
-                    : config.getDouble(configPath);
-        }
-
-        /**
-         * Get the value at the path specified (or return default if set), as a float
-         *
-         * @param config The {@link YamlDocument} config file
-         * @return the value defined in the config, as a float
-         */
-        public float getFloatValue(@NotNull YamlDocument config) {
-            return defaultValue != null
-                    ? config.getFloat(configPath, (Float) defaultValue)
-                    : config.getFloat(configPath);
-        }
-
-        /**
-         * Get the value at the path specified (or return default if set), as an int
-         *
-         * @param config The {@link YamlDocument} config file
-         * @return the value defined in the config, as an int
-         */
-        public int getIntValue(@NotNull YamlDocument config) {
-            return defaultValue != null
-                    ? config.getInt(configPath, (Integer) defaultValue)
-                    : config.getInt(configPath);
-        }
-
-        /**
-         * Get the value at the path specified (or return default if set), as a string {@link List}
-         *
-         * @param config The {@link YamlDocument} config file
-         * @return the value defined in the config, as a string {@link List}
-         */
-        public List<String> getStringListValue(@NotNull YamlDocument config) {
-            return config.getStringList(configPath, new ArrayList<>());
-        }
-
-        /**
-         * Represents the type of the object
-         */
-        public enum OptionType {
-            BOOLEAN,
-            STRING,
-            DOUBLE,
-            FLOAT,
-            INTEGER,
-            STRING_LIST
+        private static Map<String, String> getDefaults() {
+            return Map.ofEntries(Arrays.stream(values())
+                    .map(TableName::toEntry)
+                    .toArray(Map.Entry[]::new));
         }
     }
 
-}
+    /**
+     * Determines the slot a system notification should be displayed in
+     */
+    public enum NotificationDisplaySlot {
+        /**
+         * Displays the notification in the action bar
+         */
+        ACTION_BAR,
+        /**
+         * Displays the notification in the chat
+         */
+        CHAT,
+        /**
+         * Displays the notification in an advancement toast
+         */
+        TOAST,
+        /**
+         * Does not display the notification
+         */
+        NONE
+    }
+
+    /**
+     * Represents enabled synchronisation features
+     */
+    public enum SynchronizationFeature {
+        INVENTORIES(true),
+        ENDER_CHESTS(true),
+        HEALTH(true),
+        MAX_HEALTH(true),
+        HUNGER(true),
+        EXPERIENCE(true),
+        POTION_EFFECTS(true),
+        ADVANCEMENTS(true),
+        GAME_MODE(true),
+        STATISTICS(true),
+        PERSISTENT_DATA_CONTAINER(false),
+        LOCKED_MAPS(false),
+        LOCATION(false);
+
+        private final boolean enabledByDefault;
+
+        SynchronizationFeature(boolean enabledByDefault) {
+            this.enabledByDefault = enabledByDefault;
+        }
+
+        @NotNull
+        private Map.Entry<String, Boolean> toEntry() {
+            return Map.entry(name().toLowerCase(), enabledByDefault);
+        }
+
+        @SuppressWarnings("unchecked")
+        @NotNull
+        private static Map<String, Boolean> getDefaults() {
+            return Map.ofEntries(Arrays.stream(values())
+                    .map(SynchronizationFeature::toEntry)
+                    .toArray(Map.Entry[]::new));
+        }
+    }
+
+    /**
+     * Represents events that HuskSync listens to, with a configurable priority listener
+     */
+    public enum EventType {
+        JOIN_LISTENER(EventPriority.LOWEST),
+        QUIT_LISTENER(EventPriority.LOWEST),
+        DEATH_LISTENER(EventPriority.NORMAL);
+
+        private final EventPriority defaultPriority;
+
+        EventType(@NotNull EventPriority defaultPriority) {
+            this.defaultPriority = defaultPriority;
+        }
+
+        @NotNull
+        private Map.Entry<String, String> toEntry() {
+            return Map.entry(name().toLowerCase(), defaultPriority.name());
+        }
+
+
+        @SuppressWarnings("unchecked")
+        @NotNull
+        private static Map<String, String> getDefaults() {
+            return Map.ofEntries(Arrays.stream(values())
+                    .map(EventType::toEntry)
+                    .toArray(Map.Entry[]::new));
+        }
+    }
+
+    /**
+     * Represents priorities for events that HuskSync listens to
+     */
+    public enum EventPriority {
+        /**
+         * Listens and processes the event execution last
+         */
+        HIGHEST,
+        /**
+         * Listens in between {@link #HIGHEST} and {@link #LOWEST} priority marked
+         */
+        NORMAL,
+        /**
+         * Listens and processes the event execution first
+         */
+        LOWEST
+    }
+
+}

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

@@ -1,5 +1,6 @@
 package net.william278.husksync.data;
 
+import net.william278.husksync.config.Locales;
 import net.william278.husksync.player.OnlineUser;
 import net.william278.husksync.api.BaseHuskSyncAPI;
 import net.william278.husksync.player.User;
@@ -26,6 +27,12 @@ public enum DataSaveCause {
      * @since 2.0
      */
     WORLD_SAVE,
+    /**
+     * Indicates data saved when the user died
+     *
+     * @since 2.1
+     */
+    DEATH,
     /**
      * Indicates data saved when the server shut down
      *
@@ -94,4 +101,9 @@ public enum DataSaveCause {
         return UNKNOWN;
     }
 
+    @NotNull
+    public String getDisplayName() {
+        return Locales.truncate(name().toLowerCase(), 10);
+    }
+
 }

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

@@ -14,6 +14,16 @@ public class ItemData {
     @SerializedName("serialized_items")
     public String serializedItems;
 
+    /**
+     * Get an empty item data object, representing an empty inventory or Ender Chest
+     *
+     * @return an empty item data object
+     */
+    @NotNull
+    public static ItemData empty() {
+        return new ItemData("");
+    }
+
     public ItemData(@NotNull final String serializedItems) {
         this.serializedItems = serializedItems;
     }
@@ -22,4 +32,13 @@ public class ItemData {
     protected ItemData() {
     }
 
+    /**
+     * Check if the item data is empty
+     *
+     * @return {@code true} if the item data is empty; {@code false} otherwise
+     */
+    public boolean isEmpty() {
+        return serializedItems.isEmpty();
+    }
+
 }

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

@@ -4,6 +4,8 @@ import com.google.gson.annotations.SerializedName;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 
 /**
  * Store's a user's persistent data container, holding a map of plugin-set persistent values
@@ -14,9 +16,9 @@ public class PersistentDataContainerData {
      * Map of namespaced key strings to a byte array representing the persistent data
      */
     @SerializedName("persistent_data_map")
-    public Map<String, Byte[]> persistentDataMap;
+    protected Map<String, PersistentDataTag<?>> persistentDataMap;
 
-    public PersistentDataContainerData(@NotNull final Map<String, Byte[]> persistentDataMap) {
+    public PersistentDataContainerData(@NotNull final Map<String, PersistentDataTag<?>> persistentDataMap) {
         this.persistentDataMap = persistentDataMap;
     }
 
@@ -24,4 +26,23 @@ public class PersistentDataContainerData {
     protected PersistentDataContainerData() {
     }
 
+
+    public <T> Optional<T> getTagValue(@NotNull final String tagName, @NotNull Class<T> tagClass) {
+        if (persistentDataMap.containsKey(tagName)) {
+            return Optional.of(tagClass.cast(persistentDataMap.get(tagName).value));
+        }
+        return Optional.empty();
+    }
+
+    public Optional<PersistentDataTagType> getTagType(@NotNull final String tagType) {
+        if (persistentDataMap.containsKey(tagType)) {
+            return PersistentDataTagType.getDataType(persistentDataMap.get(tagType).type);
+        }
+        return Optional.empty();
+    }
+
+    public Set<String> getTags() {
+        return persistentDataMap.keySet();
+    }
+
 }

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

@@ -0,0 +1,35 @@
+package net.william278.husksync.data;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Optional;
+
+/**
+ * Represents a persistent data tag set by a plugin.
+ */
+public class PersistentDataTag<T> {
+
+    /**
+     * The enumerated primitive data type name value of the tag
+     */
+    protected String type;
+
+    /**
+     * The value of the tag
+     */
+    public T value;
+
+    public PersistentDataTag(@NotNull PersistentDataTagType type, @NotNull T value) {
+        this.type = type.name();
+        this.value = value;
+    }
+
+    @SuppressWarnings("unused")
+    private PersistentDataTag() {
+    }
+
+    public Optional<PersistentDataTagType> getType() {
+        return PersistentDataTagType.getDataType(type);
+    }
+
+}

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

@@ -0,0 +1,35 @@
+package net.william278.husksync.data;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Optional;
+
+/**
+ * Represents the type of a {@link PersistentDataTag}
+ */
+public enum PersistentDataTagType {
+
+    BYTE,
+    SHORT,
+    INTEGER,
+    LONG,
+    FLOAT,
+    DOUBLE,
+    STRING,
+    BYTE_ARRAY,
+    INTEGER_ARRAY,
+    LONG_ARRAY,
+    TAG_CONTAINER_ARRAY,
+    TAG_CONTAINER;
+
+
+    public static Optional<PersistentDataTagType> getDataType(@NotNull String typeName) {
+        for (PersistentDataTagType type : values()) {
+            if (type.name().equalsIgnoreCase(typeName)) {
+                return Optional.of(type);
+            }
+        }
+        return Optional.empty();
+    }
+
+}

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

@@ -11,7 +11,7 @@ import java.util.Map;
 public class StatisticsData {
 
     /**
-     * Map of untyped statistic names to their values
+     * Map of generic statistic names to their values
      */
     @SerializedName("untyped_statistics")
     public Map<String, Integer> untypedStatistics;

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

@@ -8,29 +8,34 @@ import java.util.List;
 
 /**
  * Flags for setting {@link StatusData}, indicating which elements should be synced
+ *
+ * @deprecated Use the more direct {@link Settings#getSynchronizationFeature(Settings.SynchronizationFeature)} instead
  */
+@Deprecated(since = "2.1")
 public enum StatusDataFlag {
 
-    SET_HEALTH(Settings.ConfigOption.SYNCHRONIZATION_SYNC_HEALTH),
-    SET_MAX_HEALTH(Settings.ConfigOption.SYNCHRONIZATION_SYNC_MAX_HEALTH),
-    SET_HUNGER(Settings.ConfigOption.SYNCHRONIZATION_SYNC_HUNGER),
-    SET_EXPERIENCE(Settings.ConfigOption.SYNCHRONIZATION_SYNC_EXPERIENCE),
-    SET_GAME_MODE(Settings.ConfigOption.SYNCHRONIZATION_SYNC_GAME_MODE),
-    SET_FLYING(Settings.ConfigOption.SYNCHRONIZATION_SYNC_LOCATION),
-    SET_SELECTED_ITEM_SLOT(Settings.ConfigOption.SYNCHRONIZATION_SYNC_INVENTORIES);
+    SET_HEALTH(Settings.SynchronizationFeature.HEALTH),
+    SET_MAX_HEALTH(Settings.SynchronizationFeature.MAX_HEALTH),
+    SET_HUNGER(Settings.SynchronizationFeature.HUNGER),
+    SET_EXPERIENCE(Settings.SynchronizationFeature.EXPERIENCE),
+    SET_GAME_MODE(Settings.SynchronizationFeature.GAME_MODE),
+    SET_FLYING(Settings.SynchronizationFeature.LOCATION),
+    SET_SELECTED_ITEM_SLOT(Settings.SynchronizationFeature.INVENTORIES);
 
-    private final Settings.ConfigOption configOption;
+    private final Settings.SynchronizationFeature feature;
 
-    StatusDataFlag(@NotNull Settings.ConfigOption configOption) {
-        this.configOption = configOption;
+    StatusDataFlag(@NotNull Settings.SynchronizationFeature feature) {
+        this.feature = feature;
     }
 
     /**
      * Returns all status data flags
      *
      * @return all status data flags as a list
+     * @deprecated Use {@link Settings#getSynchronizationFeature(Settings.SynchronizationFeature)} instead
      */
     @NotNull
+    @Deprecated(since = "2.1")
     @SuppressWarnings("unused")
     public static List<StatusDataFlag> getAll() {
         return Arrays.stream(StatusDataFlag.values()).toList();
@@ -41,11 +46,13 @@ public enum StatusDataFlag {
      *
      * @param settings the settings to use for determining which flags are enabled
      * @return all status data flags that are enabled for setting
+     * @deprecated Use {@link Settings#getSynchronizationFeature(Settings.SynchronizationFeature)} instead
      */
     @NotNull
+    @Deprecated(since = "2.1")
     public static List<StatusDataFlag> getFromSettings(@NotNull Settings settings) {
         return Arrays.stream(StatusDataFlag.values()).filter(
-                flag -> settings.getBooleanValue(flag.configOption)).toList();
+                flag -> settings.getSynchronizationFeature(flag.feature)).toList();
     }
 
 }

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

@@ -1,11 +1,14 @@
 package net.william278.husksync.data;
 
 import com.google.gson.annotations.SerializedName;
+import net.william278.desertwell.Version;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
+import java.util.Optional;
 
-/***
+/**
  * Stores data about a user
  */
 public class UserData {
@@ -15,72 +18,97 @@ public class UserData {
      * </p>
      * This value is to be incremented whenever the format changes.
      */
-    public static final int CURRENT_FORMAT_VERSION = 1;
+    public static final int CURRENT_FORMAT_VERSION = 3;
 
     /**
      * Stores the user's status data, including health, food, etc.
      */
     @SerializedName("status")
+    @Nullable
     protected StatusData statusData;
 
     /**
      * Stores the user's inventory contents
      */
     @SerializedName("inventory")
+    @Nullable
     protected ItemData inventoryData;
 
     /**
      * Stores the user's ender chest contents
      */
     @SerializedName("ender_chest")
+    @Nullable
     protected ItemData enderChestData;
 
     /**
      * Store's the user's potion effects
      */
     @SerializedName("potion_effects")
+    @Nullable
     protected PotionEffectData potionEffectData;
 
     /**
      * Stores the set of this user's advancements
      */
     @SerializedName("advancements")
+    @Nullable
     protected List<AdvancementData> advancementData;
 
     /**
      * Stores the user's set of statistics
      */
     @SerializedName("statistics")
+    @Nullable
     protected StatisticsData statisticData;
 
     /**
      * Store's the user's world location and coordinates
      */
     @SerializedName("location")
+    @Nullable
     protected LocationData locationData;
 
     /**
      * Stores the user's serialized persistent data container, which contains metadata keys applied by other plugins
      */
     @SerializedName("persistent_data_container")
+    @Nullable
     protected PersistentDataContainerData persistentDataContainerData;
 
     /**
      * Stores the version of Minecraft this data was generated in
      */
     @SerializedName("minecraft_version")
+    @NotNull
     protected String minecraftVersion;
 
     /**
      * Stores the version of the data format being used
      */
     @SerializedName("format_version")
-    protected int formatVersion;
+    protected int formatVersion = CURRENT_FORMAT_VERSION;
 
-    public UserData(@NotNull StatusData statusData, @NotNull ItemData inventoryData,
-                    @NotNull ItemData enderChestData, @NotNull PotionEffectData potionEffectData,
-                    @NotNull List<AdvancementData> advancementData, @NotNull StatisticsData statisticData,
-                    @NotNull LocationData locationData, @NotNull PersistentDataContainerData persistentDataContainerData,
+    /**
+     * Create a new {@link UserData} object with the provided data
+     *
+     * @param statusData                  the user's status data ({@link StatusData})
+     * @param inventoryData               the user's inventory data ({@link ItemData})
+     * @param enderChestData              the user's ender chest data ({@link ItemData})
+     * @param potionEffectData            the user's potion effect data ({@link PotionEffectData})
+     * @param advancementData             the user's advancement data ({@link AdvancementData})
+     * @param statisticData               the user's statistic data ({@link StatisticsData})
+     * @param locationData                the user's location data ({@link LocationData})
+     * @param persistentDataContainerData the user's persistent data container data ({@link PersistentDataContainerData})
+     * @param minecraftVersion            the version of Minecraft this data was generated in (e.g. {@code "1.19.2"})
+     * @deprecated see {@link #builder(String)} or {@link #builder(Version)} to create a {@link UserDataBuilder}, which
+     * you can use to {@link UserDataBuilder#build()} a {@link UserData} instance with
+     */
+    @Deprecated(since = "2.1")
+    public UserData(@Nullable StatusData statusData, @Nullable ItemData inventoryData,
+                    @Nullable ItemData enderChestData, @Nullable PotionEffectData potionEffectData,
+                    @Nullable List<AdvancementData> advancementData, @Nullable StatisticsData statisticData,
+                    @Nullable LocationData locationData, @Nullable PersistentDataContainerData persistentDataContainerData,
                     @NotNull String minecraftVersion) {
         this.statusData = statusData;
         this.inventoryData = inventoryData;
@@ -91,7 +119,6 @@ public class UserData {
         this.locationData = locationData;
         this.persistentDataContainerData = persistentDataContainerData;
         this.minecraftVersion = minecraftVersion;
-        this.formatVersion = CURRENT_FORMAT_VERSION;
     }
 
     // Empty constructor to facilitate json serialization
@@ -99,45 +126,232 @@ public class UserData {
     protected UserData() {
     }
 
+    /**
+     * Gets the {@link StatusData} from this user data
+     *
+     * @return the {@link StatusData} of this user data
+     * @since 2.0
+     * @deprecated Use {@link #getStatus()}, which returns an optional instead
+     */
+    @Nullable
+    @Deprecated(since = "2.1")
     public StatusData getStatusData() {
         return statusData;
     }
 
+    /**
+     * Gets the {@link StatusData} from this user data
+     *
+     * @return an optional containing the {@link StatusData} if it is present in this user data
+     * @since 2.1
+     */
+    public Optional<StatusData> getStatus() {
+        return Optional.ofNullable(statusData);
+    }
+
+    /**
+     * Gets the {@link ItemData} representing the player's inventory from this user data
+     *
+     * @return the inventory {@link ItemData} of this user data
+     * @since 2.0
+     * @deprecated Use {@link #getInventory()}, which returns an optional instead
+     */
+    @Nullable
+    @Deprecated(since = "2.1")
     public ItemData getInventoryData() {
         return inventoryData;
     }
 
+    /**
+     * Gets the {@link ItemData} representing the player's inventory from this user data
+     *
+     * @return an optional containing the inventory {@link ItemData} if it is present in this user data
+     * @since 2.1
+     */
+    public Optional<ItemData> getInventory() {
+        return Optional.ofNullable(inventoryData);
+    }
+
+    /**
+     * Gets the {@link ItemData} representing the player's ender chest from this user data
+     *
+     * @return the ender chest {@link ItemData} of this user data
+     * @since 2.0
+     * @deprecated Use {@link #getEnderChest()}, which returns an optional instead
+     */
+    @Nullable
+    @Deprecated(since = "2.1")
     public ItemData getEnderChestData() {
         return enderChestData;
     }
 
+    /**
+     * Gets the {@link ItemData} representing the player's ender chest from this user data
+     *
+     * @return an optional containing the ender chest {@link ItemData} if it is present in this user data
+     * @since 2.1
+     */
+    public Optional<ItemData> getEnderChest() {
+        return Optional.ofNullable(enderChestData);
+    }
+
+    /**
+     * Gets the {@link PotionEffectData} representing player status effects from this user data
+     *
+     * @return the {@link PotionEffectData} of this user data
+     * @since 2.0
+     * @deprecated Use {@link #getPotionEffects()}, which returns an optional instead
+     */
+    @Nullable
+    @Deprecated(since = "2.1")
     public PotionEffectData getPotionEffectsData() {
         return potionEffectData;
     }
 
+    /**
+     * Gets the {@link PotionEffectData} representing the player's potion effects from this user data
+     *
+     * @return an optional containing {@link PotionEffectData} if it is present in this user data
+     * @since 2.1
+     */
+    public Optional<PotionEffectData> getPotionEffects() {
+        return Optional.ofNullable(potionEffectData);
+    }
+
+    /**
+     * Gets the list of {@link AdvancementData} from this user data
+     *
+     * @return the {@link AdvancementData} of this user data
+     * @since 2.0
+     * @deprecated Use {@link #getAdvancements()}, which returns an optional instead
+     */
+    @Nullable
+    @Deprecated(since = "2.1")
     public List<AdvancementData> getAdvancementData() {
         return advancementData;
     }
 
+    /**
+     * Gets a list of {@link AdvancementData} representing the player's advancements from this user data
+     *
+     * @return an optional containing a {@link List} of {@link AdvancementData} if it is present in this user data
+     * @since 2.1
+     */
+    public Optional<List<AdvancementData>> getAdvancements() {
+        return Optional.ofNullable(advancementData);
+    }
+
+    /**
+     * Gets the {@link StatisticsData} representing player statistics from this user data
+     *
+     * @return the {@link StatisticsData} of this user data
+     * @since 2.0
+     * @deprecated Use {@link #getStatistics()}, which returns an optional instead
+     */
+    @Nullable
+    @Deprecated(since = "2.1")
     public StatisticsData getStatisticsData() {
         return statisticData;
     }
 
+    /**
+     * Gets {@link StatisticsData} representing player statistics from this user data
+     *
+     * @return an optional containing player {@link StatisticsData} if it is present in this user data
+     * @since 2.1
+     */
+    public Optional<StatisticsData> getStatistics() {
+        return Optional.ofNullable(statisticData);
+    }
+
+    /**
+     * Gets the {@link LocationData} representing the player location from this user data
+     *
+     * @return the inventory {@link LocationData} of this user data
+     * @since 2.0
+     * @deprecated Use {@link #getLocation()}, which returns an optional instead
+     */
+    @Nullable
+    @Deprecated(since = "2.1")
     public LocationData getLocationData() {
         return locationData;
     }
 
+    /**
+     * Gets {@link LocationData} representing the player location from this user data
+     *
+     * @return an optional containing player {@link LocationData} if it is present in this user data
+     * @since 2.1
+     */
+    public Optional<LocationData> getLocation() {
+        return Optional.ofNullable(locationData);
+    }
+
+    /**
+     * Gets the {@link PersistentDataContainerData} from this user data
+     *
+     * @return the {@link PersistentDataContainerData} of this user data
+     * @since 2.0
+     * @deprecated Use {@link #getPersistentDataContainer()}, which returns an optional instead
+     */
+    @Nullable
+    @Deprecated(since = "2.1")
     public PersistentDataContainerData getPersistentDataContainerData() {
         return persistentDataContainerData;
     }
 
+    /**
+     * Gets {@link PersistentDataContainerData} from this user data
+     *
+     * @return an optional containing the player's {@link PersistentDataContainerData} if it is present in this user data
+     * @since 2.1
+     */
+    public Optional<PersistentDataContainerData> getPersistentDataContainer() {
+        return Optional.ofNullable(persistentDataContainerData);
+    }
+
+    /**
+     * Get the version of Minecraft this data was generated in
+     *
+     * @return the version of Minecraft this data was generated in
+     */
     @NotNull
     public String getMinecraftVersion() {
         return minecraftVersion;
     }
 
+    /**
+     * Gets the version of the data format being used
+     *
+     * @return the version of the data format being used
+     */
     public int getFormatVersion() {
         return formatVersion;
     }
 
+    /**
+     * Get a new {@link UserDataBuilder} for creating {@link UserData}
+     *
+     * @param minecraftVersion the version of Minecraft this data was generated in (e.g. {@code "1.19.2"})
+     * @return a UserData {@link UserDataBuilder} instance
+     * @since 2.1
+     */
+    @NotNull
+    public static UserDataBuilder builder(@NotNull String minecraftVersion) {
+        return new UserDataBuilder(minecraftVersion);
+    }
+
+    /**
+     * Get a new {@link UserDataBuilder} for creating {@link UserData}
+     *
+     * @param minecraftVersion a {@link Version} object, representing the Minecraft version this data was generated in
+     * @return a UserData {@link UserDataBuilder} instance
+     * @since 2.1
+     */
+    @NotNull
+    public static UserDataBuilder builder(@NotNull Version minecraftVersion) {
+        return builder(minecraftVersion.toStringWithoutMetadata());
+    }
+
+
 }

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

@@ -0,0 +1,140 @@
+package net.william278.husksync.data;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+/**
+ * A builder utility for creating {@link UserData} instances
+ *
+ * @since 2.1
+ */
+@SuppressWarnings("UnusedReturnValue")
+public class UserDataBuilder {
+
+    @NotNull
+    private final UserData userData;
+
+    protected UserDataBuilder(@NotNull String minecraftVersion) {
+        this.userData = new UserData();
+        this.userData.minecraftVersion = minecraftVersion;
+    }
+
+    /**
+     * Set the {@link StatusData} to this {@link UserData}
+     *
+     * @param status the {@link StatusData} to set
+     * @return this {@link UserDataBuilder}
+     * @since 2.1
+     */
+    @NotNull
+    public UserDataBuilder setStatus(@NotNull StatusData status) {
+        this.userData.statusData = status;
+        return this;
+    }
+
+    /**
+     * Set the inventory {@link ItemData} to this {@link UserData}
+     *
+     * @param inventoryData the inventory {@link ItemData} to set
+     * @return this {@link UserDataBuilder}
+     * @since 2.1
+     */
+    @NotNull
+    public UserDataBuilder setInventory(@Nullable ItemData inventoryData) {
+        this.userData.inventoryData = inventoryData;
+        return this;
+    }
+
+    /**
+     * Set the ender chest {@link ItemData} to this {@link UserData}
+     *
+     * @param enderChestData the ender chest {@link ItemData} to set
+     * @return this {@link UserDataBuilder}
+     * @since 2.1
+     */
+    @NotNull
+    public UserDataBuilder setEnderChest(@Nullable ItemData enderChestData) {
+        this.userData.enderChestData = enderChestData;
+        return this;
+    }
+
+    /**
+     * Set the {@link List} of {@link ItemData} to this {@link UserData}
+     *
+     * @param potionEffectData the {@link List} of {@link ItemData} to set
+     * @return this {@link UserDataBuilder}
+     * @since 2.1
+     */
+    @NotNull
+    public UserDataBuilder setPotionEffects(@Nullable PotionEffectData potionEffectData) {
+        this.userData.potionEffectData = potionEffectData;
+        return this;
+    }
+
+    /**
+     * Set the {@link List} of {@link ItemData} to this {@link UserData}
+     *
+     * @param advancementData the {@link List} of {@link ItemData} to set
+     * @return this {@link UserDataBuilder}
+     * @since 2.1
+     */
+    @NotNull
+    public UserDataBuilder setAdvancements(@Nullable List<AdvancementData> advancementData) {
+        this.userData.advancementData = advancementData;
+        return this;
+    }
+
+    /**
+     * Set the {@link StatisticsData} to this {@link UserData}
+     *
+     * @param statisticData the {@link StatisticsData} to set
+     * @return this {@link UserDataBuilder}
+     * @since 2.1
+     */
+    @NotNull
+    public UserDataBuilder setStatistics(@Nullable StatisticsData statisticData) {
+        this.userData.statisticData = statisticData;
+        return this;
+    }
+
+
+    /**
+     * Set the {@link LocationData} to this {@link UserData}
+     *
+     * @param locationData the {@link LocationData} to set
+     * @return this {@link UserDataBuilder}
+     * @since 2.1
+     */
+    @NotNull
+    public UserDataBuilder setLocation(@Nullable LocationData locationData) {
+        this.userData.locationData = locationData;
+        return this;
+    }
+
+    /**
+     * Set the {@link PersistentDataContainerData} to this {@link UserData}
+     *
+     * @param persistentDataContainerData the {@link PersistentDataContainerData} to set
+     * @return this {@link UserDataBuilder}
+     * @since 2.1
+     */
+    @NotNull
+    public UserDataBuilder setPersistentDataContainer(@Nullable PersistentDataContainerData persistentDataContainerData) {
+        this.userData.persistentDataContainerData = persistentDataContainerData;
+        return this;
+    }
+
+    /**
+     * Build and get the {@link UserData} instance
+     *
+     * @return the {@link UserData} instance
+     * @since 2.1
+     */
+    @NotNull
+    public UserData build() {
+        return this.userData;
+    }
+
+}

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

@@ -1,8 +1,15 @@
 package net.william278.husksync.data;
 
+import net.william278.husksync.command.Permission;
+import net.william278.husksync.config.Locales;
+import net.william278.husksync.player.OnlineUser;
+import net.william278.husksync.player.User;
 import org.jetbrains.annotations.NotNull;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
+import java.util.StringJoiner;
 import java.util.UUID;
 
 /**
@@ -32,6 +39,82 @@ public record UserDataSnapshot(@NotNull UUID versionUUID, @NotNull Date versionT
                 DataSaveCause.API, false, userData);
     }
 
+    /**
+     * Display a menu in chat to an {@link OnlineUser} about this {@link UserDataSnapshot} for a {@link User dataOwner}
+     *
+     * @param user      The {@link OnlineUser} to display the menu to
+     * @param dataOwner The {@link User} whose data this snapshot captures a state of
+     * @param locales   The {@link Locales} to use for displaying the menu
+     */
+    public void displayDataOverview(@NotNull OnlineUser user, @NotNull User dataOwner, @NotNull Locales locales) {
+        // Title message, timestamp, owner and cause.
+        locales.getLocale("data_manager_title", versionUUID().toString().split("-")[0],
+                        versionUUID().toString(), dataOwner.username, dataOwner.uuid.toString())
+                .ifPresent(user::sendMessage);
+        locales.getLocale("data_manager_timestamp",
+                        new SimpleDateFormat("MMM dd yyyy, HH:mm:ss.sss").format(versionTimestamp()))
+                .ifPresent(user::sendMessage);
+        if (pinned()) {
+            locales.getLocale("data_manager_pinned").ifPresent(user::sendMessage);
+        }
+        locales.getLocale("data_manager_cause", cause().name().toLowerCase().replaceAll("_", " "))
+                .ifPresent(user::sendMessage);
+
+        // User status data, if present in the snapshot
+        userData().getStatus()
+                .flatMap(statusData -> locales.getLocale("data_manager_status",
+                        Integer.toString((int) statusData.health),
+                        Integer.toString((int) statusData.maxHealth),
+                        Integer.toString(statusData.hunger),
+                        Integer.toString(statusData.expLevel),
+                        statusData.gameMode.toLowerCase()))
+                .ifPresent(user::sendMessage);
+
+        // Advancement and statistic data, if both are present in the snapshot
+        userData().getAdvancements()
+                .flatMap(advancementData -> userData().getStatistics()
+                        .flatMap(statisticsData -> locales.getLocale("data_manager_advancements_statistics",
+                                Integer.toString(advancementData.size()),
+                                generateAdvancementPreview(advancementData, locales),
+                                String.format("%.2f", (((statisticsData.untypedStatistics.getOrDefault(
+                                        "PLAY_ONE_MINUTE", 0)) / 20d) / 60d) / 60d))))
+                .ifPresent(user::sendMessage);
+
+        if (user.hasPermission(Permission.COMMAND_INVENTORY.node)
+            && user.hasPermission(Permission.COMMAND_ENDER_CHEST.node)) {
+            locales.getLocale("data_manager_item_buttons", dataOwner.username, versionUUID().toString())
+                    .ifPresent(user::sendMessage);
+        }
+        if (user.hasPermission(Permission.COMMAND_USER_DATA_MANAGE.node)) {
+            locales.getLocale("data_manager_management_buttons", dataOwner.username, versionUUID().toString())
+                    .ifPresent(user::sendMessage);
+        }
+        if (user.hasPermission(Permission.COMMAND_USER_DATA_DUMP.node)) {
+            locales.getLocale("data_manager_system_buttons", dataOwner.username, versionUUID().toString())
+                    .ifPresent(user::sendMessage);
+        }
+    }
+
+    @NotNull
+    private String generateAdvancementPreview(@NotNull List<AdvancementData> advancementData, @NotNull Locales locales) {
+        final StringJoiner joiner = new StringJoiner("\n");
+        final List<AdvancementData> advancementsToPreview = advancementData.stream().filter(dataItem ->
+                !dataItem.key.startsWith("minecraft:recipes/")).toList();
+        final int PREVIEW_SIZE = 8;
+        for (int i = 0; i < advancementsToPreview.size(); i++) {
+            joiner.add(advancementsToPreview.get(i).key);
+            if (i >= PREVIEW_SIZE) {
+                break;
+            }
+        }
+        final int remainingAdvancements = advancementsToPreview.size() - PREVIEW_SIZE;
+        if (remainingAdvancements > 0) {
+            joiner.add(locales.getRawLocale("data_manager_advancements_preview_remaining",
+                    Integer.toString(remainingAdvancements)).orElse("+" + remainingAdvancements + "…"));
+        }
+        return joiner.toString();
+    }
+
     /**
      * Compare UserData by creation timestamp
      *

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

@@ -1,19 +1,18 @@
 package net.william278.husksync.database;
 
-import net.william278.husksync.data.DataAdapter;
+import net.william278.husksync.HuskSync;
+import net.william278.husksync.config.Settings;
 import net.william278.husksync.data.DataSaveCause;
 import net.william278.husksync.data.UserData;
 import net.william278.husksync.data.UserDataSnapshot;
-import net.william278.husksync.event.EventCannon;
 import net.william278.husksync.migrator.Migrator;
 import net.william278.husksync.player.User;
-import net.william278.husksync.util.Logger;
-import net.william278.husksync.util.ResourceReader;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
@@ -25,78 +24,10 @@ import java.util.concurrent.CompletableFuture;
  */
 public abstract class Database {
 
-    /**
-     * Name of the table that stores player information
-     */
-    protected final String playerTableName;
+    protected final HuskSync plugin;
 
-    /**
-     * Name of the table that stores data
-     */
-    protected final String dataTableName;
-
-    /**
-     * The maximum number of user records to store in the database at once per user
-     */
-    protected final int maxUserDataRecords;
-
-    /**
-     * {@link DataAdapter} implementation used for adapting {@link UserData} to and from JSON
-     */
-    private final DataAdapter dataAdapter;
-
-    /**
-     * Returns the {@link DataAdapter} used to adapt {@link UserData} to and from JSON
-     *
-     * @return instance of the {@link DataAdapter} implementation
-     */
-    protected DataAdapter getDataAdapter() {
-        return dataAdapter;
-    }
-
-    /**
-     * {@link EventCannon} implementation used for firing events
-     */
-    private final EventCannon eventCannon;
-
-    /**
-     * Returns the {@link EventCannon} used to fire events
-     *
-     * @return instance of the {@link EventCannon} implementation
-     */
-    protected EventCannon getEventCannon() {
-        return eventCannon;
-    }
-
-    /**
-     * Logger instance used for database error logging
-     */
-    private final Logger logger;
-
-    /**
-     * Returns the {@link Logger} used to log database errors
-     *
-     * @return the {@link Logger} instance
-     */
-    protected Logger getLogger() {
-        return logger;
-    }
-
-    /**
-     * The {@link ResourceReader} used to read internal resource files by name
-     */
-    private final ResourceReader resourceReader;
-
-    protected Database(@NotNull String playerTableName, @NotNull String dataTableName, final int maxUserDataRecords,
-                       @NotNull ResourceReader resourceReader, @NotNull DataAdapter dataAdapter,
-                       @NotNull EventCannon eventCannon, @NotNull Logger logger) {
-        this.playerTableName = playerTableName;
-        this.dataTableName = dataTableName;
-        this.maxUserDataRecords = maxUserDataRecords;
-        this.resourceReader = resourceReader;
-        this.dataAdapter = dataAdapter;
-        this.eventCannon = eventCannon;
-        this.logger = logger;
+    protected Database(@NotNull HuskSync plugin) {
+        this.plugin = plugin;
     }
 
     /**
@@ -108,7 +39,7 @@ public abstract class Database {
      */
     @SuppressWarnings("SameParameterValue")
     protected final String[] getSchemaStatements(@NotNull String schemaFileName) throws IOException {
-        return formatStatementTables(new String(resourceReader.getResource(schemaFileName)
+        return formatStatementTables(new String(Objects.requireNonNull(plugin.getResource(schemaFileName))
                 .readAllBytes(), StandardCharsets.UTF_8)).split(";");
     }
 
@@ -119,8 +50,8 @@ public abstract class Database {
      * @return the formatted statement, with table placeholders replaced with the correct names
      */
     protected final String formatStatementTables(@NotNull String sql) {
-        return sql.replaceAll("%users_table%", playerTableName)
-                .replaceAll("%user_data_table%", dataTableName);
+        return sql.replaceAll("%users_table%", plugin.getSettings().getTableName(Settings.TableName.USERS))
+                .replaceAll("%user_data_table%", plugin.getSettings().getTableName(Settings.TableName.USER_DATA));
     }
 
     /**
@@ -183,10 +114,9 @@ public abstract class Database {
      * <b>(Internal)</b> Prune user data for a given user to the maximum value as configured.
      *
      * @param user The user to prune data for
-     * @return A future returning void when complete
      * @implNote Data snapshots marked as {@code pinned} are exempt from rotation
      */
-    protected abstract CompletableFuture<Void> rotateUserData(@NotNull User user);
+    protected abstract void rotateUserData(@NotNull User user);
 
     /**
      * Deletes a specific {@link UserDataSnapshot} entry for a user from the database, by its UUID.

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

@@ -1,13 +1,11 @@
 package net.william278.husksync.database;
 
 import com.zaxxer.hikari.HikariDataSource;
+import net.william278.husksync.HuskSync;
 import net.william278.husksync.config.Settings;
 import net.william278.husksync.data.*;
 import net.william278.husksync.event.DataSaveEvent;
-import net.william278.husksync.event.EventCannon;
 import net.william278.husksync.player.User;
-import net.william278.husksync.util.Logger;
-import net.william278.husksync.util.ResourceReader;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.ByteArrayInputStream;
@@ -40,9 +38,9 @@ public class MySqlDatabase extends Database {
 
     private final int hikariMaximumPoolSize;
     private final int hikariMinimumIdle;
-    private final int hikariMaximumLifetime;
-    private final int hikariKeepAliveTime;
-    private final int hikariConnectionTimeOut;
+    private final long hikariMaximumLifetime;
+    private final long hikariKeepAliveTime;
+    private final long hikariConnectionTimeOut;
 
     private static final String DATA_POOL_NAME = "HuskSyncHikariPool";
 
@@ -51,23 +49,20 @@ public class MySqlDatabase extends Database {
      */
     private HikariDataSource connectionPool;
 
-    public MySqlDatabase(@NotNull Settings settings, @NotNull ResourceReader resourceReader, @NotNull Logger logger,
-                         @NotNull DataAdapter dataAdapter, @NotNull EventCannon eventCannon) {
-        super(settings.getStringValue(Settings.ConfigOption.DATABASE_USERS_TABLE_NAME),
-                settings.getStringValue(Settings.ConfigOption.DATABASE_USER_DATA_TABLE_NAME),
-                Math.max(1, Math.min(20, settings.getIntegerValue(Settings.ConfigOption.SYNCHRONIZATION_MAX_USER_DATA_SNAPSHOTS))),
-                resourceReader, dataAdapter, eventCannon, logger);
-        this.mySqlHost = settings.getStringValue(Settings.ConfigOption.DATABASE_HOST);
-        this.mySqlPort = settings.getIntegerValue(Settings.ConfigOption.DATABASE_PORT);
-        this.mySqlDatabaseName = settings.getStringValue(Settings.ConfigOption.DATABASE_NAME);
-        this.mySqlUsername = settings.getStringValue(Settings.ConfigOption.DATABASE_USERNAME);
-        this.mySqlPassword = settings.getStringValue(Settings.ConfigOption.DATABASE_PASSWORD);
-        this.mySqlConnectionParameters = settings.getStringValue(Settings.ConfigOption.DATABASE_CONNECTION_PARAMS);
-        this.hikariMaximumPoolSize = settings.getIntegerValue(Settings.ConfigOption.DATABASE_CONNECTION_POOL_MAX_SIZE);
-        this.hikariMinimumIdle = settings.getIntegerValue(Settings.ConfigOption.DATABASE_CONNECTION_POOL_MIN_IDLE);
-        this.hikariMaximumLifetime = settings.getIntegerValue(Settings.ConfigOption.DATABASE_CONNECTION_POOL_MAX_LIFETIME);
-        this.hikariKeepAliveTime = settings.getIntegerValue(Settings.ConfigOption.DATABASE_CONNECTION_POOL_KEEPALIVE);
-        this.hikariConnectionTimeOut = settings.getIntegerValue(Settings.ConfigOption.DATABASE_CONNECTION_POOL_TIMEOUT);
+    public MySqlDatabase(@NotNull HuskSync plugin) {
+        super(plugin);
+        final Settings settings = plugin.getSettings();
+        this.mySqlHost = settings.getMySqlHost();
+        this.mySqlPort = settings.getMySqlPort();
+        this.mySqlDatabaseName = settings.getMySqlDatabase();
+        this.mySqlUsername = settings.getMySqlUsername();
+        this.mySqlPassword = settings.getMySqlPassword();
+        this.mySqlConnectionParameters = settings.getMySqlConnectionParameters();
+        this.hikariMaximumPoolSize = settings.getMySqlConnectionPoolSize();
+        this.hikariMinimumIdle = settings.getMySqlConnectionPoolIdle();
+        this.hikariMaximumLifetime = settings.getMySqlConnectionPoolLifetime();
+        this.hikariKeepAliveTime = settings.getMySqlConnectionPoolKeepAlive();
+        this.hikariConnectionTimeOut = settings.getMySqlConnectionPoolTimeout();
     }
 
     /**
@@ -111,17 +106,17 @@ public class MySqlDatabase extends Database {
                 }
                 return true;
             } catch (SQLException | IOException e) {
-                getLogger().log(Level.SEVERE, "Failed to perform database setup: " + e.getMessage());
+                plugin.log(Level.SEVERE, "Failed to perform database setup: " + e.getMessage());
             }
         } catch (Exception e) {
-            getLogger().log(Level.SEVERE, "An unhandled exception occurred during database setup!", e);
+            plugin.log(Level.SEVERE, "An unhandled exception occurred during database setup!", e);
         }
         return false;
     }
 
     @Override
     public CompletableFuture<Void> ensureUser(@NotNull User user) {
-        return CompletableFuture.runAsync(() -> getUser(user.uuid).thenAccept(optionalUser ->
+        return getUser(user.uuid).thenAccept(optionalUser ->
                 optionalUser.ifPresentOrElse(existingUser -> {
                             if (!existingUser.username.equals(user.username)) {
                                 // Update a user's name if it has changed in the database
@@ -135,9 +130,9 @@ public class MySqlDatabase extends Database {
                                         statement.setString(2, existingUser.uuid.toString());
                                         statement.executeUpdate();
                                     }
-                                    getLogger().log(Level.INFO, "Updated " + user.username + "'s name in the database (" + existingUser.username + " -> " + user.username + ")");
+                                    plugin.log(Level.INFO, "Updated " + user.username + "'s name in the database (" + existingUser.username + " -> " + user.username + ")");
                                 } catch (SQLException e) {
-                                    getLogger().log(Level.SEVERE, "Failed to update a user's name on the database", e);
+                                    plugin.log(Level.SEVERE, "Failed to update a user's name on the database", e);
                                 }
                             }
                         },
@@ -153,9 +148,9 @@ public class MySqlDatabase extends Database {
                                     statement.executeUpdate();
                                 }
                             } catch (SQLException e) {
-                                getLogger().log(Level.SEVERE, "Failed to insert a user into the database", e);
+                                plugin.log(Level.SEVERE, "Failed to insert a user into the database", e);
                             }
-                        })));
+                        }));
     }
 
     @Override
@@ -176,7 +171,7 @@ public class MySqlDatabase extends Database {
                     }
                 }
             } catch (SQLException e) {
-                getLogger().log(Level.SEVERE, "Failed to fetch a user from uuid from the database", e);
+                plugin.log(Level.SEVERE, "Failed to fetch a user from uuid from the database", e);
             }
             return Optional.empty();
         });
@@ -199,7 +194,7 @@ public class MySqlDatabase extends Database {
                     }
                 }
             } catch (SQLException e) {
-                getLogger().log(Level.SEVERE, "Failed to fetch a user by name from the database", e);
+                plugin.log(Level.SEVERE, "Failed to fetch a user by name from the database", e);
             }
             return Optional.empty();
         });
@@ -226,11 +221,11 @@ public class MySqlDatabase extends Database {
                                 Date.from(resultSet.getTimestamp("timestamp").toInstant()),
                                 DataSaveCause.getCauseByName(resultSet.getString("save_cause")),
                                 resultSet.getBoolean("pinned"),
-                                getDataAdapter().fromBytes(dataByteArray)));
+                                plugin.getDataAdapter().fromBytes(dataByteArray)));
                     }
                 }
             } catch (SQLException | DataAdaptionException e) {
-                getLogger().log(Level.SEVERE, "Failed to fetch a user's current user data from the database", e);
+                plugin.log(Level.SEVERE, "Failed to fetch a user's current user data from the database", e);
             }
             return Optional.empty();
         });
@@ -257,13 +252,13 @@ public class MySqlDatabase extends Database {
                                 Date.from(resultSet.getTimestamp("timestamp").toInstant()),
                                 DataSaveCause.getCauseByName(resultSet.getString("save_cause")),
                                 resultSet.getBoolean("pinned"),
-                                getDataAdapter().fromBytes(dataByteArray));
+                                plugin.getDataAdapter().fromBytes(dataByteArray));
                         retrievedData.add(data);
                     }
                     return retrievedData;
                 }
             } catch (SQLException | DataAdaptionException e) {
-                getLogger().log(Level.SEVERE, "Failed to fetch a user's current user data from the database", e);
+                plugin.log(Level.SEVERE, "Failed to fetch a user's current user data from the database", e);
             }
             return retrievedData;
         });
@@ -291,38 +286,36 @@ public class MySqlDatabase extends Database {
                                 Date.from(resultSet.getTimestamp("timestamp").toInstant()),
                                 DataSaveCause.getCauseByName(resultSet.getString("save_cause")),
                                 resultSet.getBoolean("pinned"),
-                                getDataAdapter().fromBytes(dataByteArray)));
+                                plugin.getDataAdapter().fromBytes(dataByteArray)));
                     }
                 }
             } catch (SQLException | DataAdaptionException e) {
-                getLogger().log(Level.SEVERE, "Failed to fetch specific user data by UUID from the database", e);
+                plugin.log(Level.SEVERE, "Failed to fetch specific user data by UUID from the database", e);
             }
             return Optional.empty();
         });
     }
 
     @Override
-    protected CompletableFuture<Void> rotateUserData(@NotNull User user) {
-        return CompletableFuture.runAsync(() -> {
-            final List<UserDataSnapshot> unpinnedUserData = getUserData(user).join().stream()
-                    .filter(dataSnapshot -> !dataSnapshot.pinned()).toList();
-            if (unpinnedUserData.size() > maxUserDataRecords) {
-                try (Connection connection = getConnection()) {
-                    try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
-                            DELETE FROM `%user_data_table%`
-                            WHERE `player_uuid`=?
-                            AND `pinned` IS FALSE
-                            ORDER BY `timestamp` ASC
-                            LIMIT %entry_count%;""".replace("%entry_count%",
-                            Integer.toString(unpinnedUserData.size() - maxUserDataRecords))))) {
-                        statement.setString(1, user.uuid.toString());
-                        statement.executeUpdate();
-                    }
-                } catch (SQLException e) {
-                    getLogger().log(Level.SEVERE, "Failed to prune user data from the database", e);
+    protected void rotateUserData(@NotNull User user) {
+        final List<UserDataSnapshot> unpinnedUserData = getUserData(user).join().stream()
+                .filter(dataSnapshot -> !dataSnapshot.pinned()).toList();
+        if (unpinnedUserData.size() > plugin.getSettings().getMaxUserDataSnapshots()) {
+            try (Connection connection = getConnection()) {
+                try (PreparedStatement statement = connection.prepareStatement(formatStatementTables("""
+                        DELETE FROM `%user_data_table%`
+                        WHERE `player_uuid`=?
+                        AND `pinned` IS FALSE
+                        ORDER BY `timestamp` ASC
+                        LIMIT %entry_count%;""".replace("%entry_count%",
+                        Integer.toString(unpinnedUserData.size() - plugin.getSettings().getMaxUserDataSnapshots()))))) {
+                    statement.setString(1, user.uuid.toString());
+                    statement.executeUpdate();
                 }
+            } catch (SQLException e) {
+                plugin.log(Level.SEVERE, "Failed to prune user data from the database", e);
             }
-        });
+        }
     }
 
     @Override
@@ -338,7 +331,7 @@ public class MySqlDatabase extends Database {
                     return statement.executeUpdate() > 0;
                 }
             } catch (SQLException e) {
-                getLogger().log(Level.SEVERE, "Failed to delete specific user data from the database", e);
+                plugin.log(Level.SEVERE, "Failed to delete specific user data from the database", e);
             }
             return false;
         });
@@ -348,7 +341,7 @@ public class MySqlDatabase extends Database {
     public CompletableFuture<Void> setUserData(@NotNull User user, @NotNull UserData userData,
                                                @NotNull DataSaveCause saveCause) {
         return CompletableFuture.runAsync(() -> {
-            final DataSaveEvent dataSaveEvent = (DataSaveEvent) getEventCannon().fireDataSaveEvent(user,
+            final DataSaveEvent dataSaveEvent = (DataSaveEvent) plugin.getEventCannon().fireDataSaveEvent(user,
                     userData, saveCause).join();
             if (!dataSaveEvent.isCancelled()) {
                 final UserData finalData = dataSaveEvent.getUserData();
@@ -360,14 +353,15 @@ public class MySqlDatabase extends Database {
                         statement.setString(1, user.uuid.toString());
                         statement.setString(2, saveCause.name());
                         statement.setBlob(3, new ByteArrayInputStream(
-                                getDataAdapter().toBytes(finalData)));
+                                plugin.getDataAdapter().toBytes(finalData)));
                         statement.executeUpdate();
                     }
                 } catch (SQLException | DataAdaptionException e) {
-                    getLogger().log(Level.SEVERE, "Failed to set user data in the database", e);
+                    plugin.log(Level.SEVERE, "Failed to set user data in the database", e);
                 }
             }
-        }).thenRun(() -> rotateUserData(user).join());
+            this.rotateUserData(user);
+        });
     }
 
     @Override
@@ -384,7 +378,7 @@ public class MySqlDatabase extends Database {
                     statement.executeUpdate();
                 }
             } catch (SQLException e) {
-                getLogger().log(Level.SEVERE, "Failed to pin user data in the database", e);
+                plugin.log(Level.SEVERE, "Failed to pin user data in the database", e);
             }
         });
     }
@@ -403,7 +397,7 @@ public class MySqlDatabase extends Database {
                     statement.executeUpdate();
                 }
             } catch (SQLException e) {
-                getLogger().log(Level.SEVERE, "Failed to unpin user data in the database", e);
+                plugin.log(Level.SEVERE, "Failed to unpin user data in the database", e);
             }
         });
     }
@@ -416,7 +410,7 @@ public class MySqlDatabase extends Database {
                     statement.executeUpdate(formatStatementTables("DELETE FROM `%user_data_table%`;"));
                 }
             } catch (SQLException e) {
-                getLogger().log(Level.SEVERE, "Failed to wipe the database", e);
+                plugin.log(Level.SEVERE, "Failed to wipe the database", e);
             }
         });
     }

common/src/main/java/net/william278/husksync/editor/DataEditor.java

@@ -1,184 +0,0 @@
-package net.william278.husksync.editor;
-
-import net.william278.husksync.command.Permission;
-import net.william278.husksync.config.Locales;
-import net.william278.husksync.data.AdvancementData;
-import net.william278.husksync.data.ItemData;
-import net.william278.husksync.data.UserDataSnapshot;
-import net.william278.husksync.player.OnlineUser;
-import net.william278.husksync.player.User;
-import org.jetbrains.annotations.NotNull;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-
-/**
- * Provides methods for displaying and editing user data
- */
-public class DataEditor {
-
-    /**
-     * Map of currently open inventory and ender chest data editors
-     */
-    @NotNull
-    protected final HashMap<UUID, ItemEditorMenu> openInventoryMenus;
-
-    private final Locales locales;
-
-    public DataEditor(@NotNull Locales locales) {
-        this.openInventoryMenus = new HashMap<>();
-        this.locales = locales;
-    }
-
-    /**
-     * Open an inventory or ender chest editor menu
-     *
-     * @param user           The online user to open the editor for
-     * @param itemEditorMenu The {@link ItemEditorMenu} to open
-     * @see ItemEditorMenu#createInventoryMenu(ItemData, User, OnlineUser, Locales, boolean)
-     * @see ItemEditorMenu#createEnderChestMenu(ItemData, User, OnlineUser, Locales, boolean)
-     */
-    public CompletableFuture<ItemData> openItemEditorMenu(@NotNull OnlineUser user,
-                                                          @NotNull ItemEditorMenu itemEditorMenu) {
-        this.openInventoryMenus.put(user.uuid, itemEditorMenu);
-        return itemEditorMenu.showInventory(user);
-    }
-
-    /**
-     * Close an inventory or ender chest editor menu
-     *
-     * @param user     The online user to close the editor for
-     * @param itemData the {@link ItemData} contained within the menu at the time of closing
-     */
-    public void closeInventoryMenu(@NotNull OnlineUser user, @NotNull ItemData itemData) {
-        if (this.openInventoryMenus.containsKey(user.uuid)) {
-            this.openInventoryMenus.get(user.uuid).closeInventory(itemData);
-        }
-        this.openInventoryMenus.remove(user.uuid);
-    }
-
-    /**
-     * Returns whether edits to the inventory or ender chest menu are allowed
-     *
-     * @param user The online user with an inventory open to check
-     * @return {@code true} if edits to the inventory or ender chest menu are allowed; {@code false} otherwise, including if they don't have an inventory open
-     */
-    public boolean cancelMenuEdit(@NotNull OnlineUser user) {
-        if (this.openInventoryMenus.containsKey(user.uuid)) {
-            return !this.openInventoryMenus.get(user.uuid).canEdit;
-        }
-        return false;
-    }
-
-    /**
-     * Display a chat menu detailing information about {@link UserDataSnapshot}
-     *
-     * @param user      The online user to display the message to
-     * @param userData  The {@link UserDataSnapshot} to display information about
-     * @param dataOwner The {@link User} who owns the {@link UserDataSnapshot}
-     */
-    public void displayDataOverview(@NotNull OnlineUser user, @NotNull UserDataSnapshot userData,
-                                    @NotNull User dataOwner) {
-        locales.getLocale("data_manager_title",
-                        userData.versionUUID().toString().split("-")[0],
-                        userData.versionUUID().toString(),
-                        dataOwner.username,
-                        dataOwner.uuid.toString())
-                .ifPresent(user::sendMessage);
-        locales.getLocale("data_manager_timestamp",
-                        new SimpleDateFormat("MMM dd yyyy, HH:mm:ss.sss").format(userData.versionTimestamp()))
-                .ifPresent(user::sendMessage);
-        if (userData.pinned()) {
-            locales.getLocale("data_manager_pinned").ifPresent(user::sendMessage);
-        }
-        locales.getLocale("data_manager_cause",
-                        userData.cause().name().toLowerCase().replaceAll("_", " "))
-                .ifPresent(user::sendMessage);
-        locales.getLocale("data_manager_status",
-                        Integer.toString((int) userData.userData().getStatusData().health),
-                        Integer.toString((int) userData.userData().getStatusData().maxHealth),
-                        Integer.toString(userData.userData().getStatusData().hunger),
-                        Integer.toString(userData.userData().getStatusData().expLevel),
-                        userData.userData().getStatusData().gameMode.toLowerCase())
-                .ifPresent(user::sendMessage);
-        locales.getLocale("data_manager_advancements_statistics",
-                        Integer.toString(userData.userData().getAdvancementData().size()),
-                        generateAdvancementPreview(userData.userData().getAdvancementData()),
-                        String.format("%.2f", (((userData.userData().getStatisticsData().untypedStatistics.getOrDefault(
-                                "PLAY_ONE_MINUTE", 0)) / 20d) / 60d) / 60d))
-                .ifPresent(user::sendMessage);
-        if (user.hasPermission(Permission.COMMAND_INVENTORY.node)
-            && user.hasPermission(Permission.COMMAND_ENDER_CHEST.node)) {
-            locales.getLocale("data_manager_item_buttons",
-                            dataOwner.username, userData.versionUUID().toString())
-                    .ifPresent(user::sendMessage);
-        }
-        if (user.hasPermission(Permission.COMMAND_USER_DATA_MANAGE.node)) {
-            locales.getLocale("data_manager_management_buttons",
-                            dataOwner.username, userData.versionUUID().toString())
-                    .ifPresent(user::sendMessage);
-        }
-    }
-
-    @NotNull
-    private String generateAdvancementPreview(@NotNull List<AdvancementData> advancementData) {
-        final StringJoiner joiner = new StringJoiner("\n");
-        final List<AdvancementData> advancementsToPreview = advancementData.stream().filter(dataItem ->
-                !dataItem.key.startsWith("minecraft:recipes/")).toList();
-        final int PREVIEW_SIZE = 8;
-        for (int i = 0; i < advancementsToPreview.size(); i++) {
-            joiner.add(advancementsToPreview.get(i).key);
-            if (i >= PREVIEW_SIZE) {
-                break;
-            }
-        }
-        final int remainingAdvancements = advancementsToPreview.size() - PREVIEW_SIZE;
-        if (remainingAdvancements > 0) {
-            joiner.add(locales.getRawLocale("data_manager_advancements_preview_remaining",
-                    Integer.toString(remainingAdvancements)).orElse("+" + remainingAdvancements + "…"));
-        }
-        return joiner.toString();
-    }
-
-    /**
-     * Display a chat list detailing a player's saved list of {@link UserDataSnapshot}
-     *
-     * @param user         The online user to display the message to
-     * @param userDataList The list of {@link UserDataSnapshot} to display
-     * @param dataOwner    The {@link User} who owns the {@link UserDataSnapshot}
-     */
-    public void displayDataList(@NotNull OnlineUser user, @NotNull List<UserDataSnapshot> userDataList,
-                                @NotNull User dataOwner) {
-        locales.getLocale("data_list_title",
-                        dataOwner.username, dataOwner.uuid.toString())
-                .ifPresent(user::sendMessage);
-
-        final String[] numberedIcons = "①②③④⑤⑥⑦⑧⑨⑩⑪⑫⑬⑭⑮⑯⑰⑱⑲⑳".split("");
-        for (int i = 0; i < Math.min(20, userDataList.size()); i++) {
-            final UserDataSnapshot userData = userDataList.get(i);
-            locales.getLocale("data_list_item",
-                            numberedIcons[i],
-                            DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, Locale.getDefault())
-                                    .format(userData.versionTimestamp()),
-                            userData.versionUUID().toString().split("-")[0],
-                            userData.versionUUID().toString(),
-                            userData.cause().name().toLowerCase().replaceAll("_", " "),
-                            dataOwner.username,
-                            userData.pinned() ? "※" : "  ")
-                    .ifPresent(user::sendMessage);
-        }
-    }
-
-    /**
-     * Returns whether the user has an inventory editor menu open
-     *
-     * @param user {@link OnlineUser} to check
-     * @return {@code true} if the user has an inventory editor open; {@code false} otherwise
-     */
-    public Optional<ItemEditorMenu> getEditingInventoryData(@NotNull OnlineUser user) {
-        return this.openInventoryMenus.containsKey(user.uuid) ? Optional.of(this.openInventoryMenus.get(user.uuid))
-                : Optional.empty();
-    }
-}

common/src/main/java/net/william278/husksync/editor/ItemEditorMenu.java

@@ -1,56 +0,0 @@
-package net.william278.husksync.editor;
-
-import de.themoep.minedown.MineDown;
-import net.william278.husksync.command.Permission;
-import net.william278.husksync.config.Locales;
-import net.william278.husksync.data.ItemData;
-import net.william278.husksync.player.OnlineUser;
-import net.william278.husksync.player.User;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.concurrent.CompletableFuture;
-
-public class ItemEditorMenu {
-
-    public final ItemData itemData;
-    public final ItemEditorMenuType itemEditorMenuType;
-    public final MineDown menuTitle;
-    public final boolean canEdit;
-
-    private CompletableFuture<ItemData> inventoryDataCompletableFuture;
-
-    private ItemEditorMenu(@NotNull ItemData itemData, ItemEditorMenuType itemEditorMenuType,
-                           @NotNull MineDown menuTitle, boolean canEdit) {
-        this.itemData = itemData;
-        this.menuTitle = menuTitle;
-        this.itemEditorMenuType = itemEditorMenuType;
-        this.canEdit = canEdit;
-    }
-
-    public CompletableFuture<ItemData> showInventory(@NotNull OnlineUser user) {
-        inventoryDataCompletableFuture = new CompletableFuture<>();
-        user.showMenu(this);
-        return inventoryDataCompletableFuture;
-    }
-
-    public void closeInventory(@NotNull ItemData itemData) {
-        inventoryDataCompletableFuture.complete(itemData);
-    }
-
-    public static ItemEditorMenu createInventoryMenu(@NotNull ItemData itemData, @NotNull User dataOwner,
-                                                     @NotNull OnlineUser viewer, @NotNull Locales locales,
-                                                     boolean canEdit) {
-        return new ItemEditorMenu(itemData, ItemEditorMenuType.INVENTORY_VIEWER,
-                locales.getLocale(ItemEditorMenuType.INVENTORY_VIEWER.localeKey, dataOwner.username).orElse(new MineDown("")),
-                viewer.hasPermission(Permission.COMMAND_INVENTORY_EDIT.node) && canEdit);
-    }
-
-    public static ItemEditorMenu createEnderChestMenu(@NotNull ItemData itemData, @NotNull User dataOwner,
-                                                      @NotNull OnlineUser viewer, @NotNull Locales locales,
-                                                      boolean canEdit) {
-        return new ItemEditorMenu(itemData, ItemEditorMenuType.ENDER_CHEST_VIEWER,
-                locales.getLocale(ItemEditorMenuType.ENDER_CHEST_VIEWER.localeKey, dataOwner.username).orElse(new MineDown("")),
-                viewer.hasPermission(Permission.COMMAND_ENDER_CHEST_EDIT.node) && canEdit);
-    }
-
-}

common/src/main/java/net/william278/husksync/editor/ItemEditorMenuType.java

@@ -1,16 +0,0 @@
-package net.william278.husksync.editor;
-
-import org.jetbrains.annotations.NotNull;
-
-public enum ItemEditorMenuType {
-    INVENTORY_VIEWER(45, "inventory_viewer_menu_title"),
-    ENDER_CHEST_VIEWER(27, "ender_chest_viewer_menu_title");
-
-    public final int slotCount;
-    final String localeKey;
-
-    ItemEditorMenuType(int slotCount, @NotNull String localeKey) {
-        this.slotCount = slotCount;
-        this.localeKey = localeKey;
-    }
-}

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

@@ -10,9 +10,8 @@ import com.djrapitops.plan.extension.icon.Family;
 import com.djrapitops.plan.extension.icon.Icon;
 import com.djrapitops.plan.extension.table.Table;
 import com.djrapitops.plan.extension.table.TableColumnFormat;
-import net.william278.husksync.data.StatusData;
+import net.william278.husksync.HuskSync;
 import net.william278.husksync.data.UserDataSnapshot;
-import net.william278.husksync.database.Database;
 import net.william278.husksync.player.User;
 import org.jetbrains.annotations.NotNull;
 
@@ -44,14 +43,14 @@ import java.util.regex.Pattern;
 @SuppressWarnings("unused")
 public class PlanDataExtension implements DataExtension {
 
-    private Database database;
+    private HuskSync plugin;
 
     private static final String UNKNOWN_STRING = "N/A";
 
     private static final String PINNED_HTML_STRING = "📍 ";
 
-    protected PlanDataExtension(@NotNull Database database) {
-        this.database = database;
+    protected PlanDataExtension(@NotNull HuskSync plugin) {
+        this.plugin = plugin;
     }
 
     protected PlanDataExtension() {
@@ -67,9 +66,9 @@ public class PlanDataExtension implements DataExtension {
 
     private CompletableFuture<Optional<UserDataSnapshot>> getCurrentUserData(@NotNull UUID uuid) {
         return CompletableFuture.supplyAsync(() -> {
-            final Optional<User> optionalUser = database.getUser(uuid).join();
+            final Optional<User> optionalUser = plugin.getDatabase().getUser(uuid).join();
             if (optionalUser.isPresent()) {
-                return database.getCurrentUserData(optionalUser.get()).join();
+                return plugin.getDatabase().getCurrentUserData(optionalUser.get()).join();
             }
             return Optional.empty();
         });
@@ -114,9 +113,9 @@ public class PlanDataExtension implements DataExtension {
     )
     @Tab("Current Status")
     public String getCurrentDataId(@NotNull UUID uuid) {
-        return getCurrentUserData(uuid).join().map(
-                        versionedUserData -> versionedUserData.versionUUID().toString()
-                                .split(Pattern.quote("-"))[0])
+        return getCurrentUserData(uuid).join()
+                .map(versionedUserData -> versionedUserData.versionUUID().toString()
+                        .split(Pattern.quote("-"))[0])
                 .orElse(UNKNOWN_STRING);
     }
 
@@ -130,11 +129,9 @@ public class PlanDataExtension implements DataExtension {
     )
     @Tab("Current Status")
     public String getHealth(@NotNull UUID uuid) {
-        return getCurrentUserData(uuid).join().map(
-                        versionedUserData -> {
-                            final StatusData statusData = versionedUserData.userData().getStatusData();
-                            return (int) statusData.health + "/" + (int) statusData.maxHealth;
-                        })
+        return getCurrentUserData(uuid).join()
+                .flatMap(versionedUserData -> versionedUserData.userData().getStatus())
+                .map(statusData -> (int) statusData.health + "/" + (int) statusData.maxHealth)
                 .orElse(UNKNOWN_STRING);
     }
 
@@ -148,8 +145,9 @@ public class PlanDataExtension implements DataExtension {
     )
     @Tab("Current Status")
     public long getHunger(@NotNull UUID uuid) {
-        return getCurrentUserData(uuid).join().map(
-                        versionedUserData -> (long) versionedUserData.userData().getStatusData().hunger)
+        return getCurrentUserData(uuid).join()
+                .flatMap(versionedUserData -> versionedUserData.userData().getStatus())
+                .map(statusData -> (long) statusData.hunger)
                 .orElse(0L);
     }
 
@@ -163,8 +161,9 @@ public class PlanDataExtension implements DataExtension {
     )
     @Tab("Current Status")
     public long getExperienceLevel(@NotNull UUID uuid) {
-        return getCurrentUserData(uuid).join().map(
-                        versionedUserData -> (long) versionedUserData.userData().getStatusData().expLevel)
+        return getCurrentUserData(uuid).join()
+                .flatMap(versionedUserData -> versionedUserData.userData().getStatus())
+                .map(statusData -> (long) statusData.expLevel)
                 .orElse(0L);
     }
 
@@ -178,8 +177,9 @@ public class PlanDataExtension implements DataExtension {
     )
     @Tab("Current Status")
     public String getGameMode(@NotNull UUID uuid) {
-        return getCurrentUserData(uuid).join().map(
-                        versionedUserData -> versionedUserData.userData().getStatusData().gameMode.toLowerCase())
+        return getCurrentUserData(uuid).join()
+                .flatMap(versionedUserData -> versionedUserData.userData().getStatus())
+                .map(status -> status.gameMode)
                 .orElse(UNKNOWN_STRING);
     }
 
@@ -192,8 +192,9 @@ public class PlanDataExtension implements DataExtension {
     )
     @Tab("Current Status")
     public long getAdvancementsCompleted(@NotNull UUID playerUUID) {
-        return getCurrentUserData(playerUUID).join().map(
-                        versionedUserData -> (long) versionedUserData.userData().getAdvancementData().size())
+        return getCurrentUserData(playerUUID).join()
+                .flatMap(versionedUserData -> versionedUserData.userData().getAdvancements())
+                .map(advancementsData -> (long) advancementsData.size())
                 .orElse(0L);
     }
 
@@ -201,14 +202,14 @@ public class PlanDataExtension implements DataExtension {
     @TableProvider(tableColor = Color.LIGHT_BLUE)
     @Tab("Data Snapshots")
     public Table getDataSnapshots(@NotNull UUID playerUUID) {
-        Table.Factory dataSnapshotsTable = Table.builder()
+        final Table.Factory dataSnapshotsTable = Table.builder()
                 .columnOne("Time", new Icon(Family.SOLID, "clock", Color.NONE))
                 .columnOneFormat(TableColumnFormat.DATE_SECOND)
                 .columnTwo("ID", new Icon(Family.SOLID, "bolt", Color.NONE))
                 .columnThree("Cause", new Icon(Family.SOLID, "flag", Color.NONE))
                 .columnFour("Pinned", new Icon(Family.SOLID, "thumbtack", Color.NONE));
-        database.getUser(playerUUID).join().ifPresent(user ->
-                database.getUserData(user).join().forEach(versionedUserData -> dataSnapshotsTable.addRow(
+        plugin.getDatabase().getUser(playerUUID).join().ifPresent(user ->
+                plugin.getDatabase().getUserData(user).join().forEach(versionedUserData -> dataSnapshotsTable.addRow(
                         versionedUserData.versionTimestamp().getTime(),
                         versionedUserData.versionUUID().toString().split("-")[0],
                         versionedUserData.cause().name().toLowerCase().replaceAll("_", " "),

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

@@ -2,20 +2,17 @@ package net.william278.husksync.hook;
 
 import com.djrapitops.plan.capability.CapabilityService;
 import com.djrapitops.plan.extension.ExtensionService;
-import net.william278.husksync.database.Database;
-import net.william278.husksync.util.Logger;
+import net.william278.husksync.HuskSync;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.logging.Level;
 
 public class PlanHook {
 
-    private final Database database;
-    private final Logger logger;
+    private final HuskSync plugin;
 
-    public PlanHook(@NotNull Database database, @NotNull Logger logger) {
-        this.database = database;
-        this.logger = logger;
+    public PlanHook(@NotNull HuskSync plugin) {
+        this.plugin = plugin;
     }
 
     public void hookIntoPlan() {
@@ -33,13 +30,9 @@ public class PlanHook {
 
     private void registerDataExtension() {
         try {
-            ExtensionService.getInstance().register(new PlanDataExtension(database));
-        } catch (IllegalStateException planIsNotEnabled) {
-            logger.log(Level.SEVERE, "Plan extension hook failed to register. Plan is not enabled.", planIsNotEnabled);
-            // Plan is not enabled, handle exception
-        } catch (IllegalArgumentException dataExtensionImplementationIsInvalid) {
-            logger.log(Level.SEVERE, "Plan extension hook failed to register. Data hook implementation is invalid.", dataExtensionImplementationIsInvalid);
-            // The DataExtension implementation has an implementation error, handle exception
+            ExtensionService.getInstance().register(new PlanDataExtension(plugin));
+        } catch (IllegalStateException | IllegalArgumentException e) {
+            plugin.log(Level.WARNING, "Failed to register Plan data extension: " + e.getMessage(), e);
         }
     }
 

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

@@ -1,11 +1,10 @@
 package net.william278.husksync.listener;
 
+import de.themoep.minedown.adventure.MineDown;
 import net.william278.husksync.HuskSync;
-import net.william278.husksync.config.Settings;
-import net.william278.husksync.data.ItemData;
 import net.william278.husksync.data.DataSaveCause;
+import net.william278.husksync.data.ItemData;
 import net.william278.husksync.player.OnlineUser;
-import net.william278.husksync.editor.ItemEditorMenuType;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashSet;
@@ -53,13 +52,17 @@ public abstract class EventListener {
      * @param user The {@link OnlineUser} to handle
      */
     protected final void handlePlayerJoin(@NotNull OnlineUser user) {
+        if (user.isNpc()) {
+            return;
+        }
+
         lockedPlayers.add(user.uuid);
         CompletableFuture.runAsync(() -> {
             try {
                 // Hold reading data for the network latency threshold, to ensure the source server has set the redis key
-                Thread.sleep(Math.max(0, plugin.getSettings().getIntegerValue(Settings.ConfigOption.SYNCHRONIZATION_NETWORK_LATENCY_MILLISECONDS)));
+                Thread.sleep(Math.max(0, plugin.getSettings().getNetworkLatencyMilliseconds()));
             } catch (InterruptedException e) {
-                plugin.getLoggingAdapter().log(Level.SEVERE, "An exception occurred handling a player join", e);
+                plugin.log(Level.SEVERE, "An exception occurred handling a player join", e);
             } finally {
                 plugin.getRedisManager().getUserServerSwitch(user).thenAccept(changingServers -> {
                     if (!changingServers) {
@@ -85,8 +88,7 @@ public abstract class EventListener {
                                 }
                                 plugin.getRedisManager().getUserData(user).thenAccept(redisUserData ->
                                         redisUserData.ifPresent(redisData -> {
-                                            user.setData(redisData, plugin.getSettings(), plugin.getEventCannon(),
-                                                            plugin.getLoggingAdapter(), plugin.getMinecraftVersion())
+                                            user.setData(redisData, plugin)
                                                     .thenAccept(succeeded -> handleSynchronisationCompletion(user, succeeded)).join();
                                             executor.shutdown();
                                         })).join();
@@ -108,8 +110,7 @@ public abstract class EventListener {
     private CompletableFuture<Boolean> setUserFromDatabase(@NotNull OnlineUser user) {
         return plugin.getDatabase().getCurrentUserData(user).thenApply(databaseUserData -> {
             if (databaseUserData.isPresent()) {
-                return user.setData(databaseUserData.get().userData(), plugin.getSettings(), plugin.getEventCannon(),
-                        plugin.getLoggingAdapter(), plugin.getMinecraftVersion()).join();
+                return user.setData(databaseUserData.get().userData(), plugin).join();
             }
             return true;
         });
@@ -123,9 +124,17 @@ public abstract class EventListener {
      */
     private void handleSynchronisationCompletion(@NotNull OnlineUser user, boolean succeeded) {
         if (succeeded) {
-            plugin.getLocales().getLocale("synchronisation_complete").ifPresent(user::sendActionBar);
-            lockedPlayers.remove(user.uuid);
+            switch (plugin.getSettings().getNotificationDisplaySlot()) {
+                case CHAT -> plugin.getLocales().getLocale("synchronisation_complete")
+                        .ifPresent(user::sendMessage);
+                case ACTION_BAR -> plugin.getLocales().getLocale("synchronisation_complete")
+                        .ifPresent(user::sendActionBar);
+                case TOAST -> plugin.getLocales().getLocale("synchronisation_complete")
+                        .ifPresent(locale -> user.sendToast(locale, new MineDown(""),
+                                "minecraft:bell", "TASK"));
+            }
             plugin.getDatabase().ensureUser(user).join();
+            lockedPlayers.remove(user.uuid);
             plugin.getEventCannon().fireSyncCompleteEvent(user);
         } else {
             plugin.getLocales().getLocale("synchronisation_failed")
@@ -145,18 +154,19 @@ public abstract class EventListener {
             return;
         }
         // Don't sync players awaiting synchronization
-        if (lockedPlayers.contains(user.uuid)) {
+        if (lockedPlayers.contains(user.uuid) || user.isNpc()) {
             return;
         }
 
         // Handle asynchronous disconnection
         lockedPlayers.add(user.uuid);
         CompletableFuture.runAsync(() -> plugin.getRedisManager().setUserServerSwitch(user)
-                .thenRun(() -> user.getUserData(plugin.getLoggingAdapter()).thenAccept(optionalUserData ->
-                        optionalUserData.ifPresent(userData -> plugin.getRedisManager().setUserData(user, userData)
-                                .thenRun(() -> plugin.getDatabase().setUserData(user, userData, DataSaveCause.DISCONNECT)))))
-                .thenRun(() -> lockedPlayers.remove(user.uuid)).exceptionally(throwable -> {
-                    plugin.getLoggingAdapter().log(Level.SEVERE,
+                .thenRun(() -> user.getUserData(plugin).thenAccept(
+                        optionalUserData -> optionalUserData.ifPresent(userData -> plugin.getRedisManager()
+                                .setUserData(user, userData).thenRun(() -> plugin.getDatabase()
+                                        .setUserData(user, userData, DataSaveCause.DISCONNECT)))))
+                .exceptionally(throwable -> {
+                    plugin.log(Level.SEVERE,
                             "An exception occurred handling a player disconnection");
                     throwable.printStackTrace();
                     return null;
@@ -164,50 +174,48 @@ public abstract class EventListener {
     }
 
     /**
-     * Asynchronously handles a world save event
+     * Handles the saving of data when the world save event is fired
      *
      * @param usersInWorld a list of users in the world that is being saved
      */
-    protected final void handleAsyncWorldSave(@NotNull List<OnlineUser> usersInWorld) {
-        if (disabling || !plugin.getSettings().getBooleanValue(Settings.ConfigOption.SYNCHRONIZATION_SAVE_ON_WORLD_SAVE)) {
+    protected final void saveOnWorldSave(@NotNull List<OnlineUser> usersInWorld) {
+        if (disabling || !plugin.getSettings().doSaveOnWorldSave()) {
             return;
         }
-        usersInWorld.forEach(user -> user.getUserData(plugin.getLoggingAdapter()).join().ifPresent(
-                userData -> plugin.getDatabase().setUserData(user, userData, DataSaveCause.WORLD_SAVE).join()));
+        usersInWorld.stream()
+                .filter(user -> !lockedPlayers.contains(user.uuid) && !user.isNpc())
+                .forEach(user -> user.getUserData(plugin)
+                        .thenAccept(data -> data.ifPresent(userData -> plugin.getDatabase()
+                                .setUserData(user, userData, DataSaveCause.WORLD_SAVE))));
     }
 
     /**
-     * Handle an inventory menu closing
+     * Handles the saving of data when a player dies
      *
-     * @param user          The user who closed the menu
-     * @param menuInventory Serialized {@link ItemData} containing the inventory contents
-     * @implNote The size of the serialized {@link ItemData} array is determined by the {@link ItemEditorMenuType} of the closed inventory
+     * @param user  The user who died
+     * @param drops The items that this user would have dropped
      */
-    protected final void handleMenuClose(@NotNull OnlineUser user, @NotNull ItemData menuInventory) {
-        if (disabling) {
+    protected void saveOnPlayerDeath(@NotNull OnlineUser user, @NotNull ItemData drops) {
+        if (disabling || !plugin.getSettings().doSaveOnDeath() || lockedPlayers.contains(user.uuid) || user.isNpc()
+            || (!plugin.getSettings().doSaveEmptyDropsOnDeath() && drops.isEmpty())) {
             return;
         }
-        plugin.getDataEditor().closeInventoryMenu(user, menuInventory);
-    }
 
-    /**
-     * Determine whether an inventory click should be cancelled
-     *
-     * @param user {@link OnlineUser} performing the event
-     * @return Whether the event should be cancelled
-     */
-    protected final boolean cancelInventoryClick(@NotNull OnlineUser user) {
-        return plugin.getDataEditor().cancelMenuEdit(user) || cancelPlayerEvent(user);
+        user.getUserData(plugin)
+                .thenAccept(data -> data.ifPresent(userData -> {
+                    userData.getInventory().orElse(ItemData.empty()).serializedItems = drops.serializedItems;
+                    plugin.getDatabase().setUserData(user, userData, DataSaveCause.DEATH);
+                }));
     }
 
     /**
      * Determine whether a player event should be cancelled
      *
-     * @param user {@link OnlineUser} performing the event
+     * @param userUuid The UUID of the user to check
      * @return Whether the event should be cancelled
      */
-    protected final boolean cancelPlayerEvent(@NotNull OnlineUser user) {
-        return disabling || lockedPlayers.contains(user.uuid);
+    protected final boolean cancelPlayerEvent(@NotNull UUID userUuid) {
+        return disabling || lockedPlayers.contains(userUuid);
     }
 
     /**
@@ -216,12 +224,23 @@ public abstract class EventListener {
     public final void handlePluginDisable() {
         disabling = true;
 
-        plugin.getOnlineUsers().stream().filter(user -> !lockedPlayers.contains(user.uuid)).forEach(
-                user -> user.getUserData(plugin.getLoggingAdapter()).join().ifPresent(
-                        userData -> plugin.getDatabase().setUserData(user, userData, DataSaveCause.SERVER_SHUTDOWN).join()));
+        // Save data for all online users
+        plugin.getOnlineUsers().stream()
+                .filter(user -> !lockedPlayers.contains(user.uuid) && !user.isNpc())
+                .forEach(user -> {
+                    lockedPlayers.add(user.uuid);
+                    user.getUserData(plugin).join()
+                            .ifPresent(userData -> plugin.getDatabase()
+                                    .setUserData(user, userData, DataSaveCause.SERVER_SHUTDOWN).join());
+                });
 
+        // Close outstanding connections
         plugin.getDatabase().close();
         plugin.getRedisManager().close();
     }
 
+    public final Set<UUID> getLockedPlayers() {
+        return this.lockedPlayers;
+    }
+
 }

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

@@ -1,13 +1,11 @@
 package net.william278.husksync.player;
 
-import de.themoep.minedown.MineDown;
+import de.themoep.minedown.adventure.MineDown;
+import net.william278.desertwell.Version;
+import net.william278.husksync.HuskSync;
 import net.william278.husksync.config.Settings;
 import net.william278.husksync.data.*;
-import net.william278.husksync.editor.ItemEditorMenu;
-import net.william278.husksync.event.EventCannon;
 import net.william278.husksync.event.PreSyncEvent;
-import net.william278.husksync.util.Logger;
-import net.william278.husksync.util.Version;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -39,9 +37,30 @@ public abstract class OnlineUser extends User {
      * @param statusData      the player's {@link StatusData}
      * @param statusDataFlags the flags to use for setting the status data
      * @return a future returning void when complete
+     * @deprecated Use {@link #setStatus(StatusData, Settings)} instead
+     */
+    @Deprecated(since = "2.1")
+    public final CompletableFuture<Void> setStatus(@NotNull StatusData statusData,
+                                                   @NotNull List<StatusDataFlag> statusDataFlags) {
+        final Settings settings = new Settings();
+        settings.getSynchronizationFeatures().put(Settings.SynchronizationFeature.HEALTH.name().toLowerCase(), statusDataFlags.contains(StatusDataFlag.SET_HEALTH));
+        settings.getSynchronizationFeatures().put(Settings.SynchronizationFeature.MAX_HEALTH.name().toLowerCase(), statusDataFlags.contains(StatusDataFlag.SET_MAX_HEALTH));
+        settings.getSynchronizationFeatures().put(Settings.SynchronizationFeature.HUNGER.name().toLowerCase(), statusDataFlags.contains(StatusDataFlag.SET_HUNGER));
+        settings.getSynchronizationFeatures().put(Settings.SynchronizationFeature.EXPERIENCE.name().toLowerCase(), statusDataFlags.contains(StatusDataFlag.SET_EXPERIENCE));
+        settings.getSynchronizationFeatures().put(Settings.SynchronizationFeature.INVENTORIES.name().toLowerCase(), statusDataFlags.contains(StatusDataFlag.SET_SELECTED_ITEM_SLOT));
+        settings.getSynchronizationFeatures().put(Settings.SynchronizationFeature.LOCATION.name().toLowerCase(), statusDataFlags.contains(StatusDataFlag.SET_GAME_MODE) || statusDataFlags.contains(StatusDataFlag.SET_FLYING));
+        return setStatus(statusData, settings);
+    }
+
+    /**
+     * Set the player's {@link StatusData}
+     *
+     * @param statusData the player's {@link StatusData}
+     * @param settings   settings, containing information about which features should be synced
+     * @return a future returning void when complete
      */
     public abstract CompletableFuture<Void> setStatus(@NotNull StatusData statusData,
-                                                      @NotNull List<StatusDataFlag> statusDataFlags);
+                                                      @NotNull Settings settings);
 
     /**
      * Get the player's inventory {@link ItemData} contents
@@ -164,73 +183,6 @@ public abstract class OnlineUser extends User {
     @NotNull
     public abstract Version getMinecraftVersion();
 
-    /**
-     * Set {@link UserData} to a player
-     *
-     * @param data     The data to set
-     * @param settings Plugin settings, for determining what needs setting
-     * @return a future returning a boolean when complete; if the sync was successful, the future will return {@code true}
-     */
-    public final CompletableFuture<Boolean> setData(@NotNull UserData data, @NotNull Settings settings,
-                                                    @NotNull EventCannon eventCannon, @NotNull Logger logger,
-                                                    @NotNull Version serverMinecraftVersion) {
-        return CompletableFuture.supplyAsync(() -> {
-            // Prevent synchronising user data from newer versions of Minecraft
-            if (Version.minecraftVersion(data.getMinecraftVersion()).compareTo(serverMinecraftVersion) > 0) {
-                logger.log(Level.SEVERE, "Cannot set data for " + username +
-                                         " because the Minecraft version of their user data (" + data.getMinecraftVersion() +
-                                         ") is newer than the server's Minecraft version (" + serverMinecraftVersion + ").");
-                return false;
-            }
-            // Prevent synchronising user data from newer versions of the plugin
-            if (data.getFormatVersion() > UserData.CURRENT_FORMAT_VERSION) {
-                logger.log(Level.SEVERE, "Cannot set data for " + username +
-                                         " because the format version of their user data (v" + data.getFormatVersion() +
-                                         ") is newer than the current format version (v" + UserData.CURRENT_FORMAT_VERSION + ").");
-                return false;
-            }
-
-            // Fire the PreSyncEvent
-            final PreSyncEvent preSyncEvent = (PreSyncEvent) eventCannon.firePreSyncEvent(this, data).join();
-            final UserData finalData = preSyncEvent.getUserData();
-            final List<CompletableFuture<Void>> dataSetOperations = new ArrayList<>() {{
-                if (!isOffline() && !preSyncEvent.isCancelled()) {
-                    if (settings.getBooleanValue(Settings.ConfigOption.SYNCHRONIZATION_SYNC_INVENTORIES)) {
-                        add(setInventory(finalData.getInventoryData()));
-                    }
-                    if (settings.getBooleanValue(Settings.ConfigOption.SYNCHRONIZATION_SYNC_ENDER_CHESTS)) {
-                        add(setEnderChest(finalData.getEnderChestData()));
-                    }
-                    add(setStatus(finalData.getStatusData(), StatusDataFlag.getFromSettings(settings)));
-                    if (settings.getBooleanValue(Settings.ConfigOption.SYNCHRONIZATION_SYNC_POTION_EFFECTS)) {
-                        add(setPotionEffects(finalData.getPotionEffectsData()));
-                    }
-                    if (settings.getBooleanValue(Settings.ConfigOption.SYNCHRONIZATION_SYNC_ADVANCEMENTS)) {
-                        add(setAdvancements(finalData.getAdvancementData()));
-                    }
-                    if (settings.getBooleanValue(Settings.ConfigOption.SYNCHRONIZATION_SYNC_STATISTICS)) {
-                        add(setStatistics(finalData.getStatisticsData()));
-                    }
-                    if (settings.getBooleanValue(Settings.ConfigOption.SYNCHRONIZATION_SYNC_LOCATION)) {
-                        add(setLocation(finalData.getLocationData()));
-                    }
-                    if (settings.getBooleanValue(Settings.ConfigOption.SYNCHRONIZATION_SYNC_PERSISTENT_DATA_CONTAINER)) {
-                        add(setPersistentDataContainer(finalData.getPersistentDataContainerData()));
-                    }
-                }
-            }};
-            // Apply operations in parallel, join when complete
-            return CompletableFuture.allOf(dataSetOperations.toArray(new CompletableFuture[0])).thenApply(unused -> true)
-                    .exceptionally(exception -> {
-                        // Handle synchronisation exceptions
-                        logger.log(Level.SEVERE, "Failed to set data for player " + username + " (" + exception.getMessage() + ")");
-                        exception.printStackTrace();
-                        return false;
-                    }).join();
-        });
-
-    }
-
     /**
      * Dispatch a MineDown-formatted message to this player
      *
@@ -245,6 +197,17 @@ public abstract class OnlineUser extends User {
      */
     public abstract void sendActionBar(@NotNull MineDown mineDown);
 
+    /**
+     * Dispatch a toast message to this player
+     *
+     * @param title          the title of the toast
+     * @param description    the description of the toast
+     * @param iconMaterial   the namespace-keyed material to use as an icon of the toast
+     * @param backgroundType the background ("ToastType") of the toast
+     */
+    public abstract void sendToast(@NotNull MineDown title, @NotNull MineDown description,
+                                   @NotNull String iconMaterial, @NotNull String backgroundType);
+
     /**
      * Returns if the player has the permission node
      *
@@ -254,30 +217,164 @@ public abstract class OnlineUser extends User {
     public abstract boolean hasPermission(@NotNull String node);
 
     /**
-     * Show the player a {@link ItemEditorMenu} GUI
+     * Show a GUI chest menu to the player, containing the given {@link ItemData}
      *
-     * @param menu The {@link ItemEditorMenu} interface to show
+     * @param itemData    Item data to be shown in the GUI
+     * @param editable    If the player should be able to remove, replace and move around the items
+     * @param minimumRows The minimum number of rows to show in the chest menu
+     * @param title       The title of the chest menu, as a {@link MineDown} locale
+     * @return A future returning the {@link ItemData} in the chest menu when the player closes it
+     * @since 2.1
      */
-    public abstract void showMenu(@NotNull ItemEditorMenu menu);
+    public abstract CompletableFuture<Optional<ItemData>> showMenu(@NotNull ItemData itemData, boolean editable,
+                                                                   int minimumRows, @NotNull MineDown title);
 
     /**
-     * Get the player's current {@link UserData} in an {@link Optional}
-     * </p>
-     * If the user data could not be returned due to an exception, the optional will return empty
+     * Returns true if the player is dead
      *
-     * @param logger The logger to use for handling exceptions
-     * @return the player's current {@link UserData} in an optional; empty if an exception occurs
+     * @return true if the player is dead
      */
-    public final CompletableFuture<Optional<UserData>> getUserData(@NotNull Logger logger) {
-        return CompletableFuture.supplyAsync(() -> Optional.of(new UserData(getStatus().join(), getInventory().join(),
-                        getEnderChest().join(), getPotionEffects().join(), getAdvancements().join(),
-                        getStatistics().join(), getLocation().join(), getPersistentDataContainer().join(),
-                        getMinecraftVersion().toString())))
-                .exceptionally(exception -> {
-                    logger.log(Level.SEVERE, "Failed to get user data from online player " + username + " (" + exception.getMessage() + ")");
-                    exception.printStackTrace();
-                    return Optional.empty();
-                });
+    public abstract boolean isDead();
+
+    /**
+     * Apply {@link UserData} to a player, updating their inventory, status, statistics, etc. as per the config.
+     * <p>
+     * This will only set data that is enabled as per the enabled settings in the config file.
+     * Data present in the {@link UserData} object, but not enabled to be set in the config, will be ignored.
+     *
+     * @param plugin The plugin instance
+     * @return a future returning a boolean when complete; if the sync was successful, the future will return {@code true}.
+     */
+    public final CompletableFuture<Boolean> setData(@NotNull UserData data, @NotNull HuskSync plugin) {
+        return CompletableFuture.supplyAsync(() -> {
+            // Prevent synchronising user data from newer versions of Minecraft
+            if (Version.fromMinecraftVersionString(data.getMinecraftVersion()).compareTo(plugin.getMinecraftVersion()) > 0) {
+                plugin.log(Level.SEVERE, "Cannot set data for " + username +
+                                         " because the Minecraft version of their user data (" + data.getMinecraftVersion() +
+                                         ") is newer than the server's Minecraft version (" + plugin.getMinecraftVersion() + ").");
+                return false;
+            }
+            // Prevent synchronising user data from newer versions of the plugin
+            if (data.getFormatVersion() > UserData.CURRENT_FORMAT_VERSION) {
+                plugin.log(Level.SEVERE, "Cannot set data for " + username +
+                                         " because the format version of their user data (v" + data.getFormatVersion() +
+                                         ") is newer than the current format version (v" + UserData.CURRENT_FORMAT_VERSION + ").");
+                return false;
+            }
+
+            // Fire the PreSyncEvent
+            final PreSyncEvent preSyncEvent = (PreSyncEvent) plugin.getEventCannon().firePreSyncEvent(this, data).join();
+            final UserData finalData = preSyncEvent.getUserData();
+            final List<CompletableFuture<Void>> dataSetOperations = new ArrayList<>() {{
+                if (!isOffline() && !preSyncEvent.isCancelled()) {
+                    final Settings settings = plugin.getSettings();
+                    if (settings.getSynchronizationFeature(Settings.SynchronizationFeature.INVENTORIES)) {
+                        finalData.getInventory().ifPresent(itemData -> add(setInventory(itemData)));
+                    }
+                    if (settings.getSynchronizationFeature(Settings.SynchronizationFeature.ENDER_CHESTS)) {
+                        finalData.getEnderChest().ifPresent(itemData -> add(setEnderChest(itemData)));
+                    }
+                    finalData.getStatus().ifPresent(statusData -> add(setStatus(statusData, settings)));
+                    if (settings.getSynchronizationFeature(Settings.SynchronizationFeature.POTION_EFFECTS)) {
+                        finalData.getPotionEffects().ifPresent(potionEffectData -> add(setPotionEffects(potionEffectData)));
+                    }
+                    if (settings.getSynchronizationFeature(Settings.SynchronizationFeature.ADVANCEMENTS)) {
+                        finalData.getAdvancements().ifPresent(advancementData -> add(setAdvancements(advancementData)));
+                    }
+                    if (settings.getSynchronizationFeature(Settings.SynchronizationFeature.STATISTICS)) {
+                        finalData.getStatistics().ifPresent(statisticData -> add(setStatistics(statisticData)));
+                    }
+                    if (settings.getSynchronizationFeature(Settings.SynchronizationFeature.LOCATION)) {
+                        finalData.getLocation().ifPresent(locationData -> add(setLocation(locationData)));
+                    }
+                    if (settings.getSynchronizationFeature(Settings.SynchronizationFeature.PERSISTENT_DATA_CONTAINER)) {
+                        finalData.getPersistentDataContainer().ifPresent(persistentDataContainerData ->
+                                add(setPersistentDataContainer(persistentDataContainerData)));
+                    }
+                }
+            }};
+            // Apply operations in parallel, join when complete
+            return CompletableFuture.allOf(dataSetOperations.toArray(new CompletableFuture[0])).thenApply(unused -> true)
+                    .exceptionally(exception -> {
+                        // Handle synchronisation exceptions
+                        plugin.log(Level.SEVERE, "Failed to set data for player " + username + " (" + exception.getMessage() + ")");
+                        exception.printStackTrace();
+                        return false;
+                    }).join();
+        });
+
     }
 
+    /**
+     * Get the player's current {@link UserData} in an {@link Optional}.
+     * <p>
+     * Since v2.1, this method will respect the data synchronisation settings; user data will only be as big as the
+     * enabled synchronisation values set in the config file
+     * <p>
+     * Also note that if the {@code SYNCHRONIZATION_SAVE_DEAD_PLAYER_INVENTORIES} ConfigOption has been set,
+     * the user's inventory will only be returned if the player is alive.
+     * <p>
+     * If the user data could not be returned due to an exception, the optional will return empty
+     *
+     * @param plugin The plugin instance
+     */
+    public final CompletableFuture<Optional<UserData>> getUserData(@NotNull HuskSync plugin) {
+        return CompletableFuture.supplyAsync(() -> {
+            final UserDataBuilder builder = UserData.builder(getMinecraftVersion());
+            final List<CompletableFuture<Void>> dataGetOperations = new ArrayList<>() {{
+                if (!isOffline()) {
+                    final Settings settings = plugin.getSettings();
+                    if (settings.getSynchronizationFeature(Settings.SynchronizationFeature.INVENTORIES)) {
+                        if (isDead() && settings.isSynchroniseDeadPlayersChangingServer()) {
+                            plugin.debug("Player " + username + " is dead, so their inventory will be set to empty.");
+                            add(CompletableFuture.runAsync(() -> builder.setInventory(ItemData.empty())));
+                        } else {
+                            add(getInventory().thenAccept(builder::setInventory));
+                        }
+                    }
+                    if (settings.getSynchronizationFeature(Settings.SynchronizationFeature.ENDER_CHESTS)) {
+                        add(getEnderChest().thenAccept(builder::setEnderChest));
+                    }
+                    add(getStatus().thenAccept(builder::setStatus));
+                    if (settings.getSynchronizationFeature(Settings.SynchronizationFeature.POTION_EFFECTS)) {
+                        add(getPotionEffects().thenAccept(builder::setPotionEffects));
+                    }
+                    if (settings.getSynchronizationFeature(Settings.SynchronizationFeature.ADVANCEMENTS)) {
+                        add(getAdvancements().thenAccept(builder::setAdvancements));
+                    }
+                    if (settings.getSynchronizationFeature(Settings.SynchronizationFeature.STATISTICS)) {
+                        add(getStatistics().thenAccept(builder::setStatistics));
+                    }
+                    if (settings.getSynchronizationFeature(Settings.SynchronizationFeature.LOCATION)) {
+                        add(getLocation().thenAccept(builder::setLocation));
+                    }
+                    if (settings.getSynchronizationFeature(Settings.SynchronizationFeature.PERSISTENT_DATA_CONTAINER)) {
+                        add(getPersistentDataContainer().thenAccept(builder::setPersistentDataContainer));
+                    }
+                }
+            }};
+
+            // Apply operations in parallel, join when complete
+            CompletableFuture.allOf(dataGetOperations.toArray(new CompletableFuture[0])).join();
+            return Optional.of(builder.build());
+        }).exceptionally(exception -> {
+            plugin.log(Level.SEVERE, "Failed to get user data from online player " + username + " (" + exception.getMessage() + ")");
+            exception.printStackTrace();
+            return Optional.empty();
+        });
+    }
+
+    /**
+     * Get if the player is locked
+     *
+     * @return the player's locked status
+     */
+    public abstract boolean isLocked();
+
+    /**
+     * Get if the player is a NPC
+     *
+     * @return if the player is a NPC with metadata
+     */
+    public abstract boolean isNpc();
 }

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

@@ -1,7 +1,7 @@
 package net.william278.husksync.redis;
 
+import de.themoep.minedown.adventure.MineDown;
 import net.william278.husksync.HuskSync;
-import net.william278.husksync.config.Settings;
 import net.william278.husksync.data.UserData;
 import net.william278.husksync.player.User;
 import org.jetbrains.annotations.NotNull;
@@ -19,7 +19,7 @@ import java.util.concurrent.CompletableFuture;
 /**
  * Manages the connection to the Redis server, handling the caching of user data
  */
-public class RedisManager {
+public class RedisManager extends JedisPubSub {
 
     protected static final String KEY_NAMESPACE = "husksync:";
     protected static String clusterId = "";
@@ -33,13 +33,13 @@ public class RedisManager {
 
     public RedisManager(@NotNull HuskSync plugin) {
         this.plugin = plugin;
-        clusterId = plugin.getSettings().getStringValue(Settings.ConfigOption.CLUSTER_ID);
+        clusterId = plugin.getSettings().getClusterId();
 
         // Set redis credentials
-        this.redisHost = plugin.getSettings().getStringValue(Settings.ConfigOption.REDIS_HOST);
-        this.redisPort = plugin.getSettings().getIntegerValue(Settings.ConfigOption.REDIS_PORT);
-        this.redisPassword = plugin.getSettings().getStringValue(Settings.ConfigOption.REDIS_PASSWORD);
-        this.redisUseSsl = plugin.getSettings().getBooleanValue(Settings.ConfigOption.REDIS_USE_SSL);
+        this.redisHost = plugin.getSettings().getRedisHost();
+        this.redisPort = plugin.getSettings().getRedisPort();
+        this.redisPassword = plugin.getSettings().getRedisPassword();
+        this.redisUseSsl = plugin.getSettings().isRedisUseSsl();
 
         // Configure the jedis pool
         this.jedisPoolConfig = new JedisPoolConfig();
@@ -53,21 +53,19 @@ public class RedisManager {
      *
      * @return a future returning void when complete
      */
-    public CompletableFuture<Boolean> initialize() {
-        return CompletableFuture.supplyAsync(() -> {
-            if (redisPassword.isBlank()) {
-                jedisPool = new JedisPool(jedisPoolConfig, redisHost, redisPort, 0, redisUseSsl);
-            } else {
-                jedisPool = new JedisPool(jedisPoolConfig, redisHost, redisPort, 0, redisPassword, redisUseSsl);
-            }
-            try {
-                jedisPool.getResource().ping();
-            } catch (JedisException e) {
-                return false;
-            }
-            CompletableFuture.runAsync(this::subscribe);
-            return true;
-        });
+    public boolean initialize() {
+        if (redisPassword.isBlank()) {
+            jedisPool = new JedisPool(jedisPoolConfig, redisHost, redisPort, 0, redisUseSsl);
+        } else {
+            jedisPool = new JedisPool(jedisPoolConfig, redisHost, redisPort, 0, redisPassword, redisUseSsl);
+        }
+        try {
+            jedisPool.getResource().ping();
+        } catch (JedisException e) {
+            return false;
+        }
+        CompletableFuture.runAsync(this::subscribe);
+        return true;
     }
 
     private void subscribe() {
@@ -75,33 +73,42 @@ public class RedisManager {
                 new Jedis(redisHost, redisPort, DefaultJedisClientConfig.builder()
                         .password(redisPassword).timeoutMillis(0).ssl(redisUseSsl).build())) {
             subscriber.connect();
-            subscriber.subscribe(new JedisPubSub() {
-                @Override
-                public void onMessage(@NotNull String channel, @NotNull String message) {
-                    RedisMessageType.getTypeFromChannel(channel).ifPresent(messageType -> {
-                        if (messageType == RedisMessageType.UPDATE_USER_DATA) {
-                            final RedisMessage redisMessage = RedisMessage.fromJson(message);
-                            plugin.getOnlineUser(redisMessage.targetUserUuid).ifPresent(user -> {
-                                final UserData userData = plugin.getDataAdapter().fromBytes(redisMessage.data);
-                                user.setData(userData, plugin.getSettings(), plugin.getEventCannon(),
-                                        plugin.getLoggingAdapter(), plugin.getMinecraftVersion()).thenAccept(succeeded -> {
-                                    if (succeeded) {
-                                        plugin.getLocales().getLocale("data_update_complete")
-                                                .ifPresent(user::sendActionBar);
-                                        plugin.getEventCannon().fireSyncCompleteEvent(user);
-                                    } else {
-                                        plugin.getLocales().getLocale("data_update_failed")
-                                                .ifPresent(user::sendMessage);
-                                    }
-                                });
-                            });
-                        }
-                    });
-                }
-            }, Arrays.stream(RedisMessageType.values()).map(RedisMessageType::getMessageChannel).toArray(String[]::new));
+            subscriber.subscribe(this, Arrays.stream(RedisMessageType.values())
+                    .map(RedisMessageType::getMessageChannel)
+                    .toArray(String[]::new));
         }
     }
 
+    @Override
+    public void onMessage(@NotNull String channel, @NotNull String message) {
+        final RedisMessageType messageType = RedisMessageType.getTypeFromChannel(channel).orElse(null);
+        if (messageType != RedisMessageType.UPDATE_USER_DATA) {
+            return;
+        }
+
+        final RedisMessage redisMessage = RedisMessage.fromJson(message);
+        plugin.getOnlineUser(redisMessage.targetUserUuid).ifPresent(user -> {
+            final UserData userData = plugin.getDataAdapter().fromBytes(redisMessage.data);
+            user.setData(userData, plugin).thenAccept(succeeded -> {
+                if (succeeded) {
+                    switch (plugin.getSettings().getNotificationDisplaySlot()) {
+                        case CHAT -> plugin.getLocales().getLocale("data_update_complete")
+                                .ifPresent(user::sendMessage);
+                        case ACTION_BAR -> plugin.getLocales().getLocale("data_update_complete")
+                                .ifPresent(user::sendActionBar);
+                        case TOAST -> plugin.getLocales().getLocale("data_update_complete")
+                                .ifPresent(locale -> user.sendToast(locale, new MineDown(""),
+                                        "minecraft:bell", "TASK"));
+                    }
+                    plugin.getEventCannon().fireSyncCompleteEvent(user);
+                } else {
+                    plugin.getLocales().getLocale("data_update_failed")
+                            .ifPresent(user::sendMessage);
+                }
+            });
+        });
+    }
+
     protected void sendMessage(@NotNull String channel, @NotNull String message) {
         try (Jedis jedis = jedisPool.getResource()) {
             jedis.publish(channel, message);
@@ -130,7 +137,9 @@ public class RedisManager {
                     jedis.setex(getKey(RedisKeyType.DATA_UPDATE, user.uuid),
                             RedisKeyType.DATA_UPDATE.timeToLive,
                             plugin.getDataAdapter().toBytes(userData));
-                    plugin.getLoggingAdapter().debug("[" + user.username + "] Set " + RedisKeyType.DATA_UPDATE.name()
+
+                    // Debug logging
+                    plugin.debug("[" + user.username + "] Set " + RedisKeyType.DATA_UPDATE.name()
                                                      + " key to redis at: " +
                                                      new SimpleDateFormat("mm:ss.SSS").format(new Date()));
                 }
@@ -146,7 +155,7 @@ public class RedisManager {
             try (Jedis jedis = jedisPool.getResource()) {
                 jedis.setex(getKey(RedisKeyType.SERVER_SWITCH, user.uuid),
                         RedisKeyType.SERVER_SWITCH.timeToLive, new byte[0]);
-                plugin.getLoggingAdapter().debug("[" + user.username + "] Set " + RedisKeyType.SERVER_SWITCH.name()
+                plugin.debug("[" + user.username + "] Set " + RedisKeyType.SERVER_SWITCH.name()
                                                  + " key to redis at: " +
                                                  new SimpleDateFormat("mm:ss.SSS").format(new Date()));
             } catch (Exception e) {
@@ -167,12 +176,12 @@ public class RedisManager {
                 final byte[] key = getKey(RedisKeyType.DATA_UPDATE, user.uuid);
                 final byte[] dataByteArray = jedis.get(key);
                 if (dataByteArray == null) {
-                    plugin.getLoggingAdapter().debug("[" + user.username + "] Could not read " +
+                    plugin.debug("[" + user.username + "] Could not read " +
                                                      RedisKeyType.DATA_UPDATE.name() + " key from redis at: " +
                                                      new SimpleDateFormat("mm:ss.SSS").format(new Date()));
                     return Optional.empty();
                 }
-                plugin.getLoggingAdapter().debug("[" + user.username + "] Successfully read "
+                plugin.debug("[" + user.username + "] Successfully read "
                                                  + RedisKeyType.DATA_UPDATE.name() + " key from redis at: " +
                                                  new SimpleDateFormat("mm:ss.SSS").format(new Date()));
 
@@ -194,12 +203,12 @@ public class RedisManager {
                 final byte[] key = getKey(RedisKeyType.SERVER_SWITCH, user.uuid);
                 final byte[] readData = jedis.get(key);
                 if (readData == null) {
-                    plugin.getLoggingAdapter().debug("[" + user.username + "] Could not read " +
+                    plugin.debug("[" + user.username + "] Could not read " +
                                                      RedisKeyType.SERVER_SWITCH.name() + " key from redis at: " +
                                                      new SimpleDateFormat("mm:ss.SSS").format(new Date()));
                     return false;
                 }
-                plugin.getLoggingAdapter().debug("[" + user.username + "] Successfully read "
+                plugin.debug("[" + user.username + "] Successfully read "
                                                  + RedisKeyType.SERVER_SWITCH.name() + " key from redis at: " +
                                                  new SimpleDateFormat("mm:ss.SSS").format(new Date()));
 

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

@@ -0,0 +1,172 @@
+package net.william278.husksync.util;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import net.william278.husksync.HuskSync;
+import net.william278.husksync.data.UserDataSnapshot;
+import net.william278.husksync.player.User;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
+import java.util.StringJoiner;
+import java.util.logging.Level;
+
+/**
+ * Utility class for dumping {@link UserDataSnapshot}s to a file or as a paste on the web
+ */
+public class DataDumper {
+
+    private static final String LOGS_SITE_ENDPOINT = "https://api.mclo.gs/1/log";
+
+    private final HuskSync plugin;
+    private final UserDataSnapshot dataSnapshot;
+    private final User user;
+
+    private DataDumper(@NotNull UserDataSnapshot dataSnapshot,
+                       @NotNull User user, @NotNull HuskSync implementor) {
+        this.dataSnapshot = dataSnapshot;
+        this.user = user;
+        this.plugin = implementor;
+    }
+
+    /**
+     * Create a {@link DataDumper} of the given {@link UserDataSnapshot}
+     *
+     * @param dataSnapshot The {@link UserDataSnapshot} to dump
+     * @param user         The {@link User} whose data is being dumped
+     * @param plugin       The implementing {@link HuskSync} plugin
+     * @return A {@link DataDumper} for the given {@link UserDataSnapshot}
+     */
+    public static DataDumper create(@NotNull UserDataSnapshot dataSnapshot,
+                                    @NotNull User user, @NotNull HuskSync plugin) {
+        return new DataDumper(dataSnapshot, user, plugin);
+    }
+
+    /**
+     * Dumps the data snapshot to a string
+     *
+     * @return the data snapshot as a string
+     */
+    @Override
+    @NotNull
+    public String toString() {
+        return plugin.getDataAdapter().toJson(dataSnapshot.userData(), true);
+    }
+
+    @NotNull
+    public String toWeb() {
+        try {
+            final URL url = new URL(LOGS_SITE_ENDPOINT);
+            final HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+            connection.setRequestMethod("POST");
+            connection.setDoOutput(true);
+
+            // Dispatch the request
+            final byte[] messageBody = getWebContentField().getBytes(StandardCharsets.UTF_8);
+            final int messageLength = messageBody.length;
+            connection.setFixedLengthStreamingMode(messageLength);
+            connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
+            connection.connect();
+            try (OutputStream messageOutputStream = connection.getOutputStream()) {
+                messageOutputStream.write(messageBody);
+            }
+
+            // Get the response
+            if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) {
+                // Get the body as a json
+                try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
+                    final StringBuilder response = new StringBuilder();
+                    String line;
+                    while ((line = reader.readLine()) != null) {
+                        response.append(line);
+                    }
+
+                    // Parse the response as json
+                    final JsonObject responseJson = JsonParser.parseString(response.toString()).getAsJsonObject();
+                    if (responseJson.has("url")) {
+                        return responseJson.get("url").getAsString();
+                    }
+                    return "(Failed to get URL from response)";
+                }
+            } else {
+                return "(Failed to upload to logs site, got: " + connection.getResponseCode() + ")";
+            }
+        } catch (Exception e) {
+            plugin.log(Level.SEVERE, "Failed to upload data to logs site", e);
+        }
+        return "(Failed to upload to logs site)";
+    }
+
+    @NotNull
+    private String getWebContentField() {
+        return "content=" + URLEncoder.encode(toString(), StandardCharsets.UTF_8);
+    }
+
+    /**
+     * Dump the {@link UserDataSnapshot} to a file and return the file name
+     *
+     * @return the relative path of the file the data was dumped to
+     */
+    @NotNull
+    public String toFile() throws IOException {
+        final File filePath = getFilePath();
+
+        // Write the data from #getString to the file using a writer
+        try (final FileWriter writer = new FileWriter(filePath, StandardCharsets.UTF_8, false)) {
+            writer.write(toString());
+        } catch (IOException e) {
+            throw new IOException("Failed to write data to file", e);
+        }
+
+        return "~/plugins/HuskSync/dumps/" + filePath.getName();
+    }
+
+    /**
+     * Get the file path to dump the data to
+     *
+     * @return the file path
+     * @throws IOException if the prerequisite dumps parent folder could not be created
+     */
+    @NotNull
+    private File getFilePath() throws IOException {
+        return new File(getDumpsFolder(), getFileName());
+    }
+
+    /**
+     * Get the folder to dump the data to and create it if it does not exist
+     *
+     * @return the dumps folder
+     * @throws IOException if the folder could not be created
+     */
+    @NotNull
+    private File getDumpsFolder() throws IOException {
+        final File dumpsFolder = new File(plugin.getDataFolder(), "dumps");
+        if (!dumpsFolder.exists()) {
+            if (!dumpsFolder.mkdirs()) {
+                throw new IOException("Failed to create user data dumps folder");
+            }
+        }
+        return dumpsFolder;
+    }
+
+    /**
+     * Get the name of the file to dump the data snapshot to
+     *
+     * @return the file name
+     */
+    @NotNull
+    private String getFileName() {
+        return new StringJoiner("_")
+                       .add(user.username)
+                       .add(new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss").format(dataSnapshot.versionTimestamp()))
+                       .add(dataSnapshot.cause().name().toLowerCase())
+                       .add(dataSnapshot.versionUUID().toString().split("-")[0])
+               + ".json";
+    }
+
+}

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

@@ -0,0 +1,83 @@
+package net.william278.husksync.util;
+
+import net.william278.husksync.config.Locales;
+import net.william278.husksync.data.UserDataSnapshot;
+import net.william278.husksync.player.OnlineUser;
+import net.william278.husksync.player.User;
+import net.william278.paginedown.PaginatedList;
+import org.jetbrains.annotations.NotNull;
+
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Represents a chat-viewable paginated list of {@link UserDataSnapshot}s
+ */
+public class DataSnapshotList {
+
+    // Used for displaying number ordering next to snapshots in the list
+    private static final String[] CIRCLED_NUMBER_ICONS = "①②③④⑤⑥⑦⑧⑨⑩⑪⑫⑬⑭⑮⑯⑰⑱⑲⑳".split("");
+
+    @NotNull
+    private final PaginatedList paginatedList;
+
+    private DataSnapshotList(@NotNull List<UserDataSnapshot> snapshots, @NotNull User dataOwner,
+                             @NotNull Locales locales) {
+        final AtomicInteger snapshotNumber = new AtomicInteger(1);
+        this.paginatedList = PaginatedList.of(snapshots.stream()
+                        .map(snapshot -> locales.getRawLocale("data_list_item",
+                                        getNumberIcon(snapshotNumber.getAndIncrement()),
+                                        new SimpleDateFormat("MMM dd yyyy, HH:mm:ss.sss")
+                                                .format(snapshot.versionTimestamp()),
+                                        snapshot.versionUUID().toString().split("-")[0],
+                                        snapshot.versionUUID().toString(),
+                                        snapshot.cause().getDisplayName(),
+                                        dataOwner.username,
+                                        snapshot.pinned() ? "※" : "  ")
+                                .orElse("• " + snapshot.versionUUID())).toList(),
+                locales.getBaseChatList(6)
+                        .setHeaderFormat(locales.getRawLocale("data_list_title", dataOwner.username,
+                                        "%first_item_on_page_index%", "%last_item_on_page_index%", "%total_items%")
+                                .orElse(""))
+                        .setCommand("/husksync:userdata list " + dataOwner.username)
+                        .build());
+    }
+
+    /**
+     * Create a new {@link DataSnapshotList} from a list of {@link UserDataSnapshot}s
+     *
+     * @param snapshots The list of {@link UserDataSnapshot}s to display
+     * @param user      The {@link User} who owns the {@link UserDataSnapshot}s
+     * @param locales   The {@link Locales} instance
+     * @return A new {@link DataSnapshotList}, to be viewed with {@link #displayPage(OnlineUser, int)}
+     */
+    public static DataSnapshotList create(@NotNull List<UserDataSnapshot> snapshots, @NotNull User user,
+                                          @NotNull Locales locales) {
+        return new DataSnapshotList(snapshots, user, locales);
+    }
+
+    /**
+     * Get an icon for the given snapshot number, via {@link #CIRCLED_NUMBER_ICONS}
+     *
+     * @param number the snapshot number
+     * @return the icon for the given snapshot number
+     */
+    private static String getNumberIcon(int number) {
+        if (number < 1 || number > 20) {
+            return String.valueOf(number);
+        }
+        return CIRCLED_NUMBER_ICONS[number - 1];
+    }
+
+    /**
+     * Display a page of the list of {@link UserDataSnapshot} to the user
+     *
+     * @param onlineUser The online user to display the message to
+     * @param page       The page number to display
+     */
+    public void displayPage(@NotNull OnlineUser onlineUser, int page) {
+        onlineUser.sendMessage(paginatedList.getNearestValidPage(page));
+    }
+
+}

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

@@ -1,37 +0,0 @@
-package net.william278.husksync.util;
-
-import de.themoep.minedown.MineDown;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.logging.Level;
-
-/**
- * An abstract, cross-platform representation of a logger
- */
-public abstract class Logger {
-
-    private boolean debug;
-
-    public abstract void log(@NotNull Level level, @NotNull String message, @NotNull Exception e);
-
-    public abstract void log(@NotNull Level level, @NotNull String message);
-
-    public abstract void log(@NotNull Level level, @NotNull MineDown mineDown);
-
-    public abstract void info(@NotNull String message);
-
-    public abstract void severe(@NotNull String message);
-
-    public final void debug(@NotNull String message) {
-        if (debug) {
-            log(Level.INFO, "[DEBUG] " + message);
-        }
-    }
-
-    public abstract void config(@NotNull String message);
-
-    public final void showDebugLogs(boolean debug) {
-        this.debug = debug;
-    }
-
-}

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

@@ -1,28 +0,0 @@
-package net.william278.husksync.util;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-import java.io.InputStream;
-
-/**
- * Abstract representation of a reader that reads internal resource files by name
- */
-public interface ResourceReader {
-
-    /**
-     * Gets the resource with given filename and reads it as an {@link InputStream}
-     *
-     * @param fileName Name of the resource file to read
-     * @return The resource, read as an {@link InputStream}
-     */
-    @NotNull InputStream getResource(String fileName);
-
-    /**
-     * Gets the plugin data folder where plugin configuration and data are kept
-     *
-     * @return the plugin data directory
-     */
-    @NotNull File getDataFolder();
-
-}

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

@@ -1,57 +0,0 @@
-package net.william278.husksync.util;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.concurrent.CompletableFuture;
-import java.util.logging.Level;
-
-public class UpdateChecker {
-
-    private final static int SPIGOT_PROJECT_ID = 97144;
-    private final Logger logger;
-    private final Version currentVersion;
-
-    public UpdateChecker(@NotNull Version currentVersion, @NotNull Logger logger) {
-        this.currentVersion = currentVersion;
-        this.logger = logger;
-    }
-
-    public CompletableFuture<Version> fetchLatestVersion() {
-        return CompletableFuture.supplyAsync(() -> {
-            try {
-                final URL url = new URL("https://api.spigotmc.org/legacy/update.php?resource=" + SPIGOT_PROJECT_ID);
-                URLConnection urlConnection = url.openConnection();
-                return Version.pluginVersion(new BufferedReader(new InputStreamReader(urlConnection.getInputStream())).readLine());
-            } catch (Exception e) {
-                logger.log(Level.WARNING, "Failed to fetch the latest plugin version", e);
-            }
-            return new Version();
-        });
-    }
-
-    public boolean isUpdateAvailable(@NotNull Version latestVersion) {
-        return latestVersion.compareTo(currentVersion) > 0;
-    }
-
-    public Version getCurrentVersion() {
-        return currentVersion;
-    }
-
-    public CompletableFuture<Boolean> isUpToDate() {
-        return fetchLatestVersion().thenApply(this::isUpdateAvailable);
-    }
-
-    public void logToConsole() {
-        fetchLatestVersion().thenAccept(latestVersion -> {
-            if (isUpdateAvailable(latestVersion)) {
-                logger.log(Level.WARNING, "A new version of HuskSync is available: v" + latestVersion);
-            } else {
-                logger.log(Level.INFO, "HuskSync is up-to-date! (Running: v" + getCurrentVersion().toString() + ")");
-            }
-        });
-    }
-}

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

@@ -1,71 +0,0 @@
-package net.william278.husksync.util;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Arrays;
-import java.util.StringJoiner;
-import java.util.regex.Pattern;
-
-public class Version implements Comparable<Version> {
-    private final static String VERSION_SEPARATOR = ".";
-    private final static String MINECRAFT_META_SEPARATOR = "-";
-    private final static String PLUGIN_META_SEPARATOR = "+";
-
-    private int[] versions = new int[]{};
-    @NotNull
-    private String metadata = "";
-    @NotNull
-    private String metaSeparator = "";
-
-    protected Version() {
-    }
-
-    private Version(@NotNull String version, @NotNull String metaSeparator) {
-        this.parse(version, metaSeparator);
-        this.metaSeparator = metaSeparator;
-    }
-
-    @NotNull
-    public static Version pluginVersion(@NotNull String versionString) {
-        return new Version(versionString, PLUGIN_META_SEPARATOR);
-    }
-
-    @NotNull
-    public static Version minecraftVersion(@NotNull String versionString) {
-        return new Version(versionString, MINECRAFT_META_SEPARATOR);
-    }
-
-    private void parse(@NotNull String version, @NotNull String metaSeparator) {
-        int metaIndex = version.indexOf(metaSeparator);
-        if (metaIndex > 0) {
-            this.metadata = version.substring(metaIndex + 1);
-            version = version.substring(0, metaIndex);
-        }
-        String[] versions = version.split(Pattern.quote(VERSION_SEPARATOR));
-        this.versions = Arrays.stream(versions).mapToInt(Integer::parseInt).toArray();
-    }
-
-    @Override
-    public int compareTo(@NotNull Version other) {
-        int length = Math.max(this.versions.length, other.versions.length);
-        for (int i = 0; i < length; i++) {
-            int a = i < this.versions.length ? this.versions[i] : 0;
-            int b = i < other.versions.length ? other.versions[i] : 0;
-
-            if (a < b) return -1;
-            if (a > b) return 1;
-        }
-
-        return 0;
-    }
-
-    @Override
-    public String toString() {
-        final StringJoiner joiner = new StringJoiner(VERSION_SEPARATOR);
-        for (int version : this.versions) {
-            joiner.add(String.valueOf(version));
-        }
-        return joiner + ((!this.metadata.isEmpty()) ? (this.metaSeparator + this.metadata) : "");
-    }
-
-}

common/src/main/resources/config.yml

@@ -1,56 +0,0 @@
-#  ------------------------------
-# |        HuskSync Config       |
-# |    Developed by William278   |
-#  ------------------------------
-# Documentation available at: https://william278.net/docs/husksync/Setup
-
-language: 'en-gb'
-check_for_updates: true
-cluster_id: ''
-debug_logging: false
-
-database:
-  credentials:
-    host: 'localhost'
-    port: 3306
-    database: 'HuskSync'
-    username: 'root'
-    password: 'pa55w0rd'
-    params: '?autoReconnect=true&useSSL=false'
-  connection_pool:
-    maximum_pool_size: 10
-    minimum_idle: 10
-    maximum_lifetime: 1800000
-    keepalive_time: 0
-    connection_timeout: 5000
-  table_names:
-    users_table: 'husksync_users'
-    user_data_table: 'husksync_user_data'
-
-redis:
-  credentials:
-    host: 'localhost'
-    port: 6379
-    password: ''
-  use_ssl: false
-
-synchronization:
-  max_user_data_snapshots: 5
-  save_on_world_save: true
-  compress_data: true
-  network_latency_milliseconds: 500
-  features:
-    inventories: true
-    ender_chests: true
-    health: true
-    max_health: true
-    hunger: true
-    experience: true
-    potion_effects: true
-    advancements: true
-    game_mode: true
-    statistics: true
-    persistent_data_container: true
-    location: false
-
-config_version: 1

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

@@ -0,0 +1,41 @@
+synchronisation_complete: '[⏵ Данните синхронизирани!](#00fb9a)'
+synchronisation_failed: '[⏵ Провалихме се да синхронизираме Вашите данни! Моля свържете се с администратор.](#ff7e5e)'
+reload_complete: '[HuskSync](#00fb9a bold) [| Презаредихме конфигурацията и файловете със съобщения.](#00fb9a)'
+error_invalid_syntax: '[Грешка:](#ff3300) [Неправилен синтаксис. Използвайте: %1%](#ff7e5e)'
+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)'
+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)'
+data_manager_title: '[Преглеждане потребителският снапшот](#00fb9a) [%1%](#00fb9a show_text=&7Версия на UUID:\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Какво е накарало данните да бъдат запазени)\n'
+data_manager_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: '[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: '[Управление:](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: '[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: '&7и още %1%…'
+data_list_title: '[Лист от](#00fb9a) [снапшоти на данните на потребителя](#00fb9a) [%1%](#00fb9a bold show_text=&7UUID: %2%)\n'
+data_list_item: '[%1%](gray show_text=&7Снапшот с данни %3% run_command=/userdata view %6% %4%) [%7%](#d8ff2b show_text=&7Закачен:\n&8Закачените снапшоти няма да бъдат автоматично завъртани. run_command=/userdata view %6% %4%) [%2%](color=#ffc43b-#f5c962 show_text=&7Клеймо на Версията:&7\n&8Когато данните са били запазени run_command=/userdata view %6% %4%)   [⚡ %3%](color=#62a9f5-#7ab8fa show_text=&7Версия на UUID:&7\n&8%4% run_command=/userdata view %6% %4%)   [⚑ %5%](#23a825-#36f539 show_text=&7Причина на Запазване:\n&8Какво е накарало данните да бъдат запазени run_command=/userdata view %6% %4%)'
+data_deleted: '[❌ Успешно изтрихме снапшота с потребителски данни](#00fb9a) [%1%](#00fb9a show_text=&7Версия на UUID:\n&8%2%) [за](#00fb9a) [%3%.](#00fb9a show_text=&7UUID на Играча:\n&8%4%)'
+data_restored: '[⏪ Успешно възстановихме](#00fb9a) [текущите потребителски данни за](#00fb9a) [%1%](#00fb9a show_text=&7UUID на Играча:\n&8%2%) [от снапшот](#00fb9a) [%3%.](#00fb9a show_text=&7Версия на UUID:\n&8%4%)'
+data_pinned: '[※ Успешно закачихме снапшота с потребителски данни](#00fb9a) [%1%](#00fb9a show_text=&7Версия на UUID:\n&8%2%) [за](#00fb9a) [%3%.](#00fb9a show_text=&7UUID на Играча:\n&8%4%)'
+data_unpinned: '[※ Успешно откачихме снапшота с потребителски данни](#00fb9a) [%1%](#00fb9a show_text=&7Версия на UUID:\n&8%2%) [за](#00fb9a) [%3%.](#00fb9a show_text=&7UUID на Играча:\n&8%4%)'
+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%)'
+list_page_jumpers: '(%1%)'
+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: '…'

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

@@ -1,6 +1,6 @@
 synchronisation_complete: '[⏵ Daten synchronisiert!](#00fb9a)'
 synchronisation_failed: '[⏵ Ein Fehler ist beim Synchronisieren deiner Daten aufgetreten! Bitte kontaktiere einen Administrator.](#ff7e5e)'
-reload_complete: '[HuskSync](#00fb9a bold) [| Die Konfigurations- und Sprachdateien wurden neu geladen.'
+reload_complete: '[HuskSync](#00fb9a bold) [| Die Konfigurations- und Sprachdateien wurden neu geladen.](#00fb9a)'
 error_invalid_syntax: '[Fehler:](#ff3300) [Falsche Syntax. Nutze: %1%](#ff7e5e)'
 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)'
@@ -14,18 +14,28 @@ 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)'
-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)\\n'
+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)\n'
 data_manager_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)'
-data_manager_item_buttons: '[[🪣 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%)\\n'
-data_manager_management_buttons: '[Verwalte:](gray) [[❌ Löschen…]](#ff3300 show_text=&7Klicke, um diesen Nutzerdaten-Schnappschuss zu löschen.\\n&8Dies betrifft nicht die aktuellen Nutzerdaten.\\n&#ff3300&⚠ Dieser Schritt kann nicht rückgängig gemacht werden! run_command=/userdata delete %1% %2%)   [[⏪ Wiederherstellen…]](#00fb9a show_text=&7Klicke, um die Nutzerdaten wiederherzustellen.\\n&8Dies wird die Nutzerdaten auf den Stand des Schnappschusses setzen.\\n&#ff3300&⚠ Die aktuellen Nutzerdaten von %1% werden überschrieben! run_command=/userdata restore %1% %2%)   [[※ Anheften/Loslösen…]](#d8ff2b show_text=&7Klicke, um diesen Nutzerdaten-Schnappschuss anzuheften oder loszulösen\\n&8Angeheftete Nutzerdaten-Schnappschüsse werden nicht automatisch rotiert run_command=/userdata pin %1% %2%)\\n'
+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%)'
+data_manager_management_buttons: '[Verwalten:](gray) [[❌ Löschen…]](#ff3300 show_text=&7Klicke, um diesen Nutzerdaten-Schnappschuss zu löschen.\n&8Dies betrifft nicht die aktuellen Nutzerdaten.\n&#ff3300&⚠ Dieser Schritt kann nicht rückgängig gemacht werden! suggest_command=/husksync:userdata delete %1% %2%)   [[⏪ Wiederherstellen…]](#00fb9a show_text=&7Klicke, um die Nutzerdaten wiederherzustellen.\n&8Dies wird die Nutzerdaten auf den Stand des Schnappschusses setzen.\n&#ff3300&⚠ Die aktuellen Nutzerdaten von %1% werden überschrieben! suggest_command=/husksync:userdata restore %1% %2%)   [[※ Anheften/Loslösen…]](#d8ff2b show_text=&7Klicke, um diesen Nutzerdaten-Schnappschuss anzuheften oder loszulösen\n&8Angeheftete Nutzerdaten-Schnappschüsse werden nicht automatisch rotiert run_command=/userdata pin %1% %2%)'
+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: '&7und %1% weitere…'
-data_list_title: '[Liste der Nutzerdaten-Schnappschüsse von](#00fb9a) [%1%](#00fb9a bold show_text=&7UUID: %2%)[:](#00fb9a)\\n'
-data_list_item: '[%1%](gray show_text=&7Daten-Schnappschuss %3% run_command=/userdata view %6% %4%) [%7%](#d8ff2b show_text=&7Angeheftet:\\n&8Angeheftete Schnappschüsse werden nicht automatisch rotiert. run_command=/userdata view %6% %4%) [%2%](color=#ffc43b-#f5c962 show_text=&7Versions-Zeitstempel:&7\\n&8Zeitpunkt der Speicherung der Daten run_command=/userdata view %6% %4%)   [⚡ %3%](color=#62a9f5-#7ab8fa show_text=&7Versions-UUID:&7\\n&8%4% run_command=/userdata view %6% %4%)   [⚑ %5%](#23a825-#36f539 show_text=&7Speicherungsgrund:\\n&8Der Grund für das Speichern der Daten run_command=/userdata view %6% %4%)'
-data_deleted: '[❌ Nutzerdaten-Schnappschuss erfolgreich gelöscht](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%) [for](#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%)'
-data_unpinned: '[※ Nutzerdaten-Schnappschuss erfolgreich losgelöst](#00fb9a) [%1%](#00fb9a show_text=&7Versions-UUID:\\n&8%2%) [für](#00fb9a) [%3%.](#00fb9a show_text=&7Spieler-UUID:\\n&8%4%)'
+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=&7Daten-Schnappschuss %3% run_command=/userdata view %6% %4%) [%7%](#d8ff2b show_text=&7Angeheftet:\n&8Angeheftete Schnappschüsse werden nicht automatisch rotiert. run_command=/userdata view %6% %4%) [%2%](color=#ffc43b-#f5c962 show_text=&7Versions-Zeitstempel:&7\n&8Zeitpunkt der Speicherung der Daten run_command=/userdata view %6% %4%)   [⚡ %3%](color=#62a9f5-#7ab8fa show_text=&7Versions-UUID:&7\n&8%4% run_command=/userdata view %6% %4%)   [⚑ %5%](#23a825-#36f539 show_text=&7Speicherungsgrund:\n&8Der Grund für das Speichern der Daten run_command=/userdata view %6% %4%)'
+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%)'
+data_unpinned: '[※ Nutzerdaten-Schnappschuss erfolgreich losgelöst](#00fb9a) [%1%](#00fb9a show_text=&7Versions-UUID:\n&8%2%) [für](#00fb9a) [%3%.](#00fb9a show_text=&7Spieler-UUID:\n&8%4%)'
+data_dumped: '[☂ Nutzerdaten-Schnappschuss %1% für %2% erfolgreich gedumpt nach:](#00fb9a) &7%3%'
+list_footer: '\n%1%[Seite](#00fb9a) [%2%](#00fb9a)/[%3%](#00fb9a)%4%   %5%'
+list_previous_page_button: '[◀](white show_text=&7Siehe vorherige Seite run_command=%2% %1%) '
+list_next_page_button: ' [▶](white show_text=&7Siehe nächste Seite run_command=%2% %1%)'
+list_page_jumpers: '(%1%)'
+list_page_jumper_button: '[%1%](show_text=&7Springe zu Seite %1% run_command=%2% %1%)'
+list_page_jumper_current_page: '[%1%](#00fb9a)'
+list_page_jumper_separator: ' '
+list_page_jumper_group_separator: '…'

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

@@ -10,22 +10,32 @@ error_no_data_to_display: '[Error:](#ff3300) [Could not find any user data to di
 error_invalid_version_uuid: '[Error:](#ff3300) [Could not find any user data for that version UUID.](#ff7e5e)'
 inventory_viewer_menu_title: '&0%1%''s Inventory'
 ender_chest_viewer_menu_title: '&0%1%''s Ender Chest'
-inventory_viewer_opened: '[Viewing snapshot of](#00fb9a) [%1%](#00fb9a bold) [''s inventory as of ⌚ %2%](#00fb9a)'
-ender_chest_viewer_opened: '[Viewing snapshot of](#00fb9a) [%1%](#00fb9a bold) [''s Ender Chest as of ⌚ %2%](#00fb9a)'
+inventory_viewer_opened: '[Viewing snapshot of](#00fb9a) [%1%](#00fb9a bold)[''s inventory as of ⌚ %2%](#00fb9a)'
+ender_chest_viewer_opened: '[Viewing snapshot of](#00fb9a) [%1%](#00fb9a bold)[''s Ender Chest as of ⌚ %2%](#00fb9a)'
 data_update_complete: '[🔔 Your data has been updated!](#00fb9a)'
 data_update_failed: '[🔔 Failed to update your data! Please contact an administrator.](#ff7e5e)'
-data_manager_title: '[Viewing user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%) [for](#00fb9a) [%3%](#00fb9a bold show_text=&7Player UUID:\\n&8%4%)[:](#00fb9a)'
-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)\\n'
+data_manager_title: '[Viewing user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%) [for](#00fb9a) [%3%](#00fb9a bold show_text=&7Player UUID:\n&8%4%)[:](#00fb9a)'
+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)\n'
 data_manager_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)'
-data_manager_item_buttons: '[[🪣 Inventory…]](color=#a17b5f-#f5b98c show_text=&7Click to view run_command=/inventory %1% %2%)   [[⌀ Ender Chest…]](#b649c4-#d254ff show_text=&7Click to view run_command=/enderchest %1% %2%)\\n'
-data_manager_management_buttons: '[Manage:](gray) [[❌ Delete…]](#ff3300 show_text=&7Click to delete this snapshot of user data.\\n&8This will not affect the user''s current data.\\n&#ff3300&⚠ This cannot be undone! run_command=/userdata delete %1% %2%)   [[⏪ Restore…]](#00fb9a show_text=&7Click to restore this user data.\\n&8This will set the user''s data to this snapshot.\\n&#ff3300&⚠ %1%''s current data will be overwritten! run_command=/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%)\\n'
+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'
+data_manager_item_buttons: '[View:](gray) [[🪣 Inventory…]](color=#a17b5f-#f5b98c show_text=&7Click to view run_command=/inventory %1% %2%)   [[⌀ Ender Chest…]](#b649c4-#d254ff show_text=&7Click to view run_command=/enderchest %1% %2%)'
+data_manager_management_buttons: '[Manage:](gray) [[❌ Delete…]](#ff3300 show_text=&7Click to delete this snapshot of user data.\n&8This will not affect the user''s current data.\n&#ff3300&⚠ This cannot be undone! suggest_command=/husksync:userdata delete %1% %2%)   [[⏪ Restore…]](#00fb9a show_text=&7Click to restore this user data.\n&8This will set the user''s data to this snapshot.\n&#ff3300&⚠ %1%''s current data will be overwritten! 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: '&7and %1% more…'
-data_list_title: '[List of](#00fb9a) [%1%](#00fb9a bold show_text=&7UUID: %2%)[''s user data snapshots:](#00fb9a)\\n'
-data_list_item: '[%1%](gray show_text=&7Data snapshot %3% run_command=/userdata view %6% %4%) [%7%](#d8ff2b show_text=&7Pinned:\\n&8Pinned snapshots won''t be automatically rotated. run_command=/userdata view %6% %4%) [%2%](color=#ffc43b-#f5c962 show_text=&7Version timestamp:&7\\n&8When the data was saved run_command=/userdata view %6% %4%)   [⚡ %3%](color=#62a9f5-#7ab8fa show_text=&7Version UUID:&7\\n&8%4% run_command=/userdata view %6% %4%)   [⚑ %5%](#23a825-#36f539 show_text=&7Save cause:\\n&8What caused the data to be saved run_command=/userdata view %6% %4%)'
-data_deleted: '[❌ Successfully deleted user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\\n&8%4%)'
-data_restored: '[⏪ Successfully restored](#00fb9a) [%1%](#00fb9a show_text=&7Player UUID:\\n&8%2%)[''s current user data from snapshot](#00fb9a) [%3%.](#00fb9a show_text=&7Version UUID:\\n&8%4%)'
-data_pinned: '[※ Successfully pinned user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\\n&8%4%)'
-data_unpinned: '[※ Successfully unpinned user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\\n&8%4%)'
+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=&7Data snapshot %3% run_command=/userdata view %6% %4%) [%7%](#d8ff2b show_text=&7Pinned:\n&8Pinned snapshots won''t be automatically rotated. run_command=/userdata view %6% %4%) [%2%](color=#ffc43b-#f5c962 show_text=&7Version timestamp:&7\n&8When the data was saved run_command=/userdata view %6% %4%)   [⚡ %3%](color=#62a9f5-#7ab8fa show_text=&7Version UUID:&7\n&8%4% run_command=/userdata view %6% %4%)   [⚑ %5%](#23a825-#36f539 show_text=&7Save cause:\n&8What caused the data to be saved run_command=/userdata view %6% %4%)'
+data_deleted: '[❌ Successfully deleted user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\n&8%4%)'
+data_restored: '[⏪ Successfully restored](#00fb9a) [%1%](#00fb9a show_text=&7Player UUID:\n&8%2%)[''s current user data from snapshot](#00fb9a) [%3%.](#00fb9a show_text=&7Version UUID:\n&8%4%)'
+data_pinned: '[※ Successfully pinned user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\n&8%4%)'
+data_unpinned: '[※ Successfully unpinned user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\n&8%4%)'
+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%)'
+list_page_jumpers: '(%1%)'
+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: '…'

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

@@ -14,18 +14,28 @@ inventory_viewer_opened: '[Viendo una snapshot de](#00fb9a) [%1%](#00fb9a bold)
 ender_chest_viewer_opened: '[Viendo una snapshot de](#00fb9a) [%1%](#00fb9a bold) [Enderchest a partir de ⌚ %2%](#00fb9a)'
 data_update_complete: '[🔔 ¡Tus datos han sido actualizados!](#00fb9a)'
 data_update_failed: '[🔔 Error al actualizar tus datos, por favor, contacte con un administrador.](#ff7e5e)'
-data_manager_title: '[Viendo una snapshot sobre la informacion del jugador](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%) [for](#00fb9a) [%3%](#00fb9a bold show_text=&7Player UUID:\\n&8%4%)[:](#00fb9a)'
-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)\\n'
+data_manager_title: '[Viendo una snapshot sobre la informacion del jugador](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%) [for](#00fb9a) [%3%](#00fb9a bold show_text=&7Player UUID:\n&8%4%)[:](#00fb9a)'
+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)\n'
 data_manager_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)'
-data_manager_item_buttons: '[[🪣 Inventario…]](color=#a17b5f-#f5b98c show_text=&7Click para ver run_command=/inventory %1% %2%)   [[⌀ Enderchest…]](#b649c4-#d254ff show_text=&7Click para ver run_command=/enderchest %1% %2%)\\n'
-data_manager_management_buttons: '[Manage:](gray) [[❌ Borrar…]](#ff3300 show_text=&7Click para borrar la snapshot del usuario.\\n&8Esto no afectará a la informacion actual del jugador.\\n&#ff3300&⚠ ¡Esto no se puede deshacer! run_command=/userdata delete %1% %2%)   [[⏪ Restaurar…]](#00fb9a show_text=&7Click para restaurar la informacion de este usuario.\\n&8Esto hará que la informacion actual cambie por esta snapshot.\\n&#ff3300&⚠ %1% la informacion actual será sustituida!   run_command=/userdata restore %1% %2%)   [[※ Pin/Unpin…]](#d8ff2b show_text=&7Click para anclar/desanclar esta snapshot\\n&8Las snapshot ancladas no seran rotadas automaticamente run_command=/userdata pin %1% %2%)\\n'
+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'
+data_manager_item_buttons: '[View:](gray) [[🪣 Inventario…]](color=#a17b5f-#f5b98c show_text=&7Click para ver run_command=/inventory %1% %2%)   [[⌀ Enderchest…]](#b649c4-#d254ff show_text=&7Click para ver run_command=/enderchest %1% %2%)'
+data_manager_management_buttons: '[Manage:](gray) [[❌ Borrar…]](#ff3300 show_text=&7Click para borrar la snapshot del usuario.\n&8Esto no afectará a la informacion actual del jugador.\n&#ff3300&⚠ ¡Esto no se puede deshacer! suggest_command=/husksync:userdata delete %1% %2%)   [[⏪ Restaurar…]](#00fb9a show_text=&7Click para restaurar la informacion de este usuario.\n&8Esto hará que la informacion actual cambie por esta snapshot.\n&#ff3300&⚠ %1% la informacion actual será sustituida!   suggest_command=/husksync:userdata restore %1% %2%)   [[※ Pin/Unpin…]](#d8ff2b show_text=&7Click para anclar/desanclar esta snapshot\n&8Las snapshot ancladas no seran rotadas automaticamente 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: '&7y %1% más…'
-data_list_title: '[Lista de](#00fb9a) [%1%](#00fb9a bold show_text=&7UUID: %2%)[Snapshots del usuario:](#00fb9a)\\n'
-data_list_item: '[%1%](gray show_text=&7Informacion de la snapshot %3% run_command=/userdata view %6% %4%) [%7%](#d8ff2b show_text=&7Anclado:\\n&8Las snapshot ancladas no serán rotadas automaticamente. run_command=/userdata view %6% %4%) [%2%](color=#ffc43b-#f5c962 show_text=&7Version Tiempo:&7\\n&8When the data was saved run_command=/userdata view %6% %4%)   [⚡ %3%](color=#62a9f5-#7ab8fa show_text=&7Version UUID:&7\\n&8%4% run_command=/userdata view %6% %4%)   [⚑ %5%](#23a825-#36f539 show_text=&7Causa del guardado:\\n&8Lo que sea que haya hecho que se guarde run_command=/userdata view %6% %4%)'
-data_deleted: '[❌ Se ha eliminado correctamente la snapshot del usuario](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\\n&8%4%)'
-data_restored: '[⏪ Restaurado correctamente](#00fb9a) [%1%](#00fb9a show_text=&7UUID del jugador:\\n&8%2%)[Informacion actual de la snapshot del jugador](#00fb9a) [%3%.](#00fb9a show_text=&7Version UUID:\\n&8%4%)'
-data_pinned: '[※ Se ha anclado perfectamente la snapshot del jugador](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7UUID del usuario:\\n&8%4%)'
-data_unpinned: '[※ Se ha desanclado perfectamente la snapshot del jugador](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7UUID del usuario:\\n&8%4%)'
+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=&7Informacion de la snapshot %3% run_command=/userdata view %6% %4%) [%7%](#d8ff2b show_text=&7Anclado:\n&8Las snapshot ancladas no serán rotadas automaticamente. run_command=/userdata view %6% %4%) [%2%](color=#ffc43b-#f5c962 show_text=&7Version Tiempo:&7\n&8When the data was saved run_command=/userdata view %6% %4%)   [⚡ %3%](color=#62a9f5-#7ab8fa show_text=&7Version UUID:&7\n&8%4% run_command=/userdata view %6% %4%)   [⚑ %5%](#23a825-#36f539 show_text=&7Causa del guardado:\n&8Lo que sea que haya hecho que se guarde run_command=/userdata view %6% %4%)'
+data_deleted: '[❌ Se ha eliminado correctamente la snapshot del usuario](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\n&8%4%)'
+data_restored: '[⏪ Restaurado correctamente](#00fb9a) [%1%](#00fb9a show_text=&7UUID del jugador:\n&8%2%)[Informacion actual de la snapshot del jugador](#00fb9a) [%3%.](#00fb9a show_text=&7Version UUID:\n&8%4%)'
+data_pinned: '[※ Se ha anclado perfectamente la snapshot del jugador](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7UUID del usuario:\n&8%4%)'
+data_unpinned: '[※ Se ha desanclado perfectamente la snapshot del jugador](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7UUID del usuario:\n&8%4%)'
+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%)'
+list_page_jumpers: '(%1%)'
+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: '…'

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

@@ -14,18 +14,28 @@ inventory_viewer_opened: '[Stai vedendo l''istantanea di](#00fb9a) [%1%](#00fb9a
 ender_chest_viewer_opened: '[Stai vedendo l''istantanea di](#00fb9a) [%1%](#00fb9a bold) [Ender Chest del ⌚ %2%](#00fb9a)'
 data_update_complete: '[🔔 I tuoi dati sono stati aggiornati!](#00fb9a)'
 data_update_failed: '[🔔 Aggiornamento dei tuoi dati fallito! Perfavore contatta un amministratore.](#ff7e5e)'
-data_manager_title: '[Stai vedendo l''istantanea](#00fb9a) [%1%](#00fb9a show_text=&7Versione di UUID:\\n&8%2%) [di](#00fb9a) [%3%](#00fb9a bold show_text=&7Player UUID:\\n&8%4%)[:](#00fb9a)'
-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=&7Save cause:\\n&8Cosa ha causato il salvataggio dei dati)\\n'
+data_manager_title: '[Stai vedendo l''istantanea](#00fb9a) [%1%](#00fb9a show_text=&7Versione di UUID:\n&8%2%) [di](#00fb9a) [%3%](#00fb9a bold show_text=&7Player UUID:\n&8%4%)[:](#00fb9a)'
+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=&7Save cause:\n&8Cosa ha causato il salvataggio dei dati)\n'
 data_manager_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)'
-data_manager_item_buttons: '[[🪣 Inventario…]](color=#a17b5f-#f5b98c show_text=&7Clicca per visualizzare run_command=/inventory %1% %2%)   [[⌀ Ender Chest…]](#b649c4-#d254ff show_text=&7Clicca per visualizzare run_command=/enderchest %1% %2%)\\n'
-data_manager_management_buttons: '[Gestisci:](gray) [[❌ Cancella…]](#ff3300 show_text=&7Fare clic per eliminare questa istantanea.\\n&8Questo non influisce sui dati attuali dell''utente.\\n&#ff3300&⚠ Questo non può essere annullato! run_command=/userdata delete %1% %2%)   [[⏪ Ripristina…]](#00fb9a show_text=&7Clicca per ripristinare i dati dell''utente.\\n&8I dati dell''utente saranno ripristinati a quest''istantanea.\\n&#ff3300&⚠ I dati di %1% saranno sovrascritti! run_command=/userdata restore %1% %2%)   [[※ fissa/sblocca...]](#d8ff2b show_text=&7Clicca per fissare o sbloccare quest''istantanea\\n&8Le istantanee fissate non saranno cancellate automaticamente run_command=/userdata pin %1% %2%)\\n'
+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'
+data_manager_item_buttons: '[View:](gray) [[🪣 Inventario…]](color=#a17b5f-#f5b98c show_text=&7Clicca per visualizzare run_command=/inventory %1% %2%)   [[⌀ Ender Chest…]](#b649c4-#d254ff show_text=&7Clicca per visualizzare run_command=/enderchest %1% %2%)'
+data_manager_management_buttons: '[Gestisci:](gray) [[❌ Cancella…]](#ff3300 show_text=&7Fare clic per eliminare questa istantanea.\n&8Questo non influisce sui dati attuali dell''utente.\n&#ff3300&⚠ Questo non può essere annullato! suggest_command=/husksync:userdata delete %1% %2%)   [[⏪ Ripristina…]](#00fb9a show_text=&7Clicca per ripristinare i dati dell''utente.\n&8I dati dell''utente saranno ripristinati a quest''istantanea.\n&#ff3300&⚠ I dati di %1% saranno sovrascritti! suggest_command=/husksync:userdata restore %1% %2%)   [[※ fissa/sblocca...]](#d8ff2b show_text=&7Clicca per fissare o sbloccare quest''istantanea\n&8Le istantanee fissate non saranno cancellate automaticamente run_command=/userdata pin %1% %2%)'
+data_manager_system_buttons: '[Sistema:](gray) [[⏷ Dump del File…]](dark_gray show_text=&7Clicca per ottenere il dump dei dati del giocatore.\n&8I dati salvati sono posizioanti nella cartella ~/plugins/HuskSync/dumps/ run_command=/husksync:userdata dump %1% %2% file)   [[☂ Dump su Web…]](dark_gray show_text=&7Clicca per ottenere il dump del file su mc-logs\n&8 Ti verrà consegnato l''url per visionare il dump. run_command=/husksync:userdata dump %1% %2% web)'
 data_manager_advancements_preview_remaining: '&7e %1% altro…'
-data_list_title: '[Lista delle istantanee di](#00fb9a) [%1%](#00fb9a bold show_text=&7UUID: %2%)\\n'
-data_list_item: '[%1%](gray show_text=&7Istantanea dei dati %3% run_command=/userdata view %6% %4%) [%7%](#d8ff2b show_text=&7Fissato:\\n&8Le istantanee fissate non saranno cancellate automaticamente. run_command=/userdata view %6% %4%) [%2%](color=#ffc43b-#f5c962 show_text=&7Timestamp della versione:&7\\n&8Quando i dati sono stati salvati run_command=/userdata view %6% %4%)   [⚡ %3%](color=#62a9f5-#7ab8fa show_text=&7Versione di UUID:&7\\n&8%4% run_command=/userdata view %6% %4%)   [⚑ %5%](#23a825-#36f539 show_text=&7Causa del salvataggio:\\n&8Cosa ha causato il salvataggio dei dati run_command=/userdata view %6% %4%)'
-data_deleted: '[❌ Istantanea eliminata con successo](#00fb9a) [%1%](#00fb9a show_text=&7Versione di UUID:\\n&8%2%) [per](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\\n&8%4%)'
-data_restored: '[⏪ Ripristato con successo](#00fb9a) [Dati dall''istantanea di](#00fb9a)[%1%](#00fb9a show_text=&7Player UUID:\\n&8%2%) [%3%.](#00fb9a show_text=&7Versione di UUID:\\n&8%4%)'
-data_pinned: '[※ Instantanea fissata](#00fb9a) [%1%](#00fb9a show_text=&7Versione di UUID:\\n&8%2%) [per](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\\n&8%4%)'
-data_unpinned: '[※ L''istantanea dei dati utente è stata sbloccata con successo](#00fb9a) [%1%](#00fb9a show_text=&7Versione di UUID:\\n&8%2%) [per](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\\n&8%4%)'
+data_list_title: '[Lista delle istantanee di %1%:](#00fb9a) [(%2%-%3% of](#00fb9a) [%4%](#00fb9a bold)[)](#00fb9a)\n'
+data_list_item: '[%1%](gray show_text=&7Istantanea dei dati %3% run_command=/userdata view %6% %4%) [%7%](#d8ff2b show_text=&7Fissato:\n&8Le istantanee fissate non saranno cancellate automaticamente. run_command=/userdata view %6% %4%) [%2%](color=#ffc43b-#f5c962 show_text=&7Timestamp della versione:&7\n&8Quando i dati sono stati salvati run_command=/userdata view %6% %4%)   [⚡ %3%](color=#62a9f5-#7ab8fa show_text=&7Versione di UUID:&7\n&8%4% run_command=/userdata view %6% %4%)   [⚑ %5%](#23a825-#36f539 show_text=&7Causa del salvataggio:\n&8Cosa ha causato il salvataggio dei dati run_command=/userdata view %6% %4%)'
+data_deleted: '[❌ Istantanea eliminata con successo](#00fb9a) [%1%](#00fb9a show_text=&7Versione di UUID:\n&8%2%) [per](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\n&8%4%)'
+data_restored: '[⏪ Ripristato con successo](#00fb9a) [Dati dall''istantanea di](#00fb9a)[%1%](#00fb9a show_text=&7Player UUID:\n&8%2%) [%3%.](#00fb9a show_text=&7Versione di UUID:\n&8%4%)'
+data_pinned: '[※ Instantanea fissata](#00fb9a) [%1%](#00fb9a show_text=&7Versione di UUID:\n&8%2%) [per](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\n&8%4%)'
+data_unpinned: '[※ L''istantanea dei dati utente è stata sbloccata con successo](#00fb9a) [%1%](#00fb9a show_text=&7Versione di UUID:\n&8%2%) [per](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\n&8%4%)'
+data_dumped: '[☂ Hai ottenuto il dump dell''istantanea %1% di %2% nel formato:](#00fb9a) &7%3%'
+list_footer: '\n%1%[Pagina](#00fb9a) [%2%](#00fb9a)/[%3%](#00fb9a)%4%   %5%'
+list_previous_page_button: '[◀](white show_text=&7Visualizza pagina precedente run_command=%2% %1%) '
+list_next_page_button: ' [▶](white show_text=&7Visualizza pagina successiva run_command=%2% %1%)'
+list_page_jumpers: '(%1%)'
+list_page_jumper_button: '[%1%](show_text=&7Vai alla pagina %1% run_command=%2% %1%)'
+list_page_jumper_current_page: '[%1%](#00fb9a)'
+list_page_jumper_separator: ' '
+list_page_jumper_group_separator: '…'

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

@@ -10,22 +10,32 @@ error_no_data_to_display: '[Error:](#ff3300) [Could not find any user data to di
 error_invalid_version_uuid: '[Error:](#ff3300) [Could not find any user data for that version UUID.](#ff7e5e)'
 inventory_viewer_menu_title: '&0%1%''s Inventory'
 ender_chest_viewer_menu_title: '&0%1%''s Ender Chest'
-inventory_viewer_opened: '[Viewing snapshot of](#00fb9a) [%1%](#00fb9a bold) [''s inventory as of ⌚ %2%](#00fb9a)'
-ender_chest_viewer_opened: '[Viewing snapshot of](#00fb9a) [%1%](#00fb9a bold) [''s Ender Chest as of ⌚ %2%](#00fb9a)'
+inventory_viewer_opened: '[Viewing snapshot of](#00fb9a) [%1%](#00fb9a bold)[''s inventory as of ⌚ %2%](#00fb9a)'
+ender_chest_viewer_opened: '[Viewing snapshot of](#00fb9a) [%1%](#00fb9a bold)[''s Ender Chest as of ⌚ %2%](#00fb9a)'
 data_update_complete: '[🔔 Your data has been updated!](#00fb9a)'
 data_update_failed: '[🔔 Failed to update your data! Please contact an administrator.](#ff7e5e)'
-data_manager_title: '[Viewing user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%) [for](#00fb9a) [%3%](#00fb9a bold show_text=&7Player UUID:\\n&8%4%)[:](#00fb9a)'
-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)\\n'
+data_manager_title: '[Viewing user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%) [for](#00fb9a) [%3%](#00fb9a bold show_text=&7Player UUID:\n&8%4%)[:](#00fb9a)'
+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)\n'
 data_manager_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)'
-data_manager_item_buttons: '[[🪣 Inventory…]](color=#a17b5f-#f5b98c show_text=&7Click to view run_command=/inventory %1% %2%)   [[⌀ Ender Chest…]](#b649c4-#d254ff show_text=&7Click to view run_command=/enderchest %1% %2%)\\n'
-data_manager_management_buttons: '[Manage:](gray) [[❌ Delete…]](#ff3300 show_text=&7Click to delete this snapshot of user data.\\n&8This will not affect the user''s current data.\\n&#ff3300&⚠ This cannot be undone! run_command=/userdata delete %1% %2%)   [[⏪ Restore…]](#00fb9a show_text=&7Click to restore this user data.\\n&8This will set the user''s data to this snapshot.\\n&#ff3300&⚠ %1%''s current data will be overwritten! run_command=/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%)\\n'
+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'
+data_manager_item_buttons: '[View:](gray) [[🪣 Inventory…]](color=#a17b5f-#f5b98c show_text=&7Click to view run_command=/inventory %1% %2%)   [[⌀ Ender Chest…]](#b649c4-#d254ff show_text=&7Click to view run_command=/enderchest %1% %2%)'
+data_manager_management_buttons: '[Manage:](gray) [[❌ Delete…]](#ff3300 show_text=&7Click to delete this snapshot of user data.\n&8This will not affect the user''s current data.\n&#ff3300&⚠ This cannot be undone! suggest_command=/husksync:userdata delete %1% %2%)   [[⏪ Restore…]](#00fb9a show_text=&7Click to restore this user data.\n&8This will set the user''s data to this snapshot.\n&#ff3300&⚠ %1%''s current data will be overwritten! 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: '&7and %1% more…'
-data_list_title: '[List of](#00fb9a) [%1%](#00fb9a bold show_text=&7UUID: %2%)[''s user data snapshots:](#00fb9a)\\n'
-data_list_item: '[%1%](gray show_text=&7Data snapshot %3% run_command=/userdata view %6% %4%) [%7%](#d8ff2b show_text=&7Pinned:\\n&8Pinned snapshots won''t be automatically rotated. run_command=/userdata view %6% %4%) [%2%](color=#ffc43b-#f5c962 show_text=&7Version timestamp:&7\\n&8When the data was saved run_command=/userdata view %6% %4%)   [⚡ %3%](color=#62a9f5-#7ab8fa show_text=&7Version UUID:&7\\n&8%4% run_command=/userdata view %6% %4%)   [⚑ %5%](#23a825-#36f539 show_text=&7Save cause:\\n&8What caused the data to be saved run_command=/userdata view %6% %4%)'
-data_deleted: '[❌ Successfully deleted user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\\n&8%4%)'
-data_restored: '[⏪ Successfully restored](#00fb9a) [%1%](#00fb9a show_text=&7Player UUID:\\n&8%2%)[''s current user data from snapshot](#00fb9a) [%3%.](#00fb9a show_text=&7Version UUID:\\n&8%4%)'
-data_pinned: '[※ Successfully pinned user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\\n&8%4%)'
-data_unpinned: '[※ Successfully unpinned user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\\n&8%4%)'
+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=&7Data snapshot %3% run_command=/userdata view %6% %4%) [%7%](#d8ff2b show_text=&7Pinned:\n&8Pinned snapshots won''t be automatically rotated. run_command=/userdata view %6% %4%) [%2%](color=#ffc43b-#f5c962 show_text=&7Version timestamp:&7\n&8When the data was saved run_command=/userdata view %6% %4%)   [⚡ %3%](color=#62a9f5-#7ab8fa show_text=&7Version UUID:&7\n&8%4% run_command=/userdata view %6% %4%)   [⚑ %5%](#23a825-#36f539 show_text=&7Save cause:\n&8What caused the data to be saved run_command=/userdata view %6% %4%)'
+data_deleted: '[❌ Successfully deleted user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\n&8%4%)'
+data_restored: '[⏪ Successfully restored](#00fb9a) [%1%](#00fb9a show_text=&7Player UUID:\n&8%2%)[''s current user data from snapshot](#00fb9a) [%3%.](#00fb9a show_text=&7Version UUID:\n&8%4%)'
+data_pinned: '[※ Successfully pinned user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\n&8%4%)'
+data_unpinned: '[※ Successfully unpinned user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\n&8%4%)'
+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%)'
+list_page_jumpers: '(%1%)'
+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: '…'

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

@@ -14,18 +14,28 @@ inventory_viewer_opened: '[Visualizando snapshot de](#00fb9a) [%1%](#00fb9a bold
 ender_chest_viewer_opened: '[Visualizando snapshot de](#00fb9a) [%1%](#00fb9a bold) [''s Ender Chest a partir de ⌚ %2%](#00fb9a)'
 data_update_complete: '[🔔 Seus dados foram atualizados!](#00fb9a)'
 data_update_failed: '[🔔 Falha na atualização de seus dados! Por favor entre em contato com um administrador.](#ff7e5e)'
-data_manager_title: '[Visualizando snapshot dos dados do usuário](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%) [for](#00fb9a) [%3%](#00fb9a bold show_text=&7Player UUID:\\n&8%4%)[:](#00fb9a)'
-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)\\n'
+data_manager_title: '[Visualizando snapshot dos dados do usuário](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%) [for](#00fb9a) [%3%](#00fb9a bold show_text=&7Player UUID:\n&8%4%)[:](#00fb9a)'
+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)\n'
 data_manager_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)'
-data_manager_item_buttons: '[[🪣 Inventory…]](color=#a17b5f-#f5b98c show_text=&7Clique para ver run_command=/inventory %1% %2%)   [[⌀ Ender Chest…]](#b649c4-#d254ff show_text=&7Clique para ver run_command=/enderchest %1% %2%)\\n'
-data_manager_management_buttons: '[Gerenciar:](gray) [[❌ Deletar…]](#ff3300 show_text=&7Clique para deletar esta snapshot de dados do usuário\\n&8Isto não afetará os dados atuais do usuário.\\n&#ff3300&⚠ Isto não pode ser desfeito! run_command=/userdata delete %1% %2%)   [[⏪ Restaurar…]](#00fb9a show_text=&7Clique para restaurar estes dados do usuário.\\n&8Isto substituirá os dados atuais do usuário para os da snapshot.\\n&#ff3300&⚠ %1%''s os dados atuais serão substituídos! run_command=/userdata restore %1% %2%)   [[※ Marcar/Desmarcar…]](#d8ff2b show_text=&7Clique para marcar ou desmarcar este snapshot de dados do usuário\\n&8Snapshots marcadas não serão giradas automaticamente run_command=/userdata pin %1% %2%)\\n'
+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'
+data_manager_item_buttons: '[View:](gray) [[🪣 Inventory…]](color=#a17b5f-#f5b98c show_text=&7Clique para ver run_command=/inventory %1% %2%)   [[⌀ Ender Chest…]](#b649c4-#d254ff show_text=&7Clique para ver run_command=/enderchest %1% %2%)'
+data_manager_management_buttons: '[Gerenciar:](gray) [[❌ Deletar…]](#ff3300 show_text=&7Clique para deletar esta snapshot de dados do usuário\n&8Isto não afetará os dados atuais do usuário.\n&#ff3300&⚠ Isto não pode ser desfeito! suggest_command=/husksync:userdata delete %1% %2%)   [[⏪ Restaurar…]](#00fb9a show_text=&7Clique para restaurar estes dados do usuário.\n&8Isto substituirá os dados atuais do usuário para os da snapshot.\n&#ff3300&⚠ %1%''s os dados atuais serão substituídos! suggest_command=/husksync:userdata restore %1% %2%)   [[※ Marcar/Desmarcar…]](#d8ff2b show_text=&7Clique para marcar ou desmarcar este snapshot de dados do usuário\n&8Snapshots marcadas não serão giradas automaticamente 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: '&7e %1% mais…'
-data_list_title: '[Lista de](#00fb9a) [%1%](#00fb9a bold show_text=&7UUID: %2%)[''s snapshots de dados do usuário:](#00fb9a)\\n'
-data_list_item: '[%1%](gray show_text=&7Snapshot data %3% run_command=/userdata view %6% %4%) [%7%](#d8ff2b show_text=&7Marcado:\\n&8Snapshots marcadas não serão giradas automaticamente. run_command=/userdata view %6% %4%) [%2%](color=#ffc43b-#f5c962 show_text=&7Version timestamp:&7\\n&8Quando os dados foram salvos run_command=/userdata view %6% %4%)   [⚡ %3%](color=#62a9f5-#7ab8fa show_text=&7Version UUID:&7\\n&8%4% run_command=/userdata view %6% %4%)   [⚑ %5%](#23a825-#36f539 show_text=&7Causa do salvamento:\\n&8O motivo para que os dados fossem salvos run_command=/userdata view %6% %4%)'
-data_deleted: '[❌ Snapshot de dados do usuário deletada com sucesso](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\\n&8%4%)'
-data_restored: '[⏪ Restaurada com sucesso](#00fb9a) [%1%](#00fb9a show_text=&7Player UUID:\\n&8%2%)[''s current user data from snapshot](#00fb9a) [%3%.](#00fb9a show_text=&7Version UUID:\\n&8%4%)'
-data_pinned: '[※ Snapshot de dados do usuário marcada com sucesso](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\\n&8%4%)'
-data_unpinned: '[※ Snapshot de dados do usuário desmarcada com sucesso](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\\n&8%4%)'
+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=&7Snapshot data %3% run_command=/userdata view %6% %4%) [%7%](#d8ff2b show_text=&7Marcado:\n&8Snapshots marcadas não serão giradas automaticamente. run_command=/userdata view %6% %4%) [%2%](color=#ffc43b-#f5c962 show_text=&7Version timestamp:&7\n&8Quando os dados foram salvos run_command=/userdata view %6% %4%)   [⚡ %3%](color=#62a9f5-#7ab8fa show_text=&7Version UUID:&7\n&8%4% run_command=/userdata view %6% %4%)   [⚑ %5%](#23a825-#36f539 show_text=&7Causa do salvamento:\n&8O motivo para que os dados fossem salvos run_command=/userdata view %6% %4%)'
+data_deleted: '[❌ Snapshot de dados do usuário deletada com sucesso](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\n&8%4%)'
+data_restored: '[⏪ Restaurada com sucesso](#00fb9a) [%1%](#00fb9a show_text=&7Player UUID:\n&8%2%)[''s current user data from snapshot](#00fb9a) [%3%.](#00fb9a show_text=&7Version UUID:\n&8%4%)'
+data_pinned: '[※ Snapshot de dados do usuário marcada com sucesso](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\n&8%4%)'
+data_unpinned: '[※ Snapshot de dados do usuário desmarcada com sucesso](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\n&8%4%)'
+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%)'
+list_page_jumpers: '(%1%)'
+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: '…'

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

@@ -10,22 +10,32 @@ error_no_data_to_display: '[Error:](#ff3300) [Could not find any user data to di
 error_invalid_version_uuid: '[Error:](#ff3300) [Could not find any user data for that version UUID.](#ff7e5e)'
 inventory_viewer_menu_title: '&0%1%''s Inventory'
 ender_chest_viewer_menu_title: '&0%1%''s Ender Chest'
-inventory_viewer_opened: '[Viewing snapshot of](#00fb9a) [%1%](#00fb9a bold) [''s inventory as of ⌚ %2%](#00fb9a)'
-ender_chest_viewer_opened: '[Viewing snapshot of](#00fb9a) [%1%](#00fb9a bold) [''s Ender Chest as of ⌚ %2%](#00fb9a)'
+inventory_viewer_opened: '[Viewing snapshot of](#00fb9a) [%1%](#00fb9a bold)[''s inventory as of ⌚ %2%](#00fb9a)'
+ender_chest_viewer_opened: '[Viewing snapshot of](#00fb9a) [%1%](#00fb9a bold)[''s Ender Chest as of ⌚ %2%](#00fb9a)'
 data_update_complete: '[🔔 Your data has been updated!](#00fb9a)'
 data_update_failed: '[🔔 Failed to update your data! Please contact an administrator.](#ff7e5e)'
-data_manager_title: '[Viewing user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%) [for](#00fb9a) [%3%](#00fb9a bold show_text=&7Player UUID:\\n&8%4%)[:](#00fb9a)'
-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)\\n'
+data_manager_title: '[Viewing user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%) [for](#00fb9a) [%3%](#00fb9a bold show_text=&7Player UUID:\n&8%4%)[:](#00fb9a)'
+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)\n'
 data_manager_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)'
-data_manager_item_buttons: '[[🪣 Inventory…]](color=#a17b5f-#f5b98c show_text=&7Click to view run_command=/inventory %1% %2%)   [[⌀ Ender Chest…]](#b649c4-#d254ff show_text=&7Click to view run_command=/enderchest %1% %2%)\\n'
-data_manager_management_buttons: '[Manage:](gray) [[❌ Delete…]](#ff3300 show_text=&7Click to delete this snapshot of user data.\\n&8This will not affect the user''s current data.\\n&#ff3300&⚠ This cannot be undone! run_command=/userdata delete %1% %2%)   [[⏪ Restore…]](#00fb9a show_text=&7Click to restore this user data.\\n&8This will set the user''s data to this snapshot.\\n&#ff3300&⚠ %1%''s current data will be overwritten! run_command=/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%)\\n'
+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'
+data_manager_item_buttons: '[View:](gray) [[🪣 Inventory…]](color=#a17b5f-#f5b98c show_text=&7Click to view run_command=/inventory %1% %2%)   [[⌀ Ender Chest…]](#b649c4-#d254ff show_text=&7Click to view run_command=/enderchest %1% %2%)'
+data_manager_management_buttons: '[Manage:](gray) [[❌ Delete…]](#ff3300 show_text=&7Click to delete this snapshot of user data.\n&8This will not affect the user''s current data.\n&#ff3300&⚠ This cannot be undone! suggest_command=/husksync:userdata delete %1% %2%)   [[⏪ Restore…]](#00fb9a show_text=&7Click to restore this user data.\n&8This will set the user''s data to this snapshot.\n&#ff3300&⚠ %1%''s current data will be overwritten! 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: '&7and %1% more…'
-data_list_title: '[List of](#00fb9a) [%1%](#00fb9a bold show_text=&7UUID: %2%)[''s user data snapshots:](#00fb9a)\\n'
-data_list_item: '[%1%](gray show_text=&7Data snapshot %3% run_command=/userdata view %6% %4%) [%7%](#d8ff2b show_text=&7Pinned:\\n&8Pinned snapshots won''t be automatically rotated. run_command=/userdata view %6% %4%) [%2%](color=#ffc43b-#f5c962 show_text=&7Version timestamp:&7\\n&8When the data was saved run_command=/userdata view %6% %4%)   [⚡ %3%](color=#62a9f5-#7ab8fa show_text=&7Version UUID:&7\\n&8%4% run_command=/userdata view %6% %4%)   [⚑ %5%](#23a825-#36f539 show_text=&7Save cause:\\n&8What caused the data to be saved run_command=/userdata view %6% %4%)'
-data_deleted: '[❌ Successfully deleted user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\\n&8%4%)'
-data_restored: '[⏪ Successfully restored](#00fb9a) [%1%](#00fb9a show_text=&7Player UUID:\\n&8%2%)[''s current user data from snapshot](#00fb9a) [%3%.](#00fb9a show_text=&7Version UUID:\\n&8%4%)'
-data_pinned: '[※ Successfully pinned user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\\n&8%4%)'
-data_unpinned: '[※ Successfully unpinned user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\\n&8%4%)'
+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=&7Data snapshot %3% run_command=/userdata view %6% %4%) [%7%](#d8ff2b show_text=&7Pinned:\n&8Pinned snapshots won''t be automatically rotated. run_command=/userdata view %6% %4%) [%2%](color=#ffc43b-#f5c962 show_text=&7Version timestamp:&7\n&8When the data was saved run_command=/userdata view %6% %4%)   [⚡ %3%](color=#62a9f5-#7ab8fa show_text=&7Version UUID:&7\n&8%4% run_command=/userdata view %6% %4%)   [⚑ %5%](#23a825-#36f539 show_text=&7Save cause:\n&8What caused the data to be saved run_command=/userdata view %6% %4%)'
+data_deleted: '[❌ Successfully deleted user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\n&8%4%)'
+data_restored: '[⏪ Successfully restored](#00fb9a) [%1%](#00fb9a show_text=&7Player UUID:\n&8%2%)[''s current user data from snapshot](#00fb9a) [%3%.](#00fb9a show_text=&7Version UUID:\n&8%4%)'
+data_pinned: '[※ Successfully pinned user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\n&8%4%)'
+data_unpinned: '[※ Successfully unpinned user data snapshot](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%) [for](#00fb9a) [%3%.](#00fb9a show_text=&7Player UUID:\n&8%4%)'
+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%)'
+list_page_jumpers: '(%1%)'
+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: '…'

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

@@ -14,18 +14,28 @@ inventory_viewer_opened: '[正在查看玩家](#00fb9a) [%1%](#00fb9a bold) [于
 ender_chest_viewer_opened: '[正在查看玩家](#00fb9a) [%1%](#00fb9a bold) [于 ⌚ %2% 的末影箱备份](#00fb9a)'
 data_update_complete: '[🔔 你的用户数据已更新!](#00fb9a)'
 data_update_failed: '[🔔 无法更新你的用户数据! 请联系管理员.](#ff7e5e)'
-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为何保存了此数据)\\n'
+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为何保存了此数据)\n'
 data_manager_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⚠ 基于游戏内的统计)'
-data_manager_item_buttons: '[[🪣 背包…]](color=#a17b5f-#f5b98c show_text=&7点击查看 run_command=/inventory %1% %2%)   [[⌀ 末影箱…]](#b649c4-#d254ff show_text=&7点击查看 run_command=/enderchest %1% %2%)\\n'
-data_manager_management_buttons: '[Manage:](gray) [[❌ 删除…]](#ff3300 show_text=&7点击删除此数据备份.\\n这不会影响玩家当前的数据.\\n&#ff3300&⚠ 此操作不可撤销! run_command=/userdata delete %1% %2%)   [[⏪ 恢复…]](#00fb9a show_text=&7点击让玩家恢复到此数据备份.\\n这将会使玩家的数据恢复到这个备份.\\n&#ff3300&⚠ %1% 当前的用户数据会被备份数据所覆盖! run_command=/userdata restore %1% %2%)\\n'
+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: '&7还有 %1% …'
-data_list_title: '[玩家](#00fb9a) [%1%](#00fb9a bold show_text=&7UUID: %2%)[的数据备份列表:](#00fb9a)\\n'
-data_list_item: '[%1%](gray show_text=&7备份 %3% run_command=/userdata view %6% %4%)   [%2%](color=#ffc43b-#f5c962 show_text=&7备份时间&7\\n&8何时保存了此数据 run_command=/userdata view %6% %4%)   [⚡ %3%](color=#62a9f5-#7ab8fa show_text=&7备份版本 UUID:&7\\n&8%4% run_command=/userdata view %6% %4%)   [⚑ %5%](#23a825-#36f539 show_text=&7备份原因\\n&8为何保存了此数据 run_command=/userdata view %6% %4%)'
-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_list_title: '[%1%''s user data snapshots:](#00fb9a) [(%2%-%3% of](#00fb9a) [%4%](#00fb9a bold)[)](#00fb9a)\n'
+data_list_item: '[%1%](gray show_text=&7备份 %3% run_command=/userdata view %6% %4%)   [%2%](color=#ffc43b-#f5c962 show_text=&7备份时间&7\n&8何时保存了此数据 run_command=/userdata view %6% %4%)   [⚡ %3%](color=#62a9f5-#7ab8fa show_text=&7备份版本 UUID:&7\n&8%4% run_command=/userdata view %6% %4%)   [⚑ %5%](#23a825-#36f539 show_text=&7备份原因\n&8为何保存了此数据 run_command=/userdata view %6% %4%)'
+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%)'
+list_page_jumpers: '(%1%)'
+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: '…'

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

@@ -14,18 +14,28 @@ inventory_viewer_opened: '[查看](#00fb9a) [%1%](#00fb9a bold) [於 ⌚ %2% 的
 ender_chest_viewer_opened: '[查看](#00fb9a) [%1%](#00fb9a bold) [於 ⌚ %2% 的終界箱快照資料](#00fb9a)'
 data_update_complete: '[🔔 你的資料已更新!](#00fb9a)'
 data_update_failed: '[🔔 無法更新您的資料！ 請聯繫管理員](#ff7e5e)'
-data_manager_title: '[查看](#00fb9a) [%3%](#00fb9a bold show_text=&7玩家 UUID:\\n&8%4%) [的快照:](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%) [:](#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保存此快照的原因)\\n'
+data_manager_title: '[查看](#00fb9a) [%3%](#00fb9a bold show_text=&7玩家 UUID:\n&8%4%) [的快照:](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%) [:](#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保存此快照的原因)\n'
 data_manager_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⚠ 根據遊戲內統計)'
-data_manager_item_buttons: '[[🪣 背包…]](color=#a17b5f-#f5b98c show_text=&7點擊查看 run_command=/inventory %1% %2%)   [[⌀ 終界箱…]](#b649c4-#d254ff show_text=&7點擊查看 run_command=/enderchest %1% %2%)\\n'
-data_manager_management_buttons: '[管理:](gray) [[❌ 刪除…]](#ff3300 show_text=&7點擊刪除這個快照\\n&8這不會影像目前玩家的資料\\n&#ff3300&⚠ 此操作不能取消! run_command=/userdata delete %1% %2%)   [[⏪ 恢復…]](#00fb9a show_text=&7點擊將玩家資料覆蓋為此快照\\n&8這將導致玩家的資料會被此快照覆蓋\\n&#ff3300&⚠ %1% 當前的資料將被覆蓋! run_command=/userdata restore %1% %2%)   [[※ 標記…]](#d8ff2b show_text=&7點擊切換標記狀態\\n&8被標記的快照將不會自動輪換更新 run_command=/userdata pin %1% %2%)\\n'
+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: '[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: '[管理:](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: '[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: '&7還有 %1% …'
-data_list_title: '[%1%](#00fb9a bold show_text=&7UUID: %2%) [的快照資料列表:](#00fb9a)\\n'
-data_list_item: '[%1%](gray show_text=&7快照名稱: %3% run_command=/userdata view %6% %4%) [%7%](#d8ff2b show_text=&7標記:\\n&8被標記的快照不會自動輪換更新 run_command=/userdata view %6% %4%) [%2%](color=#ffc43b-#f5c962 show_text=&7時間戳:&7\\n&8資料保存時間 run_command=/userdata view %6% %4%)   [⚡ %3%](color=#62a9f5-#7ab8fa show_text=&7Version UUID:&7\\n&8%4% run_command=/userdata view %6% %4%)   [⚑ %5%](#23a825-#36f539 show_text=&7保存原因:\\n&8保存此快照的原因 run_command=/userdata view %6% %4%)'
-data_deleted: '[❌ 成功刪除:](#00fb9a) [%3%](#00fb9a show_text=&7玩家 UUID:\\n&8%4%) [的快照:](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%)'
-data_restored: '[⏪ 成功將玩家](#00fb9a) [%1%](#00fb9a show_text=&7玩家 UUID:\\n&8%2%)[的資料恢復為 快照:](#00fb9a) [%3%.](#00fb9a show_text=&7Version UUID:\\n&8%4%)'
-data_pinned: '[※ 成功標記](#00fb9a) [%3%](#00fb9a show_text=&7玩家 UUID:\\n&8%4%) [的快照:](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%)'
-data_unpinned: '[※ 成功解除](#00fb9a) [%3%](#00fb9a show_text=&7玩家 UUID:\\n&8%4%) [快照:](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\\n&8%2%) [的標記](#00fb9a)'
+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=&7快照名稱: %3% run_command=/userdata view %6% %4%) [%7%](#d8ff2b show_text=&7標記:\n&8被標記的快照不會自動輪換更新 run_command=/userdata view %6% %4%) [%2%](color=#ffc43b-#f5c962 show_text=&7時間戳:&7\n&8資料保存時間 run_command=/userdata view %6% %4%)   [⚡ %3%](color=#62a9f5-#7ab8fa show_text=&7Version UUID:&7\n&8%4% run_command=/userdata view %6% %4%)   [⚑ %5%](#23a825-#36f539 show_text=&7保存原因:\n&8保存此快照的原因 run_command=/userdata view %6% %4%)'
+data_deleted: '[❌ 成功刪除:](#00fb9a) [%3%](#00fb9a show_text=&7玩家 UUID:\n&8%4%) [的快照:](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%)'
+data_restored: '[⏪ 成功將玩家](#00fb9a) [%1%](#00fb9a show_text=&7玩家 UUID:\n&8%2%)[的資料恢復為 快照:](#00fb9a) [%3%.](#00fb9a show_text=&7Version UUID:\n&8%4%)'
+data_pinned: '[※ 成功標記](#00fb9a) [%3%](#00fb9a show_text=&7玩家 UUID:\n&8%4%) [的快照:](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%)'
+data_unpinned: '[※ 成功解除](#00fb9a) [%3%](#00fb9a show_text=&7玩家 UUID:\n&8%4%) [快照:](#00fb9a) [%1%](#00fb9a show_text=&7Version UUID:\n&8%2%) [的標記](#00fb9a)'
+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%)'
+list_page_jumpers: '(%1%)'
+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: '…'

common/src/test/java/net/william278/husksync/DummyHuskSync.java

@@ -0,0 +1,115 @@
+package net.william278.husksync;
+
+import net.william278.desertwell.Version;
+import net.william278.husksync.config.Locales;
+import net.william278.husksync.config.Settings;
+import net.william278.husksync.data.DataAdapter;
+import net.william278.husksync.database.Database;
+import net.william278.husksync.event.EventCannon;
+import net.william278.husksync.migrator.Migrator;
+import net.william278.husksync.player.OnlineUser;
+import net.william278.husksync.redis.RedisManager;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.logging.Level;
+
+public class DummyHuskSync implements HuskSync {
+    @Override
+    @NotNull
+    public Set<OnlineUser> getOnlineUsers() {
+        return Set.of();
+    }
+
+    @Override
+    @NotNull
+    public Optional<OnlineUser> getOnlineUser(@NotNull UUID uuid) {
+        return Optional.empty();
+    }
+
+    @Override
+    @NotNull
+    public Database getDatabase() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    @NotNull
+    public RedisManager getRedisManager() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    @NotNull
+    public DataAdapter getDataAdapter() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    @NotNull
+    public EventCannon getEventCannon() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    @NotNull
+    public List<Migrator> getAvailableMigrators() {
+        return List.of();
+    }
+
+    @Override
+    @NotNull
+    public Settings getSettings() {
+        return new Settings();
+    }
+
+    @Override
+    @NotNull
+    public Locales getLocales() {
+        return new Locales();
+    }
+
+    @Override
+    public InputStream getResource(@NotNull String name) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void log(@NotNull Level level, @NotNull String message, @NotNull Throwable... throwable) {
+        System.out.println(message);
+    }
+
+    @Override
+    @NotNull
+    public Version getPluginVersion() {
+        return Version.fromString("1.0.0");
+    }
+
+    @Override
+    @NotNull
+    public File getDataFolder() {
+        return new File(".");
+    }
+
+    @Override
+    @NotNull
+    public Version getMinecraftVersion() {
+        return Version.fromString("1.16.2");
+    }
+
+    @Override
+    public CompletableFuture<Boolean> reload() {
+        return CompletableFuture.supplyAsync(() -> true);
+    }
+
+    @Override
+    public Set<UUID> getLockedPlayers() {
+        return Set.of();
+    }
+}

common/src/test/java/net/william278/husksync/data/DataAdaptionTests.java

@@ -1,13 +1,13 @@
 package net.william278.husksync.data;
 
-import net.william278.husksync.logger.DummyLogger;
+import net.william278.husksync.DummyHuskSync;
 import net.william278.husksync.player.DummyPlayer;
 import net.william278.husksync.player.OnlineUser;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import java.nio.charset.StandardCharsets;
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
@@ -18,36 +18,25 @@ public class DataAdaptionTests {
     @Test
     public void testJsonDataAdapter() {
         final OnlineUser dummyUser = DummyPlayer.create();
-        final AtomicBoolean isEquals = new AtomicBoolean(false);
-        dummyUser.getUserData(new DummyLogger()).join().ifPresent(dummyUserData -> {
+        dummyUser.getUserData(new DummyHuskSync()).join().ifPresent(dummyUserData -> {
             final DataAdapter dataAdapter = new JsonDataAdapter();
             final byte[] data = dataAdapter.toBytes(dummyUserData);
             final UserData deserializedUserData = dataAdapter.fromBytes(data);
 
-            isEquals.set(deserializedUserData.getInventoryData().serializedItems
-                                 .equals(dummyUserData.getInventoryData().serializedItems)
-                         && deserializedUserData.getEnderChestData().serializedItems
-                                 .equals(dummyUserData.getEnderChestData().serializedItems)
-                         && deserializedUserData.getPotionEffectsData().serializedPotionEffects
-                                 .equals(dummyUserData.getPotionEffectsData().serializedPotionEffects)
-                         && deserializedUserData.getStatusData().health == dummyUserData.getStatusData().health
-                         && deserializedUserData.getStatusData().hunger == dummyUserData.getStatusData().hunger
-                         && deserializedUserData.getStatusData().saturation == dummyUserData.getStatusData().saturation
-                         && deserializedUserData.getStatusData().saturationExhaustion == dummyUserData.getStatusData().saturationExhaustion
-                         && deserializedUserData.getStatusData().selectedItemSlot == dummyUserData.getStatusData().selectedItemSlot
-                         && deserializedUserData.getStatusData().totalExperience == dummyUserData.getStatusData().totalExperience
-                         && deserializedUserData.getStatusData().maxHealth == dummyUserData.getStatusData().maxHealth
-                         && deserializedUserData.getStatusData().healthScale == dummyUserData.getStatusData().healthScale);
+            // Assert all deserialized data is equal to the original data
+            Assertions.assertTrue(dummyUserData.getInventory().isPresent());
+            Assertions.assertTrue(deserializedUserData.getInventory().isPresent());
+            Assertions.assertEquals(dummyUserData.getInventory().get().serializedItems, deserializedUserData.getInventory().get().serializedItems);
+            Assertions.assertEquals(dummyUserData.getFormatVersion(), deserializedUserData.getFormatVersion());
         });
-        Assertions.assertTrue(isEquals.get());
     }
 
     @Test
     public void testJsonFormat() {
         final OnlineUser dummyUser = DummyPlayer.create();
-        final String expectedJson = "{\"status\":{\"health\":20.0,\"max_health\":20.0,\"health_scale\":0.0,\"hunger\":20,\"saturation\":5.0,\"saturation_exhaustion\":5.0,\"selected_item_slot\":1,\"total_experience\":100,\"experience_level\":1,\"experience_progress\":1.0,\"game_mode\":\"SURVIVAL\",\"is_flying\":false},\"inventory\":{\"serialized_items\":\"\"},\"ender_chest\":{\"serialized_items\":\"\"},\"potion_effects\":{\"serialized_potion_effects\":\"\"},\"advancements\":[],\"statistics\":{\"untyped_statistics\":{},\"block_statistics\":{},\"item_statistics\":{},\"entity_statistics\":{}},\"location\":{\"world_name\":\"dummy_world\",\"world_uuid\":\"00000000-0000-0000-0000-000000000000\",\"world_environment\":\"NORMAL\",\"x\":0.0,\"y\":64.0,\"z\":0.0,\"yaw\":90.0,\"pitch\":180.0},\"persistent_data_container\":{\"persistent_data_map\":{}},\"minecraft_version\":\"1.19-beta123456\",\"format_version\":1}";
+        final String expectedJson = "{\"status\":{\"health\":20.0,\"max_health\":20.0,\"health_scale\":0.0,\"hunger\":20,\"saturation\":5.0,\"saturation_exhaustion\":5.0,\"selected_item_slot\":1,\"total_experience\":100,\"experience_level\":1,\"experience_progress\":1.0,\"game_mode\":\"SURVIVAL\",\"is_flying\":false},\"inventory\":{\"serialized_items\":\"\"},\"ender_chest\":{\"serialized_items\":\"\"},\"potion_effects\":{\"serialized_potion_effects\":\"\"},\"advancements\":[],\"statistics\":{\"untyped_statistics\":{},\"block_statistics\":{},\"item_statistics\":{},\"entity_statistics\":{}},\"minecraft_version\":\"1.19\",\"format_version\":3}";
         AtomicReference<String> json = new AtomicReference<>();
-        dummyUser.getUserData(new DummyLogger()).join().ifPresent(dummyUserData -> {
+        dummyUser.getUserData(new DummyHuskSync()).join().ifPresent(dummyUserData -> {
             final DataAdapter dataAdapter = new JsonDataAdapter();
             final byte[] data = dataAdapter.toBytes(dummyUserData);
             json.set(new String(data, StandardCharsets.UTF_8));
@@ -58,28 +47,40 @@ public class DataAdaptionTests {
     @Test
     public void testCompressedDataAdapter() {
         final OnlineUser dummyUser = DummyPlayer.create();
-        AtomicBoolean isEquals = new AtomicBoolean(false);
-        dummyUser.getUserData(new DummyLogger()).join().ifPresent(dummyUserData -> {
+        dummyUser.getUserData(new DummyHuskSync()).join().ifPresent(dummyUserData -> {
             final DataAdapter dataAdapter = new CompressedDataAdapter();
             final byte[] data = dataAdapter.toBytes(dummyUserData);
             final UserData deserializedUserData = dataAdapter.fromBytes(data);
 
-            isEquals.set(deserializedUserData.getInventoryData().serializedItems
-                                 .equals(dummyUserData.getInventoryData().serializedItems)
-                         && deserializedUserData.getEnderChestData().serializedItems
-                                 .equals(dummyUserData.getEnderChestData().serializedItems)
-                         && deserializedUserData.getPotionEffectsData().serializedPotionEffects
-                                 .equals(dummyUserData.getPotionEffectsData().serializedPotionEffects)
-                         && deserializedUserData.getStatusData().health == dummyUserData.getStatusData().health
-                         && deserializedUserData.getStatusData().hunger == dummyUserData.getStatusData().hunger
-                         && deserializedUserData.getStatusData().saturation == dummyUserData.getStatusData().saturation
-                         && deserializedUserData.getStatusData().saturationExhaustion == dummyUserData.getStatusData().saturationExhaustion
-                         && deserializedUserData.getStatusData().selectedItemSlot == dummyUserData.getStatusData().selectedItemSlot
-                         && deserializedUserData.getStatusData().totalExperience == dummyUserData.getStatusData().totalExperience
-                         && deserializedUserData.getStatusData().maxHealth == dummyUserData.getStatusData().maxHealth
-                         && deserializedUserData.getStatusData().healthScale == dummyUserData.getStatusData().healthScale);
+            // Assert all deserialized data is equal to the original data
+            Assertions.assertTrue(dummyUserData.getInventory().isPresent());
+            Assertions.assertTrue(deserializedUserData.getInventory().isPresent());
+            Assertions.assertEquals(dummyUserData.getInventory().get().serializedItems, deserializedUserData.getInventory().get().serializedItems);
+            Assertions.assertEquals(dummyUserData.getFormatVersion(), deserializedUserData.getFormatVersion());
         });
-        Assertions.assertTrue(isEquals.get());
     }
 
+    private String getTestSerializedPersistentDataContainer() {
+        final HashMap<String, PersistentDataTag<?>> persistentDataTest = new HashMap<>();
+        persistentDataTest.put("husksync:byte_test", new PersistentDataTag<>(PersistentDataTagType.BYTE, 0x01));
+        persistentDataTest.put("husksync:double_test", new PersistentDataTag<>(PersistentDataTagType.DOUBLE, 2d));
+        persistentDataTest.put("husksync:string_test", new PersistentDataTag<>(PersistentDataTagType.STRING, "test"));
+        persistentDataTest.put("husksync:int_test", new PersistentDataTag<>(PersistentDataTagType.INTEGER, 3));
+        persistentDataTest.put("husksync:long_test", new PersistentDataTag<>(PersistentDataTagType.LONG, 4L));
+        persistentDataTest.put("husksync:float_test", new PersistentDataTag<>(PersistentDataTagType.FLOAT, 5f));
+        persistentDataTest.put("husksync:short_test", new PersistentDataTag<>(PersistentDataTagType.SHORT, 6));
+        final PersistentDataContainerData persistentDataContainerData = new PersistentDataContainerData(persistentDataTest);
+
+        final DataAdapter dataAdapter = new JsonDataAdapter();
+        UserData userData = new UserData();
+        userData.persistentDataContainerData = persistentDataContainerData;
+        return dataAdapter.toJson(userData, false);
+    }
+
+    @Test
+    public void testPersistentDataContainerSerialization() {
+        Assertions.assertEquals(getTestSerializedPersistentDataContainer(), "{\"persistent_data_container\":{\"persistent_data_map\":{\"husksync:int_test\":{\"type\":\"INTEGER\",\"value\":3},\"husksync:string_test\":{\"type\":\"STRING\",\"value\":\"test\"},\"husksync:long_test\":{\"type\":\"LONG\",\"value\":4},\"husksync:byte_test\":{\"type\":\"BYTE\",\"value\":1},\"husksync:short_test\":{\"type\":\"SHORT\",\"value\":6},\"husksync:double_test\":{\"type\":\"DOUBLE\",\"value\":2.0},\"husksync:float_test\":{\"type\":\"FLOAT\",\"value\":5.0}}},\"format_version\":3}");
+    }
+
+
 }

common/src/test/java/net/william278/husksync/logger/DummyLogger.java

@@ -1,44 +0,0 @@
-package net.william278.husksync.logger;
-
-import de.themoep.minedown.MineDown;
-import net.william278.husksync.util.Logger;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.logging.Level;
-
-public class DummyLogger extends Logger {
-
-    public DummyLogger() {
-    }
-
-    @Override
-    public void log(@NotNull Level level, @NotNull String message, @NotNull Exception e) {
-        System.out.println(level.getName() + ": " + message);
-        e.printStackTrace();
-    }
-
-    @Override
-    public void log(@NotNull Level level, @NotNull String message) {
-        System.out.println(level.getName() + ": " + message);
-    }
-
-    @Override
-    public void log(@NotNull Level level, @NotNull MineDown mineDown) {
-        System.out.println(level.getName() + ": " + mineDown.message());
-    }
-
-    @Override
-    public void info(@NotNull String message) {
-        System.out.println(Level.INFO.getName() + ": " + message);
-    }
-
-    @Override
-    public void severe(@NotNull String message) {
-        System.out.println(Level.SEVERE.getName() + ": " + message);
-    }
-
-    @Override
-    public void config(@NotNull String message) {
-        System.out.println(Level.CONFIG.getName() + ": " + message);
-    }
-}

common/src/test/java/net/william278/husksync/player/DummyPlayer.java

@@ -1,15 +1,12 @@
 package net.william278.husksync.player;
 
-import de.themoep.minedown.MineDown;
+import de.themoep.minedown.adventure.MineDown;
+import net.william278.husksync.config.Settings;
 import net.william278.husksync.data.*;
-import net.william278.husksync.editor.ItemEditorMenu;
-import net.william278.husksync.util.Version;
+import net.william278.desertwell.Version;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 
 public class DummyPlayer extends OnlineUser {
@@ -31,7 +28,7 @@ public class DummyPlayer extends OnlineUser {
     }
 
     @Override
-    public CompletableFuture<Void> setStatus(@NotNull StatusData statusData, @NotNull List<StatusDataFlag> statusDataFlags) {
+    public CompletableFuture<Void> setStatus(@NotNull StatusData statusData, @NotNull Settings settings) {
         return CompletableFuture.runAsync(() -> {
             // do nothing
         });
@@ -132,7 +129,7 @@ public class DummyPlayer extends OnlineUser {
     @NotNull
     @Override
     public Version getMinecraftVersion() {
-        return Version.minecraftVersion("1.19-beta123456");
+        return Version.fromMinecraftVersionString("1.19-beta123456");
     }
 
     @Override
@@ -145,14 +142,38 @@ public class DummyPlayer extends OnlineUser {
         // do nothing
     }
 
+    @Override
+    public void sendToast(@NotNull MineDown title, @NotNull MineDown description,
+                          @NotNull String iconMaterial, @NotNull String backgroundType) {
+        // do nothing
+    }
+
     @Override
     public boolean hasPermission(@NotNull String node) {
         return true;
     }
 
     @Override
-    public void showMenu(@NotNull ItemEditorMenu menu) {
+    public CompletableFuture<Optional<ItemData>> showMenu(@NotNull ItemData itemData, boolean editable,
+                                                          int minimumRows, @NotNull MineDown title) {
         // do nothing
+        return CompletableFuture.completedFuture(Optional.empty());
+    }
+
+
+    @Override
+    public boolean isDead() {
+        return false;
+    }
+
+    @Override
+    public boolean isLocked() {
+        return false;
+    }
+
+    @Override
+    public boolean isNpc() {
+        return false;
     }
 
 }

gradle.properties

@@ -3,5 +3,10 @@ org.gradle.jvmargs='-Dfile.encoding=UTF-8'
 org.gradle.daemon=true
 javaVersion=16
 
-plugin_version=2.0.1
-plugin_archive=husksync
+plugin_version=2.2.4
+plugin_archive=husksync
+
+jedis_version=4.3.1
+mysql_driver_version=8.0.32
+snappy_version=1.1.9.1
+commons_text_version=1.10.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,105 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

plugin/build.gradle

@@ -1,6 +1,5 @@
 dependencies {
     implementation project(path: ':bukkit', configuration: 'shadow')
-    implementation project(path: ':api', configuration: 'shadow')
 }
 
 shadowJar {

settings.gradle

@@ -8,5 +8,4 @@ rootProject.name = 'HuskSync'
 
 include 'common'
 include 'bukkit'
-include 'api'
 include 'plugin'