diff --git a/bukkit/src/main/java/co/aikar/commands/MinecraftMessageKeys.java b/bukkit/src/main/java/co/aikar/commands/MinecraftMessageKeys.java index e9c242a0..e438b2e1 100644 --- a/bukkit/src/main/java/co/aikar/commands/MinecraftMessageKeys.java +++ b/bukkit/src/main/java/co/aikar/commands/MinecraftMessageKeys.java @@ -36,7 +36,7 @@ public enum MinecraftMessageKeys implements MessageKeyProvider { NO_PLAYER_FOUND ; - private final MessageKey key = MessageKey.of(this.name().toLowerCase()); + private final MessageKey key = MessageKey.of("acf-minecraft." + this.name().toLowerCase()); public MessageKey getMessageKey() { return key; } diff --git a/bungee/src/main/java/co/aikar/commands/MinecraftMessageKeys.java b/bungee/src/main/java/co/aikar/commands/MinecraftMessageKeys.java index 910fc5ba..af84b083 100644 --- a/bungee/src/main/java/co/aikar/commands/MinecraftMessageKeys.java +++ b/bungee/src/main/java/co/aikar/commands/MinecraftMessageKeys.java @@ -10,7 +10,7 @@ public enum MinecraftMessageKeys implements MessageKeyProvider { NO_PLAYER_FOUND ; - private final MessageKey key = MessageKey.of(this.name().toLowerCase()); + private final MessageKey key = MessageKey.of("acf-minecraft." + this.name().toLowerCase()); public MessageKey getMessageKey() { return key; } diff --git a/core/src/main/java/co/aikar/commands/MessageKeys.java b/core/src/main/java/co/aikar/commands/MessageKeys.java index 64716ada..9cb3a788 100644 --- a/core/src/main/java/co/aikar/commands/MessageKeys.java +++ b/core/src/main/java/co/aikar/commands/MessageKeys.java @@ -26,7 +26,7 @@ package co.aikar.commands; import co.aikar.locales.MessageKey; /** - * Enum Name = MessageKey in lowercase + * Enum Name = MessageKey in lowercase prefixed with acf-core. */ @SuppressWarnings("WeakerAccess") public enum MessageKeys implements MessageKeyProvider { @@ -41,9 +41,10 @@ public enum MessageKeys implements MessageKeyProvider { MUST_BE_A_NUMBER, MUST_BE_MIN_LENGTH, MUST_BE_MAX_LENGTH, - NOT_ALLOWED_ON_CONSOLE, COULD_NOT_FIND_PLAYER; + NOT_ALLOWED_ON_CONSOLE, + COULD_NOT_FIND_PLAYER; - private final MessageKey key = MessageKey.of(this.name().toLowerCase()); + private final MessageKey key = MessageKey.of("acf-core." + this.name().toLowerCase()); public MessageKey getMessageKey() { return key; } diff --git a/languages/core/acf-core_en.properties b/languages/core/acf-core_en.properties index 8bac7ade..eea3f958 100644 --- a/languages/core/acf-core_en.properties +++ b/languages/core/acf-core_en.properties @@ -20,16 +20,16 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -permission_denied = I'm sorry, but you do not have permission to perform this command. -error_generic_logged = An error occured. This problem has been logged. Sorry for the inconvienence. -unknown_command = Unknown Command, please type /help -invalid_syntax = Usage: {command} {syntax} -error_prefix = Error: {message} -error_performing_command = I'm sorry, but there was an error performing this command. -info_message = {message} -please_specify_one_of = Error: Please specify one of ({valid}). -must_be_a_number = Error: Must be a number -must_be_min_length = Error: Must be at least {min} characters long. -must_be_max_length = Error: Must be less than {max} characters long. -not_allowed_on_console = Error: Console may not execute this command. -could_not_find_player = Error: Could not find a player by the name: {search} +acf-core.permission_denied = I'm sorry, but you do not have permission to perform this command. +acf-core.error_generic_logged = An error occured. This problem has been logged. Sorry for the inconvienence. +acf-core.unknown_command = Unknown Command, please type /help +acf-core.invalid_syntax = Usage: {command} {syntax} +acf-core.error_prefix = Error: {message} +acf-core.error_performing_command = I'm sorry, but there was an error performing this command. +acf-core.info_message = {message} +acf-core.please_specify_one_of = Error: Please specify one of ({valid}). +acf-core.must_be_a_number = Error: Must be a number +acf-core.must_be_min_length = Error: Must be at least {min} characters long. +acf-core.must_be_max_length = Error: Must be less than {max} characters long. +acf-core.not_allowed_on_console = Error: Console may not execute this command. +acf-core.could_not_find_player = Error: Could not find a player by the name: {search} diff --git a/languages/minecraft/acf-minecraft_en.properties b/languages/minecraft/acf-minecraft_en.properties index e74aa595..acbea370 100644 --- a/languages/minecraft/acf-minecraft_en.properties +++ b/languages/minecraft/acf-minecraft_en.properties @@ -21,15 +21,15 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -invalid_world = Error: That world does not exists. -you_must_be_holding_item = Error: You must be holding an item in your main hand. -player_is_vanished_confirm = \ +acf-minecraft.invalid_world = Error: That world does not exists. +acf-minecraft.you_must_be_holding_item = Error: You must be holding an item in your main hand. +acf-minecraft.player_is_vanished_confirm = \ Warning: {vanished} is vanished. Do not blow their cover!\n\ To confirm your action, add :confirm to the end of their name.\n\ Ex: {vanished}:confirm -username_too_short = Error: Username too short, must be at least three characters. -is_not_a_valid_name = Error: {name} is not a valid username. -multiple_players_matched = Error: Multiple players matched {search} ({all}), please be more specific. -no_player_found_server = No player matching {search} is connected to this server. -no_player_found = No player matching {search} could be found. +acf-minecraft.username_too_short = Error: Username too short, must be at least three characters. +acf-minecraft.is_not_a_valid_name = Error: {name} is not a valid username. +acf-minecraft.multiple_players_matched = Error: Multiple players matched {search} ({all}), please be more specific. +acf-minecraft.no_player_found_server = No player matching {search} is connected to this server. +acf-minecraft.no_player_found = No player matching {search} could be found. diff --git a/sponge/src/main/java/co/aikar/commands/MinecraftMessageKeys.java b/sponge/src/main/java/co/aikar/commands/MinecraftMessageKeys.java index e9c242a0..e438b2e1 100644 --- a/sponge/src/main/java/co/aikar/commands/MinecraftMessageKeys.java +++ b/sponge/src/main/java/co/aikar/commands/MinecraftMessageKeys.java @@ -36,7 +36,7 @@ public enum MinecraftMessageKeys implements MessageKeyProvider { NO_PLAYER_FOUND ; - private final MessageKey key = MessageKey.of(this.name().toLowerCase()); + private final MessageKey key = MessageKey.of("acf-minecraft." + this.name().toLowerCase()); public MessageKey getMessageKey() { return key; }