diff --git a/src/mineverse/Aust1n46/chat/MineverseChat.java b/src/mineverse/Aust1n46/chat/MineverseChat.java index f1c554a..f794eba 100644 --- a/src/mineverse/Aust1n46/chat/MineverseChat.java +++ b/src/mineverse/Aust1n46/chat/MineverseChat.java @@ -41,7 +41,7 @@ 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.VentureCommandExecutor; import mineverse.Aust1n46.chat.command.chat.Channel; import mineverse.Aust1n46.chat.command.mute.MuteContainer; import mineverse.Aust1n46.chat.database.Database; @@ -182,7 +182,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { Database.initializeMySQL(); }); - MineverseCommandExecutor.initialize(); + VentureCommandExecutor.initialize(); this.registerListeners(); this.registerPacketListeners(); diff --git a/src/mineverse/Aust1n46/chat/command/MineverseCommand.java b/src/mineverse/Aust1n46/chat/command/MineverseCommand.java deleted file mode 100644 index fbbe835..0000000 --- a/src/mineverse/Aust1n46/chat/command/MineverseCommand.java +++ /dev/null @@ -1,15 +0,0 @@ -package mineverse.Aust1n46.chat.command; - -import java.util.List; - -import org.bukkit.command.Command; -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 { - public abstract void execute(CommandSender sender, String command, String[] args); - - public List onTabComplete(CommandSender sender, Command command, String label, String[] args) { - return null; - } -} diff --git a/src/mineverse/Aust1n46/chat/command/VentureCommand.java b/src/mineverse/Aust1n46/chat/command/VentureCommand.java new file mode 100644 index 0000000..ed21a57 --- /dev/null +++ b/src/mineverse/Aust1n46/chat/command/VentureCommand.java @@ -0,0 +1,17 @@ +package mineverse.Aust1n46.chat.command; + +import java.util.List; + +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; + +/** + * Interface for the plugin's commands. + */ +public interface VentureCommand { + public void execute(CommandSender sender, String command, String[] args); + + public default List onTabComplete(CommandSender sender, Command command, String label, String[] args) { + return null; + } +} diff --git a/src/mineverse/Aust1n46/chat/command/MineverseCommandExecutor.java b/src/mineverse/Aust1n46/chat/command/VentureCommandExecutor.java similarity index 92% rename from src/mineverse/Aust1n46/chat/command/MineverseCommandExecutor.java rename to src/mineverse/Aust1n46/chat/command/VentureCommandExecutor.java index 34aa7c7..aa2eeeb 100644 --- a/src/mineverse/Aust1n46/chat/command/MineverseCommandExecutor.java +++ b/src/mineverse/Aust1n46/chat/command/VentureCommandExecutor.java @@ -52,10 +52,10 @@ import mineverse.Aust1n46.chat.command.mute.Unmuteall; /** * Class that initializes and executes the plugin's commands. */ -public class MineverseCommandExecutor implements TabExecutor { - private static Map commands = new HashMap(); +public class VentureCommandExecutor implements TabExecutor { + private static Map commands = new HashMap(); private static MineverseChat plugin = MineverseChat.getInstance(); - private static MineverseCommandExecutor commandExecutor; + private static VentureCommandExecutor commandExecutor; @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] parameters) { @@ -69,7 +69,7 @@ public class MineverseCommandExecutor implements TabExecutor { } public static void initialize() { - commandExecutor = new MineverseCommandExecutor(); + commandExecutor = new VentureCommandExecutor(); commands.put("broadcast", new Broadcast()); commands.put("channel", new Channel()); commands.put("join", new Channel()); @@ -108,7 +108,7 @@ public class MineverseCommandExecutor implements TabExecutor { } plugin.getServer().getScheduler().runTaskLater(plugin, () -> { - MineverseCommand reply = new Reply(); + VentureCommand reply = new Reply(); commands.put("reply", reply); commands.put("r", reply); plugin.getCommand("reply").setExecutor(commandExecutor); diff --git a/src/mineverse/Aust1n46/chat/command/chat/Broadcast.java b/src/mineverse/Aust1n46/chat/command/chat/Broadcast.java index 3032fe0..cdf63f8 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Broadcast.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Broadcast.java @@ -5,11 +5,11 @@ import org.bukkit.command.CommandSender; import org.bukkit.configuration.ConfigurationSection; import mineverse.Aust1n46.chat.MineverseChat; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; -public class Broadcast extends MineverseCommand { +public class Broadcast implements VentureCommand { private MineverseChat plugin = MineverseChat.getInstance(); @Override @@ -40,4 +40,4 @@ public class Broadcast extends MineverseCommand { return; } } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/BungeeToggle.java b/src/mineverse/Aust1n46/chat/command/chat/BungeeToggle.java index 9865d2f..2b49c70 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/BungeeToggle.java +++ b/src/mineverse/Aust1n46/chat/command/chat/BungeeToggle.java @@ -7,10 +7,10 @@ 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.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; -public class BungeeToggle extends MineverseCommand { +public class BungeeToggle implements VentureCommand { @Override public void execute(CommandSender sender, String command, String[] args) { @@ -34,4 +34,4 @@ public class BungeeToggle 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/Channel.java b/src/mineverse/Aust1n46/chat/command/chat/Channel.java index dc78649..5af1923 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Channel.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Channel.java @@ -12,10 +12,10 @@ import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.api.events.ChannelJoinEvent; import mineverse.Aust1n46.chat.channel.ChatChannel; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; -public class Channel extends MineverseCommand implements Listener { +public class Channel implements VentureCommand, Listener { @Override public void execute(CommandSender sender, String command, String[] args) { diff --git a/src/mineverse/Aust1n46/chat/command/chat/Channelinfo.java b/src/mineverse/Aust1n46/chat/command/chat/Channelinfo.java index cd7c420..3047ffc 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Channelinfo.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Channelinfo.java @@ -4,10 +4,10 @@ import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.channel.ChatChannel; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.utilities.Format; -public class Channelinfo extends MineverseCommand { +public class Channelinfo implements VentureCommand { @Override public void execute(CommandSender sender, String command, String[] args) { @@ -66,4 +66,4 @@ public class Channelinfo extends MineverseCommand { return; } } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/Chatinfo.java b/src/mineverse/Aust1n46/chat/command/chat/Chatinfo.java index d46ca3f..dac494b 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Chatinfo.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Chatinfo.java @@ -8,10 +8,10 @@ import org.bukkit.entity.Player; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.command.mute.MuteContainer; -public class Chatinfo extends MineverseCommand { +public class Chatinfo implements VentureCommand { @Override public void execute(CommandSender sender, String command, String[] args) { @@ -148,4 +148,4 @@ public class Chatinfo extends MineverseCommand { return; } } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/chat/Chatreload.java b/src/mineverse/Aust1n46/chat/command/chat/Chatreload.java index bcf9fc9..e350f02 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Chatreload.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Chatreload.java @@ -6,10 +6,10 @@ import org.bukkit.command.CommandSender; 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.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; -public class Chatreload extends MineverseCommand { +public class Chatreload implements VentureCommand { private MineverseChat plugin = MineverseChat.getInstance(); @Override @@ -29,4 +29,4 @@ public class Chatreload 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/Chlist.java b/src/mineverse/Aust1n46/chat/command/chat/Chlist.java index 7b096d5..9a30ad6 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Chlist.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Chlist.java @@ -3,10 +3,10 @@ package mineverse.Aust1n46.chat.command.chat; import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.channel.ChatChannel; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; -public class Chlist extends MineverseCommand { +public class Chlist implements VentureCommand { @Override public void execute(CommandSender sender, String command, String[] args) { diff --git a/src/mineverse/Aust1n46/chat/command/chat/Chwho.java b/src/mineverse/Aust1n46/chat/command/chat/Chwho.java index 7cff0aa..6894a50 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Chwho.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Chwho.java @@ -19,10 +19,10 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; -public class Chwho extends MineverseCommand { +public class Chwho implements VentureCommand { private MineverseChat plugin = MineverseChat.getInstance(); @Override diff --git a/src/mineverse/Aust1n46/chat/command/chat/Clearchat.java b/src/mineverse/Aust1n46/chat/command/chat/Clearchat.java index 77896f0..988192f 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Clearchat.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Clearchat.java @@ -4,11 +4,11 @@ import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.localization.InternalMessage; import mineverse.Aust1n46.chat.localization.LocalizedMessage; -public class Clearchat extends MineverseCommand { +public class Clearchat implements VentureCommand { @Override public void execute(CommandSender sender, String command, String[] args) { diff --git a/src/mineverse/Aust1n46/chat/command/chat/Commandblock.java b/src/mineverse/Aust1n46/chat/command/chat/Commandblock.java index d4644bf..ad00445 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Commandblock.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Commandblock.java @@ -7,10 +7,10 @@ import org.bukkit.command.CommandSender; 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.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; -public class Commandblock extends MineverseCommand { +public class Commandblock implements VentureCommand { private MineverseChat plugin = MineverseChat.getInstance(); @Override diff --git a/src/mineverse/Aust1n46/chat/command/chat/Commandspy.java b/src/mineverse/Aust1n46/chat/command/chat/Commandspy.java index daac96c..b79216b 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Commandspy.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Commandspy.java @@ -6,10 +6,10 @@ import org.bukkit.entity.Player; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; -public class Commandspy extends MineverseCommand { +public class Commandspy implements VentureCommand { @Override public void execute(CommandSender sender, String command, String[] args) { diff --git a/src/mineverse/Aust1n46/chat/command/chat/Config.java b/src/mineverse/Aust1n46/chat/command/chat/Config.java index 9bae416..e8b610c 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Config.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Config.java @@ -7,10 +7,10 @@ import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.MineverseChat; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.utilities.Format; -public class Config extends MineverseCommand { +public class Config implements VentureCommand { private MineverseChat plugin = MineverseChat.getInstance(); @Override diff --git a/src/mineverse/Aust1n46/chat/command/chat/Edit.java b/src/mineverse/Aust1n46/chat/command/chat/Edit.java index 3dd74fc..a2ac648 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Edit.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Edit.java @@ -16,11 +16,11 @@ import mineverse.Aust1n46.chat.ChatMessage; 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.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; -public class Edit extends MineverseCommand { +public class Edit implements VentureCommand { private PacketContainer emptyLinePacketContainer = Format.createPacketPlayOutChat("{\"extra\":[\" \"],\"text\":\"\"}"); private MineverseChat plugin = MineverseChat.getInstance(); private WrappedChatComponent messageDeletedComponentPlayer; diff --git a/src/mineverse/Aust1n46/chat/command/chat/Filter.java b/src/mineverse/Aust1n46/chat/command/chat/Filter.java index db3263b..7096e0f 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Filter.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Filter.java @@ -6,10 +6,10 @@ import org.bukkit.entity.Player; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; -public class Filter extends MineverseCommand { +public class Filter implements VentureCommand { @Override public void execute(CommandSender sender, String command, String[] args) { diff --git a/src/mineverse/Aust1n46/chat/command/chat/Force.java b/src/mineverse/Aust1n46/chat/command/chat/Force.java index 4bd7cc8..6fe55ce 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Force.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Force.java @@ -4,10 +4,10 @@ import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; -public class Force extends MineverseCommand { +public class Force implements VentureCommand { @Override public void execute(CommandSender sender, String command, String[] args) { diff --git a/src/mineverse/Aust1n46/chat/command/chat/Forceall.java b/src/mineverse/Aust1n46/chat/command/chat/Forceall.java index b675963..baaa58e 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Forceall.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Forceall.java @@ -4,10 +4,10 @@ import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; -public class Forceall extends MineverseCommand { +public class Forceall implements VentureCommand { @Override public void execute(CommandSender sender, String command, String[] args) { diff --git a/src/mineverse/Aust1n46/chat/command/chat/Kickchannel.java b/src/mineverse/Aust1n46/chat/command/chat/Kickchannel.java index b2fe947..0e0abdf 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Kickchannel.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Kickchannel.java @@ -6,10 +6,10 @@ import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; -public class Kickchannel extends MineverseCommand { +public class Kickchannel implements VentureCommand { @Override public void execute(CommandSender sender, String command, String[] args) { diff --git a/src/mineverse/Aust1n46/chat/command/chat/Kickchannelall.java b/src/mineverse/Aust1n46/chat/command/chat/Kickchannelall.java index 92c0208..1591649 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Kickchannelall.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Kickchannelall.java @@ -6,10 +6,10 @@ import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; -public class Kickchannelall extends MineverseCommand { +public class Kickchannelall implements VentureCommand { @Override public void execute(CommandSender sender, String command, String[] args) { diff --git a/src/mineverse/Aust1n46/chat/command/chat/Leave.java b/src/mineverse/Aust1n46/chat/command/chat/Leave.java index 9defe98..7a77437 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Leave.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Leave.java @@ -9,10 +9,10 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; -public class Leave extends MineverseCommand { +public class Leave implements VentureCommand { @Override public void execute(CommandSender sender, String command, String[] args) { diff --git a/src/mineverse/Aust1n46/chat/command/chat/Listen.java b/src/mineverse/Aust1n46/chat/command/chat/Listen.java index a608774..fd6e50a 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Listen.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Listen.java @@ -7,10 +7,10 @@ import org.bukkit.entity.Player; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; -public class Listen extends MineverseCommand { +public class Listen implements VentureCommand { @Override public void execute(CommandSender sender, String command, String[] args) { diff --git a/src/mineverse/Aust1n46/chat/command/chat/Me.java b/src/mineverse/Aust1n46/chat/command/chat/Me.java index 1e40d32..1348aa0 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Me.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Me.java @@ -4,11 +4,11 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import mineverse.Aust1n46.chat.api.MineverseChatAPI; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; -public class Me extends MineverseCommand { +public class Me implements VentureCommand { @Override public void execute(CommandSender sender, String command, String[] args) { diff --git a/src/mineverse/Aust1n46/chat/command/chat/Nick.java b/src/mineverse/Aust1n46/chat/command/chat/Nick.java index 8c4517e..2bd3151 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Nick.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Nick.java @@ -7,11 +7,11 @@ 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.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; -public class Nick extends MineverseCommand { +public class Nick implements VentureCommand { private MineverseChat plugin = MineverseChat.getInstance(); @Override diff --git a/src/mineverse/Aust1n46/chat/command/chat/Party.java b/src/mineverse/Aust1n46/chat/command/chat/Party.java index 1bf9ecb..ee5b132 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Party.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Party.java @@ -9,10 +9,10 @@ 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.command.VentureCommand; import mineverse.Aust1n46.chat.utilities.Format; -public class Party extends MineverseCommand { +public class Party implements VentureCommand { private MineverseChat plugin = MineverseChat.getInstance(); @Override diff --git a/src/mineverse/Aust1n46/chat/command/chat/RangedSpy.java b/src/mineverse/Aust1n46/chat/command/chat/RangedSpy.java index e41b8b2..31d89f7 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/RangedSpy.java +++ b/src/mineverse/Aust1n46/chat/command/chat/RangedSpy.java @@ -2,14 +2,14 @@ package mineverse.Aust1n46.chat.command.chat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; 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 { +public class RangedSpy implements VentureCommand { @Override public void execute(CommandSender sender, String command, String[] args) { diff --git a/src/mineverse/Aust1n46/chat/command/chat/Removemessage.java b/src/mineverse/Aust1n46/chat/command/chat/Removemessage.java index 49b40b0..df06fea 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Removemessage.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Removemessage.java @@ -12,7 +12,7 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; @@ -24,7 +24,7 @@ import org.bukkit.scheduler.BukkitRunnable; import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.wrappers.WrappedChatComponent; -public class Removemessage extends MineverseCommand { +public class Removemessage implements VentureCommand { private MineverseChat plugin = MineverseChat.getInstance(); 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"))) + "]}}}]}");; diff --git a/src/mineverse/Aust1n46/chat/command/chat/Setchannel.java b/src/mineverse/Aust1n46/chat/command/chat/Setchannel.java index afc9297..8490239 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Setchannel.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Setchannel.java @@ -5,10 +5,10 @@ import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; -public class Setchannel extends MineverseCommand { +public class Setchannel implements VentureCommand { @Override public void execute(CommandSender sender, String command, String[] args) { diff --git a/src/mineverse/Aust1n46/chat/command/chat/Setchannelall.java b/src/mineverse/Aust1n46/chat/command/chat/Setchannelall.java index ae20de7..415d879 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Setchannelall.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Setchannelall.java @@ -5,10 +5,10 @@ import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; -public class Setchannelall extends MineverseCommand { +public class Setchannelall implements VentureCommand { @Override public void execute(CommandSender sender, String command, String[] args) { diff --git a/src/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java b/src/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java index d720f91..fddf716 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java +++ b/src/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java @@ -17,13 +17,13 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.gui.GuiSlot; import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; import mineverse.Aust1n46.chat.versions.VersionHandler; -public class VentureChatGui extends MineverseCommand { +public class VentureChatGui implements VentureCommand { private MineverseChat plugin = MineverseChat.getInstance(); @Override diff --git a/src/mineverse/Aust1n46/chat/command/chat/Venturechat.java b/src/mineverse/Aust1n46/chat/command/chat/Venturechat.java index 8e18107..fffcb7b 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Venturechat.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Venturechat.java @@ -1,7 +1,7 @@ package mineverse.Aust1n46.chat.command.chat; import mineverse.Aust1n46.chat.MineverseChat; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.localization.InternalMessage; import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.ComponentBuilder; @@ -15,7 +15,7 @@ import org.bukkit.command.CommandSender; //import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer; import org.bukkit.entity.Player; -public class Venturechat extends MineverseCommand { +public class Venturechat implements VentureCommand { private MineverseChat plugin = MineverseChat.getInstance(); @Override @@ -52,4 +52,4 @@ public class Venturechat extends MineverseCommand { // } // p.getHandle().playerConnection.sendPacket(ppoc); // } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/message/MessageToggle.java b/src/mineverse/Aust1n46/chat/command/message/MessageToggle.java index a61c27e..d3fab3a 100644 --- a/src/mineverse/Aust1n46/chat/command/message/MessageToggle.java +++ b/src/mineverse/Aust1n46/chat/command/message/MessageToggle.java @@ -7,10 +7,10 @@ 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.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; -public class MessageToggle extends MineverseCommand { +public class MessageToggle implements VentureCommand { @Override public void execute(CommandSender sender, String command, String[] args) { @@ -34,4 +34,4 @@ public class MessageToggle 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/message/Notifications.java b/src/mineverse/Aust1n46/chat/command/message/Notifications.java index cd67774..b3ca832 100644 --- a/src/mineverse/Aust1n46/chat/command/message/Notifications.java +++ b/src/mineverse/Aust1n46/chat/command/message/Notifications.java @@ -6,10 +6,10 @@ import org.bukkit.entity.Player; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; -public class Notifications extends MineverseCommand { +public class Notifications implements VentureCommand { @Override public void execute(CommandSender sender, String command, String[] args) { @@ -28,4 +28,4 @@ public class Notifications extends MineverseCommand { mcp.getPlayer().sendMessage(LocalizedMessage.NOTIFICATIONS_OFF.toString()); return; } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/message/Reply.java b/src/mineverse/Aust1n46/chat/command/message/Reply.java index 64f3c0e..26f7161 100644 --- a/src/mineverse/Aust1n46/chat/command/message/Reply.java +++ b/src/mineverse/Aust1n46/chat/command/message/Reply.java @@ -10,11 +10,11 @@ import me.clip.placeholderapi.PlaceholderAPI; 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.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; -public class Reply extends MineverseCommand { +public class Reply implements VentureCommand { private MineverseChat plugin = MineverseChat.getInstance(); @Override @@ -149,4 +149,4 @@ public class Reply extends MineverseCommand { e.printStackTrace(); } } -} \ No newline at end of file +} diff --git a/src/mineverse/Aust1n46/chat/command/message/Spy.java b/src/mineverse/Aust1n46/chat/command/message/Spy.java index 56d45d3..e6a70fc 100644 --- a/src/mineverse/Aust1n46/chat/command/message/Spy.java +++ b/src/mineverse/Aust1n46/chat/command/message/Spy.java @@ -7,10 +7,10 @@ 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.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; -public class Spy extends MineverseCommand { +public class Spy implements VentureCommand { @Override public void execute(CommandSender sender, String command, String[] args) { @@ -34,4 +34,4 @@ public class Spy 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/mute/Mute.java b/src/mineverse/Aust1n46/chat/command/mute/Mute.java index 42be4f1..5d5cca9 100644 --- a/src/mineverse/Aust1n46/chat/command/mute/Mute.java +++ b/src/mineverse/Aust1n46/chat/command/mute/Mute.java @@ -17,11 +17,11 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; -public class Mute extends MineverseCommand { +public class Mute implements VentureCommand { private static final List COMMON_MUTE_TIMES = Collections.unmodifiableList(Arrays.asList(new String[]{"12h", "15m", "1d", "1h", "1m", "30s"})); @Override diff --git a/src/mineverse/Aust1n46/chat/command/mute/Muteall.java b/src/mineverse/Aust1n46/chat/command/mute/Muteall.java index eb5b45a..eeb9ef6 100644 --- a/src/mineverse/Aust1n46/chat/command/mute/Muteall.java +++ b/src/mineverse/Aust1n46/chat/command/mute/Muteall.java @@ -6,10 +6,10 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; -public class Muteall extends MineverseCommand { +public class Muteall implements VentureCommand { @Override public void execute(CommandSender sender, String command, String[] args) { diff --git a/src/mineverse/Aust1n46/chat/command/mute/Unmute.java b/src/mineverse/Aust1n46/chat/command/mute/Unmute.java index b0f0874..25b8de6 100644 --- a/src/mineverse/Aust1n46/chat/command/mute/Unmute.java +++ b/src/mineverse/Aust1n46/chat/command/mute/Unmute.java @@ -16,10 +16,10 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; -public class Unmute extends MineverseCommand { +public class Unmute implements VentureCommand { @Override public void execute(CommandSender sender, String command, String[] args) { diff --git a/src/mineverse/Aust1n46/chat/command/mute/Unmuteall.java b/src/mineverse/Aust1n46/chat/command/mute/Unmuteall.java index 9c0e919..a671e75 100644 --- a/src/mineverse/Aust1n46/chat/command/mute/Unmuteall.java +++ b/src/mineverse/Aust1n46/chat/command/mute/Unmuteall.java @@ -6,10 +6,10 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.VentureCommand; import mineverse.Aust1n46.chat.localization.LocalizedMessage; -public class Unmuteall extends MineverseCommand { +public class Unmuteall implements VentureCommand { @Override public void execute(CommandSender sender, String command, String[] args) {