funkemunky/commands
1
0
Fork 0
mirror of https://github.com/aikar/commands.git synced 2026-05-31 14:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

autoload message bundles based on plugin name

Browse Source
This commit is contained in:
Aikar
2017-07-02 14:27:44 -05:00
parent 8c545ce343
commit d9652ba9eb
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java
+2 -1
View File
@@ -65,7 +65,8 @@ public class BukkitCommandManager extends CommandManager {
@SuppressWarnings("JavaReflectionMemberAccess")
public BukkitCommandManager(Plugin plugin) {
this.plugin = plugin;
this.locales.addMessageBundle("acf-minecraft", Locale.ENGLISH);
String pluginName = "acf-" + plugin.getDescription().getName();
this.locales.addMessageBundles("acf-minecraft", pluginName, pluginName.toLowerCase());
this.timingManager = TimingManager.of(plugin);
this.commandTiming = this.timingManager.of("Commands");
CommandMap commandMap = null;
bungee/src/main/java/co/aikar/commands/BungeeCommandManager.java
+2 -2
View File
@@ -41,14 +41,14 @@ import java.util.logging.Logger;
public class BungeeCommandManager extends CommandManager {
protected final Plugin plugin;
protected Map<String, Command> knownCommands = new HashMap<>();
protected Map<String, BungeeRootCommand> registeredCommands = new HashMap<>();
protected BungeeCommandContexts contexts;
protected BungeeCommandCompletions completions;
public BungeeCommandManager(Plugin plugin) {
this.plugin = plugin;
this.locales.addMessageBundle("acf-minecraft", Locale.ENGLISH);
String pluginName = "acf-" + plugin.getDescription().getName();
this.locales.addMessageBundles("acf-minecraft", pluginName, pluginName.toLowerCase());
this.formatters.put(MessageType.ERROR, new BungeeMessageFormatter(ChatColor.RED, ChatColor.YELLOW, ChatColor.RED));
this.formatters.put(MessageType.SYNTAX, new BungeeMessageFormatter(ChatColor.YELLOW, ChatColor.GREEN, ChatColor.WHITE));
this.formatters.put(MessageType.INFO, new BungeeMessageFormatter(ChatColor.BLUE, ChatColor.DARK_GREEN, ChatColor.GREEN));
core/src/main/java/co/aikar/commands/CommandManager.java
+1 -1
View File
@@ -30,7 +30,7 @@ import java.lang.reflect.Parameter;
import java.util.*;
@SuppressWarnings("WeakerAccess")
abstract class CommandManager {
public abstract class CommandManager {
static ThreadLocal<Stack<CommandManager>> currentCommandManager = ThreadLocal.withInitial(Stack::new);
static ThreadLocal<Stack<CommandIssuer>> currentCommandIssuer = ThreadLocal.withInitial(Stack::new);
core/src/main/java/co/aikar/commands/Locales.java
+6 -2
View File
@@ -40,13 +40,18 @@ public class Locales {
Locales(CommandManager manager) {
this.manager = manager;
this.localeManager = LocaleManager.create(manager::getIssuerLocale);
this.localeManager.addMessageBundle("acf-core", Locale.ENGLISH);
this.localeManager.addMessageBundles("acf-core");
}
public Locale getDefaultLocale() {
return this.localeManager.getDefaultLocale();
}
public void addMessageBundles(String... bundleNames) {
this.localeManager.addMessageBundles(bundleNames);
}
public void addMessageBundle(String bundleName, Locale locale) {
this.localeManager.addMessageBundle(bundleName, locale);
}
@@ -68,5 +73,4 @@ public class Locales {
return message;
}
}
sponge/src/main/java/co/aikar/commands/SpongeCommandManager.java
+2 -2
View File
@@ -36,7 +36,6 @@ import java.lang.reflect.Method;
import java.lang.reflect.Parameter;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@SuppressWarnings("WeakerAccess")
@@ -50,7 +49,8 @@ public class SpongeCommandManager extends CommandManager {
public SpongeCommandManager(PluginContainer plugin) {
this.plugin = plugin;
this.locales.addMessageBundle("acf-minecraft", Locale.ENGLISH);
String pluginName = "acf-" + plugin.getName();
this.locales.addMessageBundles("acf-minecraft", pluginName, pluginName.toLowerCase());
this.commandTiming = Timings.of(plugin, "Commands");
this.formatters.put(MessageType.ERROR, new SpongeMessageFormatter(TextColors.RED, TextColors.YELLOW, TextColors.RED));