mirror/VentureChat
1
0
Fork 1
mirror of https://github.com/Aust1n46/VentureChat.git synced 2025-10-30 21:52:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactored command registration system.

Browse Source
This commit is contained in:
Aust1n46 2021-04-15 21:42:03 -05:00
parent 719ee85268
commit 51a5540d08
40 changed files with 223 additions and 405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

202
src/mineverse/Aust1n46/chat/MineverseChat.java
View File

@ -9,7 +9,6 @@ import java.io.IOException;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -19,73 +18,6 @@ import java.util.UUID;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; 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.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.Command; import org.bukkit.command.Command;
@ -103,18 +35,37 @@ import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.utility.MinecraftReflection; import com.comphenix.protocol.utility.MinecraftReflection;
import me.clip.placeholderapi.PlaceholderAPI; 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. * VentureChat Minecraft plugin for servers running Spigot or Paper software.
* @author Aust1n46 * @author Aust1n46
*/ */
public class MineverseChat extends JavaPlugin implements PluginMessageListener { 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;
public static String playerlist_server; public static String playerlist_server;
public boolean ircListen; public boolean ircListen;
@ -126,10 +77,6 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
private static Field commandMap; private static Field commandMap;
private static Field knownCommands; private static Field knownCommands;
// Executors --------------------------------
private MineverseCommandExecutor commandExecutor;
private Map<String, MineverseCommand> commands = new HashMap<String, MineverseCommand>();
// Misc -------------------------------- // Misc --------------------------------
public static AliasInfo aaInfo; public static AliasInfo aaInfo;
public static JsonFormatInfo jfInfo; public static JsonFormatInfo jfInfo;
@ -143,7 +90,6 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
public static Set<MineverseChatPlayer> onlinePlayers = new HashSet<MineverseChatPlayer>(); public static Set<MineverseChatPlayer> onlinePlayers = new HashSet<MineverseChatPlayer>();
public static List<String> networkPlayerNames = new ArrayList<String>(); public static List<String> networkPlayerNames = new ArrayList<String>();
//private boolean firstRun = true;
// Plugin Messaging Channel // Plugin Messaging Channel
public static final String PLUGIN_MESSAGING_CHANNEL = "venturechat:data"; public static final String PLUGIN_MESSAGING_CHANNEL = "venturechat:data";
@ -155,15 +101,12 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
// Vault -------------------------------- // Vault --------------------------------
public static Permission permission = null; public static Permission permission = null;
public static Chat chat = null; public static Chat chat = null;
public static CommandMap cmap; private static CommandMap cmap;
// Offline data ---------------------------- public static final int LINE_LENGTH = 40;
public Map<String, String> mutes = new HashMap<String, String>();
private LogLevels curLogLevel; private LogLevels curLogLevel;
public long LINELENGTH = 40;
// DiscordSRV backwards compatibility // DiscordSRV backwards compatibility
@Deprecated @Deprecated
public static ChatChannelInfo ccInfo; public static ChatChannelInfo ccInfo;
@ -216,6 +159,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
jfInfo = new JsonFormatInfo(this); jfInfo = new JsonFormatInfo(this);
gsInfo = new GuiSlotInfo(); gsInfo = new GuiSlotInfo();
Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Loading player data"));
PlayerData.loadLegacyPlayerData(); PlayerData.loadLegacyPlayerData();
PlayerData.loadPlayerData(); PlayerData.loadPlayerData();
for(Player p : this.getServer().getOnlinePlayers()) { for(Player p : this.getServer().getOnlinePlayers()) {
@ -238,72 +182,13 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
Database.initializeMySQL(); Database.initializeMySQL();
}); });
commands.put("broadcast", new Broadcast("broadcast")); MineverseCommandExecutor.initialize();
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.registerListeners();
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());
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.registerPacketListeners(); this.registerPacketListeners();
this.loadNMS(); this.loadNMS();
Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Attaching to Executors")); Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Attaching to Executors"));
try { try {
// if(VersionHandler.is1_7_9()) cmap = V1_7_9.v1_7_9(); // if(VersionHandler.is1_7_9()) cmap = V1_7_9.v1_7_9();
// if(VersionHandler.is1_7_10()) cmap = V1_7_10.v1_7_10(); // 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.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Establishing BungeeCord"));
Bukkit.getMessenger().registerOutgoingPluginChannel(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL); Bukkit.getMessenger().registerOutgoingPluginChannel(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL);
Bukkit.getMessenger().registerIncomingPluginChannel(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, this); Bukkit.getMessenger().registerIncomingPluginChannel(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, this);
PluginManager pluginManager = getServer().getPluginManager();
if(pluginManager.isPluginEnabled("Towny")) { if(pluginManager.isPluginEnabled("Towny")) {
Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Enabling Towny Formatting")); 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(); String version = pluginManager.getPlugin("Factions").getDescription().getVersion();
Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Enabling Factions Formatting version " + version)); 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")) { if(pluginManager.isPluginEnabled("PlaceholderAPI")) {
Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Enabling PlaceholderAPI Hook")); Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Enabling PlaceholderAPI Hook"));
} }
new VentureChatPlaceholders().register(); new VentureChatPlaceholders().register();
Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Loading player data"));
BukkitScheduler scheduler = Bukkit.getServer().getScheduler(); BukkitScheduler scheduler = Bukkit.getServer().getScheduler();
scheduler.runTaskTimerAsynchronously(this, new Runnable() { scheduler.runTaskTimerAsynchronously(this, new Runnable() {
@Override @Override
@ -418,7 +303,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void unregister(String name) { public static void unregister(String name) {
try { try {
((Map<String, Command>) knownCommands.get((SimpleCommandMap) commandMap.get(Bukkit.getServer()))).remove(name); ((Map<String, Command>) 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; return cmap;
} }
@ -447,6 +332,15 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
} }
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() { private void registerPacketListeners() {
ProtocolLibrary.getProtocolManager().addPacketListener(new PacketListener()); ProtocolLibrary.getProtocolManager().addPacketListener(new PacketListener());
} }
@ -503,10 +397,6 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
return(chat != null); return(chat != null);
} }
public long getLineLength() {
return LINELENGTH;
}
public void setLogLevel(String loglevel) { public void setLogLevel(String loglevel) {
if(LogLevels.valueOf(loglevel) != null) { if(LogLevels.valueOf(loglevel) != null) {
curLogLevel = LogLevels.valueOf(loglevel); curLogLevel = LogLevels.valueOf(loglevel);

12
src/mineverse/Aust1n46/chat/command/MineverseCommand.java
View File

@ -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. //This class is the parent class of all of the plugins commands. The execute method runs the command.
public abstract class MineverseCommand { 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 abstract void execute(CommandSender sender, String command, String[] args);
public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) { public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
return null; return null;
} }
public String getName() {
return name;
}
} }

118
src/mineverse/Aust1n46/chat/command/MineverseCommandExecutor.java
View File

@ -1,5 +1,6 @@
package mineverse.Aust1n46.chat.command; package mineverse.Aust1n46.chat.command;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -7,13 +8,54 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.TabExecutor; import org.bukkit.command.TabExecutor;
//This class is a standard command executor that is used to run the MineverseCommand's. import mineverse.Aust1n46.chat.MineverseChat;
public class MineverseCommandExecutor implements TabExecutor { import mineverse.Aust1n46.chat.command.chat.Broadcast;
private Map<String, MineverseCommand> commands; 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<String, MineverseCommand> commands) { /**
this.commands = commands; * Class that initializes and executes the plugin's commands.
} */
public class MineverseCommandExecutor implements TabExecutor {
private static Map<String, MineverseCommand> commands = new HashMap<String, MineverseCommand>();
private static MineverseChat plugin = MineverseChat.getInstance();
private static MineverseCommandExecutor commandExecutor;
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] parameters) { public boolean onCommand(CommandSender sender, Command command, String label, String[] parameters) {
@ -25,4 +67,68 @@ public class MineverseCommandExecutor implements TabExecutor {
public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) { public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
return commands.get(command.getName()).onTabComplete(sender, command, label, 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);
}
} }

4
src/mineverse/Aust1n46/chat/command/chat/Broadcast.java
View File

@ -12,10 +12,6 @@ import mineverse.Aust1n46.chat.utilities.Format;
public class Broadcast extends MineverseCommand { public class Broadcast extends MineverseCommand {
private MineverseChat plugin = MineverseChat.getInstance(); private MineverseChat plugin = MineverseChat.getInstance();
public Broadcast(String name) {
super(name);
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
ConfigurationSection bs = plugin.getConfig().getConfigurationSection("broadcast"); ConfigurationSection bs = plugin.getConfig().getConfigurationSection("broadcast");

9
src/mineverse/Aust1n46/chat/command/chat/BungeeToggle.java
View File

@ -1,5 +1,6 @@
package mineverse.Aust1n46.chat.command.chat; package mineverse.Aust1n46.chat.command.chat;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -10,17 +11,11 @@ import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class BungeeToggle extends MineverseCommand { public class BungeeToggle extends MineverseCommand {
private MineverseChat plugin;
public BungeeToggle(String name) {
super(name);
this.plugin = MineverseChat.getInstance();
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(!(sender instanceof Player)) { 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; return;
} }
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);

12
src/mineverse/Aust1n46/chat/command/chat/Channel.java
View File

@ -1,5 +1,6 @@
package mineverse.Aust1n46.chat.command.chat; package mineverse.Aust1n46.chat.command.chat;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -15,18 +16,11 @@ import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Channel extends MineverseCommand implements Listener { public class Channel extends MineverseCommand implements Listener {
private MineverseChat plugin = MineverseChat.getInstance();
public Channel() {}
public Channel(String name) {
super(name);
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(!(sender instanceof Player)) { 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; return;
} }
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
@ -37,7 +31,7 @@ public class Channel extends MineverseCommand implements Listener {
return; return;
} }
ChatChannel channel = ChatChannel.getChannel(args[0]); 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_color}", channel.getColor() + "")
.replace("{channel_name}", channel.getName()))); .replace("{channel_name}", channel.getName())));
return; return;

4
src/mineverse/Aust1n46/chat/command/chat/Channelinfo.java
View File

@ -9,10 +9,6 @@ import mineverse.Aust1n46.chat.utilities.Format;
public class Channelinfo extends MineverseCommand { public class Channelinfo extends MineverseCommand {
public Channelinfo(String name) {
super(name);
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(sender.hasPermission("venturechat.channelinfo")) { if(sender.hasPermission("venturechat.channelinfo")) {

10
src/mineverse/Aust1n46/chat/command/chat/Chatinfo.java
View File

@ -1,10 +1,10 @@
package mineverse.Aust1n46.chat.command.chat; package mineverse.Aust1n46.chat.command.chat;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import mineverse.Aust1n46.chat.MineverseChat;
import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatAPI;
import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannel;
@ -12,19 +12,13 @@ import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.command.mute.MuteContainer; import mineverse.Aust1n46.chat.command.mute.MuteContainer;
public class Chatinfo extends MineverseCommand { public class Chatinfo extends MineverseCommand {
private MineverseChat plugin = MineverseChat.getInstance();;
public Chatinfo(String name) {
super(name);
}
//@SuppressWarnings("unchecked")
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(sender.hasPermission("venturechat.chatinfo")) { if(sender.hasPermission("venturechat.chatinfo")) {
if(args.length == 0) { if(args.length == 0) {
if(!(sender instanceof Player)) { 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; return;
} }
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);

7
src/mineverse/Aust1n46/chat/command/chat/Chatreload.java
View File

@ -10,12 +10,7 @@ import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Chatreload extends MineverseCommand { public class Chatreload extends MineverseCommand {
private MineverseChat plugin; private MineverseChat plugin = MineverseChat.getInstance();
public Chatreload(String name) {
super(name);
this.plugin = MineverseChat.getInstance();
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {

4
src/mineverse/Aust1n46/chat/command/chat/Chlist.java
View File

@ -8,10 +8,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Chlist extends MineverseCommand { public class Chlist extends MineverseCommand {
public Chlist(String name) {
super(name);
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
sender.sendMessage(LocalizedMessage.CHANNEL_LIST_HEADER.toString()); sender.sendMessage(LocalizedMessage.CHANNEL_LIST_HEADER.toString());

16
src/mineverse/Aust1n46/chat/command/chat/Chwho.java
View File

@ -1,5 +1,7 @@
package mineverse.Aust1n46.chat.command.chat; package mineverse.Aust1n46.chat.command.chat;
import static mineverse.Aust1n46.chat.MineverseChat.LINE_LENGTH;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
@ -23,10 +25,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Chwho extends MineverseCommand { public class Chwho extends MineverseCommand {
private MineverseChat plugin = MineverseChat.getInstance(); private MineverseChat plugin = MineverseChat.getInstance();
public Chwho(String name) {
super(name);
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
String playerlist = ""; String playerlist = "";
@ -63,7 +61,7 @@ public class Chwho extends MineverseCommand {
} }
PluginManager pluginManager = plugin.getServer().getPluginManager(); PluginManager pluginManager = plugin.getServer().getPluginManager();
long linecount = plugin.getLineLength(); long linecount = LINE_LENGTH;
for(MineverseChatPlayer p : MineverseChatAPI.getOnlineMineverseChatPlayers()) { for(MineverseChatPlayer p : MineverseChatAPI.getOnlineMineverseChatPlayers()) {
if(p.getListening().contains(channel.getName())) { if(p.getListening().contains(channel.getName())) {
if(sender instanceof Player) { if(sender instanceof Player) {
@ -85,7 +83,7 @@ public class Chwho extends MineverseCommand {
if(!pp.hasTown()) { if(!pp.hasTown()) {
if(playerlist.length() + p.getName().length() > linecount) { if(playerlist.length() + p.getName().length() > linecount) {
playerlist += "\n"; playerlist += "\n";
linecount = linecount + plugin.getLineLength(); linecount = linecount + LINE_LENGTH;
} }
if(!p.isMuted(channel.getName())) { if(!p.isMuted(channel.getName())) {
playerlist += ChatColor.WHITE + p.getName(); playerlist += ChatColor.WHITE + p.getName();
@ -109,7 +107,7 @@ public class Chwho extends MineverseCommand {
if(!pp.hasNation()) { if(!pp.hasNation()) {
if(playerlist.length() + p.getName().length() > linecount) { if(playerlist.length() + p.getName().length() > linecount) {
playerlist += "\n"; playerlist += "\n";
linecount = linecount + plugin.getLineLength(); linecount = linecount + LINE_LENGTH;
} }
if(!p.isMuted(channel.getName())) { if(!p.isMuted(channel.getName())) {
playerlist += ChatColor.WHITE + p.getName(); playerlist += ChatColor.WHITE + p.getName();
@ -140,7 +138,7 @@ public class Chwho extends MineverseCommand {
if(!mplayerp.hasFaction()) { if(!mplayerp.hasFaction()) {
if(playerlist.length() + p.getName().length() > linecount) { if(playerlist.length() + p.getName().length() > linecount) {
playerlist += "\n"; playerlist += "\n";
linecount = linecount + plugin.getLineLength(); linecount = linecount + LINE_LENGTH;
} }
if(!p.isMuted(channel.getName())) { if(!p.isMuted(channel.getName())) {
playerlist += ChatColor.WHITE + p.getName(); playerlist += ChatColor.WHITE + p.getName();
@ -165,7 +163,7 @@ public class Chwho extends MineverseCommand {
} }
if(playerlist.length() + p.getName().length() > linecount) { if(playerlist.length() + p.getName().length() > linecount) {
playerlist += "\n"; playerlist += "\n";
linecount = linecount + plugin.getLineLength(); linecount = linecount + LINE_LENGTH;
} }
if(!p.isMuted(channel.getName())) { if(!p.isMuted(channel.getName())) {
playerlist += ChatColor.WHITE + p.getName(); playerlist += ChatColor.WHITE + p.getName();

4
src/mineverse/Aust1n46/chat/command/chat/Clearchat.java
View File

@ -10,10 +10,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Clearchat extends MineverseCommand { public class Clearchat extends MineverseCommand {
public Clearchat(String name) {
super(name);
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(sender.hasPermission("venturechat.clearchat")) { if(sender.hasPermission("venturechat.clearchat")) {

7
src/mineverse/Aust1n46/chat/command/chat/Commandblock.java
View File

@ -11,12 +11,7 @@ import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Commandblock extends MineverseCommand { public class Commandblock extends MineverseCommand {
private MineverseChat plugin; private MineverseChat plugin = MineverseChat.getInstance();
public Commandblock(String name) {
super(name);
this.plugin = MineverseChat.getInstance();
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {

10
src/mineverse/Aust1n46/chat/command/chat/Commandspy.java
View File

@ -1,26 +1,20 @@
package mineverse.Aust1n46.chat.command.chat; package mineverse.Aust1n46.chat.command.chat;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import mineverse.Aust1n46.chat.MineverseChat;
import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatAPI;
import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Commandspy extends MineverseCommand { public class Commandspy extends MineverseCommand {
private MineverseChat plugin;
public Commandspy(String name) {
super(name);
this.plugin = MineverseChat.getInstance();
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(!(sender instanceof Player)) { 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; return;
} }
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);

4
src/mineverse/Aust1n46/chat/command/chat/Config.java
View File

@ -13,10 +13,6 @@ import mineverse.Aust1n46.chat.utilities.Format;
public class Config extends MineverseCommand { public class Config extends MineverseCommand {
private MineverseChat plugin = MineverseChat.getInstance(); private MineverseChat plugin = MineverseChat.getInstance();
public Config(String name) {
super(name);
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(sender.hasPermission("venturechat.edit")) { if(sender.hasPermission("venturechat.edit")) {

4
src/mineverse/Aust1n46/chat/command/chat/Edit.java
View File

@ -25,10 +25,6 @@ public class Edit extends MineverseCommand {
private MineverseChat plugin = MineverseChat.getInstance(); private MineverseChat plugin = MineverseChat.getInstance();
private WrappedChatComponent messageDeletedComponentPlayer; private WrappedChatComponent messageDeletedComponentPlayer;
public Edit(String name) {
super(name);
}
@Override @Override
@SuppressWarnings({ "unchecked", "rawtypes" }) @SuppressWarnings({ "unchecked", "rawtypes" })
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {

10
src/mineverse/Aust1n46/chat/command/chat/Filter.java
View File

@ -1,26 +1,20 @@
package mineverse.Aust1n46.chat.command.chat; package mineverse.Aust1n46.chat.command.chat;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import mineverse.Aust1n46.chat.MineverseChat;
import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatAPI;
import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Filter extends MineverseCommand { public class Filter extends MineverseCommand {
private MineverseChat plugin;
public Filter(String name) {
super(name);
this.plugin = MineverseChat.getInstance();
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(!(sender instanceof Player)) { 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; return;
} }
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);

4
src/mineverse/Aust1n46/chat/command/chat/Force.java
View File

@ -9,10 +9,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Force extends MineverseCommand { public class Force extends MineverseCommand {
public Force(String name) {
super(name);
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(sender.hasPermission("venturechat.force")) { if(sender.hasPermission("venturechat.force")) {

4
src/mineverse/Aust1n46/chat/command/chat/Forceall.java
View File

@ -9,10 +9,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Forceall extends MineverseCommand { public class Forceall extends MineverseCommand {
public Forceall(String name) {
super(name);
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if (sender.hasPermission("venturechat.forceall")) { if (sender.hasPermission("venturechat.forceall")) {

4
src/mineverse/Aust1n46/chat/command/chat/Kickchannel.java
View File

@ -11,10 +11,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Kickchannel extends MineverseCommand { public class Kickchannel extends MineverseCommand {
public Kickchannel(String name) {
super(name);
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(sender.hasPermission("venturechat.kickchannel")) { if(sender.hasPermission("venturechat.kickchannel")) {

4
src/mineverse/Aust1n46/chat/command/chat/Kickchannelall.java
View File

@ -11,10 +11,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Kickchannelall extends MineverseCommand { public class Kickchannelall extends MineverseCommand {
public Kickchannelall(String name) {
super(name);
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(sender.hasPermission("venturechat.kickchannelall")) { if(sender.hasPermission("venturechat.kickchannelall")) {

8
src/mineverse/Aust1n46/chat/command/chat/Leave.java
View File

@ -1,5 +1,6 @@
package mineverse.Aust1n46.chat.command.chat; package mineverse.Aust1n46.chat.command.chat;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -12,16 +13,11 @@ import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Leave extends MineverseCommand { public class Leave extends MineverseCommand {
private MineverseChat plugin = MineverseChat.getInstance();;
public Leave(String name) {
super(name);
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(!(sender instanceof Player)) { 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; return;
} }
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);

9
src/mineverse/Aust1n46/chat/command/chat/Listen.java
View File

@ -1,9 +1,9 @@
package mineverse.Aust1n46.chat.command.chat; package mineverse.Aust1n46.chat.command.chat;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import mineverse.Aust1n46.chat.MineverseChat;
import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatAPI;
import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannel;
@ -11,16 +11,11 @@ import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Listen extends MineverseCommand { public class Listen extends MineverseCommand {
private MineverseChat plugin = MineverseChat.getInstance();;
public Listen(String name) {
super(name);
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(!(sender instanceof Player)) { 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; return;
} }
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);

10
src/mineverse/Aust1n46/chat/command/chat/Me.java
View File

@ -3,18 +3,12 @@ package mineverse.Aust1n46.chat.command.chat;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import mineverse.Aust1n46.chat.MineverseChat;
import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatAPI;
import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.localization.LocalizedMessage;
import mineverse.Aust1n46.chat.utilities.Format; import mineverse.Aust1n46.chat.utilities.Format;
public class Me extends MineverseCommand { public class Me extends MineverseCommand {
private MineverseChat plugin = MineverseChat.getInstance();
public Me(String name) {
super(name);
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
@ -36,10 +30,10 @@ public class Me extends MineverseCommand {
msg = Format.FormatString(msg); msg = Format.FormatString(msg);
if(sender instanceof Player) { if(sender instanceof Player) {
Player p = (Player) sender; Player p = (Player) sender;
plugin.getServer().broadcastMessage("* " + p.getDisplayName() + msg); Format.broadcastToServer("* " + p.getDisplayName() + msg);
return; return;
} }
plugin.getServer().broadcastMessage("* " + sender.getName() + msg); Format.broadcastToServer("* " + sender.getName() + msg);
return; return;
} }
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()

7
src/mineverse/Aust1n46/chat/command/chat/Nick.java
View File

@ -12,12 +12,7 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage;
import mineverse.Aust1n46.chat.utilities.Format; import mineverse.Aust1n46.chat.utilities.Format;
public class Nick extends MineverseCommand { public class Nick extends MineverseCommand {
private MineverseChat plugin; private MineverseChat plugin = MineverseChat.getInstance();
public Nick(String name) {
super(name);
this.plugin = MineverseChat.getInstance();
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {

10
src/mineverse/Aust1n46/chat/command/chat/Party.java
View File

@ -1,5 +1,7 @@
package mineverse.Aust1n46.chat.command.chat; package mineverse.Aust1n46.chat.command.chat;
import static mineverse.Aust1n46.chat.MineverseChat.LINE_LENGTH;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -13,10 +15,6 @@ import mineverse.Aust1n46.chat.utilities.Format;
public class Party extends MineverseCommand { public class Party extends MineverseCommand {
private MineverseChat plugin = MineverseChat.getInstance(); private MineverseChat plugin = MineverseChat.getInstance();
public Party(String name) {
super(name);
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(!(sender instanceof Player)) { if(!(sender instanceof Player)) {
@ -251,12 +249,12 @@ public class Party extends MineverseCommand {
if(player != null) { if(player != null) {
if(player.isHost()) { if(player.isHost()) {
String members = ""; String members = "";
long linecount = plugin.getLineLength(); long linecount = LINE_LENGTH;
for(MineverseChatPlayer p : MineverseChatAPI.getMineverseChatPlayers()) { for(MineverseChatPlayer p : MineverseChatAPI.getMineverseChatPlayers()) {
if(p.getParty() != null && p.getParty().equals(player.getUUID())) { if(p.getParty() != null && p.getParty().equals(player.getUUID())) {
if(members.length() + p.getName().length() > linecount) { if(members.length() + p.getName().length() > linecount) {
members += "\n"; members += "\n";
linecount = linecount + plugin.getLineLength(); linecount = linecount + LINE_LENGTH;
} }
if(p.isOnline()) { if(p.isOnline()) {
members += ChatColor.GREEN + p.getName() + ChatColor.WHITE + ", "; members += ChatColor.GREEN + p.getName() + ChatColor.WHITE + ", ";

10
src/mineverse/Aust1n46/chat/command/chat/RangedSpy.java
View File

@ -1,26 +1,20 @@
package mineverse.Aust1n46.chat.command.chat; package mineverse.Aust1n46.chat.command.chat;
import mineverse.Aust1n46.chat.MineverseChat;
import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatAPI;
import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.localization.LocalizedMessage;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class RangedSpy extends MineverseCommand { public class RangedSpy extends MineverseCommand {
private MineverseChat plugin;
public RangedSpy(String name) {
super(name);
this.plugin = MineverseChat.getInstance();
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(!(sender instanceof Player)) { 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; return;
} }
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);

4
src/mineverse/Aust1n46/chat/command/chat/Removemessage.java
View File

@ -29,10 +29,6 @@ public class Removemessage extends MineverseCommand {
private PacketContainer emptyLinePacketContainer = Format.createPacketPlayOutChat("{\"extra\":[\" \"],\"text\":\"\"}"); 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"))) + "]}}}]}");; 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 @Override
@SuppressWarnings({ "unchecked", "rawtypes" }) @SuppressWarnings({ "unchecked", "rawtypes" })
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {

4
src/mineverse/Aust1n46/chat/command/chat/Setchannel.java
View File

@ -10,10 +10,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Setchannel extends MineverseCommand { public class Setchannel extends MineverseCommand {
public Setchannel(String name) {
super(name);
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(sender.hasPermission("venturechat.setchannel")) { if(sender.hasPermission("venturechat.setchannel")) {

4
src/mineverse/Aust1n46/chat/command/chat/Setchannelall.java
View File

@ -10,10 +10,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Setchannelall extends MineverseCommand { public class Setchannelall extends MineverseCommand {
public Setchannelall(String name) {
super(name);
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(sender.hasPermission("venturechat.setchannelall")) { if(sender.hasPermission("venturechat.setchannelall")) {

8
src/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java
View File

@ -24,16 +24,12 @@ import mineverse.Aust1n46.chat.utilities.Format;
import mineverse.Aust1n46.chat.versions.VersionHandler; import mineverse.Aust1n46.chat.versions.VersionHandler;
public class VentureChatGui extends MineverseCommand { public class VentureChatGui extends MineverseCommand {
private MineverseChat plugin = MineverseChat.getInstance();; private MineverseChat plugin = MineverseChat.getInstance();
public VentureChatGui(String name) {
super(name);
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(!(sender instanceof Player)) { 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; return;
} }
if(args.length < 3) { if(args.length < 3) {

7
src/mineverse/Aust1n46/chat/command/chat/Venturechat.java
View File

@ -16,12 +16,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class Venturechat extends MineverseCommand { public class Venturechat extends MineverseCommand {
private MineverseChat plugin; private MineverseChat plugin = MineverseChat.getInstance();
public Venturechat(String name) {
super(name);
this.plugin = MineverseChat.getInstance();
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {

9
src/mineverse/Aust1n46/chat/command/message/MessageToggle.java
View File

@ -1,5 +1,6 @@
package mineverse.Aust1n46.chat.command.message; package mineverse.Aust1n46.chat.command.message;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -10,17 +11,11 @@ import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class MessageToggle extends MineverseCommand { public class MessageToggle extends MineverseCommand {
private MineverseChat plugin;
public MessageToggle(String name) {
super(name);
this.plugin = MineverseChat.getInstance();
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(!(sender instanceof Player)) { 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; return;
} }
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);

10
src/mineverse/Aust1n46/chat/command/message/Notifications.java
View File

@ -1,26 +1,20 @@
package mineverse.Aust1n46.chat.command.message; package mineverse.Aust1n46.chat.command.message;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import mineverse.Aust1n46.chat.MineverseChat;
import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatAPI;
import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Notifications extends MineverseCommand { public class Notifications extends MineverseCommand {
private MineverseChat plugin;
public Notifications(String name) {
super(name);
this.plugin = MineverseChat.getInstance();
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(!(sender instanceof Player)) { 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; return;
} }

4
src/mineverse/Aust1n46/chat/command/message/Reply.java
View File

@ -17,10 +17,6 @@ import mineverse.Aust1n46.chat.utilities.Format;
public class Reply extends MineverseCommand { public class Reply extends MineverseCommand {
private MineverseChat plugin = MineverseChat.getInstance(); private MineverseChat plugin = MineverseChat.getInstance();
public Reply(String name) {
super(name);
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(!(sender instanceof Player)) { if(!(sender instanceof Player)) {

9
src/mineverse/Aust1n46/chat/command/message/Spy.java
View File

@ -1,5 +1,6 @@
package mineverse.Aust1n46.chat.command.message; package mineverse.Aust1n46.chat.command.message;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -10,17 +11,11 @@ import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Spy extends MineverseCommand { public class Spy extends MineverseCommand {
private MineverseChat plugin;
public Spy(String name) {
super(name);
this.plugin = MineverseChat.getInstance();
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(!(sender instanceof Player)) { 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; return;
} }
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);

4
src/mineverse/Aust1n46/chat/command/mute/Mute.java
View File

@ -24,10 +24,6 @@ import mineverse.Aust1n46.chat.utilities.Format;
public class Mute extends MineverseCommand { public class Mute extends MineverseCommand {
private static final List<String> COMMON_MUTE_TIMES = Collections.unmodifiableList(Arrays.asList(new String[]{"12h", "15m", "1d", "1h", "1m", "30s"})); private static final List<String> COMMON_MUTE_TIMES = Collections.unmodifiableList(Arrays.asList(new String[]{"12h", "15m", "1d", "1h", "1m", "30s"}));
public Mute(String name) {
super(name);
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if (sender.hasPermission("venturechat.mute")) { if (sender.hasPermission("venturechat.mute")) {

4
src/mineverse/Aust1n46/chat/command/mute/Muteall.java
View File

@ -11,10 +11,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Muteall extends MineverseCommand { public class Muteall extends MineverseCommand {
public Muteall(String name) {
super(name);
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(sender.hasPermission("venturechat.mute")) { if(sender.hasPermission("venturechat.mute")) {

4
src/mineverse/Aust1n46/chat/command/mute/Unmute.java
View File

@ -21,10 +21,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Unmute extends MineverseCommand { public class Unmute extends MineverseCommand {
public Unmute(String name) {
super(name);
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if (sender.hasPermission("venturechat.mute")) { if (sender.hasPermission("venturechat.mute")) {

4
src/mineverse/Aust1n46/chat/command/mute/Unmuteall.java
View File

@ -11,10 +11,6 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Unmuteall extends MineverseCommand { public class Unmuteall extends MineverseCommand {
public Unmuteall(String name) {
super(name);
}
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(sender.hasPermission("venturechat.mute")) { if(sender.hasPermission("venturechat.mute")) {