From c24f198ed0bcbef6f5c182b46707d9d180619a69 Mon Sep 17 00:00:00 2001 From: Zax71 Date: Sat, 24 Feb 2024 13:36:13 +0000 Subject: [PATCH 1/4] Add `/mv version` --- .../core/commands/VersionCommand.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 src/main/java/org/mvplugins/multiverse/core/commands/VersionCommand.java diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/VersionCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/VersionCommand.java new file mode 100644 index 00000000..8c71065e --- /dev/null +++ b/src/main/java/org/mvplugins/multiverse/core/commands/VersionCommand.java @@ -0,0 +1,36 @@ +package org.mvplugins.multiverse.core.commands; + +import co.aikar.commands.BukkitCommandIssuer; +import co.aikar.commands.annotation.CommandAlias; +import co.aikar.commands.annotation.CommandPermission; +import co.aikar.commands.annotation.Description; +import co.aikar.commands.annotation.Subcommand; +import jakarta.inject.Inject; +import org.bukkit.ChatColor; +import org.jetbrains.annotations.NotNull; +import org.jvnet.hk2.annotations.Service; +import org.mvplugins.multiverse.core.MultiverseCore; +import org.mvplugins.multiverse.core.commandtools.MVCommandManager; +import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; + +@Service +@CommandAlias("mv") +class VersionCommand extends MultiverseCommand { + + private final MultiverseCore plugin; + + @Inject + VersionCommand(@NotNull MVCommandManager commandManager, MultiverseCore plugin) { + super(commandManager); + this.plugin = plugin; + } + + @Subcommand("version") + @CommandPermission("multiverse.core.version") + @Description("{@@mv-core.version.description}") + void versionCommand(BukkitCommandIssuer issuer) { + issuer.sendMessage("Multiverse Core version: " + ChatColor.WHITE + plugin.getDescription().getVersion()); + issuer.sendMessage("Multiverse Core authors: " + ChatColor.WHITE + String.join(", ", plugin.getDescription().getAuthors())); + issuer.sendMessage("Special Code: " + ChatColor.WHITE + "FRN002"); // An in joke I don't get... + } +} From 90b87291299ef8c19cb9ae5e68e783ad73cfdeed Mon Sep 17 00:00:00 2001 From: Zax71 Date: Sat, 24 Feb 2024 13:37:23 +0000 Subject: [PATCH 2/4] Add Ben and Zax71 to authors --- src/main/resources/plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 8a26e307..0ce00df3 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: Multiverse-Core main: org.mvplugins.multiverse.core.MultiverseCore -authors: ['dumptruckman', 'Rigby', 'fernferret', 'lithium3141', 'main--'] +authors: ['dumptruckman', 'Rigby', 'fernferret', 'lithium3141', 'main--', 'Benergy10', 'Zax71'] website: 'https://dev.bukkit.org/projects/multiverse-core' softdepend: ['Vault', 'PlaceholderAPI'] api-version: 1.13 From 7276da766514020af73bdd6a2e420b082533f06d Mon Sep 17 00:00:00 2001 From: Zax71 Date: Sat, 24 Feb 2024 13:48:57 +0000 Subject: [PATCH 3/4] Implement i18n --- .../multiverse/core/commands/VersionCommand.java | 9 +++++---- .../org/mvplugins/multiverse/core/utils/MVCorei18n.java | 5 +++++ src/main/resources/multiverse-core_en.properties | 6 ++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/VersionCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/VersionCommand.java index 8c71065e..ea3474dd 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/VersionCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/VersionCommand.java @@ -1,17 +1,18 @@ package org.mvplugins.multiverse.core.commands; import co.aikar.commands.BukkitCommandIssuer; +import co.aikar.commands.MessageType; import co.aikar.commands.annotation.CommandAlias; import co.aikar.commands.annotation.CommandPermission; import co.aikar.commands.annotation.Description; import co.aikar.commands.annotation.Subcommand; import jakarta.inject.Inject; -import org.bukkit.ChatColor; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; import org.mvplugins.multiverse.core.MultiverseCore; import org.mvplugins.multiverse.core.commandtools.MVCommandManager; import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; +import org.mvplugins.multiverse.core.utils.MVCorei18n; @Service @CommandAlias("mv") @@ -29,8 +30,8 @@ class VersionCommand extends MultiverseCommand { @CommandPermission("multiverse.core.version") @Description("{@@mv-core.version.description}") void versionCommand(BukkitCommandIssuer issuer) { - issuer.sendMessage("Multiverse Core version: " + ChatColor.WHITE + plugin.getDescription().getVersion()); - issuer.sendMessage("Multiverse Core authors: " + ChatColor.WHITE + String.join(", ", plugin.getDescription().getAuthors())); - issuer.sendMessage("Special Code: " + ChatColor.WHITE + "FRN002"); // An in joke I don't get... + issuer.sendMessage(MessageType.INFO, MVCorei18n.VERSION_MV, "{version}", plugin.getDescription().getVersion()); + issuer.sendMessage(MessageType.INFO, MVCorei18n.VERSION_AUTHORS, "{authors}", String.join(", ", plugin.getDescription().getAuthors())); + issuer.sendMessage(MessageType.INFO, MVCorei18n.VERSION_SECRETCODE); // An in joke I don't get... } } diff --git a/src/main/java/org/mvplugins/multiverse/core/utils/MVCorei18n.java b/src/main/java/org/mvplugins/multiverse/core/utils/MVCorei18n.java index 42d5fab2..c257157a 100644 --- a/src/main/java/org/mvplugins/multiverse/core/utils/MVCorei18n.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/MVCorei18n.java @@ -101,6 +101,11 @@ public enum MVCorei18n implements MessageKeyProvider { UNLOAD_UNLOADING, UNLOAD_SUCCESS, + // version command + VERSION_MV, + VERSION_AUTHORS, + VERSION_SECRETCODE, + // debug command DEBUG_INFO_OFF, DEBUG_INFO_ON, diff --git a/src/main/resources/multiverse-core_en.properties b/src/main/resources/multiverse-core_en.properties index bfb4bcd5..26a9ab61 100644 --- a/src/main/resources/multiverse-core_en.properties +++ b/src/main/resources/multiverse-core_en.properties @@ -139,6 +139,12 @@ mv-core.unload.success=&aWorld '{world}' unloaded! # /mv usage mv-core.usage.description=Show Multiverse-Core command usage. +# /mv version +mv-core.version.description=Displays version and authors +mv-core.version.mv=Multiverse Core Version &fv{version} +mv-core.version.authors=Multiverse Core Authors &f{authors} +mv-core.version.secretcode=Special Code: &fFRN002 + # commands error mv-core.commands.error.playersonly=&cThis command can only be used by players mv-core.commands.error.multiverseworldonly=&cThis can only be used in multiverse worlds From caed081f822914ab301aeebc0f41dbe2fefded04 Mon Sep 17 00:00:00 2001 From: Zax71 Date: Fri, 8 Mar 2024 18:03:42 +0000 Subject: [PATCH 4/4] Update Ben's name --- src/main/resources/plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 0ce00df3..f4bc2d69 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: Multiverse-Core main: org.mvplugins.multiverse.core.MultiverseCore -authors: ['dumptruckman', 'Rigby', 'fernferret', 'lithium3141', 'main--', 'Benergy10', 'Zax71'] +authors: ['dumptruckman', 'Rigby', 'fernferret', 'lithium3141', 'main--', 'benwoo1110', 'Zax71'] website: 'https://dev.bukkit.org/projects/multiverse-core' softdepend: ['Vault', 'PlaceholderAPI'] api-version: 1.13