diff --git a/src/mineverse/Aust1n46/chat/MineverseChat.java b/src/mineverse/Aust1n46/chat/MineverseChat.java index df114ed..f1c554a 100644 --- a/src/mineverse/Aust1n46/chat/MineverseChat.java +++ b/src/mineverse/Aust1n46/chat/MineverseChat.java @@ -9,7 +9,6 @@ import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -19,73 +18,6 @@ import java.util.UUID; import java.util.logging.Level; import java.util.logging.Logger; -import net.milkbowl.vault.chat.Chat; -import net.milkbowl.vault.permission.Permission; -import mineverse.Aust1n46.chat.json.JsonFormatInfo; -import mineverse.Aust1n46.chat.listeners.CommandListener; -import mineverse.Aust1n46.chat.listeners.LoginListener; -import mineverse.Aust1n46.chat.listeners.ChatListener; -import mineverse.Aust1n46.chat.listeners.PacketListener; -import mineverse.Aust1n46.chat.listeners.SignListener; -import mineverse.Aust1n46.chat.localization.Localization; -import mineverse.Aust1n46.chat.localization.LocalizedMessage; -//import mineverse.Aust1n46.chat.alias.Alias; -import mineverse.Aust1n46.chat.alias.AliasInfo; -import mineverse.Aust1n46.chat.api.MineverseChatAPI; -import mineverse.Aust1n46.chat.api.MineverseChatPlayer; -import mineverse.Aust1n46.chat.api.events.VentureChatEvent; -import mineverse.Aust1n46.chat.channel.ChatChannel; -import mineverse.Aust1n46.chat.channel.ChatChannelInfo; -//import mineverse.Aust1n46.chat.command.CCommand; -import mineverse.Aust1n46.chat.command.MineverseCommand; -import mineverse.Aust1n46.chat.command.MineverseCommandExecutor; -import mineverse.Aust1n46.chat.command.chat.Broadcast; -import mineverse.Aust1n46.chat.command.chat.BungeeToggle; -import mineverse.Aust1n46.chat.command.chat.Channel; -import mineverse.Aust1n46.chat.command.chat.Channelinfo; -import mineverse.Aust1n46.chat.command.chat.Chatinfo; -import mineverse.Aust1n46.chat.command.chat.Chatreload; -import mineverse.Aust1n46.chat.command.chat.Chlist; -import mineverse.Aust1n46.chat.command.chat.Chwho; -import mineverse.Aust1n46.chat.command.chat.Clearchat; -import mineverse.Aust1n46.chat.command.chat.Commandblock; -import mineverse.Aust1n46.chat.command.chat.Commandspy; -import mineverse.Aust1n46.chat.command.chat.Config; -import mineverse.Aust1n46.chat.command.chat.Edit; -import mineverse.Aust1n46.chat.command.chat.Filter; -import mineverse.Aust1n46.chat.command.chat.Force; -import mineverse.Aust1n46.chat.command.chat.Forceall; -import mineverse.Aust1n46.chat.command.chat.Kickchannel; -import mineverse.Aust1n46.chat.command.chat.Kickchannelall; -import mineverse.Aust1n46.chat.command.chat.Leave; -import mineverse.Aust1n46.chat.command.chat.Listen; -import mineverse.Aust1n46.chat.command.chat.Me; -import mineverse.Aust1n46.chat.command.chat.Nick; -import mineverse.Aust1n46.chat.command.chat.Party; -import mineverse.Aust1n46.chat.command.chat.RangedSpy; -import mineverse.Aust1n46.chat.command.chat.Removemessage; -import mineverse.Aust1n46.chat.command.chat.Setchannel; -import mineverse.Aust1n46.chat.command.chat.Setchannelall; -import mineverse.Aust1n46.chat.command.chat.VentureChatGui; -import mineverse.Aust1n46.chat.command.chat.Venturechat; -import mineverse.Aust1n46.chat.command.message.IgnoreCommandExecutor; -import mineverse.Aust1n46.chat.command.message.MessageCommandExecutor; -import mineverse.Aust1n46.chat.command.message.MessageToggle; -import mineverse.Aust1n46.chat.command.message.Notifications; -import mineverse.Aust1n46.chat.command.message.Reply; -import mineverse.Aust1n46.chat.command.message.Spy; -import mineverse.Aust1n46.chat.command.mute.Mute; -import mineverse.Aust1n46.chat.command.mute.MuteContainer; -import mineverse.Aust1n46.chat.command.mute.Muteall; -import mineverse.Aust1n46.chat.command.mute.Unmute; -import mineverse.Aust1n46.chat.command.mute.Unmuteall; -import mineverse.Aust1n46.chat.database.Database; -import mineverse.Aust1n46.chat.database.PlayerData; -import mineverse.Aust1n46.chat.gui.GuiSlotInfo; -import mineverse.Aust1n46.chat.utilities.Format; -import mineverse.Aust1n46.chat.versions.V1_8; -import mineverse.Aust1n46.chat.versions.VersionHandler; - import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -103,18 +35,37 @@ import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.utility.MinecraftReflection; import me.clip.placeholderapi.PlaceholderAPI; +import mineverse.Aust1n46.chat.alias.AliasInfo; +import mineverse.Aust1n46.chat.api.MineverseChatAPI; +import mineverse.Aust1n46.chat.api.MineverseChatPlayer; +import mineverse.Aust1n46.chat.api.events.VentureChatEvent; +import mineverse.Aust1n46.chat.channel.ChatChannel; +import mineverse.Aust1n46.chat.channel.ChatChannelInfo; +import mineverse.Aust1n46.chat.command.MineverseCommandExecutor; +import mineverse.Aust1n46.chat.command.chat.Channel; +import mineverse.Aust1n46.chat.command.mute.MuteContainer; +import mineverse.Aust1n46.chat.database.Database; +import mineverse.Aust1n46.chat.database.PlayerData; +import mineverse.Aust1n46.chat.gui.GuiSlotInfo; +import mineverse.Aust1n46.chat.json.JsonFormatInfo; +import mineverse.Aust1n46.chat.listeners.ChatListener; +import mineverse.Aust1n46.chat.listeners.CommandListener; +import mineverse.Aust1n46.chat.listeners.LoginListener; +import mineverse.Aust1n46.chat.listeners.PacketListener; +import mineverse.Aust1n46.chat.listeners.SignListener; +import mineverse.Aust1n46.chat.localization.Localization; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; +import mineverse.Aust1n46.chat.utilities.Format; +import mineverse.Aust1n46.chat.versions.V1_8; +import mineverse.Aust1n46.chat.versions.VersionHandler; +import net.milkbowl.vault.chat.Chat; +import net.milkbowl.vault.permission.Permission; /** * VentureChat Minecraft plugin for servers running Spigot or Paper software. * @author Aust1n46 */ public class MineverseChat extends JavaPlugin implements PluginMessageListener { - // Listeners -------------------------------- - private ChatListener chatListener; - private LoginListener loginListener; - private SignListener signListener; - private CommandListener commandListener; - private Channel channelListener; public static String[] playerlist; public static String playerlist_server; public boolean ircListen; @@ -126,10 +77,6 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { private static Field commandMap; private static Field knownCommands; - // Executors -------------------------------- - private MineverseCommandExecutor commandExecutor; - private Map commands = new HashMap(); - // Misc -------------------------------- public static AliasInfo aaInfo; public static JsonFormatInfo jfInfo; @@ -143,7 +90,6 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { public static Set onlinePlayers = new HashSet(); public static List networkPlayerNames = new ArrayList(); - //private boolean firstRun = true; // Plugin Messaging Channel public static final String PLUGIN_MESSAGING_CHANNEL = "venturechat:data"; @@ -155,14 +101,11 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { // Vault -------------------------------- public static Permission permission = null; public static Chat chat = null; - public static CommandMap cmap; - - // Offline data ---------------------------- - public Map mutes = new HashMap(); + private static CommandMap cmap; + public static final int LINE_LENGTH = 40; + private LogLevels curLogLevel; - - public long LINELENGTH = 40; // DiscordSRV backwards compatibility @Deprecated @@ -216,6 +159,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { jfInfo = new JsonFormatInfo(this); gsInfo = new GuiSlotInfo(); + Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Loading player data")); PlayerData.loadLegacyPlayerData(); PlayerData.loadPlayerData(); for(Player p : this.getServer().getOnlinePlayers()) { @@ -238,72 +182,13 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { Database.initializeMySQL(); }); - commands.put("broadcast", new Broadcast("broadcast")); - commands.put("channel", new Channel("channel")); - commands.put("join", new Channel("join")); - commands.put("channelinfo", new Channelinfo("channelinfo")); - commands.put("chatinfo", new Chatinfo("chatinfo")); - commands.put("chatreload", new Chatreload("chatreload")); - commands.put("chlist", new Chlist("chlist")); - commands.put("chwho", new Chwho("chwho")); - commands.put("clearchat", new Clearchat("clearchat")); - commands.put("commandblock", new Commandblock("commandblock")); - commands.put("commandspy", new Commandspy("commandspy")); - commands.put("config", new Config("config")); - commands.put("edit", new Edit("edit")); - commands.put("filter", new Filter("filter")); - commands.put("force", new Force("force")); - commands.put("forceall", new Forceall("forceall")); - commands.put("kickchannel", new Kickchannel("kickchannel")); - commands.put("kickchannelall", new Kickchannelall("kickchannelall")); - commands.put("leave", new Leave("leave")); - commands.put("listen", new Listen("listen")); - commands.put("me", new Me("me")); - commands.put("venturechat", new Venturechat("venturechat")); - commands.put("mute", new Mute("mute")); - commands.put("muteall", new Muteall("muteall")); - commands.put("setnickname", new Nick("setnickname")); - commands.put("notifications", new Notifications("notifications")); - commands.put("party", new Party("party")); - commands.put("rangedspy", new RangedSpy("rangedspy")); - commands.put("removemessage", new Removemessage("removemessage")); - commands.put("reply", new Reply("reply")); - commands.put("r", new Reply("r")); - commands.put("setchannel", new Setchannel("setchannel")); - commands.put("setchannelall", new Setchannelall("setchannelall")); - commands.put("spy", new Spy("spy")); - commands.put("unmute", new Unmute("unmute")); - commands.put("unmuteall", new Unmuteall("unmuteall")); - commands.put("venturechatgui", new VentureChatGui("venturechatgui")); - commands.put("messagetoggle", new MessageToggle("messagetoggle")); - commands.put("bungeetoggle", new BungeeToggle("bungeetoggle")); - commandExecutor = new MineverseCommandExecutor(commands); - for(String command : commands.keySet()) { - this.getCommand(command).setExecutor(commandExecutor); - } - - MessageCommandExecutor messageCommandExecutor = new MessageCommandExecutor(); - this.getCommand("message").setExecutor(messageCommandExecutor); - this.getCommand("msg").setExecutor(messageCommandExecutor); - this.getCommand("tell").setExecutor(messageCommandExecutor); - this.getCommand("whisper").setExecutor(messageCommandExecutor); - this.getCommand("ignore").setExecutor(new IgnoreCommandExecutor()); + MineverseCommandExecutor.initialize(); - channelListener = new Channel(); - signListener = new SignListener(); - chatListener = new ChatListener(); - commandListener = new CommandListener(aaInfo); - - PluginManager pluginManager = getServer().getPluginManager(); - pluginManager.registerEvents(channelListener, this); - pluginManager.registerEvents(chatListener, this); - pluginManager.registerEvents(signListener, this); - pluginManager.registerEvents(commandListener, this); - loginListener = new LoginListener(); - pluginManager.registerEvents(loginListener, this); + this.registerListeners(); this.registerPacketListeners(); this.loadNMS(); Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Attaching to Executors")); + try { // if(VersionHandler.is1_7_9()) cmap = V1_7_9.v1_7_9(); // if(VersionHandler.is1_7_10()) cmap = V1_7_10.v1_7_10(); @@ -338,9 +223,11 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { * )); */ } + Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Establishing BungeeCord")); Bukkit.getMessenger().registerOutgoingPluginChannel(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL); Bukkit.getMessenger().registerIncomingPluginChannel(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, this); + PluginManager pluginManager = getServer().getPluginManager(); if(pluginManager.isPluginEnabled("Towny")) { Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Enabling Towny Formatting")); } @@ -351,14 +238,12 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { String version = pluginManager.getPlugin("Factions").getDescription().getVersion(); Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Enabling Factions Formatting version " + version)); } - if(pluginManager.isPluginEnabled("Heroes")) { - Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Enabling Heroes Formatting")); - } if(pluginManager.isPluginEnabled("PlaceholderAPI")) { Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Enabling PlaceholderAPI Hook")); } + new VentureChatPlaceholders().register(); - Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Loading player data")); + BukkitScheduler scheduler = Bukkit.getServer().getScheduler(); scheduler.runTaskTimerAsynchronously(this, new Runnable() { @Override @@ -418,7 +303,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { } @SuppressWarnings("unchecked") - public void unregister(String name) { + public static void unregister(String name) { try { ((Map) knownCommands.get((SimpleCommandMap) commandMap.get(Bukkit.getServer()))).remove(name); } @@ -438,7 +323,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { } } - public CommandMap getCommandMap() { + public static CommandMap getCommandMap() { return cmap; } @@ -446,6 +331,15 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { return getPlugin(MineverseChat.class); } + + private void registerListeners() { + PluginManager pluginManager = getServer().getPluginManager(); + pluginManager.registerEvents(new Channel(), this); + pluginManager.registerEvents(new ChatListener(), this); + pluginManager.registerEvents(new SignListener(), this); + pluginManager.registerEvents(new CommandListener(aaInfo), this); + pluginManager.registerEvents(new LoginListener(), this); + } private void registerPacketListeners() { ProtocolLibrary.getProtocolManager().addPacketListener(new PacketListener()); @@ -503,10 +397,6 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { return(chat != null); } - public long getLineLength() { - return LINELENGTH; - } - public void setLogLevel(String loglevel) { if(LogLevels.valueOf(loglevel) != null) { curLogLevel = LogLevels.valueOf(loglevel); diff --git a/src/mineverse/Aust1n46/chat/command/MineverseCommand.java b/src/mineverse/Aust1n46/chat/command/MineverseCommand.java index 818a793..fbbe835 100644 --- a/src/mineverse/Aust1n46/chat/command/MineverseCommand.java +++ b/src/mineverse/Aust1n46/chat/command/MineverseCommand.java @@ -7,21 +7,9 @@ import org.bukkit.command.CommandSender; //This class is the parent class of all of the plugins commands. The execute method runs the command. public abstract class MineverseCommand { - protected String name; - - protected MineverseCommand() {} - - protected MineverseCommand(String name) { - this.name = name; - } - public abstract void execute(CommandSender sender, String command, String[] args); public List onTabComplete(CommandSender sender, Command command, String label, String[] args) { return null; } - - public String getName() { - return name; - } } diff --git a/src/mineverse/Aust1n46/chat/command/MineverseCommandExecutor.java b/src/mineverse/Aust1n46/chat/command/MineverseCommandExecutor.java index fe442f8..34aa7c7 100644 --- a/src/mineverse/Aust1n46/chat/command/MineverseCommandExecutor.java +++ b/src/mineverse/Aust1n46/chat/command/MineverseCommandExecutor.java @@ -1,5 +1,6 @@ package mineverse.Aust1n46.chat.command; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -7,13 +8,54 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.command.TabExecutor; -//This class is a standard command executor that is used to run the MineverseCommand's. -public class MineverseCommandExecutor implements TabExecutor { - private Map commands; +import mineverse.Aust1n46.chat.MineverseChat; +import mineverse.Aust1n46.chat.command.chat.Broadcast; +import mineverse.Aust1n46.chat.command.chat.BungeeToggle; +import mineverse.Aust1n46.chat.command.chat.Channel; +import mineverse.Aust1n46.chat.command.chat.Channelinfo; +import mineverse.Aust1n46.chat.command.chat.Chatinfo; +import mineverse.Aust1n46.chat.command.chat.Chatreload; +import mineverse.Aust1n46.chat.command.chat.Chlist; +import mineverse.Aust1n46.chat.command.chat.Chwho; +import mineverse.Aust1n46.chat.command.chat.Clearchat; +import mineverse.Aust1n46.chat.command.chat.Commandblock; +import mineverse.Aust1n46.chat.command.chat.Commandspy; +import mineverse.Aust1n46.chat.command.chat.Config; +import mineverse.Aust1n46.chat.command.chat.Edit; +import mineverse.Aust1n46.chat.command.chat.Filter; +import mineverse.Aust1n46.chat.command.chat.Force; +import mineverse.Aust1n46.chat.command.chat.Forceall; +import mineverse.Aust1n46.chat.command.chat.Kickchannel; +import mineverse.Aust1n46.chat.command.chat.Kickchannelall; +import mineverse.Aust1n46.chat.command.chat.Leave; +import mineverse.Aust1n46.chat.command.chat.Listen; +import mineverse.Aust1n46.chat.command.chat.Me; +import mineverse.Aust1n46.chat.command.chat.Nick; +import mineverse.Aust1n46.chat.command.chat.Party; +import mineverse.Aust1n46.chat.command.chat.RangedSpy; +import mineverse.Aust1n46.chat.command.chat.Removemessage; +import mineverse.Aust1n46.chat.command.chat.Setchannel; +import mineverse.Aust1n46.chat.command.chat.Setchannelall; +import mineverse.Aust1n46.chat.command.chat.VentureChatGui; +import mineverse.Aust1n46.chat.command.chat.Venturechat; +import mineverse.Aust1n46.chat.command.message.IgnoreCommandExecutor; +import mineverse.Aust1n46.chat.command.message.MessageCommandExecutor; +import mineverse.Aust1n46.chat.command.message.MessageToggle; +import mineverse.Aust1n46.chat.command.message.Notifications; +import mineverse.Aust1n46.chat.command.message.Reply; +import mineverse.Aust1n46.chat.command.message.Spy; +import mineverse.Aust1n46.chat.command.mute.Mute; +import mineverse.Aust1n46.chat.command.mute.Muteall; +import mineverse.Aust1n46.chat.command.mute.Unmute; +import mineverse.Aust1n46.chat.command.mute.Unmuteall; - public MineverseCommandExecutor(Map commands) { - this.commands = commands; - } +/** + * Class that initializes and executes the plugin's commands. + */ +public class MineverseCommandExecutor implements TabExecutor { + private static Map commands = new HashMap(); + private static MineverseChat plugin = MineverseChat.getInstance(); + private static MineverseCommandExecutor commandExecutor; @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] parameters) { @@ -25,4 +67,68 @@ public class MineverseCommandExecutor implements TabExecutor { public List onTabComplete(CommandSender sender, Command command, String label, String[] args) { return commands.get(command.getName()).onTabComplete(sender, command, label, args); } + + public static void initialize() { + commandExecutor = new MineverseCommandExecutor(); + commands.put("broadcast", new Broadcast()); + commands.put("channel", new Channel()); + commands.put("join", new Channel()); + commands.put("channelinfo", new Channelinfo()); + commands.put("chatinfo", new Chatinfo()); + commands.put("chatreload", new Chatreload()); + commands.put("chlist", new Chlist()); + commands.put("chwho", new Chwho()); + commands.put("clearchat", new Clearchat()); + commands.put("commandblock", new Commandblock()); + commands.put("commandspy", new Commandspy()); + commands.put("config", new Config()); + commands.put("edit", new Edit()); + commands.put("filter", new Filter()); + commands.put("force", new Force()); + commands.put("forceall", new Forceall()); + commands.put("kickchannel", new Kickchannel()); + commands.put("kickchannelall", new Kickchannelall()); + commands.put("leave", new Leave()); + commands.put("listen", new Listen()); + commands.put("me", new Me()); + commands.put("venturechat", new Venturechat()); + commands.put("setnickname", new Nick()); + commands.put("notifications", new Notifications()); + commands.put("party", new Party()); + commands.put("rangedspy", new RangedSpy()); + commands.put("removemessage", new Removemessage()); + commands.put("setchannel", new Setchannel()); + commands.put("setchannelall", new Setchannelall()); + commands.put("spy", new Spy()); + commands.put("venturechatgui", new VentureChatGui()); + commands.put("messagetoggle", new MessageToggle()); + commands.put("bungeetoggle", new BungeeToggle()); + for(String command : commands.keySet()) { + plugin.getCommand(command).setExecutor(commandExecutor); + } + + plugin.getServer().getScheduler().runTaskLater(plugin, () -> { + MineverseCommand reply = new Reply(); + commands.put("reply", reply); + commands.put("r", reply); + plugin.getCommand("reply").setExecutor(commandExecutor); + plugin.getCommand("r").setExecutor(commandExecutor); + + commands.put("mute", new Mute()); + commands.put("muteall", new Muteall()); + commands.put("unmute", new Unmute()); + commands.put("unmuteall", new Unmuteall()); + plugin.getCommand("mute").setExecutor(commandExecutor); + plugin.getCommand("muteall").setExecutor(commandExecutor); + plugin.getCommand("unmute").setExecutor(commandExecutor); + plugin.getCommand("unmuteall").setExecutor(commandExecutor); + + MessageCommandExecutor messageCommandExecutor = new MessageCommandExecutor(); + plugin.getCommand("message").setExecutor(messageCommandExecutor); + plugin.getCommand("msg").setExecutor(messageCommandExecutor); + plugin.getCommand("tell").setExecutor(messageCommandExecutor); + plugin.getCommand("whisper").setExecutor(messageCommandExecutor); + plugin.getCommand("ignore").setExecutor(new IgnoreCommandExecutor()); + }, 0); + } } diff --git a/src/mineverse/Aust1n46/chat/command/chat/Broadcast.java b/src/mineverse/Aust1n46/chat/command/chat/Broadcast.java index 33da48f..3032fe0 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Broadcast.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Broadcast.java @@ -12,10 +12,6 @@ import mineverse.Aust1n46.chat.utilities.Format; public class Broadcast extends MineverseCommand { private MineverseChat plugin = MineverseChat.getInstance(); - public Broadcast(String name) { - super(name); - } - @Override public void execute(CommandSender sender, String command, String[] args) { ConfigurationSection bs = plugin.getConfig().getConfigurationSection("broadcast"); diff --git a/src/mineverse/Aust1n46/chat/command/chat/BungeeToggle.java b/src/mineverse/Aust1n46/chat/command/chat/BungeeToggle.java index e0e1dbf..9865d2f 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/BungeeToggle.java +++ b/src/mineverse/Aust1n46/chat/command/chat/BungeeToggle.java @@ -1,5 +1,6 @@ package mineverse.Aust1n46.chat.command.chat; +import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -10,17 +11,11 @@ import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class BungeeToggle extends MineverseCommand { - private MineverseChat plugin; - - public BungeeToggle(String name) { - super(name); - this.plugin = MineverseChat.getInstance(); - } @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); + Bukkit.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); diff --git a/src/mineverse/Aust1n46/chat/command/chat/Channel.java b/src/mineverse/Aust1n46/chat/command/chat/Channel.java index 3a1e1e7..dc78649 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Channel.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Channel.java @@ -1,5 +1,6 @@ package mineverse.Aust1n46.chat.command.chat; +import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -15,18 +16,11 @@ import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Channel extends MineverseCommand implements Listener { - private MineverseChat plugin = MineverseChat.getInstance(); - - public Channel() {} - - public Channel(String name) { - super(name); - } @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); + Bukkit.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); @@ -37,7 +31,7 @@ public class Channel extends MineverseCommand implements Listener { return; } ChatChannel channel = ChatChannel.getChannel(args[0]); - plugin.getServer().getPluginManager().callEvent(new ChannelJoinEvent(mcp.getPlayer(), channel, LocalizedMessage.SET_CHANNEL.toString() + Bukkit.getServer().getPluginManager().callEvent(new ChannelJoinEvent(mcp.getPlayer(), channel, LocalizedMessage.SET_CHANNEL.toString() .replace("{channel_color}", channel.getColor() + "") .replace("{channel_name}", channel.getName()))); return; @@ -81,4 +75,4 @@ public class Channel extends MineverseCommand implements Listener { } return; } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/Channelinfo.java b/src/mineverse/Aust1n46/chat/command/chat/Channelinfo.java index e667cad..cd7c420 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Channelinfo.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Channelinfo.java @@ -9,10 +9,6 @@ import mineverse.Aust1n46.chat.utilities.Format; public class Channelinfo extends MineverseCommand { - public Channelinfo(String name) { - super(name); - } - @Override public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.channelinfo")) { diff --git a/src/mineverse/Aust1n46/chat/command/chat/Chatinfo.java b/src/mineverse/Aust1n46/chat/command/chat/Chatinfo.java index 9cd1872..d46ca3f 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Chatinfo.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Chatinfo.java @@ -1,10 +1,10 @@ package mineverse.Aust1n46.chat.command.chat; +import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; @@ -12,19 +12,13 @@ import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.command.mute.MuteContainer; public class Chatinfo extends MineverseCommand { - private MineverseChat plugin = MineverseChat.getInstance();; - public Chatinfo(String name) { - super(name); - } - - //@SuppressWarnings("unchecked") @Override public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.chatinfo")) { if(args.length == 0) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player; use /ci [name]"); + Bukkit.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player; use /ci [name]"); return; } MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); diff --git a/src/mineverse/Aust1n46/chat/command/chat/Chatreload.java b/src/mineverse/Aust1n46/chat/command/chat/Chatreload.java index 8fdb847..bcf9fc9 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Chatreload.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Chatreload.java @@ -10,12 +10,7 @@ import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Chatreload extends MineverseCommand { - private MineverseChat plugin; - - public Chatreload(String name) { - super(name); - this.plugin = MineverseChat.getInstance(); - } + private MineverseChat plugin = MineverseChat.getInstance(); @Override public void execute(CommandSender sender, String command, String[] args) { diff --git a/src/mineverse/Aust1n46/chat/command/chat/Chlist.java b/src/mineverse/Aust1n46/chat/command/chat/Chlist.java index f526c55..7b096d5 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Chlist.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Chlist.java @@ -8,10 +8,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Chlist extends MineverseCommand { - public Chlist(String name) { - super(name); - } - @Override public void execute(CommandSender sender, String command, String[] args) { sender.sendMessage(LocalizedMessage.CHANNEL_LIST_HEADER.toString()); @@ -33,4 +29,4 @@ public class Chlist extends MineverseCommand { } return; } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/Chwho.java b/src/mineverse/Aust1n46/chat/command/chat/Chwho.java index 0e33900..7cff0aa 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Chwho.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Chwho.java @@ -1,5 +1,7 @@ package mineverse.Aust1n46.chat.command.chat; +import static mineverse.Aust1n46.chat.MineverseChat.LINE_LENGTH; + import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; @@ -22,10 +24,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Chwho extends MineverseCommand { private MineverseChat plugin = MineverseChat.getInstance(); - - public Chwho(String name) { - super(name); - } @Override public void execute(CommandSender sender, String command, String[] args) { @@ -63,7 +61,7 @@ public class Chwho extends MineverseCommand { } PluginManager pluginManager = plugin.getServer().getPluginManager(); - long linecount = plugin.getLineLength(); + long linecount = LINE_LENGTH; for(MineverseChatPlayer p : MineverseChatAPI.getOnlineMineverseChatPlayers()) { if(p.getListening().contains(channel.getName())) { if(sender instanceof Player) { @@ -85,7 +83,7 @@ public class Chwho extends MineverseCommand { if(!pp.hasTown()) { if(playerlist.length() + p.getName().length() > linecount) { playerlist += "\n"; - linecount = linecount + plugin.getLineLength(); + linecount = linecount + LINE_LENGTH; } if(!p.isMuted(channel.getName())) { playerlist += ChatColor.WHITE + p.getName(); @@ -109,7 +107,7 @@ public class Chwho extends MineverseCommand { if(!pp.hasNation()) { if(playerlist.length() + p.getName().length() > linecount) { playerlist += "\n"; - linecount = linecount + plugin.getLineLength(); + linecount = linecount + LINE_LENGTH; } if(!p.isMuted(channel.getName())) { playerlist += ChatColor.WHITE + p.getName(); @@ -140,7 +138,7 @@ public class Chwho extends MineverseCommand { if(!mplayerp.hasFaction()) { if(playerlist.length() + p.getName().length() > linecount) { playerlist += "\n"; - linecount = linecount + plugin.getLineLength(); + linecount = linecount + LINE_LENGTH; } if(!p.isMuted(channel.getName())) { playerlist += ChatColor.WHITE + p.getName(); @@ -165,7 +163,7 @@ public class Chwho extends MineverseCommand { } if(playerlist.length() + p.getName().length() > linecount) { playerlist += "\n"; - linecount = linecount + plugin.getLineLength(); + linecount = linecount + LINE_LENGTH; } if(!p.isMuted(channel.getName())) { playerlist += ChatColor.WHITE + p.getName(); @@ -223,4 +221,4 @@ public class Chwho extends MineverseCommand { } return true; } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/Clearchat.java b/src/mineverse/Aust1n46/chat/command/chat/Clearchat.java index b578bf9..77896f0 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Clearchat.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Clearchat.java @@ -10,10 +10,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Clearchat extends MineverseCommand { - public Clearchat(String name) { - super(name); - } - @Override public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.clearchat")) { @@ -30,4 +26,4 @@ public class Clearchat extends MineverseCommand { sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); return; } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/Commandblock.java b/src/mineverse/Aust1n46/chat/command/chat/Commandblock.java index 9103e4c..d4644bf 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Commandblock.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Commandblock.java @@ -11,12 +11,7 @@ import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Commandblock extends MineverseCommand { - private MineverseChat plugin; - - public Commandblock(String name) { - super(name); - this.plugin = MineverseChat.getInstance(); - } + private MineverseChat plugin = MineverseChat.getInstance(); @Override public void execute(CommandSender sender, String command, String[] args) { @@ -60,4 +55,4 @@ public class Commandblock extends MineverseCommand { } sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/Commandspy.java b/src/mineverse/Aust1n46/chat/command/chat/Commandspy.java index c87fd03..daac96c 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Commandspy.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Commandspy.java @@ -1,26 +1,20 @@ package mineverse.Aust1n46.chat.command.chat; +import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Commandspy extends MineverseCommand { - private MineverseChat plugin; - - public Commandspy(String name) { - super(name); - this.plugin = MineverseChat.getInstance(); - } @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); + Bukkit.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); @@ -36,4 +30,4 @@ public class Commandspy extends MineverseCommand { } mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/Config.java b/src/mineverse/Aust1n46/chat/command/chat/Config.java index f0386ba..9bae416 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Config.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Config.java @@ -13,10 +13,6 @@ import mineverse.Aust1n46.chat.utilities.Format; public class Config extends MineverseCommand { private MineverseChat plugin = MineverseChat.getInstance(); - public Config(String name) { - super(name); - } - @Override public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.edit")) { @@ -1236,4 +1232,4 @@ public class Config extends MineverseCommand { sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); return; } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/Edit.java b/src/mineverse/Aust1n46/chat/command/chat/Edit.java index 2203e7b..3dd74fc 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Edit.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Edit.java @@ -25,10 +25,6 @@ public class Edit extends MineverseCommand { private MineverseChat plugin = MineverseChat.getInstance(); private WrappedChatComponent messageDeletedComponentPlayer; - public Edit(String name) { - super(name); - } - @Override @SuppressWarnings({ "unchecked", "rawtypes" }) public void execute(CommandSender sender, String command, String[] args) { @@ -110,4 +106,4 @@ public class Edit extends MineverseCommand { } return WrappedChatComponent.fromJson(Format.FormatStringAll("{\"text\":\"\",\"extra\":[{\"text\":\"&c&o\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"&7Message: \"," + oMessage + "}}}]}")); } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/Filter.java b/src/mineverse/Aust1n46/chat/command/chat/Filter.java index dcc1bee..db3263b 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Filter.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Filter.java @@ -1,26 +1,20 @@ package mineverse.Aust1n46.chat.command.chat; +import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Filter extends MineverseCommand { - private MineverseChat plugin; - - public Filter(String name) { - super(name); - this.plugin = MineverseChat.getInstance(); - } @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); + Bukkit.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); @@ -36,4 +30,4 @@ public class Filter extends MineverseCommand { } mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/Force.java b/src/mineverse/Aust1n46/chat/command/chat/Force.java index a63a4b3..4bd7cc8 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Force.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Force.java @@ -9,10 +9,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Force extends MineverseCommand { - public Force(String name) { - super(name); - } - @Override public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.force")) { @@ -40,4 +36,4 @@ public class Force extends MineverseCommand { } sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/Forceall.java b/src/mineverse/Aust1n46/chat/command/chat/Forceall.java index d4d5daf..b675963 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Forceall.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Forceall.java @@ -9,10 +9,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Forceall extends MineverseCommand { - public Forceall(String name) { - super(name); - } - @Override public void execute(CommandSender sender, String command, String[] args) { if (sender.hasPermission("venturechat.forceall")) { @@ -35,4 +31,4 @@ public class Forceall extends MineverseCommand { } sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/Kickchannel.java b/src/mineverse/Aust1n46/chat/command/chat/Kickchannel.java index 2dad23b..b2fe947 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Kickchannel.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Kickchannel.java @@ -11,10 +11,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Kickchannel extends MineverseCommand { - public Kickchannel(String name) { - super(name); - } - @Override public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.kickchannel")) { @@ -63,4 +59,4 @@ public class Kickchannel extends MineverseCommand { } sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/Kickchannelall.java b/src/mineverse/Aust1n46/chat/command/chat/Kickchannelall.java index da600b9..92c0208 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Kickchannelall.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Kickchannelall.java @@ -11,10 +11,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Kickchannelall extends MineverseCommand { - public Kickchannelall(String name) { - super(name); - } - @Override public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.kickchannelall")) { @@ -48,4 +44,4 @@ public class Kickchannelall extends MineverseCommand { } sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/Leave.java b/src/mineverse/Aust1n46/chat/command/chat/Leave.java index 219f199..9defe98 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Leave.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Leave.java @@ -1,5 +1,6 @@ package mineverse.Aust1n46.chat.command.chat; +import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -12,16 +13,11 @@ import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Leave extends MineverseCommand { - private MineverseChat plugin = MineverseChat.getInstance();; - - public Leave(String name) { - super(name); - } @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); + Bukkit.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); @@ -53,4 +49,4 @@ public class Leave extends MineverseCommand { .replace("{command}", "/leave") .replace("{args}", "[channel]")); } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/Listen.java b/src/mineverse/Aust1n46/chat/command/chat/Listen.java index 29ba350..a608774 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Listen.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Listen.java @@ -1,9 +1,9 @@ package mineverse.Aust1n46.chat.command.chat; +import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; @@ -11,16 +11,11 @@ import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Listen extends MineverseCommand { - private MineverseChat plugin = MineverseChat.getInstance();; - - public Listen(String name) { - super(name); - } @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); + Bukkit.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); @@ -48,4 +43,4 @@ public class Listen extends MineverseCommand { .replace("{command}", "/listen") .replace("{args}", "[channel]")); } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/Me.java b/src/mineverse/Aust1n46/chat/command/chat/Me.java index 976329a..1e40d32 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Me.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Me.java @@ -3,18 +3,12 @@ package mineverse.Aust1n46.chat.command.chat; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; public class Me extends MineverseCommand { - private MineverseChat plugin = MineverseChat.getInstance(); - - public Me(String name) { - super(name); - } @Override public void execute(CommandSender sender, String command, String[] args) { @@ -36,10 +30,10 @@ public class Me extends MineverseCommand { msg = Format.FormatString(msg); if(sender instanceof Player) { Player p = (Player) sender; - plugin.getServer().broadcastMessage("* " + p.getDisplayName() + msg); + Format.broadcastToServer("* " + p.getDisplayName() + msg); return; } - plugin.getServer().broadcastMessage("* " + sender.getName() + msg); + Format.broadcastToServer("* " + sender.getName() + msg); return; } sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() @@ -49,4 +43,4 @@ public class Me extends MineverseCommand { } sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/Nick.java b/src/mineverse/Aust1n46/chat/command/chat/Nick.java index 0aedc6c..8c4517e 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Nick.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Nick.java @@ -12,12 +12,7 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; public class Nick extends MineverseCommand { - private MineverseChat plugin; - - public Nick(String name) { - super(name); - this.plugin = MineverseChat.getInstance(); - } + private MineverseChat plugin = MineverseChat.getInstance(); @Override public void execute(CommandSender sender, String command, String[] args) { @@ -113,4 +108,4 @@ public class Nick extends MineverseCommand { } sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/Party.java b/src/mineverse/Aust1n46/chat/command/chat/Party.java index e80868d..1bf9ecb 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Party.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Party.java @@ -1,5 +1,7 @@ package mineverse.Aust1n46.chat.command.chat; +import static mineverse.Aust1n46.chat.MineverseChat.LINE_LENGTH; + import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -13,10 +15,6 @@ import mineverse.Aust1n46.chat.utilities.Format; public class Party extends MineverseCommand { private MineverseChat plugin = MineverseChat.getInstance(); - public Party(String name) { - super(name); - } - @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { @@ -251,12 +249,12 @@ public class Party extends MineverseCommand { if(player != null) { if(player.isHost()) { String members = ""; - long linecount = plugin.getLineLength(); + long linecount = LINE_LENGTH; for(MineverseChatPlayer p : MineverseChatAPI.getMineverseChatPlayers()) { if(p.getParty() != null && p.getParty().equals(player.getUUID())) { if(members.length() + p.getName().length() > linecount) { members += "\n"; - linecount = linecount + plugin.getLineLength(); + linecount = linecount + LINE_LENGTH; } if(p.isOnline()) { members += ChatColor.GREEN + p.getName() + ChatColor.WHITE + ", "; @@ -324,4 +322,4 @@ public class Party extends MineverseCommand { } return; } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/RangedSpy.java b/src/mineverse/Aust1n46/chat/command/chat/RangedSpy.java index e8864c6..e41b8b2 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/RangedSpy.java +++ b/src/mineverse/Aust1n46/chat/command/chat/RangedSpy.java @@ -1,26 +1,20 @@ package mineverse.Aust1n46.chat.command.chat; -import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; +import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; public class RangedSpy extends MineverseCommand { - private MineverseChat plugin; - - public RangedSpy(String name) { - super(name); - this.plugin = MineverseChat.getInstance(); - } @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); + Bukkit.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); @@ -37,4 +31,4 @@ public class RangedSpy extends MineverseCommand { mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); return; } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/Removemessage.java b/src/mineverse/Aust1n46/chat/command/chat/Removemessage.java index 7fdf227..49b40b0 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Removemessage.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Removemessage.java @@ -29,10 +29,6 @@ public class Removemessage extends MineverseCommand { private PacketContainer emptyLinePacketContainer = Format.createPacketPlayOutChat("{\"extra\":[\" \"],\"text\":\"\"}"); private WrappedChatComponent messageDeletedComponentPlayer = WrappedChatComponent.fromJson("{\"text\":\"\",\"extra\":[{\"text\":\"\",\"extra\":[" + Format.convertToJsonColors(Format.FormatStringAll(plugin.getConfig().getString("messageremovertext"))) + "],\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[" + Format.convertToJsonColors(Format.FormatStringAll(plugin.getConfig().getString("messageremoverpermissions"))) + "]}}}]}");; - public Removemessage(String name) { - super(name); - } - @Override @SuppressWarnings({ "unchecked", "rawtypes" }) public void execute(CommandSender sender, String command, String[] args) { diff --git a/src/mineverse/Aust1n46/chat/command/chat/Setchannel.java b/src/mineverse/Aust1n46/chat/command/chat/Setchannel.java index dabdaa9..afc9297 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Setchannel.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Setchannel.java @@ -10,10 +10,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Setchannel extends MineverseCommand { - public Setchannel(String name) { - super(name); - } - @Override public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.setchannel")) { @@ -80,4 +76,4 @@ public class Setchannel extends MineverseCommand { } sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/Setchannelall.java b/src/mineverse/Aust1n46/chat/command/chat/Setchannelall.java index a21e427..ae20de7 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Setchannelall.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Setchannelall.java @@ -10,10 +10,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Setchannelall extends MineverseCommand { - public Setchannelall(String name) { - super(name); - } - @Override public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.setchannelall")) { @@ -56,4 +52,4 @@ public class Setchannelall extends MineverseCommand { } sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java b/src/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java index e22b177..d720f91 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java +++ b/src/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java @@ -24,16 +24,12 @@ import mineverse.Aust1n46.chat.utilities.Format; import mineverse.Aust1n46.chat.versions.VersionHandler; public class VentureChatGui extends MineverseCommand { - private MineverseChat plugin = MineverseChat.getInstance();; - - public VentureChatGui(String name) { - super(name); - } + private MineverseChat plugin = MineverseChat.getInstance(); @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); + Bukkit.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } if(args.length < 3) { @@ -208,4 +204,4 @@ public class VentureChatGui extends MineverseCommand { return 54; return 9; } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/Venturechat.java b/src/mineverse/Aust1n46/chat/command/chat/Venturechat.java index 7ce178f..8e18107 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Venturechat.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Venturechat.java @@ -16,12 +16,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; public class Venturechat extends MineverseCommand { - private MineverseChat plugin; - - public Venturechat(String name) { - super(name); - this.plugin = MineverseChat.getInstance(); - } + private MineverseChat plugin = MineverseChat.getInstance(); @Override public void execute(CommandSender sender, String command, String[] args) { diff --git a/src/mineverse/Aust1n46/chat/command/message/MessageToggle.java b/src/mineverse/Aust1n46/chat/command/message/MessageToggle.java index 790e12a..a61c27e 100644 --- a/src/mineverse/Aust1n46/chat/command/message/MessageToggle.java +++ b/src/mineverse/Aust1n46/chat/command/message/MessageToggle.java @@ -1,5 +1,6 @@ package mineverse.Aust1n46.chat.command.message; +import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -10,17 +11,11 @@ import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class MessageToggle extends MineverseCommand { - private MineverseChat plugin; - - public MessageToggle(String name) { - super(name); - this.plugin = MineverseChat.getInstance(); - } @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); + Bukkit.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); diff --git a/src/mineverse/Aust1n46/chat/command/message/Notifications.java b/src/mineverse/Aust1n46/chat/command/message/Notifications.java index b3c6506..cd67774 100644 --- a/src/mineverse/Aust1n46/chat/command/message/Notifications.java +++ b/src/mineverse/Aust1n46/chat/command/message/Notifications.java @@ -1,26 +1,20 @@ package mineverse.Aust1n46.chat.command.message; +import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Notifications extends MineverseCommand { - private MineverseChat plugin; - - public Notifications(String name) { - super(name); - this.plugin = MineverseChat.getInstance(); - } @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); + Bukkit.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } diff --git a/src/mineverse/Aust1n46/chat/command/message/Reply.java b/src/mineverse/Aust1n46/chat/command/message/Reply.java index d6863ab..64f3c0e 100644 --- a/src/mineverse/Aust1n46/chat/command/message/Reply.java +++ b/src/mineverse/Aust1n46/chat/command/message/Reply.java @@ -17,10 +17,6 @@ import mineverse.Aust1n46.chat.utilities.Format; public class Reply extends MineverseCommand { private MineverseChat plugin = MineverseChat.getInstance(); - public Reply(String name) { - super(name); - } - @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { diff --git a/src/mineverse/Aust1n46/chat/command/message/Spy.java b/src/mineverse/Aust1n46/chat/command/message/Spy.java index 4c77cc9..56d45d3 100644 --- a/src/mineverse/Aust1n46/chat/command/message/Spy.java +++ b/src/mineverse/Aust1n46/chat/command/message/Spy.java @@ -1,5 +1,6 @@ package mineverse.Aust1n46.chat.command.message; +import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -10,17 +11,11 @@ import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Spy extends MineverseCommand { - private MineverseChat plugin; - - public Spy(String name) { - super(name); - this.plugin = MineverseChat.getInstance(); - } @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); + Bukkit.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); diff --git a/src/mineverse/Aust1n46/chat/command/mute/Mute.java b/src/mineverse/Aust1n46/chat/command/mute/Mute.java index 570b7ef..42be4f1 100644 --- a/src/mineverse/Aust1n46/chat/command/mute/Mute.java +++ b/src/mineverse/Aust1n46/chat/command/mute/Mute.java @@ -24,10 +24,6 @@ import mineverse.Aust1n46.chat.utilities.Format; public class Mute extends MineverseCommand { private static final List COMMON_MUTE_TIMES = Collections.unmodifiableList(Arrays.asList(new String[]{"12h", "15m", "1d", "1h", "1m", "30s"})); - public Mute(String name) { - super(name); - } - @Override public void execute(CommandSender sender, String command, String[] args) { if (sender.hasPermission("venturechat.mute")) { diff --git a/src/mineverse/Aust1n46/chat/command/mute/Muteall.java b/src/mineverse/Aust1n46/chat/command/mute/Muteall.java index 66b4a27..eb5b45a 100644 --- a/src/mineverse/Aust1n46/chat/command/mute/Muteall.java +++ b/src/mineverse/Aust1n46/chat/command/mute/Muteall.java @@ -11,10 +11,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Muteall extends MineverseCommand { - public Muteall(String name) { - super(name); - } - @Override public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.mute")) { diff --git a/src/mineverse/Aust1n46/chat/command/mute/Unmute.java b/src/mineverse/Aust1n46/chat/command/mute/Unmute.java index 6461a8d..b0f0874 100644 --- a/src/mineverse/Aust1n46/chat/command/mute/Unmute.java +++ b/src/mineverse/Aust1n46/chat/command/mute/Unmute.java @@ -21,10 +21,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Unmute extends MineverseCommand { - public Unmute(String name) { - super(name); - } - @Override public void execute(CommandSender sender, String command, String[] args) { if (sender.hasPermission("venturechat.mute")) { diff --git a/src/mineverse/Aust1n46/chat/command/mute/Unmuteall.java b/src/mineverse/Aust1n46/chat/command/mute/Unmuteall.java index 6bc2648..9c0e919 100644 --- a/src/mineverse/Aust1n46/chat/command/mute/Unmuteall.java +++ b/src/mineverse/Aust1n46/chat/command/mute/Unmuteall.java @@ -11,10 +11,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Unmuteall extends MineverseCommand { - public Unmuteall(String name) { - super(name); - } - @Override public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.mute")) {