From 6751ec93245dbfa8bdbcfd71b908c2f3e7cda833 Mon Sep 17 00:00:00 2001 From: Ben Woo <30431861+benwoo1110@users.noreply.github.com> Date: Fri, 2 Jan 2026 11:34:05 +0800 Subject: [PATCH] Revert refactor bulkedit commands to remove "bulkedit" prefix --- .../inventories/commands/bulkedit/BulkEditCommand.java | 1 - .../commands/bulkedit/globalprofile/ClearCommand.java | 2 +- .../commands/bulkedit/globalprofile/ModifyCommand.java | 2 +- .../commands/bulkedit/playerprofile/ClearCommand.java | 2 +- .../commands/bulkedit/playerprofile/ClonePlayerCommand.java | 2 +- .../bulkedit/playerprofile/CloneWorldGroupCommand.java | 2 +- .../commands/bulkedit/playerprofile/DeleteCommand.java | 2 +- .../playerprofile/MigrateInventorySerializationCommand.java | 4 ++-- .../bulkedit/playerprofile/MigratePlayerNameCommand.java | 2 +- 9 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/BulkEditCommand.java b/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/BulkEditCommand.java index d6cfb863..d6e5c3d0 100644 --- a/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/BulkEditCommand.java +++ b/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/BulkEditCommand.java @@ -13,7 +13,6 @@ @Contract @ApiStatus.Internal -@Subcommand("bulkedit") public abstract class BulkEditCommand extends InventoriesCommand { protected final BulkEditCreator bulkEditCreator; diff --git a/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/globalprofile/ClearCommand.java b/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/globalprofile/ClearCommand.java index 20daca13..7be2c960 100644 --- a/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/globalprofile/ClearCommand.java +++ b/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/globalprofile/ClearCommand.java @@ -42,7 +42,7 @@ final class ClearCommand extends BulkEditCommand { this.flags = flags; } - @Subcommand("globalprofile clear") + @Subcommand("bulkedit globalprofile clear") @CommandPermission("multiverse.inventories.bulkedit") @CommandCompletion("@mvinvplayernames @flags:groupName=" + Flags.NAME) @Syntax(" [--clear-all-player-profiles]") diff --git a/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/globalprofile/ModifyCommand.java b/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/globalprofile/ModifyCommand.java index d5e129a2..bd419200 100644 --- a/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/globalprofile/ModifyCommand.java +++ b/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/globalprofile/ModifyCommand.java @@ -31,7 +31,7 @@ final class ModifyCommand extends InventoriesCommand { this.profileDataSource = profileDataSource; } - @Subcommand("globalprofile modify") + @Subcommand("bulkedit globalprofile modify") @CommandPermission("multiverse.inventories.bulkedit") @CommandCompletion("load-on-login|last-world @empty @mvinvplayernames") @Syntax(" ") diff --git a/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/ClearCommand.java b/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/ClearCommand.java index 2d163f07..2301d2ba 100644 --- a/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/ClearCommand.java +++ b/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/ClearCommand.java @@ -37,7 +37,7 @@ final class ClearCommand extends BulkEditCommand { this.flags = flags; } - @Subcommand("playerprofile clear") + @Subcommand("bulkedit playerprofile clear") @CommandPermission("multiverse.inventories.bulkedit") @CommandCompletion("@mvinvplayernames @mvinvcontainerkeys @mvinvprofiletypes:multiple @flags:groupName=" + IncludeGroupsWorldsFlag.NAME) @Syntax(" [profile-type] [--include-groups-worlds]") diff --git a/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/ClonePlayerCommand.java b/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/ClonePlayerCommand.java index fa14bc71..b5c945c0 100644 --- a/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/ClonePlayerCommand.java +++ b/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/ClonePlayerCommand.java @@ -36,7 +36,7 @@ public class ClonePlayerCommand extends BulkEditCommand { this.flags = flags; } - @Subcommand("playerprofile clone-player") + @Subcommand("bulkedit playerprofile clone-player") @CommandPermission("multiverse.inventories.bulkedit") @CommandCompletion("@mvinvplayername @mvinvplayername @mvinvcontainerkeys @mvinvprofiletypes:multiple " + "@flags:groupName=" + IncludeGroupsWorldsFlag.NAME) diff --git a/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/CloneWorldGroupCommand.java b/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/CloneWorldGroupCommand.java index ab2f1de1..2295f5d2 100644 --- a/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/CloneWorldGroupCommand.java +++ b/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/CloneWorldGroupCommand.java @@ -39,7 +39,7 @@ public class CloneWorldGroupCommand extends BulkEditCommand { this.flags = flags; } - @Subcommand("playerprofile clone-world-group") + @Subcommand("bulkedit playerprofile clone-world-group") @CommandPermission("multiverse.inventories.bulkedit") @CommandCompletion("@mvinvplayernames @mvinvcontainerkey @mvinvcontainerkeys @mvinvprofiletypes:multiple " + "@flags:groupName=" + IncludeGroupsWorldsFlag.NAME) diff --git a/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/DeleteCommand.java b/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/DeleteCommand.java index 7f151aba..0f111ff9 100644 --- a/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/DeleteCommand.java +++ b/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/DeleteCommand.java @@ -38,7 +38,7 @@ final class DeleteCommand extends BulkEditCommand { this.flags = flags; } - @Subcommand("playerprofile delete") + @Subcommand("bulkedit playerprofile delete") @CommandPermission("multiverse.inventories.bulkedit") @CommandCompletion("@shares @mvinvplayernames @mvinvcontainerkeys @mvinvprofiletypes:multiple @flags:groupName=" + IncludeGroupsWorldsFlag.NAME) @Syntax(" [profile-type] [--include-groups-worlds]") diff --git a/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/MigrateInventorySerializationCommand.java b/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/MigrateInventorySerializationCommand.java index f249629b..593695ad 100644 --- a/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/MigrateInventorySerializationCommand.java +++ b/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/MigrateInventorySerializationCommand.java @@ -40,7 +40,7 @@ final class MigrateInventorySerializationCommand extends InventoriesCommand { this.inventoriesConfig = inventoriesConfig; } - @Subcommand("migrate inventory-serialization nbt") + @Subcommand("bulkedit migrate inventory-serialization nbt") @CommandPermission("multiverse.inventories.bulkedit") void onNbtCommand(MVCommandIssuer issuer) { commandQueueManager.addToQueue(CommandQueuePayload.issuer(issuer) @@ -48,7 +48,7 @@ void onNbtCommand(MVCommandIssuer issuer) { .action(() -> doMigration(issuer, true))); } - @Subcommand("migrate inventory-serialization bukkit") + @Subcommand("bulkedit migrate inventory-serialization bukkit") @CommandPermission("multiverse.inventories.bulkedit") void onBukkitCommand(MVCommandIssuer issuer) { commandQueueManager.addToQueue(CommandQueuePayload.issuer(issuer) diff --git a/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/MigratePlayerNameCommand.java b/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/MigratePlayerNameCommand.java index 649c13f2..e4aec8ad 100644 --- a/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/MigratePlayerNameCommand.java +++ b/src/main/java/org/mvplugins/multiverse/inventories/commands/bulkedit/playerprofile/MigratePlayerNameCommand.java @@ -25,7 +25,7 @@ final class MigratePlayerNameCommand extends InventoriesCommand { this.profileDataSource = profileDataSource; } - @Subcommand("migrate player-name") + @Subcommand("bulkedit migrate player-name") @CommandPermission("multiverse.inventories.bulkedit") @Syntax(" ") @Description("Only use this if automatic migration failed for some reason.")