From 56dc504bec8cbb148825d9babec76c62b6f65bcd Mon Sep 17 00:00:00 2001 From: Andreas Troelsen Date: Fri, 10 Mar 2017 23:32:52 +0100 Subject: [PATCH] Refactor Messenger to allow for custom prefixes. - Messenger no longer has a static nature and must be instantiated to be used. The prefix is provided in the constructor. - MobArena instantiates a global Messenger in onEnable() with a prefix string from global-settings. This instance is used by anything that isn't arena-specific, as well as for arenas with no prefix. - ArenaImpl instantiates a local Messenger in its constructor if, and only if, its arena-specific prefix setting is non-empty. Otherwise it uses the plugin's global instance. --- .../com/garbagemule/MobArena/ArenaImpl.java | 78 +++++++++++-------- .../garbagemule/MobArena/ArenaListener.java | 40 +++++----- .../garbagemule/MobArena/ArenaMasterImpl.java | 5 ++ .../garbagemule/MobArena/MASpawnThread.java | 8 +- .../com/garbagemule/MobArena/MAUtils.java | 2 +- .../com/garbagemule/MobArena/Messenger.java | 23 ++++-- .../com/garbagemule/MobArena/MobArena.java | 14 ++++ .../MobArena/commands/CommandHandler.java | 16 ++-- .../MobArena/commands/Commands.java | 15 ++-- .../commands/admin/DisableCommand.java | 6 +- .../commands/admin/EnableCommand.java | 6 +- .../MobArena/commands/admin/ForceCommand.java | 16 ++-- .../MobArena/commands/admin/KickCommand.java | 7 +- .../commands/admin/RestoreCommand.java | 6 +- .../commands/setup/AddArenaCommand.java | 6 +- .../commands/setup/AddClassPermCommand.java | 6 +- .../commands/setup/AutoDegenerateCommand.java | 10 +-- .../commands/setup/AutoGenerateCommand.java | 8 +- .../commands/setup/CheckDataCommand.java | 4 +- .../commands/setup/CheckSpawnsCommand.java | 9 +-- .../commands/setup/ClassChestCommand.java | 9 +-- .../commands/setup/ConfigCommand.java | 10 +-- .../commands/setup/EditArenaCommand.java | 10 +-- .../commands/setup/ListClassPermsCommand.java | 8 +- .../commands/setup/ListClassesCommand.java | 6 +- .../commands/setup/RemoveArenaCommand.java | 6 +- .../commands/setup/RemoveClassCommand.java | 4 +- .../setup/RemoveClassPermCommand.java | 6 +- .../setup/RemoveContainerCommand.java | 8 +- .../setup/RemoveLeaderboardCommand.java | 9 +-- .../setup/RemoveSpawnpointCommand.java | 8 +- .../commands/setup/SetClassCommand.java | 8 +- .../commands/setup/SetClassPriceCommand.java | 7 +- .../commands/setup/SettingCommand.java | 15 ++-- .../MobArena/commands/setup/SetupCommand.java | 7 +- .../commands/user/ArenaListCommand.java | 2 +- .../MobArena/commands/user/JoinCommand.java | 4 +- .../MobArena/commands/user/LeaveCommand.java | 6 +- .../commands/user/NotReadyCommand.java | 6 +- .../commands/user/PickClassCommand.java | 19 +++-- .../commands/user/PlayerListCommand.java | 4 +- .../MobArena/commands/user/SpecCommand.java | 4 +- .../garbagemule/MobArena/framework/Arena.java | 4 + .../MobArena/framework/ArenaMaster.java | 3 + .../MobArena/listeners/MAGlobalListener.java | 3 +- .../MobArena/region/ArenaRegion.java | 13 ++-- .../MobArena/util/ClassChests.java | 5 +- .../MobArena/util/VersionChecker.java | 3 +- .../MobArena/util/timer/ChatCallback.java | 3 +- .../MobArena/util/timer/StartDelayTimer.java | 3 +- .../MobArena/waves/enums/WaveType.java | 13 ++-- .../MobArena/waves/types/BossWave.java | 3 +- src/main/resources/res/global-settings.yml | 3 +- src/main/resources/res/settings.yml | 1 + 54 files changed, 271 insertions(+), 237 deletions(-) diff --git a/src/main/java/com/garbagemule/MobArena/ArenaImpl.java b/src/main/java/com/garbagemule/MobArena/ArenaImpl.java index 54d2f88..4ffbcf1 100644 --- a/src/main/java/com/garbagemule/MobArena/ArenaImpl.java +++ b/src/main/java/com/garbagemule/MobArena/ArenaImpl.java @@ -45,6 +45,7 @@ public class ArenaImpl implements Arena private MobArena plugin; private String name; private World world; + private Messenger messenger; // Settings section of the config-file for this arena. private ConfigurationSection settings; @@ -177,6 +178,10 @@ public class ArenaImpl implements Arena // Scoreboards this.scoreboard = (settings.getBoolean("use-scoreboards", true) ? new ScoreboardManager(this) : new NullScoreboardManager(this)); + + // Messenger + String prefix = settings.getString("prefix", ""); + this.messenger = !prefix.isEmpty() ? new Messenger(prefix) : plugin.getGlobalMessenger(); } @@ -386,6 +391,17 @@ public class ArenaImpl implements Arena + @Override + public Messenger getMessenger() { + return messenger; + } + + @Override + public Messenger getGlobalMessenger() { + return plugin.getGlobalMessenger(); + } + + @Override public boolean startArena() { // Sanity-checks @@ -484,7 +500,7 @@ public class ArenaImpl implements Arena leaderboard.initialize(); leaderboard.startTracking(); - Messenger.announce(this, Msg.ARENA_START); + messenger.announce(this, Msg.ARENA_START); return true; } @@ -521,10 +537,10 @@ public class ArenaImpl implements Arena // Announce and clean arena floor, etc. if (settings.getBoolean("global-end-announce", false)) { for (Player p : Bukkit.getOnlinePlayers()) { - Messenger.tell(p, Msg.ARENA_END_GLOBAL, configName()); + messenger.tell(p, Msg.ARENA_END_GLOBAL, configName()); } } else { - Messenger.announce(this, Msg.ARENA_END); + messenger.announce(this, Msg.ARENA_END); } cleanup(); @@ -556,7 +572,7 @@ public class ArenaImpl implements Arena // Force leave. for (Player p : tmp) { playerLeave(p); - Messenger.tell(p, Msg.LEAVE_NOT_READY); + messenger.tell(p, Msg.LEAVE_NOT_READY); } // Stop start-delay-timer and start arena @@ -587,7 +603,7 @@ public class ArenaImpl implements Arena if (settings.getBoolean("global-join-announce", false)) { if (lobbyPlayers.isEmpty()) { for (Player q : Bukkit.getOnlinePlayers()) { - Messenger.tell(q, Msg.ARENA_JOIN_GLOBAL, configName()); + messenger.tell(q, Msg.ARENA_JOIN_GLOBAL, configName()); } } } @@ -613,20 +629,20 @@ public class ArenaImpl implements Arena } // Notify player of joining - Messenger.tell(p, Msg.JOIN_PLAYER_JOINED); + messenger.tell(p, Msg.JOIN_PLAYER_JOINED); // Notify player of time left if (startDelayTimer.isRunning()) { - Messenger.tell(p, Msg.ARENA_START_DELAY, "" + startDelayTimer.getRemaining() / 20l); + messenger.tell(p, Msg.ARENA_START_DELAY, "" + startDelayTimer.getRemaining() / 20l); } else if (autoStartTimer.isRunning()) { - Messenger.tell(p, Msg.ARENA_AUTO_START, "" + autoStartTimer.getRemaining() / 20l); + messenger.tell(p, Msg.ARENA_AUTO_START, "" + autoStartTimer.getRemaining() / 20l); } if (defaultClass != null) { // Assign default class if applicable if (!ClassChests.assignClassFromStoredClassChest(this, p, defaultClass)) { assignClass(p, defaultClass.getLowercaseName()); - Messenger.tell(p, Msg.LOBBY_CLASS_PICKED, defaultClass.getConfigName()); + messenger.tell(p, Msg.LOBBY_CLASS_PICKED, defaultClass.getConfigName()); } } @@ -647,7 +663,7 @@ public class ArenaImpl implements Arena int minPlayers = getMinPlayers(); if (minPlayers > 0 && lobbyPlayers.size() < minPlayers) { - Messenger.tell(p, Msg.LOBBY_NOT_ENOUGH_PLAYERS, "" + minPlayers); + messenger.tell(p, Msg.LOBBY_NOT_ENOUGH_PLAYERS, "" + minPlayers); return; } @@ -762,8 +778,8 @@ public class ArenaImpl implements Arena if (settings.getBoolean("spectate-on-death", true)) { movePlayerToSpec(p); - Messenger.tell(p, Msg.SPEC_FROM_ARENA); - Messenger.tell(p, Msg.MISC_MA_LEAVE_REMINDER); + messenger.tell(p, Msg.SPEC_FROM_ARENA); + messenger.tell(p, Msg.MISC_MA_LEAVE_REMINDER); } else { restoreInvAndExp(p); movePlayerToEntry(p); @@ -789,7 +805,7 @@ public class ArenaImpl implements Arena MAUtils.sitPets(p); movePlayerToSpec(p); - Messenger.tell(p, Msg.SPEC_PLAYER_SPECTATE); + messenger.tell(p, Msg.SPEC_PLAYER_SPECTATE); } private void spawnPets() { @@ -1247,7 +1263,7 @@ public class ArenaImpl implements Arena } assignClass(p, className); - Messenger.tell(p, Msg.LOBBY_CLASS_PICKED, this.classes.get(className).getConfigName()); + messenger.tell(p, Msg.LOBBY_CLASS_PICKED, this.classes.get(className).getConfigName()); } @Override @@ -1507,7 +1523,7 @@ public class ArenaImpl implements Arena } } - Messenger.tell(p, Msg.JOIN_FEE_PAID.format(MAUtils.listToString(entryFee, plugin))); + messenger.tell(p, Msg.JOIN_FEE_PAID.format(MAUtils.listToString(entryFee, plugin))); return true; } @@ -1533,25 +1549,25 @@ public class ArenaImpl implements Arena @Override public boolean canJoin(Player p) { if (!enabled) - Messenger.tell(p, Msg.JOIN_ARENA_NOT_ENABLED); + messenger.tell(p, Msg.JOIN_ARENA_NOT_ENABLED); else if (!region.isSetup() || waveManager.getRecurrentWaves().isEmpty()) - Messenger.tell(p, Msg.JOIN_ARENA_NOT_SETUP); + messenger.tell(p, Msg.JOIN_ARENA_NOT_SETUP); else if (edit) - Messenger.tell(p, Msg.JOIN_ARENA_EDIT_MODE); + messenger.tell(p, Msg.JOIN_ARENA_EDIT_MODE); else if (arenaPlayers.contains(p) || lobbyPlayers.contains(p)) - Messenger.tell(p, Msg.JOIN_ALREADY_PLAYING); + messenger.tell(p, Msg.JOIN_ALREADY_PLAYING); else if (running) - Messenger.tell(p, Msg.JOIN_ARENA_IS_RUNNING); + messenger.tell(p, Msg.JOIN_ARENA_IS_RUNNING); else if (!plugin.has(p, "mobarena.arenas." + configName())) - Messenger.tell(p, Msg.JOIN_ARENA_PERMISSION); + messenger.tell(p, Msg.JOIN_ARENA_PERMISSION); else if (getMaxPlayers() > 0 && lobbyPlayers.size() >= getMaxPlayers()) - Messenger.tell(p, Msg.JOIN_PLAYER_LIMIT_REACHED); + messenger.tell(p, Msg.JOIN_PLAYER_LIMIT_REACHED); else if (getJoinDistance() > 0 && !region.contains(p.getLocation(), getJoinDistance())) - Messenger.tell(p, Msg.JOIN_TOO_FAR); + messenger.tell(p, Msg.JOIN_TOO_FAR); else if (settings.getBoolean("require-empty-inv-join", true) && !InventoryManager.hasEmptyInventory(p)) - Messenger.tell(p, Msg.JOIN_EMPTY_INV); + messenger.tell(p, Msg.JOIN_EMPTY_INV); else if (!canAfford(p)) - Messenger.tell(p, Msg.JOIN_FEE_REQUIRED, MAUtils.listToString(entryFee, plugin)); + messenger.tell(p, Msg.JOIN_FEE_REQUIRED, MAUtils.listToString(entryFee, plugin)); else return true; return false; @@ -1560,17 +1576,17 @@ public class ArenaImpl implements Arena @Override public boolean canSpec(Player p) { if (!enabled) - Messenger.tell(p, Msg.JOIN_ARENA_NOT_ENABLED); + messenger.tell(p, Msg.JOIN_ARENA_NOT_ENABLED); else if (!region.isSetup()) - Messenger.tell(p, Msg.JOIN_ARENA_NOT_SETUP); + messenger.tell(p, Msg.JOIN_ARENA_NOT_SETUP); else if (edit) - Messenger.tell(p, Msg.JOIN_ARENA_EDIT_MODE); + messenger.tell(p, Msg.JOIN_ARENA_EDIT_MODE); else if (arenaPlayers.contains(p) || lobbyPlayers.contains(p)) - Messenger.tell(p, Msg.SPEC_ALREADY_PLAYING); + messenger.tell(p, Msg.SPEC_ALREADY_PLAYING); else if (settings.getBoolean("require-empty-inv-spec", true) && !InventoryManager.hasEmptyInventory(p)) - Messenger.tell(p, Msg.SPEC_EMPTY_INV); + messenger.tell(p, Msg.SPEC_EMPTY_INV); else if (getJoinDistance() > 0 && !region.contains(p.getLocation(), getJoinDistance())) - Messenger.tell(p, Msg.JOIN_TOO_FAR); + messenger.tell(p, Msg.JOIN_TOO_FAR); else return true; return false; diff --git a/src/main/java/com/garbagemule/MobArena/ArenaListener.java b/src/main/java/com/garbagemule/MobArena/ArenaListener.java index 68ad8b9..34055e5 100644 --- a/src/main/java/com/garbagemule/MobArena/ArenaListener.java +++ b/src/main/java/com/garbagemule/MobArena/ArenaListener.java @@ -384,7 +384,7 @@ public class ArenaListener arena.setLeaderboard(new Leaderboard(plugin, arena, event.getBlock().getLocation())); arena.getRegion().set(RegionPoint.LEADERBOARD, event.getBlock().getLocation()); - Messenger.tell(event.getPlayer(), "Leaderboard made. Now set up the stat signs!"); + arena.getPlugin().getGlobalMessenger().tell(event.getPlayer(), "Leaderboard made. Now set up the stat signs!"); } public void onCreatureSpawn(CreatureSpawnEvent event) { @@ -492,7 +492,7 @@ public class ArenaListener onMountDeath(event); } else if (monsters.removeGolem(event.getEntity())) { - Messenger.announce(arena, Msg.GOLEM_DIED); + arena.getMessenger().announce(arena, Msg.GOLEM_DIED); } } @@ -505,7 +505,7 @@ public class ArenaListener callKillEvent(player.getKiller(), player); } if (arena.getSettings().getBoolean("show-death-messages", true)) { - Messenger.announce(arena, event.getDeathMessage()); + arena.getMessenger().announce(arena, event.getDeathMessage()); } event.setDeathMessage(null); arena.getScoreboard().death(player); @@ -575,7 +575,7 @@ public class ArenaListener msg += MAUtils.toCamelCase(reward.getType().toString()) + ":" + reward.getAmount(); } for (Player q : arena.getPlayersInArena()) { - Messenger.tell(q, msg); + arena.getMessenger().tell(q, msg); } } } @@ -908,25 +908,25 @@ public class ArenaListener // If the player is active in the arena, only cancel if sharing is not allowed if (arena.inArena(p)) { if (!canShare) { - Messenger.tell(p, Msg.LOBBY_DROP_ITEM); + arena.getMessenger().tell(p, Msg.LOBBY_DROP_ITEM); event.setCancelled(true); } } // If the player is in the lobby, just cancel else if (arena.inLobby(p)) { - Messenger.tell(p, Msg.LOBBY_DROP_ITEM); + arena.getMessenger().tell(p, Msg.LOBBY_DROP_ITEM); event.setCancelled(true); } // Same if it's a spectator, but... else if (arena.inSpec(p)) { - Messenger.tell(p, Msg.LOBBY_DROP_ITEM); + arena.getMessenger().tell(p, Msg.LOBBY_DROP_ITEM); event.setCancelled(true); // If the spectator isn't in the region, force them to leave if (!region.contains(p.getLocation())) { - Messenger.tell(p, Msg.MISC_MA_LEAVE_REMINDER); + arena.getMessenger().tell(p, Msg.MISC_MA_LEAVE_REMINDER); arena.playerLeave(p); } } @@ -937,7 +937,7 @@ public class ArenaListener * they are trying to drop items when not allowed */ else if (region.contains(p.getLocation())) { - Messenger.tell(p, Msg.LOBBY_DROP_ITEM); + arena.getMessenger().tell(p, Msg.LOBBY_DROP_ITEM); event.setCancelled(true); } @@ -994,11 +994,11 @@ public class ArenaListener private void handleReadyBlock(Player p) { if (arena.getArenaPlayer(p).getArenaClass() != null) { - Messenger.tell(p, Msg.LOBBY_PLAYER_READY); + arena.getMessenger().tell(p, Msg.LOBBY_PLAYER_READY); arena.playerReady(p); } else { - Messenger.tell(p, Msg.LOBBY_PICK_CLASS); + arena.getMessenger().tell(p, Msg.LOBBY_PICK_CLASS); } } @@ -1011,7 +1011,7 @@ public class ArenaListener // Check for permission. if (!plugin.has(p, "mobarena.classes." + className) && !className.equals("random")) { - Messenger.tell(p, Msg.LOBBY_CLASS_PERMISSION); + arena.getMessenger().tell(p, Msg.LOBBY_CLASS_PERMISSION); return; } @@ -1025,7 +1025,7 @@ public class ArenaListener // If the new class is full, inform the player. if (!classLimits.canPlayerJoinClass(newAC)) { - Messenger.tell(p, Msg.LOBBY_CLASS_FULL); + arena.getMessenger().tell(p, Msg.LOBBY_CLASS_FULL); return; } @@ -1033,7 +1033,7 @@ public class ArenaListener double price = newAC.getPrice(); if (price > 0D) { if (!plugin.hasEnough(p, price)) { - Messenger.tell(p, Msg.LOBBY_CLASS_TOO_EXPENSIVE, plugin.economyFormat(price)); + arena.getMessenger().tell(p, Msg.LOBBY_CLASS_TOO_EXPENSIVE, plugin.economyFormat(price)); return; } } @@ -1073,14 +1073,14 @@ public class ArenaListener // Otherwise just fall through and use the items from the config-file } arena.assignClass(p, className); - Messenger.tell(p, Msg.LOBBY_CLASS_PICKED, arena.getClasses().get(className).getConfigName()); + arena.getMessenger().tell(p, Msg.LOBBY_CLASS_PICKED, arena.getClasses().get(className).getConfigName()); if (price > 0D) { - Messenger.tell(p, Msg.LOBBY_CLASS_PRICE, plugin.economyFormat(price)); + arena.getMessenger().tell(p, Msg.LOBBY_CLASS_PRICE, plugin.economyFormat(price)); } } else { arena.addRandomPlayer(p); - Messenger.tell(p, Msg.LOBBY_CLASS_RANDOM); + arena.getMessenger().tell(p, Msg.LOBBY_CLASS_RANDOM); } } }); @@ -1141,7 +1141,7 @@ public class ArenaListener return TeleportResponse.ALLOW; } - Messenger.tell(p, Msg.WARP_FROM_ARENA); + arena.getMessenger().tell(p, Msg.WARP_FROM_ARENA); return TeleportResponse.REJECT; } else if (region.contains(to)) { @@ -1154,7 +1154,7 @@ public class ArenaListener return TeleportResponse.ALLOW; } - Messenger.tell(p, Msg.WARP_TO_ARENA); + arena.getMessenger().tell(p, Msg.WARP_TO_ARENA); return TeleportResponse.REJECT; } @@ -1187,7 +1187,7 @@ public class ArenaListener // Cancel the event regardless. event.setCancelled(true); - Messenger.tell(p, Msg.MISC_COMMAND_NOT_ALLOWED); + arena.getMessenger().tell(p, Msg.MISC_COMMAND_NOT_ALLOWED); } public void onPlayerPreLogin(PlayerLoginEvent event) { diff --git a/src/main/java/com/garbagemule/MobArena/ArenaMasterImpl.java b/src/main/java/com/garbagemule/MobArena/ArenaMasterImpl.java index 1e165d0..ebdacba 100644 --- a/src/main/java/com/garbagemule/MobArena/ArenaMasterImpl.java +++ b/src/main/java/com/garbagemule/MobArena/ArenaMasterImpl.java @@ -73,6 +73,11 @@ public class ArenaMasterImpl implements ArenaMaster return plugin; } + @Override + public Messenger getGlobalMessenger() { + return plugin.getGlobalMessenger(); + } + public boolean isEnabled() { return enabled; } diff --git a/src/main/java/com/garbagemule/MobArena/MASpawnThread.java b/src/main/java/com/garbagemule/MobArena/MASpawnThread.java index 35af178..3dcca26 100644 --- a/src/main/java/com/garbagemule/MobArena/MASpawnThread.java +++ b/src/main/java/com/garbagemule/MobArena/MASpawnThread.java @@ -282,7 +282,7 @@ public class MASpawnThread implements Runnable continue; } - Messenger.tell(p, "Leaving so soon?"); + arena.getMessenger().tell(p, "Leaving so soon?"); p.getInventory().clear(); arena.playerLeave(p); } @@ -330,19 +330,19 @@ public class MASpawnThread implements Runnable rewardManager.addReward(p, reward); if (reward == null) { - Messenger.tell(p, "ERROR! Problem with rewards. Notify server host!"); + arena.getMessenger().tell(p, "ERROR! Problem with rewards. Notify server host!"); plugin.getLogger().warning("Could not add null reward. Please check the config-file!"); } else if (reward.getTypeId() == MobArena.ECONOMY_MONEY_ID) { if (plugin.giveMoney(p, reward)) { // Money already awarded here, not needed at end of match as well - Messenger.tell(p, Msg.WAVE_REWARD, plugin.economyFormat(reward)); + arena.getMessenger().tell(p, Msg.WAVE_REWARD, plugin.economyFormat(reward)); } else { plugin.getLogger().warning("Tried to add money, but no economy plugin detected!"); } } else { - Messenger.tell(p, Msg.WAVE_REWARD, MAUtils.toCamelCase(reward.getType().toString()) + ":" + reward.getAmount()); + arena.getMessenger().tell(p, Msg.WAVE_REWARD, MAUtils.toCamelCase(reward.getType().toString()) + ":" + reward.getAmount()); } } } diff --git a/src/main/java/com/garbagemule/MobArena/MAUtils.java b/src/main/java/com/garbagemule/MobArena/MAUtils.java index 4b0fe56..1117fa5 100644 --- a/src/main/java/com/garbagemule/MobArena/MAUtils.java +++ b/src/main/java/com/garbagemule/MobArena/MAUtils.java @@ -147,7 +147,7 @@ public class MAUtils if (!arena.getWorld().equals(p.getWorld())) { plugin.getLogger().info("Player '" + p.getName() + "' is not in the right world. Kicking..."); p.kickPlayer("[MobArena] Cheater! (Warped out of the arena world.)"); - Messenger.tell(p, "You warped out of the arena world."); + arena.getMessenger().tell(p, "You warped out of the arena world."); continue; } diff --git a/src/main/java/com/garbagemule/MobArena/Messenger.java b/src/main/java/com/garbagemule/MobArena/Messenger.java index 0153c7b..1a7fdc6 100644 --- a/src/main/java/com/garbagemule/MobArena/Messenger.java +++ b/src/main/java/com/garbagemule/MobArena/Messenger.java @@ -11,28 +11,35 @@ import com.garbagemule.MobArena.framework.Arena; public class Messenger { - private Messenger() {} + private final String prefix; - public static boolean tell(CommandSender p, String msg) { + public Messenger(String prefix) { + if (prefix.contains("&")) { + prefix = ChatColor.translateAlternateColorCodes('&', prefix); + } + this.prefix = prefix; + } + + public boolean tell(CommandSender p, String msg) { // If the input sender is null or the string is empty, return. if (p == null || msg.equals("")) { return false; } // Otherwise, send the message with the [MobArena] tag. - p.sendMessage(ChatColor.GREEN + "[MobArena] " + ChatColor.RESET + msg); + p.sendMessage(prefix + ChatColor.RESET + msg); return true; } - public static boolean tell(CommandSender p, Msg msg, String s) { + public boolean tell(CommandSender p, Msg msg, String s) { return tell(p, msg.format(s)); } - public static boolean tell(CommandSender p, Msg msg) { + public boolean tell(CommandSender p, Msg msg) { return tell(p, msg.toString()); } - public static void announce(Arena arena, String msg) { + public void announce(Arena arena, String msg) { List players = new ArrayList(); players.addAll(arena.getPlayersInArena()); players.addAll(arena.getPlayersInLobby()); @@ -42,11 +49,11 @@ public class Messenger } } - public static void announce(Arena arena, Msg msg, String s) { + public void announce(Arena arena, Msg msg, String s) { announce(arena, msg.format(s)); } - public static void announce(Arena arena, Msg msg) { + public void announce(Arena arena, Msg msg) { announce(arena, msg.toString()); } } diff --git a/src/main/java/com/garbagemule/MobArena/MobArena.java b/src/main/java/com/garbagemule/MobArena/MobArena.java index 79915bd..395e0a8 100644 --- a/src/main/java/com/garbagemule/MobArena/MobArena.java +++ b/src/main/java/com/garbagemule/MobArena/MobArena.java @@ -11,6 +11,7 @@ import net.milkbowl.vault.economy.EconomyResponse; import net.milkbowl.vault.economy.EconomyResponse.ResponseType; import org.bukkit.Bukkit; +import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.configuration.InvalidConfigurationException; @@ -57,12 +58,21 @@ public class MobArena extends JavaPlugin public static final int ECONOMY_MONEY_ID = -29; public static Random random = new Random(); + private Messenger messenger; + public void onEnable() { // Initialize config-file configFile = new File(getDataFolder(), "config.yml"); config = new YamlConfiguration(); reloadConfig(); + // Initialize global messenger + String prefix = config.getString("global-settings.prefix", ""); + if (prefix.isEmpty()) { + prefix = ChatColor.GREEN + "[MobArena] "; + } + messenger = new Messenger(prefix); + // Set the header and save getConfig().options().header(getHeader()); saveConfig(); @@ -352,4 +362,8 @@ public class MobArena extends JavaPlugin double minor = item.getDurability() / 100D; return major + minor; } + + public Messenger getGlobalMessenger() { + return messenger; + } } \ No newline at end of file diff --git a/src/main/java/com/garbagemule/MobArena/commands/CommandHandler.java b/src/main/java/com/garbagemule/MobArena/commands/CommandHandler.java index e659be1..0b811f3 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/CommandHandler.java +++ b/src/main/java/com/garbagemule/MobArena/commands/CommandHandler.java @@ -42,7 +42,7 @@ public class CommandHandler implements CommandExecutor // If there's no base argument, show a helpful message. if (base.equals("")) { - Messenger.tell(sender, Msg.MISC_HELP); + am.getGlobalMessenger().tell(sender, Msg.MISC_HELP); return true; } @@ -57,7 +57,7 @@ public class CommandHandler implements CommandExecutor // If there's more than one match, display them. if (matches.size() > 1) { - Messenger.tell(sender, Msg.MISC_MULTIPLE_MATCHES); + am.getGlobalMessenger().tell(sender, Msg.MISC_MULTIPLE_MATCHES); for (Command cmd : matches) { showUsage(cmd, sender, false); } @@ -66,7 +66,7 @@ public class CommandHandler implements CommandExecutor // If there are no matches at all, notify. if (matches.size() == 0) { - Messenger.tell(sender, Msg.MISC_NO_MATCHES); + am.getGlobalMessenger().tell(sender, Msg.MISC_NO_MATCHES); return true; } @@ -76,7 +76,7 @@ public class CommandHandler implements CommandExecutor // First check if the sender has permission. if (!plugin.has(sender, info.permission())) { - Messenger.tell(sender, Msg.MISC_NO_ACCESS); + am.getGlobalMessenger().tell(sender, Msg.MISC_NO_ACCESS); return true; } @@ -162,11 +162,11 @@ public class CommandHandler implements CommandExecutor } if (admin.length() == 0 && setup.length() == 0) { - Messenger.tell(sender, "Available commands: " + user.toString()); + am.getGlobalMessenger().tell(sender, "Available commands: " + user.toString()); } else { - Messenger.tell(sender, "User commands: " + user.toString()); - if (admin.length() > 0) Messenger.tell(sender, "Admin commands: " + admin.toString()); - if (setup.length() > 0) Messenger.tell(sender, "Setup commands: " + setup.toString()); + am.getGlobalMessenger().tell(sender, "User commands: " + user.toString()); + if (admin.length() > 0) am.getGlobalMessenger().tell(sender, "Admin commands: " + admin.toString()); + if (setup.length() > 0) am.getGlobalMessenger().tell(sender, "Setup commands: " + setup.toString()); } } diff --git a/src/main/java/com/garbagemule/MobArena/commands/Commands.java b/src/main/java/com/garbagemule/MobArena/commands/Commands.java index 665d13b..610488f 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/Commands.java +++ b/src/main/java/com/garbagemule/MobArena/commands/Commands.java @@ -7,7 +7,6 @@ import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.garbagemule.MobArena.Messenger; import com.garbagemule.MobArena.Msg; import com.garbagemule.MobArena.framework.Arena; import com.garbagemule.MobArena.framework.ArenaMaster; @@ -40,21 +39,21 @@ public class Commands public static Arena getArenaToJoinOrSpec(ArenaMaster am, Player p, String arg1) { // Check if MobArena is enabled first. if (!am.isEnabled()) { - Messenger.tell(p, Msg.JOIN_NOT_ENABLED); + am.getGlobalMessenger().tell(p, Msg.JOIN_NOT_ENABLED); return null; } // Then check if we have permission at all. List arenas = am.getPermittedArenas(p); if (arenas.isEmpty()) { - Messenger.tell(p, Msg.JOIN_NO_PERMISSION); + am.getGlobalMessenger().tell(p, Msg.JOIN_NO_PERMISSION); return null; } // Then check if we have any enabled arenas. arenas = am.getEnabledArenas(arenas); if (arenas.isEmpty()) { - Messenger.tell(p, Msg.JOIN_NOT_ENABLED); + am.getGlobalMessenger().tell(p, Msg.JOIN_NOT_ENABLED); return null; } @@ -65,19 +64,19 @@ public class Commands if (arg1 != null) { arena = am.getArenaWithName(arg1); if (arena == null) { - Messenger.tell(p, Msg.ARENA_DOES_NOT_EXIST); + am.getGlobalMessenger().tell(p, Msg.ARENA_DOES_NOT_EXIST); return null; } if (!arenas.contains(arena)) { - Messenger.tell(p, Msg.JOIN_ARENA_NOT_ENABLED); + am.getGlobalMessenger().tell(p, Msg.JOIN_ARENA_NOT_ENABLED); return null; } } else { if (arenas.size() > 1) { - Messenger.tell(p, Msg.JOIN_ARG_NEEDED); - Messenger.tell(p, Msg.MISC_LIST_ARENAS.format(TextUtils.listToString(arenas))); + am.getGlobalMessenger().tell(p, Msg.JOIN_ARG_NEEDED); + am.getGlobalMessenger().tell(p, Msg.MISC_LIST_ARENAS.format(TextUtils.listToString(arenas))); return null; } arena = arenas.get(0); diff --git a/src/main/java/com/garbagemule/MobArena/commands/admin/DisableCommand.java b/src/main/java/com/garbagemule/MobArena/commands/admin/DisableCommand.java index 83ca268..02ecd48 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/admin/DisableCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/admin/DisableCommand.java @@ -32,7 +32,7 @@ public class DisableCommand implements Command if (!arg1.equals("")) { Arena arena = am.getArenaWithName(arg1); if (arena == null) { - Messenger.tell(sender, Msg.ARENA_DOES_NOT_EXIST); + am.getGlobalMessenger().tell(sender, Msg.ARENA_DOES_NOT_EXIST); return true; } disable(arena, sender); @@ -41,13 +41,13 @@ public class DisableCommand implements Command am.setEnabled(false); am.saveConfig(); - Messenger.tell(sender, "MobArena " + ChatColor.RED + "disabled"); + am.getGlobalMessenger().tell(sender, "MobArena " + ChatColor.RED + "disabled"); return true; } private void disable(Arena arena, CommandSender sender) { arena.setEnabled(false); arena.getPlugin().saveConfig(); - Messenger.tell(sender, "Arena '" + arena.configName() + "' " + ChatColor.RED + "disabled"); + arena.getGlobalMessenger().tell(sender, "Arena '" + arena.configName() + "' " + ChatColor.RED + "disabled"); } } diff --git a/src/main/java/com/garbagemule/MobArena/commands/admin/EnableCommand.java b/src/main/java/com/garbagemule/MobArena/commands/admin/EnableCommand.java index 9c16e79..c791837 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/admin/EnableCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/admin/EnableCommand.java @@ -32,7 +32,7 @@ public class EnableCommand implements Command if (!arg1.equals("")) { Arena arena = am.getArenaWithName(arg1); if (arena == null) { - Messenger.tell(sender, Msg.ARENA_DOES_NOT_EXIST); + am.getGlobalMessenger().tell(sender, Msg.ARENA_DOES_NOT_EXIST); return true; } enable(arena, sender); @@ -41,13 +41,13 @@ public class EnableCommand implements Command am.setEnabled(true); am.saveConfig(); - Messenger.tell(sender, "MobArena " + ChatColor.GREEN + "enabled"); + am.getGlobalMessenger().tell(sender, "MobArena " + ChatColor.GREEN + "enabled"); return true; } private void enable(Arena arena, CommandSender sender) { arena.setEnabled(true); arena.getPlugin().saveConfig(); - Messenger.tell(sender, "Arena '" + arena.configName() + "' " + ChatColor.GREEN + "enabled"); + arena.getGlobalMessenger().tell(sender, "Arena '" + arena.configName() + "' " + ChatColor.GREEN + "enabled"); } } diff --git a/src/main/java/com/garbagemule/MobArena/commands/admin/ForceCommand.java b/src/main/java/com/garbagemule/MobArena/commands/admin/ForceCommand.java index bbd438d..b595d9a 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/admin/ForceCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/admin/ForceCommand.java @@ -31,7 +31,7 @@ public class ForceCommand implements Command for (Arena arena : am.getArenas()) { arena.forceEnd(); } - Messenger.tell(sender, Msg.FORCE_END_ENDED); + am.getGlobalMessenger().tell(sender, Msg.FORCE_END_ENDED); am.resetArenaMap(); return true; } @@ -39,18 +39,18 @@ public class ForceCommand implements Command // Otherwise, grab the arena in question. Arena arena = am.getArenaWithName(arg2); if (arena == null) { - Messenger.tell(sender, Msg.ARENA_DOES_NOT_EXIST); + am.getGlobalMessenger().tell(sender, Msg.ARENA_DOES_NOT_EXIST); return true; } if (arena.getAllPlayers().isEmpty()) { - Messenger.tell(sender, Msg.FORCE_END_EMPTY); + am.getGlobalMessenger().tell(sender, Msg.FORCE_END_EMPTY); return true; } // And end it! arena.forceEnd(); - Messenger.tell(sender, Msg.FORCE_END_ENDED); + am.getGlobalMessenger().tell(sender, Msg.FORCE_END_ENDED); return true; } @@ -61,23 +61,23 @@ public class ForceCommand implements Command // Grab the arena. Arena arena = am.getArenaWithName(arg2); if (arena == null) { - Messenger.tell(sender, Msg.ARENA_DOES_NOT_EXIST); + am.getGlobalMessenger().tell(sender, Msg.ARENA_DOES_NOT_EXIST); return true; } if (arena.isRunning()) { - Messenger.tell(sender, Msg.FORCE_START_RUNNING); + am.getGlobalMessenger().tell(sender, Msg.FORCE_START_RUNNING); return true; } if (arena.getReadyPlayersInLobby().isEmpty()) { - Messenger.tell(sender, Msg.FORCE_START_NOT_READY); + am.getGlobalMessenger().tell(sender, Msg.FORCE_START_NOT_READY); return true; } // And start it! arena.forceStart(); - Messenger.tell(sender, Msg.FORCE_START_STARTED); + am.getGlobalMessenger().tell(sender, Msg.FORCE_START_STARTED); return true; } return false; diff --git a/src/main/java/com/garbagemule/MobArena/commands/admin/KickCommand.java b/src/main/java/com/garbagemule/MobArena/commands/admin/KickCommand.java index 6fe799b..7cfb679 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/admin/KickCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/admin/KickCommand.java @@ -3,7 +3,6 @@ package com.garbagemule.MobArena.commands.admin; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.garbagemule.MobArena.*; import com.garbagemule.MobArena.commands.*; import com.garbagemule.MobArena.framework.Arena; import com.garbagemule.MobArena.framework.ArenaMaster; @@ -24,7 +23,7 @@ public class KickCommand implements Command Arena arena = am.getArenaWithPlayer(args[0]); if (arena == null) { - Messenger.tell(sender, "That player is not in an arena."); + am.getGlobalMessenger().tell(sender, "That player is not in an arena."); return true; } @@ -33,8 +32,8 @@ public class KickCommand implements Command // Force leave. arena.playerLeave(bp); - Messenger.tell(sender, "Player '" + args[0] + "' was kicked from arena '" + arena.configName() + "'."); - Messenger.tell(bp, "You were kicked by " + sender.getName() + "."); + am.getGlobalMessenger().tell(sender, "Player '" + args[0] + "' was kicked from arena '" + arena.configName() + "'."); + am.getGlobalMessenger().tell(bp, "You were kicked by " + sender.getName() + "."); return true; } } diff --git a/src/main/java/com/garbagemule/MobArena/commands/admin/RestoreCommand.java b/src/main/java/com/garbagemule/MobArena/commands/admin/RestoreCommand.java index 3298809..db0293d 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/admin/RestoreCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/admin/RestoreCommand.java @@ -22,14 +22,14 @@ public class RestoreCommand implements Command if (args.length != 1) return false; if (am.getArenaWithPlayer(args[0]) != null) { - Messenger.tell(sender, "Player is currently in an arena."); + am.getGlobalMessenger().tell(sender, "Player is currently in an arena."); return true; } if (InventoryManager.restoreFromFile(am.getPlugin(), am.getPlugin().getServer().getPlayer(args[0]))) { - Messenger.tell(sender, "Restored " + args[0] + "'s inventory!"); + am.getGlobalMessenger().tell(sender, "Restored " + args[0] + "'s inventory!"); } else { - Messenger.tell(sender, "Failed to restore " + args[0] + "'s inventory."); + am.getGlobalMessenger().tell(sender, "Failed to restore " + args[0] + "'s inventory."); } return true; } diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/AddArenaCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/AddArenaCommand.java index 3af6b52..8b70271 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/AddArenaCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/setup/AddArenaCommand.java @@ -20,7 +20,7 @@ public class AddArenaCommand implements Command @Override public boolean execute(ArenaMaster am, CommandSender sender, String... args) { if (!Commands.isPlayer(sender)) { - Messenger.tell(sender, Msg.MISC_NOT_FROM_CONSOLE); + am.getGlobalMessenger().tell(sender, Msg.MISC_NOT_FROM_CONSOLE); return true; } @@ -32,11 +32,11 @@ public class AddArenaCommand implements Command Arena arena = am.getArenaWithName(args[0]); if (arena != null) { - Messenger.tell(sender, "An arena with that name already exists."); + am.getGlobalMessenger().tell(sender, "An arena with that name already exists."); return true; } am.createArenaNode(args[0], p.getWorld()); - Messenger.tell(sender, "New arena with name '" + args[0] + "' created!"); + am.getGlobalMessenger().tell(sender, "New arena with name '" + args[0] + "' created!"); return true; } } diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/AddClassPermCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/AddClassPermCommand.java index b03617c..517fb3e 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/AddClassPermCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/setup/AddClassPermCommand.java @@ -24,18 +24,18 @@ public class AddClassPermCommand implements Command // Grab the arena class ArenaClass arenaClass = am.getClasses().get(args[0]); if (arenaClass == null) { - Messenger.tell(sender, "The class '" + TextUtils.camelCase(args[0]) + "' does not exist."); + am.getGlobalMessenger().tell(sender, "The class '" + TextUtils.camelCase(args[0]) + "' does not exist."); return true; } // Try to add the permission. if (am.addClassPermission(args[0], args[1])) { - Messenger.tell(sender, "Added permission '" + args[1] + "' to class '" + TextUtils.camelCase(args[0]) + "'."); + am.getGlobalMessenger().tell(sender, "Added permission '" + args[1] + "' to class '" + TextUtils.camelCase(args[0]) + "'."); return true; } // If it wasn't added, notify. - Messenger.tell(sender, "Permission '" + args[1] + "' was NOT added to class '" + TextUtils.camelCase(args[0]) + "'."); + am.getGlobalMessenger().tell(sender, "Permission '" + args[1] + "' was NOT added to class '" + TextUtils.camelCase(args[0]) + "'."); return true; } } diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/AutoDegenerateCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/AutoDegenerateCommand.java index ba80297..7dc808d 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/AutoDegenerateCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/setup/AutoDegenerateCommand.java @@ -23,23 +23,23 @@ public class AutoDegenerateCommand implements Command // We have to make sure at least one arena exists before degenerating if (am.getArenas().size() < 2) { - Messenger.tell(sender, "At least one arena must exist!"); + am.getGlobalMessenger().tell(sender, "At least one arena must exist!"); return true; } // Check if arena exists. Arena arena = am.getArenaWithName(args[0]); if (arena == null) { - Messenger.tell(sender, Msg.ARENA_DOES_NOT_EXIST); + am.getGlobalMessenger().tell(sender, Msg.ARENA_DOES_NOT_EXIST); return true; } if (!MAUtils.undoItHippieMonster(args[0], am.getPlugin(), true)) { - Messenger.tell(sender, "Could not degenerate arena."); + am.getGlobalMessenger().tell(sender, "Could not degenerate arena."); return true; } - - Messenger.tell(sender, "Arena with name '" + args[0] + "' degenerated."); + + am.getGlobalMessenger().tell(sender, "Arena with name '" + args[0] + "' degenerated."); return true; } } diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/AutoGenerateCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/AutoGenerateCommand.java index bc49e79..f772ac0 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/AutoGenerateCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/setup/AutoGenerateCommand.java @@ -20,7 +20,7 @@ public class AutoGenerateCommand implements Command @Override public boolean execute(ArenaMaster am, CommandSender sender, String... args) { if (!Commands.isPlayer(sender)) { - Messenger.tell(sender, Msg.MISC_NOT_FROM_CONSOLE); + am.getGlobalMessenger().tell(sender, Msg.MISC_NOT_FROM_CONSOLE); return true; } @@ -33,16 +33,16 @@ public class AutoGenerateCommand implements Command // Check if arena already exists. Arena arena = am.getArenaWithName(args[0]); if (arena != null) { - Messenger.tell(sender, "An arena with that name already exists."); + am.getGlobalMessenger().tell(sender, "An arena with that name already exists."); return true; } if (!MAUtils.doooooItHippieMonster(p.getLocation(), 13, args[0], am.getPlugin())) { - Messenger.tell(sender, "Could not auto-generate arena."); + am.getGlobalMessenger().tell(sender, "Could not auto-generate arena."); return true; } - Messenger.tell(sender, "Arena with name '" + args[0] + "' generated."); + am.getGlobalMessenger().tell(sender, "Arena with name '" + args[0] + "' generated."); return true; } } diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/CheckDataCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/CheckDataCommand.java index f6e4abe..a310b97 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/CheckDataCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/setup/CheckDataCommand.java @@ -21,7 +21,7 @@ public class CheckDataCommand implements Command Arena arena; if (args.length == 0) { if (am.getArenas().size() > 1) { - Messenger.tell(sender, "There are multiple arenas."); + am.getGlobalMessenger().tell(sender, "There are multiple arenas."); return true; } else { arena = am.getArenas().get(0); @@ -29,7 +29,7 @@ public class CheckDataCommand implements Command } else { arena = am.getArenaWithName(args[0]); if (arena == null) { - Messenger.tell(sender, "There is no arena named " + args[0]); + am.getGlobalMessenger().tell(sender, "There is no arena named " + args[0]); return true; } } diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/CheckSpawnsCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/CheckSpawnsCommand.java index 4361a5e..9ed39fa 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/CheckSpawnsCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/setup/CheckSpawnsCommand.java @@ -1,6 +1,5 @@ package com.garbagemule.MobArena.commands.setup; -import com.garbagemule.MobArena.Messenger; import com.garbagemule.MobArena.Msg; import com.garbagemule.MobArena.commands.Command; import com.garbagemule.MobArena.commands.CommandInfo; @@ -22,14 +21,14 @@ public class CheckSpawnsCommand implements Command @Override public boolean execute(ArenaMaster am, CommandSender sender, String... args) { if (!Commands.isPlayer(sender)) { - Messenger.tell(sender, Msg.MISC_NOT_FROM_CONSOLE); + am.getGlobalMessenger().tell(sender, Msg.MISC_NOT_FROM_CONSOLE); return true; } Arena arena; if (args.length == 0) { if (am.getArenas().size() > 1) { - Messenger.tell(sender, "There are multiple arenas."); + am.getGlobalMessenger().tell(sender, "There are multiple arenas."); return true; } else { arena = am.getArenas().get(0); @@ -37,13 +36,13 @@ public class CheckSpawnsCommand implements Command } else { arena = am.getArenaWithName(args[0]); if (arena == null) { - Messenger.tell(sender, "There is no arena named " + args[0]); + am.getGlobalMessenger().tell(sender, "There is no arena named " + args[0]); return true; } } if (arena.getRegion().getSpawnpoints().isEmpty()) { - Messenger.tell(sender, "There are no spawnpoints in the selected arena."); + am.getGlobalMessenger().tell(sender, "There are no spawnpoints in the selected arena."); return true; } Player p = Commands.unwrap(sender); diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/ClassChestCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/ClassChestCommand.java index d94b76a..4a91306 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/ClassChestCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/setup/ClassChestCommand.java @@ -1,7 +1,6 @@ package com.garbagemule.MobArena.commands.setup; import com.garbagemule.MobArena.ArenaClass; -import com.garbagemule.MobArena.Messenger; import com.garbagemule.MobArena.Msg; import com.garbagemule.MobArena.commands.Command; import com.garbagemule.MobArena.commands.CommandInfo; @@ -27,7 +26,7 @@ public class ClassChestCommand implements Command { @Override public boolean execute(ArenaMaster am, CommandSender sender, String... args) { if (!Commands.isPlayer(sender)) { - Messenger.tell(sender, Msg.MISC_NOT_FROM_CONSOLE); + am.getGlobalMessenger().tell(sender, Msg.MISC_NOT_FROM_CONSOLE); return true; } @@ -36,7 +35,7 @@ public class ClassChestCommand implements Command { ArenaClass ac = am.getClasses().get(args[0].toLowerCase()); if (ac == null) { - Messenger.tell(sender, "Class not found."); + am.getGlobalMessenger().tell(sender, "Class not found."); return true; } @@ -49,13 +48,13 @@ public class ClassChestCommand implements Command { case TRAPPED_CHEST: break; default: - Messenger.tell(sender, "You must look at a chest."); + am.getGlobalMessenger().tell(sender, "You must look at a chest."); return true; } setLocation(am.getPlugin().getConfig(), "classes." + ac.getConfigName() + ".classchest", b.getLocation()); am.saveConfig(); - Messenger.tell(sender, "Class chest updated for class " + ac.getConfigName()); + am.getGlobalMessenger().tell(sender, "Class chest updated for class " + ac.getConfigName()); am.loadClasses(); return true; } diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/ConfigCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/ConfigCommand.java index 40a48f4..08e8b25 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/ConfigCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/setup/ConfigCommand.java @@ -24,15 +24,15 @@ public class ConfigCommand implements Command if (args[0].equals("reload")) { try { am.reloadConfig(); - Messenger.tell(sender, "Config reloaded."); + am.getGlobalMessenger().tell(sender, "Config reloaded."); } catch (Exception e) { - Messenger.tell(sender, ChatColor.RED + "ERROR:" + ChatColor.RESET + "\n" + e.getMessage()); - Messenger.tell(sender, "MobArena has been " + ChatColor.RED + "disabled" + ChatColor.RESET + "."); - Messenger.tell(sender, "Fix the config-file, then reload it again, and then type " + ChatColor.YELLOW + "/ma enable" + ChatColor.RESET + " to re-enable MobArena."); + am.getGlobalMessenger().tell(sender, ChatColor.RED + "ERROR:" + ChatColor.RESET + "\n" + e.getMessage()); + am.getGlobalMessenger().tell(sender, "MobArena has been " + ChatColor.RED + "disabled" + ChatColor.RESET + "."); + am.getGlobalMessenger().tell(sender, "Fix the config-file, then reload it again, and then type " + ChatColor.YELLOW + "/ma enable" + ChatColor.RESET + " to re-enable MobArena."); } } else if (args[0].equals("save")) { am.saveConfig(); - Messenger.tell(sender, "Config saved."); + am.getGlobalMessenger().tell(sender, "Config saved."); } else { return false; } diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/EditArenaCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/EditArenaCommand.java index 43003d3..3efc8ad 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/EditArenaCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/setup/EditArenaCommand.java @@ -23,7 +23,7 @@ public class EditArenaCommand implements Command Arena arena; if (args.length == 0) { if (am.getArenas().size() > 1) { - Messenger.tell(sender, "There are multiple arenas."); + am.getGlobalMessenger().tell(sender, "There are multiple arenas."); return true; } arena = am.getArenas().get(0); @@ -31,7 +31,7 @@ public class EditArenaCommand implements Command } else if (args.length == 1) { if (args[0].matches("on|off|true|false")) { if (am.getArenas().size() > 1) { - Messenger.tell(sender, "There are multiple arenas."); + am.getGlobalMessenger().tell(sender, "There are multiple arenas."); return true; } arena = am.getArenas().get(0); @@ -39,7 +39,7 @@ public class EditArenaCommand implements Command } else { arena = am.getArenaWithName(args[0]); if (arena == null) { - Messenger.tell(sender, "There is no arena named " + args[0]); + am.getGlobalMessenger().tell(sender, "There is no arena named " + args[0]); return true; } value = !arena.inEditMode(); @@ -49,8 +49,8 @@ public class EditArenaCommand implements Command value = args[1].matches("on|true"); } arena.setEditMode(value); - Messenger.tell(sender, "Edit mode for arena '" + arena.configName() + "': " + ((arena.inEditMode()) ? ChatColor.GREEN + "true" : ChatColor.RED + "false")); - if (arena.inEditMode()) Messenger.tell(sender, "Remember to turn it back off after editing!"); + am.getGlobalMessenger().tell(sender, "Edit mode for arena '" + arena.configName() + "': " + ((arena.inEditMode()) ? ChatColor.GREEN + "true" : ChatColor.RED + "false")); + if (arena.inEditMode()) am.getGlobalMessenger().tell(sender, "Remember to turn it back off after editing!"); return true; } } diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/ListClassPermsCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/ListClassPermsCommand.java index 7f7f48e..ab8572a 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/ListClassPermsCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/setup/ListClassPermsCommand.java @@ -28,14 +28,14 @@ public class ListClassPermsCommand implements Command String className = TextUtils.camelCase(args[0]); if (arenaClass == null) { - Messenger.tell(sender, "The class '" + className + "' does not exist."); + am.getGlobalMessenger().tell(sender, "The class '" + className + "' does not exist."); return true; } - Messenger.tell(sender, "Permissions for '" + className + "':"); + am.getGlobalMessenger().tell(sender, "Permissions for '" + className + "':"); Map perms = arenaClass.getPermissions(); if (perms.isEmpty()) { - Messenger.tell(sender, ""); + am.getGlobalMessenger().tell(sender, ""); return true; } @@ -44,7 +44,7 @@ public class ListClassPermsCommand implements Command if (!entry.getValue()) { perm = "^" + perm; } - Messenger.tell(sender, "- " + perm); + am.getGlobalMessenger().tell(sender, "- " + perm); } return true; } diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/ListClassesCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/ListClassesCommand.java index 30cc553..bd6f07b 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/ListClassesCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/setup/ListClassesCommand.java @@ -19,15 +19,15 @@ public class ListClassesCommand implements Command { @Override public boolean execute(ArenaMaster am, CommandSender sender, String... args) { - Messenger.tell(sender, "Current classes:"); + am.getGlobalMessenger().tell(sender, "Current classes:"); Set classes = am.getClasses().keySet(); if (classes == null || classes.isEmpty()) { - Messenger.tell(sender, ""); + am.getGlobalMessenger().tell(sender, ""); return true; } for (String c : classes) { - Messenger.tell(sender, "- " + c); + am.getGlobalMessenger().tell(sender, "- " + c); } return true; } diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveArenaCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveArenaCommand.java index 95f557d..b4ce884 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveArenaCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveArenaCommand.java @@ -22,17 +22,17 @@ public class RemoveArenaCommand implements Command if (args.length != 1) return false; if (am.getArenas().size() == 1) { - Messenger.tell(sender, "At least one arena must exist."); + am.getGlobalMessenger().tell(sender, "At least one arena must exist."); return true; } Arena arena = am.getArenaWithName(args[0]); if (arena == null) { - Messenger.tell(sender, "There is no arena with that name."); + am.getGlobalMessenger().tell(sender, "There is no arena with that name."); return true; } am.removeArenaNode(arena); - Messenger.tell(sender, "Arena '" + arena.configName() + "' deleted."); + am.getGlobalMessenger().tell(sender, "Arena '" + arena.configName() + "' deleted."); return true; } } diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveClassCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveClassCommand.java index 6ade546..dfc1d16 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveClassCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveClassCommand.java @@ -25,12 +25,12 @@ public class RemoveClassCommand implements Command ArenaClass arenaClass = am.getClasses().get(args[0]); String className = TextUtils.camelCase(args[0]); if (arenaClass == null) { - Messenger.tell(sender, "The class '" + className + "' does not exist."); + am.getGlobalMessenger().tell(sender, "The class '" + className + "' does not exist."); return true; } am.removeClassNode(className); - Messenger.tell(sender, "Removed class '" + className + "'."); + am.getGlobalMessenger().tell(sender, "Removed class '" + className + "'."); return true; } } diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveClassPermCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveClassPermCommand.java index fa084e2..97d18f3 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveClassPermCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveClassPermCommand.java @@ -24,18 +24,18 @@ public class RemoveClassPermCommand implements Command // Grab the arena class ArenaClass arenaClass = am.getClasses().get(args[0]); if (arenaClass == null) { - Messenger.tell(sender, "The class '" + TextUtils.camelCase(args[0]) + "' does not exist."); + am.getGlobalMessenger().tell(sender, "The class '" + TextUtils.camelCase(args[0]) + "' does not exist."); return true; } // Remove the permission. if (am.removeClassPermission(args[0], args[1])) { - Messenger.tell(sender, "Removed permission '" + args[1] + "' from class '" + TextUtils.camelCase(args[0]) + "'."); + am.getGlobalMessenger().tell(sender, "Removed permission '" + args[1] + "' from class '" + TextUtils.camelCase(args[0]) + "'."); return true; } // If it wasn't removed, notify. - Messenger.tell(sender, "Permission '" + args[1] + "' was NOT removed from class '" + TextUtils.camelCase(args[0]) + "'."); + am.getGlobalMessenger().tell(sender, "Permission '" + args[1] + "' was NOT removed from class '" + TextUtils.camelCase(args[0]) + "'."); return true; } } diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveContainerCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveContainerCommand.java index d3c1246..f45598d 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveContainerCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveContainerCommand.java @@ -24,7 +24,7 @@ public class RemoveContainerCommand implements Command String chest; if (args.length == 1) { if (am.getArenas().size() > 1) { - Messenger.tell(sender, "There are multiple arenas."); + am.getGlobalMessenger().tell(sender, "There are multiple arenas."); return true; } arena = am.getArenas().get(0); @@ -32,16 +32,16 @@ public class RemoveContainerCommand implements Command } else { arena = am.getArenaWithName(args[0]); if (arena == null) { - Messenger.tell(sender, "There is no arena named " + args[0]); + am.getGlobalMessenger().tell(sender, "There is no arena named " + args[0]); return true; } chest = args[1]; } if (arena.getRegion().removeChest(chest)) { - Messenger.tell(sender, "Container " + chest + " removed for arena '" + arena.configName() + "'"); + am.getGlobalMessenger().tell(sender, "Container " + chest + " removed for arena '" + arena.configName() + "'"); } else { - Messenger.tell(sender, "Could not find the container " + chest + " for the arena '" + arena.configName() + "'"); + am.getGlobalMessenger().tell(sender, "Could not find the container " + chest + " for the arena '" + arena.configName() + "'"); } return true; } diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveLeaderboardCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveLeaderboardCommand.java index 0cde48d..e8d8edd 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveLeaderboardCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveLeaderboardCommand.java @@ -3,7 +3,6 @@ package com.garbagemule.MobArena.commands.setup; import com.garbagemule.MobArena.framework.Arena; import org.bukkit.command.CommandSender; -import com.garbagemule.MobArena.Messenger; import com.garbagemule.MobArena.Msg; import com.garbagemule.MobArena.commands.Command; import com.garbagemule.MobArena.commands.CommandInfo; @@ -23,23 +22,23 @@ public class RemoveLeaderboardCommand implements Command Arena arena; if (args.length == 0) { if (am.getArenas().size() > 1) { - Messenger.tell(sender, "There are multiple arenas."); + am.getGlobalMessenger().tell(sender, "There are multiple arenas."); return true; } arena = am.getArenas().get(0); } else { arena = am.getArenaWithName(args[0]); if (arena == null) { - Messenger.tell(sender, "There is no arena named " + args[0]); + am.getGlobalMessenger().tell(sender, "There is no arena named " + args[0]); return true; } } if (arena.getRegion().getLeaderboard() != null) { arena.getRegion().set("leaderboard", null); - Messenger.tell(sender, "Leaderboard for " + arena.configName() + " successfully removed!"); + am.getGlobalMessenger().tell(sender, "Leaderboard for " + arena.configName() + " successfully removed!"); } else { - Messenger.tell(sender, Msg.ARENA_LBOARD_NOT_FOUND); + am.getGlobalMessenger().tell(sender, Msg.ARENA_LBOARD_NOT_FOUND); } return true; } diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveSpawnpointCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveSpawnpointCommand.java index f671030..8523ef7 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveSpawnpointCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/setup/RemoveSpawnpointCommand.java @@ -24,7 +24,7 @@ public class RemoveSpawnpointCommand implements Command String point; if (args.length == 1) { if (am.getArenas().size() > 1) { - Messenger.tell(sender, "There are multiple arenas."); + am.getGlobalMessenger().tell(sender, "There are multiple arenas."); return true; } arena = am.getArenas().get(0); @@ -32,16 +32,16 @@ public class RemoveSpawnpointCommand implements Command } else { arena = am.getArenaWithName(args[0]); if (arena == null) { - Messenger.tell(sender, "There is no arena named " + args[0]); + am.getGlobalMessenger().tell(sender, "There is no arena named " + args[0]); return true; } point = args[1]; } if (arena.getRegion().removeSpawn(point)) { - Messenger.tell(sender, "Spawnpoint " + point + " removed for arena '" + arena.configName() + "'"); + am.getGlobalMessenger().tell(sender, "Spawnpoint " + point + " removed for arena '" + arena.configName() + "'"); } else { - Messenger.tell(sender, "Could not find the spawnpoint " + point + " for the arena '" + arena.configName() + "'"); + am.getGlobalMessenger().tell(sender, "Could not find the spawnpoint " + point + " for the arena '" + arena.configName() + "'"); } return true; } diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/SetClassCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/SetClassCommand.java index 604e824..9d44d5f 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/SetClassCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/setup/SetClassCommand.java @@ -20,7 +20,7 @@ public class SetClassCommand implements Command @Override public boolean execute(ArenaMaster am, CommandSender sender, String... args) { if (!Commands.isPlayer(sender)) { - Messenger.tell(sender, Msg.MISC_NOT_FROM_CONSOLE); + am.getGlobalMessenger().tell(sender, Msg.MISC_NOT_FROM_CONSOLE); return true; } @@ -46,13 +46,13 @@ public class SetClassCommand implements Command // If the class is null, it was not created. if (arenaClass == null) { - Messenger.tell(p, "That class already exists!"); - Messenger.tell(p, "To overwrite, omit the 'safe' parameter."); + am.getGlobalMessenger().tell(p, "That class already exists!"); + am.getGlobalMessenger().tell(p, "To overwrite, omit the 'safe' parameter."); return true; } // Otherwise, yay! - Messenger.tell(p, "Class '" + className + "' set with your current inventory."); + am.getGlobalMessenger().tell(p, "Class '" + className + "' set with your current inventory."); return true; } } diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/SetClassPriceCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/SetClassPriceCommand.java index 19f0967..f20c08c 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/SetClassPriceCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/setup/SetClassPriceCommand.java @@ -1,7 +1,6 @@ package com.garbagemule.MobArena.commands.setup; import com.garbagemule.MobArena.ArenaClass; -import com.garbagemule.MobArena.Messenger; import com.garbagemule.MobArena.Msg; import com.garbagemule.MobArena.commands.Command; import com.garbagemule.MobArena.commands.CommandInfo; @@ -32,7 +31,7 @@ public class SetClassPriceCommand implements Command // Grab the class. ArenaClass ac = am.getClasses().get(arg1); if (ac == null) { - Messenger.tell(sender, "No class named '" + arg1 + "'."); + am.getGlobalMessenger().tell(sender, "No class named '" + arg1 + "'."); return true; } @@ -48,7 +47,7 @@ public class SetClassPriceCommand implements Command // Not a valid number? Bail! if (!arg2.matches("([1-9]\\d*)|(\\d*.\\d\\d?)")) { - Messenger.tell(sender, "Could not parse price '" + arg2 + "'. Expected e.g. $10 or $2.50 or $.25"); + am.getGlobalMessenger().tell(sender, "Could not parse price '" + arg2 + "'. Expected e.g. $10 or $2.50 or $.25"); return true; } double price = Double.parseDouble(arg2); @@ -64,7 +63,7 @@ public class SetClassPriceCommand implements Command am.getPlugin().getConfig().set("classes." + ac.getConfigName() + ".price", value); am.getPlugin().saveConfig(); am.loadClasses(); - Messenger.tell(sender, msg); + am.getGlobalMessenger().tell(sender, msg); return true; } } diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/SettingCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/SettingCommand.java index e2959c2..dbadf6e 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/SettingCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/setup/SettingCommand.java @@ -1,6 +1,5 @@ package com.garbagemule.MobArena.commands.setup; -import com.garbagemule.MobArena.Messenger; import com.garbagemule.MobArena.commands.Command; import com.garbagemule.MobArena.commands.CommandInfo; import com.garbagemule.MobArena.framework.Arena; @@ -26,7 +25,7 @@ public class SettingCommand implements Command { // Find the arena first Arena arena = am.getArenaWithName(args[0]); if (arena == null) { - Messenger.tell(sender, "There's no arena with the name '" + args[0] + "'."); + am.getGlobalMessenger().tell(sender, "There's no arena with the name '" + args[0] + "'."); return true; } @@ -39,7 +38,7 @@ public class SettingCommand implements Command { buffy.append(ChatColor.AQUA).append(entry.getKey()).append(ChatColor.RESET).append(": "); buffy.append(ChatColor.YELLOW).append(entry.getValue()); } - Messenger.tell(sender, buffy.toString()); + am.getGlobalMessenger().tell(sender, buffy.toString()); return true; } @@ -50,7 +49,7 @@ public class SettingCommand implements Command { buffy.append(ChatColor.RED).append(" is not a valid setting."); buffy.append("Type ").append(ChatColor.YELLOW).append("/ma setting ").append(args[0]); buffy.append(ChatColor.RESET).append(" to see all settings."); - Messenger.tell(sender, buffy.toString()); + am.getGlobalMessenger().tell(sender, buffy.toString()); return true; } @@ -59,14 +58,14 @@ public class SettingCommand implements Command { StringBuilder buffy = new StringBuilder(); buffy.append(ChatColor.AQUA).append(args[1]).append(ChatColor.RESET).append(": "); buffy.append(ChatColor.YELLOW).append(val); - Messenger.tell(sender, buffy.toString()); + am.getGlobalMessenger().tell(sender, buffy.toString()); return true; } // Otherwise, determine the value of the setting if (val instanceof Boolean) { if (!args[2].matches("on|off|yes|no|true|false")) { - Messenger.tell(sender, "Expected a boolean value for that setting"); + am.getGlobalMessenger().tell(sender, "Expected a boolean value for that setting"); return true; } boolean value = args[2].matches("on|yes|true"); @@ -76,7 +75,7 @@ public class SettingCommand implements Command { try { arena.getSettings().set(args[1], Integer.parseInt(args[2])); } catch (NumberFormatException e) { - Messenger.tell(sender, "Expected a numeric value for that setting."); + am.getGlobalMessenger().tell(sender, "Expected a numeric value for that setting."); return true; } } else { @@ -93,7 +92,7 @@ public class SettingCommand implements Command { buffy.append(" for arena ").append(ChatColor.GREEN).append(args[0]).append(ChatColor.RESET); buffy.append(" set to ").append(ChatColor.YELLOW).append(args[2]).append(ChatColor.RESET); buffy.append("!"); - Messenger.tell(sender, buffy.toString()); + am.getGlobalMessenger().tell(sender, buffy.toString()); return true; } } diff --git a/src/main/java/com/garbagemule/MobArena/commands/setup/SetupCommand.java b/src/main/java/com/garbagemule/MobArena/commands/setup/SetupCommand.java index ba75c2e..dd609f6 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/setup/SetupCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/setup/SetupCommand.java @@ -1,6 +1,5 @@ package com.garbagemule.MobArena.commands.setup; -import static com.garbagemule.MobArena.Messenger.*; import com.garbagemule.MobArena.Msg; import com.garbagemule.MobArena.commands.Command; import com.garbagemule.MobArena.commands.CommandInfo; @@ -44,7 +43,7 @@ public class SetupCommand implements Command, Listener { @Override public boolean execute(ArenaMaster am, CommandSender sender, String... args) { if (!Commands.isPlayer(sender)) { - tell(sender, Msg.MISC_NOT_FROM_CONSOLE); + am.getGlobalMessenger().tell(sender, Msg.MISC_NOT_FROM_CONSOLE); return true; } @@ -59,8 +58,8 @@ public class SetupCommand implements Command, Listener { } else { arena = am.getArenaWithName(args[0]); if (arena == null) { - tell(sender, "There is no arena with the name " + ChatColor.RED + args[0] + ChatColor.RESET + "."); - tell(sender, "Type " + ChatColor.YELLOW + "/ma addarena " + args[0] + ChatColor.RESET + " to create it!"); + am.getGlobalMessenger().tell(sender, "There is no arena with the name " + ChatColor.RED + args[0] + ChatColor.RESET + "."); + am.getGlobalMessenger().tell(sender, "Type " + ChatColor.YELLOW + "/ma addarena " + args[0] + ChatColor.RESET + " to create it!"); return true; } } diff --git a/src/main/java/com/garbagemule/MobArena/commands/user/ArenaListCommand.java b/src/main/java/com/garbagemule/MobArena/commands/user/ArenaListCommand.java index 95caa50..f14a8c0 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/user/ArenaListCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/user/ArenaListCommand.java @@ -31,7 +31,7 @@ public class ArenaListCommand implements Command } String list = MAUtils.listToString(arenas, am.getPlugin()); - Messenger.tell(sender, Msg.MISC_LIST_ARENAS.format(list)); + am.getGlobalMessenger().tell(sender, Msg.MISC_LIST_ARENAS.format(list)); return true; } } diff --git a/src/main/java/com/garbagemule/MobArena/commands/user/JoinCommand.java b/src/main/java/com/garbagemule/MobArena/commands/user/JoinCommand.java index ddcd1bf..293c456 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/user/JoinCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/user/JoinCommand.java @@ -20,7 +20,7 @@ public class JoinCommand implements Command @Override public boolean execute(ArenaMaster am, CommandSender sender, String... args) { if (!Commands.isPlayer(sender)) { - Messenger.tell(sender, Msg.MISC_NOT_FROM_CONSOLE); + am.getGlobalMessenger().tell(sender, Msg.MISC_NOT_FROM_CONSOLE); return true; } @@ -37,7 +37,7 @@ public class JoinCommand implements Command // Deny joining from other arenas Arena fromArena = am.getArenaWithPlayer(p); if (fromArena != null && (fromArena.inArena(p) || fromArena.inLobby(p))) { - Messenger.tell(p, Msg.JOIN_ALREADY_PLAYING); + fromArena.getMessenger().tell(p, Msg.JOIN_ALREADY_PLAYING); return true; } diff --git a/src/main/java/com/garbagemule/MobArena/commands/user/LeaveCommand.java b/src/main/java/com/garbagemule/MobArena/commands/user/LeaveCommand.java index f34449d..4ec3a00 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/user/LeaveCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/user/LeaveCommand.java @@ -20,7 +20,7 @@ public class LeaveCommand implements Command @Override public boolean execute(ArenaMaster am, CommandSender sender, String... args) { if (!Commands.isPlayer(sender)) { - Messenger.tell(sender, Msg.MISC_NOT_FROM_CONSOLE); + am.getGlobalMessenger().tell(sender, Msg.MISC_NOT_FROM_CONSOLE); return true; } @@ -31,13 +31,13 @@ public class LeaveCommand implements Command if (arena == null) { arena = am.getArenaWithSpectator(p); if (arena == null) { - Messenger.tell(p, Msg.LEAVE_NOT_PLAYING); + am.getGlobalMessenger().tell(p, Msg.LEAVE_NOT_PLAYING); return true; } } if (arena.playerLeave(p)) { - Messenger.tell(p, Msg.LEAVE_PLAYER_LEFT); + arena.getMessenger().tell(p, Msg.LEAVE_PLAYER_LEFT); } return true; } diff --git a/src/main/java/com/garbagemule/MobArena/commands/user/NotReadyCommand.java b/src/main/java/com/garbagemule/MobArena/commands/user/NotReadyCommand.java index 743e248..8025183 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/user/NotReadyCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/user/NotReadyCommand.java @@ -28,7 +28,7 @@ public class NotReadyCommand implements Command if (!arg1.equals("")) { arena = am.getArenaWithName(arg1); if (arena == null) { - Messenger.tell(sender, Msg.ARENA_DOES_NOT_EXIST); + am.getGlobalMessenger().tell(sender, Msg.ARENA_DOES_NOT_EXIST); return false; } } else if (Commands.isPlayer(sender)) { @@ -36,7 +36,7 @@ public class NotReadyCommand implements Command arena = am.getArenaWithPlayer(p); if (arena == null) { - Messenger.tell(sender, Msg.LEAVE_NOT_PLAYING); + am.getGlobalMessenger().tell(sender, Msg.LEAVE_NOT_PLAYING); return true; } } else { @@ -44,7 +44,7 @@ public class NotReadyCommand implements Command } String list = MAUtils.listToString(arena.getNonreadyPlayers(), am.getPlugin()); - Messenger.tell(sender, Msg.MISC_LIST_PLAYERS.format(list)); + arena.getMessenger().tell(sender, Msg.MISC_LIST_PLAYERS.format(list)); return true; } } diff --git a/src/main/java/com/garbagemule/MobArena/commands/user/PickClassCommand.java b/src/main/java/com/garbagemule/MobArena/commands/user/PickClassCommand.java index 33b0df1..8a74689 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/user/PickClassCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/user/PickClassCommand.java @@ -2,7 +2,6 @@ package com.garbagemule.MobArena.commands.user; import com.garbagemule.MobArena.ArenaClass; import com.garbagemule.MobArena.ClassLimitManager; -import com.garbagemule.MobArena.Messenger; import com.garbagemule.MobArena.Msg; import com.garbagemule.MobArena.commands.Command; import com.garbagemule.MobArena.commands.CommandInfo; @@ -30,7 +29,7 @@ public class PickClassCommand implements Command @Override public boolean execute(ArenaMaster am, CommandSender sender, String... args) { if (!Commands.isPlayer(sender)) { - Messenger.tell(sender, Msg.MISC_NOT_FROM_CONSOLE); + am.getGlobalMessenger().tell(sender, Msg.MISC_NOT_FROM_CONSOLE); return true; } @@ -46,7 +45,7 @@ public class PickClassCommand implements Command // Make sure the player is in the lobby if (!arena.inLobby(p)) { - Messenger.tell(p, Msg.MISC_NO_ACCESS); + arena.getMessenger().tell(p, Msg.MISC_NO_ACCESS); return true; } @@ -54,13 +53,13 @@ public class PickClassCommand implements Command String lowercase = args[0].toLowerCase(); ArenaClass ac = am.getClasses().get(lowercase); if (ac == null) { - Messenger.tell(p, Msg.LOBBY_NO_SUCH_CLASS, lowercase); + arena.getMessenger().tell(p, Msg.LOBBY_NO_SUCH_CLASS, lowercase); return true; } // Check for permission. if (!am.getPlugin().has(p, "mobarena.classes." + lowercase) && !lowercase.equals("random")) { - Messenger.tell(p, Msg.LOBBY_CLASS_PERMISSION); + arena.getMessenger().tell(p, Msg.LOBBY_CLASS_PERMISSION); return true; } @@ -71,7 +70,7 @@ public class PickClassCommand implements Command // If the new class is full, inform the player. ClassLimitManager clm = arena.getClassLimitManager(); if (!clm.canPlayerJoinClass(ac)) { - Messenger.tell(p, Msg.LOBBY_CLASS_FULL); + arena.getMessenger().tell(p, Msg.LOBBY_CLASS_FULL); return true; } @@ -79,7 +78,7 @@ public class PickClassCommand implements Command double price = ac.getPrice(); if (price > 0D) { if (!am.getPlugin().hasEnough(p, price)) { - Messenger.tell(p, Msg.LOBBY_CLASS_TOO_EXPENSIVE, am.getPlugin().economyFormat(price)); + arena.getMessenger().tell(p, Msg.LOBBY_CLASS_TOO_EXPENSIVE, am.getPlugin().economyFormat(price)); return true; } } @@ -96,13 +95,13 @@ public class PickClassCommand implements Command // No linked chest? Fall through to config-file } arena.assignClass(p, lowercase); - Messenger.tell(p, Msg.LOBBY_CLASS_PICKED, arena.getClasses().get(lowercase).getConfigName()); + arena.getMessenger().tell(p, Msg.LOBBY_CLASS_PICKED, arena.getClasses().get(lowercase).getConfigName()); if (price > 0D) { - Messenger.tell(p, Msg.LOBBY_CLASS_PRICE, am.getPlugin().economyFormat(price)); + arena.getMessenger().tell(p, Msg.LOBBY_CLASS_PRICE, am.getPlugin().economyFormat(price)); } } else { arena.addRandomPlayer(p); - Messenger.tell(p, Msg.LOBBY_CLASS_RANDOM); + arena.getMessenger().tell(p, Msg.LOBBY_CLASS_RANDOM); } return true; } diff --git a/src/main/java/com/garbagemule/MobArena/commands/user/PlayerListCommand.java b/src/main/java/com/garbagemule/MobArena/commands/user/PlayerListCommand.java index e476e39..a736736 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/user/PlayerListCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/user/PlayerListCommand.java @@ -30,7 +30,7 @@ public class PlayerListCommand implements Command Arena arena = am.getArenaWithName(arg1); if (arena == null) { - Messenger.tell(sender, Msg.ARENA_DOES_NOT_EXIST); + am.getGlobalMessenger().tell(sender, Msg.ARENA_DOES_NOT_EXIST); return false; } @@ -47,7 +47,7 @@ public class PlayerListCommand implements Command list = buffy.toString(); } - Messenger.tell(sender, Msg.MISC_LIST_PLAYERS.format(list)); + am.getGlobalMessenger().tell(sender, Msg.MISC_LIST_PLAYERS.format(list)); return true; } } diff --git a/src/main/java/com/garbagemule/MobArena/commands/user/SpecCommand.java b/src/main/java/com/garbagemule/MobArena/commands/user/SpecCommand.java index daf98c3..62cbfe2 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/user/SpecCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/user/SpecCommand.java @@ -20,7 +20,7 @@ public class SpecCommand implements Command @Override public boolean execute(ArenaMaster am, CommandSender sender, String... args) { if (!Commands.isPlayer(sender)) { - Messenger.tell(sender, Msg.MISC_NOT_FROM_CONSOLE); + am.getGlobalMessenger().tell(sender, Msg.MISC_NOT_FROM_CONSOLE); return false; } @@ -37,7 +37,7 @@ public class SpecCommand implements Command // Deny spectating from other arenas Arena fromArena = am.getArenaWithPlayer(p); if (fromArena != null && (fromArena.inArena(p) || fromArena.inLobby(p))) { - Messenger.tell(p, Msg.SPEC_ALREADY_PLAYING); + fromArena.getMessenger().tell(p, Msg.SPEC_ALREADY_PLAYING); return true; } diff --git a/src/main/java/com/garbagemule/MobArena/framework/Arena.java b/src/main/java/com/garbagemule/MobArena/framework/Arena.java index 978a44b..203ffe6 100644 --- a/src/main/java/com/garbagemule/MobArena/framework/Arena.java +++ b/src/main/java/com/garbagemule/MobArena/framework/Arena.java @@ -2,6 +2,7 @@ package com.garbagemule.MobArena.framework; import java.util.*; +import com.garbagemule.MobArena.Messenger; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.block.Block; @@ -109,6 +110,9 @@ public interface Arena public ScoreboardManager getScoreboard(); + public Messenger getMessenger(); + + public Messenger getGlobalMessenger(); diff --git a/src/main/java/com/garbagemule/MobArena/framework/ArenaMaster.java b/src/main/java/com/garbagemule/MobArena/framework/ArenaMaster.java index fef3f76..2e60d74 100644 --- a/src/main/java/com/garbagemule/MobArena/framework/ArenaMaster.java +++ b/src/main/java/com/garbagemule/MobArena/framework/ArenaMaster.java @@ -4,6 +4,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import com.garbagemule.MobArena.Messenger; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Entity; @@ -24,6 +25,8 @@ public interface ArenaMaster public MobArena getPlugin(); + + public Messenger getGlobalMessenger(); public boolean isEnabled(); diff --git a/src/main/java/com/garbagemule/MobArena/listeners/MAGlobalListener.java b/src/main/java/com/garbagemule/MobArena/listeners/MAGlobalListener.java index 4f0975b..3f61d48 100644 --- a/src/main/java/com/garbagemule/MobArena/listeners/MAGlobalListener.java +++ b/src/main/java/com/garbagemule/MobArena/listeners/MAGlobalListener.java @@ -13,7 +13,6 @@ import org.bukkit.event.vehicle.VehicleExitEvent; import org.bukkit.event.world.WorldLoadEvent; import org.bukkit.event.world.WorldUnloadEvent; -import com.garbagemule.MobArena.Messenger; import com.garbagemule.MobArena.MobArena; import com.garbagemule.MobArena.framework.Arena; import com.garbagemule.MobArena.framework.ArenaMaster; @@ -111,7 +110,7 @@ public class MAGlobalListener implements Listener } else if ((stat = Stats.getByShortName(text)) != null) { setSignLines(event, ChatColor.GREEN + "", "", ChatColor.AQUA + stat.getFullName(), "---------------"); - Messenger.tell(event.getPlayer(), "Stat sign created."); + am.getGlobalMessenger().tell(event.getPlayer(), "Stat sign created."); } } diff --git a/src/main/java/com/garbagemule/MobArena/region/ArenaRegion.java b/src/main/java/com/garbagemule/MobArena/region/ArenaRegion.java index b6c592e..f14bf12 100644 --- a/src/main/java/com/garbagemule/MobArena/region/ArenaRegion.java +++ b/src/main/java/com/garbagemule/MobArena/region/ArenaRegion.java @@ -1,7 +1,6 @@ package com.garbagemule.MobArena.region; import com.garbagemule.MobArena.MAUtils; -import com.garbagemule.MobArena.Messenger; import com.garbagemule.MobArena.MobArena; import com.garbagemule.MobArena.framework.Arena; import com.garbagemule.MobArena.util.Enums; @@ -132,7 +131,7 @@ public class ArenaRegion if (p1 == null) list.add("p1"); if (p2 == null) list.add("p2"); if (!list.isEmpty()) { - Messenger.tell(s, "Missing region points: " + MAUtils.listToString(list, plugin)); + arena.getGlobalMessenger().tell(s, "Missing region points: " + MAUtils.listToString(list, plugin)); list.clear(); } } @@ -143,7 +142,7 @@ public class ArenaRegion if (lobbyWarp == null) list.add("lobby"); if (specWarp == null) list.add("spectator"); if (!list.isEmpty()) { - Messenger.tell(s, "Missing warps: " + MAUtils.listToString(list, plugin)); + arena.getGlobalMessenger().tell(s, "Missing warps: " + MAUtils.listToString(list, plugin)); list.clear(); } } @@ -151,13 +150,13 @@ public class ArenaRegion // Spawnpoints if (spawns) { if (spawnpoints.isEmpty()) { - Messenger.tell(s, "Missing spawnpoints"); + arena.getGlobalMessenger().tell(s, "Missing spawnpoints"); } } // Ready? if (ready && setup) { - Messenger.tell(s, "Arena is ready to be used!"); + arena.getGlobalMessenger().tell(s, "Arena is ready to be used!"); } } @@ -628,12 +627,12 @@ public class ArenaRegion } if (map.isEmpty()) { - Messenger.tell(p, "No spawnpoints cover your location!"); + arena.getGlobalMessenger().tell(p, "No spawnpoints cover your location!"); return; } // Notify the player - Messenger.tell(p, "The following points cover your location:"); + arena.getGlobalMessenger().tell(p, "The following points cover your location:"); for (Map.Entry entry : map.entrySet()) { Location l = entry.getValue(); String coords = l.getBlockX() + "," + l.getBlockY() + "," + l.getBlockZ(); diff --git a/src/main/java/com/garbagemule/MobArena/util/ClassChests.java b/src/main/java/com/garbagemule/MobArena/util/ClassChests.java index c0edcfc..92c1ef2 100644 --- a/src/main/java/com/garbagemule/MobArena/util/ClassChests.java +++ b/src/main/java/com/garbagemule/MobArena/util/ClassChests.java @@ -1,7 +1,6 @@ package com.garbagemule.MobArena.util; import com.garbagemule.MobArena.ArenaClass; -import com.garbagemule.MobArena.Messenger; import com.garbagemule.MobArena.Msg; import com.garbagemule.MobArena.framework.Arena; import org.bukkit.ChatColor; @@ -97,11 +96,11 @@ public class ClassChests { contents = newContents; } arena.assignClassGiveInv(player, classname, contents); - Messenger.tell(player, Msg.LOBBY_CLASS_PICKED, arena.getClasses().get(classname).getConfigName()); + arena.getMessenger().tell(player, Msg.LOBBY_CLASS_PICKED, arena.getClasses().get(classname).getConfigName()); double price = ac.getPrice(); if (price > 0D) { - Messenger.tell(player, Msg.LOBBY_CLASS_PRICE, arena.getPlugin().economyFormat(price)); + arena.getMessenger().tell(player, Msg.LOBBY_CLASS_PRICE, arena.getPlugin().economyFormat(price)); } } diff --git a/src/main/java/com/garbagemule/MobArena/util/VersionChecker.java b/src/main/java/com/garbagemule/MobArena/util/VersionChecker.java index e9bc0d5..129bbb3 100644 --- a/src/main/java/com/garbagemule/MobArena/util/VersionChecker.java +++ b/src/main/java/com/garbagemule/MobArena/util/VersionChecker.java @@ -3,7 +3,6 @@ package com.garbagemule.MobArena.util; import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import com.garbagemule.MobArena.Messenger; import com.garbagemule.MobArena.MobArena; import com.garbagemule.MobArena.util.Updater.UpdateResult; import com.garbagemule.MobArena.util.Updater.UpdateType; @@ -91,7 +90,7 @@ public class VersionChecker if (player == null) { plugin.getLogger().info(message); } else if (player.isOnline()) { - Messenger.tell(player, message); + plugin.getGlobalMessenger().tell(player, message); } } } diff --git a/src/main/java/com/garbagemule/MobArena/util/timer/ChatCallback.java b/src/main/java/com/garbagemule/MobArena/util/timer/ChatCallback.java index 0c01423..06d73f8 100644 --- a/src/main/java/com/garbagemule/MobArena/util/timer/ChatCallback.java +++ b/src/main/java/com/garbagemule/MobArena/util/timer/ChatCallback.java @@ -1,6 +1,5 @@ package com.garbagemule.MobArena.util.timer; -import com.garbagemule.MobArena.Messenger; import com.garbagemule.MobArena.Msg; import com.garbagemule.MobArena.framework.Arena; @@ -49,7 +48,7 @@ public class ChatCallback extends TimerCallbackAdapter { // Announce remaining seconds long ticks = timer.getRemaining(); int seconds = toSeconds(ticks); - Messenger.announce(arena, msg, String.valueOf(seconds)); + arena.getMessenger().announce(arena, msg, String.valueOf(seconds)); // Calculate the new interval index++; diff --git a/src/main/java/com/garbagemule/MobArena/util/timer/StartDelayTimer.java b/src/main/java/com/garbagemule/MobArena/util/timer/StartDelayTimer.java index 4aa7857..b3c5c9d 100644 --- a/src/main/java/com/garbagemule/MobArena/util/timer/StartDelayTimer.java +++ b/src/main/java/com/garbagemule/MobArena/util/timer/StartDelayTimer.java @@ -1,6 +1,5 @@ package com.garbagemule.MobArena.util.timer; -import com.garbagemule.MobArena.Messenger; import com.garbagemule.MobArena.Msg; import com.garbagemule.MobArena.framework.Arena; @@ -106,7 +105,7 @@ public class StartDelayTimer extends CountdownTimer implements TimerCallback { // Notify players of auto-start-timer duration if (autoStartTimer.isRunning()) { - Messenger.announce(arena, Msg.ARENA_AUTO_START, "" + autoStartTimer.getRemaining() / 20l); + arena.getMessenger().announce(arena, Msg.ARENA_AUTO_START, "" + autoStartTimer.getRemaining() / 20l); } } } diff --git a/src/main/java/com/garbagemule/MobArena/waves/enums/WaveType.java b/src/main/java/com/garbagemule/MobArena/waves/enums/WaveType.java index f996d1a..ffa069e 100644 --- a/src/main/java/com/garbagemule/MobArena/waves/enums/WaveType.java +++ b/src/main/java/com/garbagemule/MobArena/waves/enums/WaveType.java @@ -1,6 +1,5 @@ package com.garbagemule.MobArena.waves.enums; -import com.garbagemule.MobArena.Messenger; import com.garbagemule.MobArena.Msg; import com.garbagemule.MobArena.framework.Arena; import com.garbagemule.MobArena.waves.WaveUtils; @@ -10,42 +9,42 @@ public enum WaveType DEFAULT { @Override public void announce(Arena arena, int wave) { - Messenger.announce(arena, Msg.WAVE_DEFAULT, "" + wave); + arena.getMessenger().announce(arena, Msg.WAVE_DEFAULT, "" + wave); } }, SPECIAL { @Override public void announce(Arena arena, int wave) { - Messenger.announce(arena, Msg.WAVE_SPECIAL, "" + wave); + arena.getMessenger().announce(arena, Msg.WAVE_SPECIAL, "" + wave); } }, SWARM { @Override public void announce(Arena arena, int wave) { - Messenger.announce(arena, Msg.WAVE_SWARM, "" + wave); + arena.getMessenger().announce(arena, Msg.WAVE_SWARM, "" + wave); } }, SUPPLY { @Override public void announce(Arena arena, int wave) { - Messenger.announce(arena, Msg.WAVE_SUPPLY, "" + wave); + arena.getMessenger().announce(arena, Msg.WAVE_SUPPLY, "" + wave); } }, BOSS { @Override public void announce(Arena arena, int wave) { - Messenger.announce(arena, Msg.WAVE_BOSS, "" + wave); + arena.getMessenger().announce(arena, Msg.WAVE_BOSS, "" + wave); } }, UPGRADE { @Override public void announce(Arena arena, int wave) { - Messenger.announce(arena, Msg.WAVE_UPGRADE, "" + wave); + arena.getMessenger().announce(arena, Msg.WAVE_UPGRADE, "" + wave); } }; diff --git a/src/main/java/com/garbagemule/MobArena/waves/types/BossWave.java b/src/main/java/com/garbagemule/MobArena/waves/types/BossWave.java index 54c27d9..1a7d7fa 100644 --- a/src/main/java/com/garbagemule/MobArena/waves/types/BossWave.java +++ b/src/main/java/com/garbagemule/MobArena/waves/types/BossWave.java @@ -10,7 +10,6 @@ import java.util.Set; import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; -import com.garbagemule.MobArena.Messenger; import com.garbagemule.MobArena.Msg; import com.garbagemule.MobArena.framework.Arena; import com.garbagemule.MobArena.waves.*; @@ -154,7 +153,7 @@ public class BossWave extends AbstractWave public void announceAbility(Ability ability, MABoss boss, Arena arena) { if(getAbilityAnnounce()) { AbilityInfo info = ability.getClass().getAnnotation(AbilityInfo.class); - Messenger.announce(arena, Msg.WAVE_BOSS_ABILITY, info.name()); + arena.getMessenger().announce(arena, Msg.WAVE_BOSS_ABILITY, info.name()); } } diff --git a/src/main/resources/res/global-settings.yml b/src/main/resources/res/global-settings.yml index 146e44b..ef527be 100644 --- a/src/main/resources/res/global-settings.yml +++ b/src/main/resources/res/global-settings.yml @@ -1,3 +1,4 @@ enabled: true allowed-commands: /list, /pl -update-notification: true \ No newline at end of file +update-notification: true +prefix: '&a[MobArena] ' \ No newline at end of file diff --git a/src/main/resources/res/settings.yml b/src/main/resources/res/settings.yml index 435785a..1190852 100644 --- a/src/main/resources/res/settings.yml +++ b/src/main/resources/res/settings.yml @@ -1,3 +1,4 @@ +prefix: '' world: '' enabled: true protect: true