fix: Set execution scopes in commands

Bumps [certifi](https://github.com/certifi/python-certifi) from 2023.7.22 to 2024.7.4.
- [Commits](https://github.com/certifi/python-certifi/compare/2023.07.22...2024.07.04)

---
updated-dependencies:
- dependency-name: certifi
  dependency-type: direct:production
...

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

build.gradle

@@ -83,9 +83,9 @@ allprojects {
     }
 
     dependencies {
-        testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
+        testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
-        testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.2'
+        testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.3'
-        testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
+        testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
     }
 
     test {

bukkit/build.gradle

@@ -1,7 +1,7 @@
 dependencies {
     implementation project(path: ':common')
 
-    implementation 'net.william278.uniform:uniform-bukkit:1.1.8'
+    implementation 'net.william278.uniform:uniform-bukkit:1.2.1'
     implementation 'net.william278:mpdbdataconverter:1.0.1'
     implementation 'net.william278:hsldataconverter:1.0'
     implementation 'net.william278:mapdataapi:1.0.3'
@@ -15,7 +15,7 @@ dependencies {
     compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
     compileOnly 'com.github.retrooper.packetevents:spigot:2.3.0'
     compileOnly 'com.comphenix.protocol:ProtocolLib:5.1.0'
-    compileOnly 'org.projectlombok:lombok:1.18.32'
+    compileOnly 'org.projectlombok:lombok:1.18.34'
     compileOnly 'commons-io:commons-io:2.16.1'
     compileOnly 'org.json:json:20240303'
     compileOnly 'net.william278:minedown:1.8.2'
@@ -25,7 +25,7 @@ dependencies {
     compileOnly 'net.william278:AdvancementAPI:97a9583413'
     compileOnly "redis.clients:jedis:$jedis_version"
 
-    annotationProcessor 'org.projectlombok:lombok:1.18.32'
+    annotationProcessor 'org.projectlombok:lombok:1.18.34'
 }
 
 shadowJar {

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

@@ -290,7 +290,7 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
     @Override
     public boolean isDependencyLoaded(@NotNull String name) {
         final Plugin plugin = getServer().getPluginManager().getPlugin(name);
-        return plugin != null && plugin.isEnabled();
+        return plugin != null;
     }
 
     // Register bStats metrics

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

@@ -625,7 +625,7 @@ public abstract class BukkitData implements Data {
         @Nullable
         private static UUID getModifierId(@NotNull AttributeModifier modifier) {
             try {
-                return UUID.fromString(modifier.getName());
+                return modifier.getUniqueId();
             } catch (Throwable e) {
                 return null;
             }
@@ -656,10 +656,12 @@ public abstract class BukkitData implements Data {
                     // Reflexively create a modern keyed attribute modifier instance. Remove in favor of API long-term.
                     final EquipmentSlot slot = slotId != -1 ? EquipmentSlot.values()[slotId] : null;
                     final Class<?> slotGroup = Class.forName(EQUIPMENT_SLOT_GROUP);
+                    final String modifierName = modifier.name() == null ? modifier.uuid().toString() : modifier.name();
                     return AttributeModifier.class.getDeclaredConstructor(
                             NamespacedKey.class, double.class, AttributeModifier.Operation.class, slotGroup
                     ).newInstance(
-                            NamespacedKey.fromString(modifier.name()), modifier.amount(),
+                            NamespacedKey.fromString(modifierName),
+                            modifier.amount(),
                             AttributeModifier.Operation.values()[modifier.operationType()],
                             slot == null ? slotGroup.getField(EQUIPMENT_SLOT_GROUP$ANY).get(null)
                                     : EquipmentSlot.class.getDeclaredMethod(EQUIPMENT_SLOT$getGroup).invoke(slot)

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

@@ -255,7 +255,7 @@ public class MpdbMigrator extends Migrator {
                 If any of these are not correct, please correct them
                 using the command:
                 "husksync migrate mpdb set <parameter> <value>"
-                (e.g.: "husksync migrate mpdb set host 1.2.3.4")
+                (e.g.: "husksync migrate set mpdb host 1.2.3.4")
 
                 STEP 3] HuskSync will migrate data into the database
                 tables configures in the config.yml file of this
@@ -263,7 +263,7 @@ public class MpdbMigrator extends Migrator {
                 before proceeding.
 
                 STEP 4] To start the migration, please run:
-                "husksync migrate mpdb start"
+                "husksync migrate start mpdb"
                 
                 NOTE: This migrator currently WORKS WITH MPDB version
                 v4.9.2 and below!

common/build.gradle

@@ -16,9 +16,9 @@ dependencies {
         exclude module: 'slf4j-api'
     }
 
-    compileOnly 'net.william278.uniform:uniform-common:1.1.8'
+    compileOnly 'net.william278.uniform:uniform-common:1.2.1'
     compileOnly 'com.mojang:brigadier:1.1.8'
-    compileOnly 'org.projectlombok:lombok:1.18.32'
+    compileOnly 'org.projectlombok:lombok:1.18.34'
     compileOnly 'org.jetbrains:annotations:24.1.0'
     compileOnly 'net.kyori:adventure-api:4.17.0'
     compileOnly 'net.kyori:adventure-platform-api:4.3.3'
@@ -38,5 +38,5 @@ dependencies {
     testCompileOnly 'de.exlll:configlib-yaml:4.5.0'
     testCompileOnly 'org.jetbrains:annotations:24.1.0'
 
-    annotationProcessor 'org.projectlombok:lombok:1.18.32'
+    annotationProcessor 'org.projectlombok:lombok:1.18.34'
 }

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

@@ -52,7 +52,7 @@ public class HuskSyncCommand extends PluginCommand {
     private final AboutMenu aboutMenu;
 
     public HuskSyncCommand(@NotNull HuskSync plugin) {
-        super("husksync", List.of(), Permission.Default.TRUE, plugin);
+        super("husksync", List.of(), Permission.Default.TRUE, ExecutionScope.ALL, plugin);
         this.updateChecker = plugin.getUpdateChecker();
         this.aboutMenu = AboutMenu.builder()
             .title(Component.text("HuskSync"))
@@ -160,6 +160,10 @@ public class HuskSyncCommand extends PluginCommand {
                         .collect(Collectors.joining("\n"))
                 ));
             });
+            sub.addSubCommand("help", (help) -> help.addSyntax((cmd) -> {
+                final Migrator migrator = cmd.getArgument("migrator", Migrator.class);
+                plugin.log(Level.INFO, migrator.getHelpMenu());
+            }, migrator()));
             sub.addSubCommand("start", (start) -> start.addSyntax((cmd) -> {
                 final Migrator migrator = cmd.getArgument("migrator", Migrator.class);
                 migrator.start().thenAccept(succeeded -> {

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

@@ -35,7 +35,7 @@ import java.util.UUID;
 public abstract class ItemsCommand extends PluginCommand {
 
     protected ItemsCommand(@NotNull String name, @NotNull List<String> aliases, @NotNull HuskSync plugin) {
-        super(name, aliases, Permission.Default.IF_OP, plugin);
+        super(name, aliases, Permission.Default.IF_OP, ExecutionScope.IN_GAME, plugin);
     }
 
     @Override

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

@@ -39,9 +39,9 @@ public abstract class PluginCommand extends Command {
 
     protected final HuskSync plugin;
 
-    protected PluginCommand(@NotNull String name, @NotNull List<String> aliases,
+    protected PluginCommand(@NotNull String name, @NotNull List<String> aliases, @NotNull Permission.Default defPerm,
-                            @NotNull Permission.Default permissionDefault, @NotNull HuskSync plugin) {
+                            @NotNull ExecutionScope scope, @NotNull HuskSync plugin) {
-        super(name, aliases, getDescription(plugin, name), new Permission(createPermission(name), permissionDefault));
+        super(name, aliases, getDescription(plugin, name), new Permission(createPermission(name), defPerm), scope);
         this.plugin = plugin;
     }
 

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

@@ -44,7 +44,7 @@ import java.util.logging.Level;
 public class UserDataCommand extends PluginCommand {
 
     public UserDataCommand(@NotNull HuskSync plugin) {
-        super("userdata", List.of("playerdata"), Permission.Default.IF_OP, plugin);
+        super("userdata", List.of("playerdata"), Permission.Default.IF_OP, ExecutionScope.ALL, plugin);
     }
 
     @Override

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

@@ -395,7 +395,7 @@ public class DataSnapshot {
                     .map(entry -> Map.entry(plugin.getIdentifier(entry.getKey()).orElseThrow(), entry.getValue()))
                     .collect(Collectors.toMap(
                             Map.Entry::getKey,
-                            entry -> plugin.deserializeData(entry.getKey(), entry.getValue()),
+                            entry -> plugin.deserializeData(entry.getKey(), entry.getValue(), getMinecraftVersion()),
                             (a, b) -> b, () -> Maps.newTreeMap(SerializerRegistry.DEPENDENCY_ORDER_COMPARATOR)
                     ));
         }

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

@@ -19,6 +19,7 @@
 
 package net.william278.husksync.data;
 
+import net.william278.desertwell.util.Version;
 import net.william278.husksync.HuskSync;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -119,19 +120,36 @@ public interface SerializerRegistry {
     }
 
     /**
-     * Deserialize data for the given {@link Identifier}
+     * Deserialize data of a given {@link Version Minecraft version} for the given {@link Identifier data identifier}
+     *
+     * @param identifier    the {@link Identifier} to deserialize data for
+     * @param data          the data to deserialize
+     * @param dataMcVersion the Minecraft version of the data
+     * @return the deserialized data
+     * @throws IllegalStateException if no serializer is found for the given {@link Identifier}
+     * @since 3.6.4
+     */
+    @NotNull
+    default Data deserializeData(@NotNull Identifier identifier, @NotNull String data,
+                                 @NotNull Version dataMcVersion) throws IllegalStateException {
+        return getSerializer(identifier).map(serializer -> serializer.deserialize(data, dataMcVersion)).orElseThrow(
+                () -> new IllegalStateException("No serializer found for %s".formatted(identifier))
+        );
+    }
+
+    /**
+     * Deserialize data for the given {@link Identifier data identifier}
      *
      * @param identifier the {@link Identifier} to deserialize data for
      * @param data       the data to deserialize
      * @return the deserialized data
-     * @throws IllegalStateException if no serializer is found for the given {@link Identifier}
      * @since 3.5.4
+     * @deprecated Use {@link #deserializeData(Identifier, String, Version)} instead
      */
     @NotNull
-    default Data deserializeData(@NotNull Identifier identifier, @NotNull String data) throws IllegalStateException {
+    @Deprecated(since = "3.6.5")
-        return getSerializer(identifier).map(serializer -> serializer.deserialize(data)).orElseThrow(
+    default Data deserializeData(@NotNull Identifier identifier, @NotNull String data) {
-                () -> new IllegalStateException("No serializer found for %s".formatted(identifier))
+        return deserializeData(identifier, data, getPlugin().getMinecraftVersion());
-        );
     }
 
     /**

docs/Legacy-Migration.md

@@ -18,12 +18,12 @@ This guide will walk you through how to upgrade from HuskSync v1.4.x to HuskSync
 
 ### 3. Configure the migrator
 - With your servers back on and correctly configured to run HuskSync v3.x, ensure nobody is online.
-- Use the console on one of your Spigot servers to enter: `husksync migrate legacy`
+- Use the console on one of your Spigot servers to enter: `husksync migrate help legacy`
-- Carefully read the migration configuration instructions. In most cases, you won't have to change the settings, but if you do need to adjust them, use `husksync migrate legacy set <setting> <value>`.
+- Carefully read the migration configuration instructions. In most cases, you won't have to change the settings, but if you do need to adjust them, use `husksync migrate set legacy <setting> <value>`.
 - Migration will be carried out *from* the database you specify with the settings in console *to* the database configured in `config.yml`. If you're migrating from multiple clusters, ensure you run the migrator on the correct servers corresponding to the migrator.
 
 ### 4. Start the migrator
-- Run `husksync migrate legacy start` to begin the migration process. This may take some time, depending on the amount of data you're migrating.
+- Run `husksync migrate start legacy` to begin the migration process. This may take some time, depending on the amount of data you're migrating.
 
 ### 5. Ensure the migration was successful
 - HuskSync will notify in console when migration is complete. Verify that the migration went OK by logging in and using the `/userdata list <username>` command to see if the data was imported with the `legacy migration` saveCause. 

docs/MPDB-Migration.md

@@ -13,12 +13,12 @@ This guide will walk you through how to migrate from MySQLPlayerDataBridge (MPDB
 
 ### 2. Configure the migrator
 - With your servers back on and correctly configured to run HuskSync v3.x, ensure nobody is online.
-- Use the console on one of your Spigot servers to enter: `husksync migrate mpdb`. If the MPDB migrator is not available, ensure MySQLPlayerDataBridge is still installed.
+- Use the console on one of your Spigot servers to enter: `husksync migrate help mpdb`. If the MPDB migrator is not available, ensure MySQLPlayerDataBridge is still installed.
-- Adjust the migration setting as needed using the following command: `husksync migrate mpdb set <setting> <value>`.
+- Adjust the migration setting as needed using the following command: `husksync migrate set mpdb <setting> <value>`.
 - Note that migration will be carried out *from* the database you specify with the settings in console *to* the database configured in `config.yml`.
 
 ### 3. Start the migrator
-- Run `husksync migrate mpdb start` to begin the migration process. This may take some time, depending on the amount of data you're migrating.
+- Run `husksync migrate start mpdb` to begin the migration process. This may take some time, depending on the amount of data you're migrating.
 
 ### 4. Uninstall MySQLPlayerDataBridge
 - HuskSync will display a message in console when data migration is complete.

fabric/build.gradle

@@ -18,20 +18,21 @@ dependencies {
     modImplementation include("net.kyori:adventure-platform-fabric:${adventure_platform_fabric_version}")
     modImplementation include("me.lucko:fabric-permissions-api:${fabric_permissions_api_version}")
     modImplementation include("eu.pb4:sgui:${sgui_version}")
-    modImplementation include('net.william278.uniform:uniform-fabric:1.1.8+1.20.1')
+    modImplementation include('net.william278.uniform:uniform-fabric:1.2.1+1.20.1')
     modCompileOnly "net.fabricmc.fabric-api:fabric-api:${fabric_api_version}"
 
     implementation include('org.apache.commons:commons-pool2:2.12.0')
     implementation include("redis.clients:jedis:$jedis_version")
     implementation include("com.mysql:mysql-connector-j:$mysql_driver_version")
     implementation include("org.mariadb.jdbc:mariadb-java-client:$mariadb_driver_version")
+    implementation include("org.postgresql:postgresql:$postgres_driver_version")
     implementation include("org.xerial.snappy:snappy-java:$snappy_version")
 
     compileOnly 'org.jetbrains:annotations:24.1.0'
     compileOnly 'net.william278:DesertWell:2.0.4'
-    compileOnly 'org.projectlombok:lombok:1.18.32'
+    compileOnly 'org.projectlombok:lombok:1.18.34'
 
-    annotationProcessor 'org.projectlombok:lombok:1.18.32'
+    annotationProcessor 'org.projectlombok:lombok:1.18.34'
 
     shadow project(path: ":common")
 }

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs='-Dfile.encoding=UTF-8'
 org.gradle.daemon=true
 javaVersion=17
 
-plugin_version=3.6.4
+plugin_version=3.6.6
 plugin_archive=husksync
 plugin_description=A modern, cross-server player data synchronization system
 

paper/build.gradle

@@ -6,13 +6,13 @@ dependencies {
     implementation project(':bukkit')
     compileOnly project(':common')
 
-    implementation 'net.william278.uniform:uniform-paper:1.1.8'
+    implementation 'net.william278.uniform:uniform-paper:1.2.1'
 
     compileOnly 'io.papermc.paper:paper-api:1.19.4-R0.1-SNAPSHOT'
     compileOnly 'org.jetbrains:annotations:24.1.0'
-    compileOnly 'org.projectlombok:lombok:1.18.32'
+    compileOnly 'org.projectlombok:lombok:1.18.34'
 
-    annotationProcessor 'org.projectlombok:lombok:1.18.32'
+    annotationProcessor 'org.projectlombok:lombok:1.18.34'
 }
 
 shadowJar {

test/requirements.txt

@@ -1,4 +1,4 @@
-certifi==2023.7.22
+certifi==2024.7.4
 charset-normalizer==3.2.0
 colorama==0.4.6
 idna==3.7