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

Convert all commands to new command API

Browse Source
This commit is contained in:
Aust1n46 2022-04-03 15:43:02 -05:00
parent 6f830190a6
commit ccccf02d5e
44 changed files with 2223 additions and 2219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.settings/org.eclipse.core.resources.prefs Normal file
View File

@ -0,0 +1,5 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding/<project>=UTF-8

4
.settings/org.eclipse.m2e.core.prefs Normal file
View File

@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

188
src/main/java/venture/Aust1n46/chat/controllers/CommandController.java
View File

@ -1,23 +1,18 @@
package venture.Aust1n46.chat.controllers;
import java.io.File;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.bukkit.Server;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.command.PluginCommand;
import org.bukkit.command.SimpleCommandMap;
import org.bukkit.command.TabExecutor;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.plugin.Plugin;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@ -25,6 +20,7 @@ import com.google.inject.Singleton;
import venture.Aust1n46.chat.controllers.commands.Broadcast;
import venture.Aust1n46.chat.controllers.commands.BungeeToggle;
import venture.Aust1n46.chat.controllers.commands.Channel;
import venture.Aust1n46.chat.controllers.commands.ChannelAlias;
import venture.Aust1n46.chat.controllers.commands.Channelinfo;
import venture.Aust1n46.chat.controllers.commands.Chatinfo;
import venture.Aust1n46.chat.controllers.commands.Chatreload;
@ -37,13 +33,13 @@ import venture.Aust1n46.chat.controllers.commands.Edit;
import venture.Aust1n46.chat.controllers.commands.Filter;
import venture.Aust1n46.chat.controllers.commands.Force;
import venture.Aust1n46.chat.controllers.commands.Forceall;
import venture.Aust1n46.chat.controllers.commands.IgnoreCommandExecutor;
import venture.Aust1n46.chat.controllers.commands.Ignore;
import venture.Aust1n46.chat.controllers.commands.Kickchannel;
import venture.Aust1n46.chat.controllers.commands.Kickchannelall;
import venture.Aust1n46.chat.controllers.commands.Leave;
import venture.Aust1n46.chat.controllers.commands.Listen;
import venture.Aust1n46.chat.controllers.commands.Me;
import venture.Aust1n46.chat.controllers.commands.MessageCommandExecutor;
import venture.Aust1n46.chat.controllers.commands.Message;
import venture.Aust1n46.chat.controllers.commands.MessageToggle;
import venture.Aust1n46.chat.controllers.commands.Mute;
import venture.Aust1n46.chat.controllers.commands.Muteall;
@ -60,24 +56,18 @@ import venture.Aust1n46.chat.controllers.commands.Unmuteall;
import venture.Aust1n46.chat.controllers.commands.VentureChatGui;
import venture.Aust1n46.chat.controllers.commands.Venturechat;
import venture.Aust1n46.chat.initiators.application.VentureChat;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.model.ChatChannel;
import venture.Aust1n46.chat.service.ConfigService;
import venture.Aust1n46.chat.utilities.FormatUtils;
/**
* Class that initializes and executes the plugin's commands.
*/
@Singleton
public class CommandController implements TabExecutor {
public class CommandController {
private static final String COMMAND_CONFIG_VERSION = "3.3.0";
private Map<String, VentureCommand> commandsOld = new HashMap<>();
@Inject
private VentureChat plugin;
@Inject
private MessageCommandExecutor messageCommandExecutor;
@Inject
private IgnoreCommandExecutor ignoreCommandExecutor;
private ConfigService configService;
@Inject
private Broadcast broadcast;
@ -149,23 +139,16 @@ public class CommandController implements TabExecutor {
private Unmute unmute;
@Inject
private Unmuteall unmuteall;
private Constructor<PluginCommand> pluginCommandConstructor;
@Inject
private Message message;
@Inject
private Ignore ignore;
@Inject
private ChannelAlias channelAlias;
private final Map<String, Command> commands = new HashMap<>();
private Map<String, Command> knownCommands;
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] parameters) {
commandsOld.get(command.getName()).execute(sender, command.getName(), parameters);
return true;
}
@Override
public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
return commandsOld.get(command.getName()).onTabComplete(sender, command, label, args);
}
@SuppressWarnings("unchecked")
@Inject
public void postConstruct() {
@ -183,7 +166,6 @@ public class CommandController implements TabExecutor {
plugin.saveResource("commands.yml", true);
commandsFileConfiguration = YamlConfiguration.loadConfiguration(commandsFile);
}
try {
knownCommands = server.getCommandMap().getKnownCommands(); // Paper :)
}
@ -202,85 +184,77 @@ public class CommandController implements TabExecutor {
e.printStackTrace();
}
}
try {
pluginCommandConstructor = PluginCommand.class.getDeclaredConstructor(String.class, Plugin.class);
pluginCommandConstructor.setAccessible(true);
} catch (NoSuchMethodException | SecurityException e) {
e.printStackTrace();
commands.put("broadcast", broadcast);
commands.put("channel", channel);
commands.put("join", channel);
commands.put("channelinfo", channelinfo);
commands.put("chatinfo", chatinfo);
commands.put("chatreload", chatreload);
commands.put("chlist", chlist);
commands.put("chwho", chwho);
commands.put("clearchat", clearchat);
commands.put("commandblock", commandblock);
commands.put("commandspy", commandspy);
commands.put("edit", edit);
commands.put("filter", filter);
commands.put("force", force);
commands.put("forceall", forceall);
commands.put("kickchannel", kickchannel);
commands.put("kickchannelall", kickchannelall);
commands.put("leave", leave);
commands.put("listen", listen);
commands.put("me", me);
commands.put("venturechat", venturechat);
commands.put("notifications", notifications);
commands.put("party", party);
commands.put("rangedspy", rangedSpy);
commands.put("removemessage", removemessage);
commands.put("setchannel", setchannel);
commands.put("setchannelall", setchannelall);
commands.put("spy", spy);
commands.put("venturechatgui", ventureChatGui);
commands.put("messagetoggle", messageToggle);
commands.put("bungeetoggle", bungeeToggle);
commands.put("reply", reply);
commands.put("mute", mute);
commands.put("muteall", muteall);
commands.put("unmute", unmute);
commands.put("unmuteall", unmuteall);
commands.put("message", message);
commands.put("ignore", ignore);
for (final ChatChannel chatChannel : configService.getChatChannels()) {
final String alias = chatChannel.getAlias();
commands.put(alias, channelAlias);
}
commandsOld.put("broadcast", broadcast);
// commandsOld.put("channel", channel);
// commandsOld.put("join", channel);
commandsOld.put("channelinfo", channelinfo);
commandsOld.put("chatinfo", chatinfo);
commandsOld.put("chatreload", chatreload);
commandsOld.put("chlist", chlist);
commandsOld.put("chwho", chwho);
commandsOld.put("clearchat", clearchat);
commandsOld.put("commandblock", commandblock);
commandsOld.put("commandspy", commandspy);
commandsOld.put("edit", edit);
commandsOld.put("filter", filter);
commandsOld.put("force", force);
commandsOld.put("forceall", forceall);
commandsOld.put("kickchannel", kickchannel);
commandsOld.put("kickchannelall", kickchannelall);
commandsOld.put("leave", leave);
commandsOld.put("listen", listen);
commandsOld.put("me", me);
commandsOld.put("venturechat", venturechat);
commandsOld.put("notifications", notifications);
commandsOld.put("party", party);
commandsOld.put("rangedspy", rangedSpy);
commandsOld.put("removemessage", removemessage);
commandsOld.put("setchannel", setchannel);
commandsOld.put("setchannelall", setchannelall);
commandsOld.put("spy", spy);
commandsOld.put("venturechatgui", ventureChatGui);
commandsOld.put("messagetoggle", messageToggle);
commandsOld.put("bungeetoggle", bungeeToggle);
for (String command : commandsOld.keySet()) {
registerCommand(command, this);
final ConfigurationSection commandsSection = commandsFileConfiguration.getConfigurationSection("commands");
for (final String commandName : commandsSection.getKeys(false)) {
final ConfigurationSection commandSection = commandsSection.getConfigurationSection(commandName);
final boolean isEnabled = commandSection.getBoolean("enabled", true);
if (!isEnabled) {
commands.remove(commandName);
} else {
final Command command = commands.get(commandName);
if (command != null) {
final List<String> aliases = commandSection.getStringList("aliases");
for (final String alias : aliases) {
commands.put(alias, command);
}
plugin.getServer().getScheduler().runTaskLater(plugin, () -> {
if (plugin.isEnabled()) {
commandsOld.put("reply", reply);
commandsOld.put("r", reply);
registerCommand("reply", this);
registerCommand("r", this);
commandsOld.put("mute", mute);
commandsOld.put("muteall", muteall);
commandsOld.put("unmute", unmute);
commandsOld.put("unmuteall", unmuteall);
registerCommand("mute", this);
registerCommand("muteall", this);
registerCommand("unmute", this);
registerCommand("unmuteall", this);
registerCommand("message", messageCommandExecutor);
registerCommand("msg", messageCommandExecutor);
registerCommand("tell", messageCommandExecutor);
registerCommand("whisper", messageCommandExecutor);
registerCommand("ignore", ignoreCommandExecutor);
commands.put("venturechat:" + commandName, command);
}
}, 0);
registerCommand("channel", channel);
}
private void registerCommand(final String command, final CommandExecutor commandExecutor) {
try {
final PluginCommand pluginCommand = pluginCommandConstructor.newInstance(command, plugin);
pluginCommand.setExecutor(commandExecutor);
knownCommands.put(command, pluginCommand);
} catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
e.printStackTrace();
}
// Initial registration is required to ensure commands are recognized by the
// server after enabling every plugin
for (final Entry<String, Command> commandEntry : commands.entrySet()) {
registerCommand(commandEntry.getKey(), commandEntry.getValue());
}
// Forcibly re-register enabled VentureChat commands on a delay to ensure they
// have priority
server.getScheduler().runTaskLater(plugin, () -> {
for (final Entry<String, Command> commandEntry : commands.entrySet()) {
registerCommand(commandEntry.getKey(), commandEntry.getValue());
}
}, 10);
}
private void registerCommand(final String commandLabel, final Command command) {

18
src/main/java/venture/Aust1n46/chat/controllers/commands/Broadcast.java
View File

@ -8,18 +8,23 @@ import com.google.inject.Inject;
import venture.Aust1n46.chat.initiators.application.VentureChat;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.model.UniversalCommand;
import venture.Aust1n46.chat.service.VentureChatFormatService;
import venture.Aust1n46.chat.utilities.FormatUtils;
public class Broadcast implements VentureCommand {
public class Broadcast extends UniversalCommand {
@Inject
private VentureChat plugin;
@Inject
private VentureChatFormatService formatService;
@Inject
public Broadcast(String name) {
super(name);
}
@Override
public void execute(CommandSender sender, String command, String[] args) {
protected void executeCommand(CommandSender sender, String command, String[] args) {
ConfigurationSection bs = plugin.getConfig().getConfigurationSection("broadcast");
String broadcastColor = bs.getString("color", "white");
String broadcastPermissions = bs.getString("permissions", "None");
@ -28,15 +33,14 @@ public class Broadcast implements VentureCommand {
if (args.length > 0) {
String bc = "";
for (int x = 0; x < args.length; x++) {
if (args[x].length() > 0) bc += args[x] + " ";
if (args[x].length() > 0)
bc += args[x] + " ";
}
bc = FormatUtils.FormatStringAll(bc);
formatService.broadcastToServer(broadcastDisplayTag + ChatColor.valueOf(broadcastColor.toUpperCase()) + " " + bc);
return;
} else {
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()
.replace("{command}", "/broadcast")
.replace("{args}", "[msg]"));
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString().replace("{command}", "/broadcast").replace("{args}", "[msg]"));
return;
}
} else {

19
src/main/java/venture/Aust1n46/chat/controllers/commands/BungeeToggle.java
View File

@ -1,30 +1,29 @@
package venture.Aust1n46.chat.controllers.commands;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.google.inject.Inject;
import venture.Aust1n46.chat.controllers.PluginMessageController;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.PlayerCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class BungeeToggle implements VentureCommand {
public class BungeeToggle extends PlayerCommand {
@Inject
private PluginMessageController pluginMessageController;
@Inject
private VentureChatPlayerApiService playerApiService;
@Override
public void execute(CommandSender sender, String command, String[] args) {
if (!(sender instanceof Player)) {
Bukkit.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return;
@Inject
public BungeeToggle(String name) {
super(name);
}
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer((Player) sender);
@Override
protected void executeCommand(Player player, String command, String[] args) {
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer(player);
if (mcp.getPlayer().hasPermission("venturechat.bungeetoggle")) {
if (!mcp.isBungeeToggle()) {
mcp.setBungeeToggle(true);

70
src/main/java/venture/Aust1n46/chat/controllers/commands/ChannelAlias.java Normal file
View File

@ -0,0 +1,70 @@
package venture.Aust1n46.chat.controllers.commands;
import org.bukkit.entity.Player;
import com.google.inject.Inject;
import venture.Aust1n46.chat.controllers.PluginMessageController;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.ChatChannel;
import venture.Aust1n46.chat.model.PlayerCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.service.ConfigService;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class ChannelAlias extends PlayerCommand {
@Inject
private VentureChatPlayerApiService playerApiService;
@Inject
private ConfigService configService;
@Inject
private PluginMessageController pluginMessageController;
public ChannelAlias() {
super("channelalias");
}
@Override
public void executeCommand(final Player player, final String commandLabel, final String[] args) {
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer(player);
for (ChatChannel channel : configService.getChatChannels()) {
if (commandLabel.toLowerCase().equals(channel.getAlias())) {
if (args.length == 0) {
mcp.getPlayer()
.sendMessage(LocalizedMessage.SET_CHANNEL.toString().replace("{channel_color}", channel.getColor() + "").replace("{channel_name}", channel.getName()));
if (mcp.hasConversation()) {
for (VentureChatPlayer p : playerApiService.getOnlineMineverseChatPlayers()) {
if (p.isSpy()) {
p.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION_SPY.toString().replace("{player_sender}", mcp.getName())
.replace("{player_receiver}", playerApiService.getMineverseChatPlayer(mcp.getConversation()).getName()));
}
}
mcp.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION.toString().replace("{player_receiver}",
playerApiService.getMineverseChatPlayer(mcp.getConversation()).getName()));
mcp.setConversation(null);
}
mcp.addListening(channel.getName());
mcp.setCurrentChannel(channel);
if (channel.getBungee()) {
pluginMessageController.synchronize(mcp, true);
}
return;
} else {
mcp.setQuickChat(true);
mcp.setQuickChannel(channel);
mcp.addListening(channel.getName());
if (channel.getBungee()) {
pluginMessageController.synchronize(mcp, true);
}
String msg = "";
for (int x = 0; x < args.length; x++) {
if (args[x].length() > 0)
msg += " " + args[x];
}
mcp.getPlayer().chat(msg);
return;
}
}
}
}
}

14
src/main/java/venture/Aust1n46/chat/controllers/commands/Channelinfo.java
View File

@ -6,16 +6,21 @@ import org.bukkit.command.CommandSender;
import com.google.inject.Inject;
import venture.Aust1n46.chat.model.ChatChannel;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.model.UniversalCommand;
import venture.Aust1n46.chat.service.ConfigService;
import venture.Aust1n46.chat.utilities.FormatUtils;
public class Channelinfo implements VentureCommand {
public class Channelinfo extends UniversalCommand {
@Inject
private ConfigService configService;
@Inject
public Channelinfo(String name) {
super(name);
}
@Override
public void execute(CommandSender sender, String command, String[] args) {
protected void executeCommand(CommandSender sender, String command, String[] args) {
if (sender.hasPermission("venturechat.channelinfo")) {
if (args.length < 1) {
sender.sendMessage(ChatColor.RED + "Invalid command: /channelinfo [channel]");
@ -35,7 +40,8 @@ public class Channelinfo implements VentureCommand {
sender.sendMessage(ChatColor.GOLD + "Channel: " + chname.getColor() + chname.getName());
sender.sendMessage(ChatColor.GOLD + "Alias: " + chname.getColor() + chname.getAlias());
sender.sendMessage(ChatColor.GOLD + "Color: " + chname.getColor() + chname.getColorRaw());
sender.sendMessage(ChatColor.GOLD + "ChatColor: " + (chname.getChatColor().equalsIgnoreCase("None") ? FormatUtils.DEFAULT_COLOR_CODE : chname.getChatColor()) + chname.getChatColorRaw());
sender.sendMessage(ChatColor.GOLD + "ChatColor: " + (chname.getChatColor().equalsIgnoreCase("None") ? FormatUtils.DEFAULT_COLOR_CODE : chname.getChatColor())
+ chname.getChatColorRaw());
if (chname.hasPermission()) {
sender.sendMessage(ChatColor.GOLD + "Permission: " + chname.getColor() + chname.getPermission());
} else {

14
src/main/java/venture/Aust1n46/chat/controllers/commands/Chatinfo.java
View File

@ -8,19 +8,24 @@ import org.bukkit.entity.Player;
import com.google.inject.Inject;
import venture.Aust1n46.chat.model.ChatChannel;
import venture.Aust1n46.chat.model.UniversalCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.ConfigService;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class Chatinfo implements VentureCommand {
public class Chatinfo extends UniversalCommand {
@Inject
private VentureChatPlayerApiService playerApiService;
@Inject
private ConfigService configService;
@Inject
public Chatinfo(String name) {
super(name);
}
@Override
public void execute(CommandSender sender, String command, String[] args) {
public void executeCommand(CommandSender sender, String command, String[] args) {
if (sender.hasPermission("venturechat.chatinfo")) {
if (args.length == 0) {
if (!(sender instanceof Player)) {
@ -56,7 +61,8 @@ public class Chatinfo implements VentureCommand {
mcp.getPlayer().sendMessage(ChatColor.GOLD + "Blocked Commands: " + ChatColor.RED + "N/A");
}
if (mcp.hasConversation()) {
mcp.getPlayer().sendMessage(ChatColor.GOLD + "Private conversation: " + ChatColor.GREEN + playerApiService.getMineverseChatPlayer(mcp.getConversation()).getName());
mcp.getPlayer().sendMessage(
ChatColor.GOLD + "Private conversation: " + ChatColor.GREEN + playerApiService.getMineverseChatPlayer(mcp.getConversation()).getName());
} else {
mcp.getPlayer().sendMessage(ChatColor.GOLD + "Private conversation: " + ChatColor.RED + "N/A");
}

30
src/main/java/venture/Aust1n46/chat/controllers/commands/Chatreload.java
View File

@ -12,13 +12,13 @@ import venture.Aust1n46.chat.controllers.VentureChatSpigotFlatFileController;
import venture.Aust1n46.chat.initiators.application.VentureChat;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.JsonFormat;
import venture.Aust1n46.chat.model.UniversalCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.ConfigService;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
import venture.Aust1n46.chat.utilities.FormatUtils;
public class Chatreload implements VentureCommand {
public class Chatreload extends UniversalCommand {
@Inject
private VentureChat plugin;
@Inject
@ -28,9 +28,14 @@ public class Chatreload implements VentureCommand {
@Inject
private ConfigService configService;
@Inject
public Chatreload(String name) {
super(name);
}
@Override
public void execute(CommandSender sender, String command, String[] args) {
if(sender.hasPermission("venturechat.reload")) {
public void executeCommand(CommandSender sender, String command, String[] args) {
if (sender.hasPermission("venturechat.reload")) {
spigotFlatFileController.savePlayerData();
playerApiService.clearMineverseChatPlayerMap();
playerApiService.clearNameMap();
@ -41,10 +46,11 @@ public class Chatreload implements VentureCommand {
spigotFlatFileController.loadLegacyPlayerData();
spigotFlatFileController.loadPlayerData();
for(Player p : plugin.getServer().getOnlinePlayers()) {
for (Player p : plugin.getServer().getOnlinePlayers()) {
VentureChatPlayer mcp = playerApiService.getMineverseChatPlayer(p);
if(mcp == null) {
Bukkit.getConsoleSender().sendMessage(FormatUtils.FormatStringAll("&8[&eVentureChat&8]&c - Could not find player data post reload for currently online player: " + p.getName()));
if (mcp == null) {
Bukkit.getConsoleSender()
.sendMessage(FormatUtils.FormatStringAll("&8[&eVentureChat&8]&c - Could not find player data post reload for currently online player: " + p.getName()));
Bukkit.getConsoleSender().sendMessage(FormatUtils.FormatStringAll("&8[&eVentureChat&8]&c - There could be an issue with your player data saving."));
String name = p.getName();
UUID uuid = p.getUniqueId();
@ -54,9 +60,9 @@ public class Chatreload implements VentureCommand {
mcp.setPlayer(plugin.getServer().getPlayer(mcp.getUuid()));
mcp.setHasPlayed(false);
String jsonFormat = mcp.getJsonFormat();
for(JsonFormat j : configService.getJsonFormats()) {
if(mcp.getPlayer().hasPermission("venturechat.json." + j.getName())) {
if(configService.getJsonFormat(mcp.getJsonFormat()).getPriority() > j.getPriority()) {
for (JsonFormat j : configService.getJsonFormats()) {
if (mcp.getPlayer().hasPermission("venturechat.json." + j.getName())) {
if (configService.getJsonFormat(mcp.getJsonFormat()).getPriority() > j.getPriority()) {
jsonFormat = j.getName();
}
}
@ -67,8 +73,8 @@ public class Chatreload implements VentureCommand {
}
Bukkit.getConsoleSender().sendMessage(FormatUtils.FormatStringAll("&8[&eVentureChat&8]&e - Config reloaded"));
for(VentureChatPlayer player : playerApiService.getOnlineMineverseChatPlayers()) {
if(player.getPlayer().hasPermission("venturechat.reload")) {
for (VentureChatPlayer player : playerApiService.getOnlineMineverseChatPlayers()) {
if (player.getPlayer().hasPermission("venturechat.reload")) {
player.getPlayer().sendMessage(LocalizedMessage.CONFIG_RELOADED.toString());
}
}

11
src/main/java/venture/Aust1n46/chat/controllers/commands/Chlist.java
View File

@ -6,15 +6,20 @@ import com.google.inject.Inject;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.ChatChannel;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.model.UniversalCommand;
import venture.Aust1n46.chat.service.ConfigService;
public class Chlist implements VentureCommand {
public class Chlist extends UniversalCommand {
@Inject
private ConfigService configService;
@Inject
public Chlist(String name) {
super(name);
}
@Override
public void execute(CommandSender sender, String command, String[] args) {
public void executeCommand(CommandSender sender, String command, String[] args) {
sender.sendMessage(LocalizedMessage.CHANNEL_LIST_HEADER.toString());
for (ChatChannel chname : configService.getChatChannels()) {
if (chname.hasPermission()) {

11
src/main/java/venture/Aust1n46/chat/controllers/commands/Chwho.java
View File

@ -21,11 +21,11 @@ import venture.Aust1n46.chat.initiators.application.VentureChat;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.ChatChannel;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.model.UniversalCommand;
import venture.Aust1n46.chat.service.ConfigService;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class Chwho implements VentureCommand {
public class Chwho extends UniversalCommand {
@Inject
private VentureChat plugin;
@Inject
@ -35,8 +35,13 @@ public class Chwho implements VentureCommand {
@Inject
private ConfigService configService;
@Inject
public Chwho(String name) {
super(name);
}
@Override
public void execute(CommandSender sender, String command, String[] args) {
public void executeCommand(CommandSender sender, String command, String[] args) {
String playerlist = "";
if (sender.hasPermission("venturechat.chwho")) {
if (args.length > 0) {

11
src/main/java/venture/Aust1n46/chat/controllers/commands/Clearchat.java
View File

@ -7,15 +7,20 @@ import com.google.inject.Inject;
import venture.Aust1n46.chat.localization.InternalMessage;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.model.UniversalCommand;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class Clearchat implements VentureCommand {
public class Clearchat extends UniversalCommand {
@Inject
private VentureChatPlayerApiService ventureChatApi;
@Inject
public Clearchat(String name) {
super(name);
}
@Override
public void execute(CommandSender sender, String command, String[] args) {
public void executeCommand(CommandSender sender, String command, String[] args) {
if (sender.hasPermission("venturechat.clearchat")) {
for (VentureChatPlayer player : ventureChatApi.getOnlineMineverseChatPlayers()) {
if (!player.getPlayer().hasPermission("venturechat.clearchat.bypass")) {

11
src/main/java/venture/Aust1n46/chat/controllers/commands/Commandblock.java
View File

@ -9,17 +9,22 @@ import com.google.inject.Inject;
import venture.Aust1n46.chat.initiators.application.VentureChat;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.model.UniversalCommand;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class Commandblock implements VentureCommand {
public class Commandblock extends UniversalCommand {
@Inject
private VentureChat plugin;
@Inject
private VentureChatPlayerApiService playerApiService;
@Inject
public Commandblock(String name) {
super(name);
}
@Override
public void execute(CommandSender sender, String command, String[] args) {
public void executeCommand(CommandSender sender, String command, String[] args) {
if (sender.hasPermission("venturechat.commandblock")) {
if (args.length > 1) {
VentureChatPlayer player = playerApiService.getOnlineMineverseChatPlayer(args[0]);

17
src/main/java/venture/Aust1n46/chat/controllers/commands/Commandspy.java
View File

@ -1,26 +1,25 @@
package venture.Aust1n46.chat.controllers.commands;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.google.inject.Inject;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.PlayerCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class Commandspy implements VentureCommand {
public class Commandspy extends PlayerCommand {
@Inject
private VentureChatPlayerApiService playerApiService;
@Override
public void execute(CommandSender sender, String command, String[] args) {
if (!(sender instanceof Player)) {
Bukkit.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return;
@Inject
public Commandspy(String name) {
super(name);
}
@Override
public void executeCommand(Player sender, String command, String[] args) {
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer((Player) sender);
if (mcp.getPlayer().hasPermission("venturechat.commandspy")) {
if (!mcp.hasCommandSpy()) {

11
src/main/java/venture/Aust1n46/chat/controllers/commands/Edit.java
View File

@ -17,12 +17,12 @@ import venture.Aust1n46.chat.initiators.application.VentureChat;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.ChatMessage;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.model.UniversalCommand;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
import venture.Aust1n46.chat.utilities.FormatUtils;
import venture.Aust1n46.chat.service.VentureChatFormatService;
public class Edit implements VentureCommand {
public class Edit extends UniversalCommand {
@Inject
private VentureChat plugin;
@Inject
@ -33,6 +33,11 @@ public class Edit implements VentureCommand {
private PacketContainer emptyLinePacketContainer;
private WrappedChatComponent messageDeletedComponentPlayer;
@Inject
public Edit(String name) {
super(name);
}
@Inject
public void postConstruct() {
emptyLinePacketContainer = formatService.createPacketPlayOutChat("{\"extra\":[\" \"],\"text\":\"\"}");
@ -41,7 +46,7 @@ public class Edit implements VentureCommand {
@Override
@SuppressWarnings({"unchecked", "rawtypes"})
public void execute(CommandSender sender, String command, String[] args) {
public void executeCommand(CommandSender sender, String command, String[] args) {
if (args.length == 0) {
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()
.replace("{command}", "/edit")

17
src/main/java/venture/Aust1n46/chat/controllers/commands/Filter.java
View File

@ -1,26 +1,25 @@
package venture.Aust1n46.chat.controllers.commands;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.google.inject.Inject;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.PlayerCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class Filter implements VentureCommand {
public class Filter extends PlayerCommand {
@Inject
private VentureChatPlayerApiService playerApiService;
@Override
public void execute(CommandSender sender, String command, String[] args) {
if (!(sender instanceof Player)) {
Bukkit.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return;
@Inject
public Filter(String name) {
super(name);
}
@Override
public void executeCommand(Player sender, String command, String[] args) {
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer((Player) sender);
if (mcp.getPlayer().hasPermission("venturechat.ignorefilter")) {
if (!mcp.isFilter()) {

22
src/main/java/venture/Aust1n46/chat/controllers/commands/Force.java
View File

@ -5,36 +5,36 @@ import org.bukkit.command.CommandSender;
import com.google.inject.Inject;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.UniversalCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class Force implements VentureCommand {
public class Force extends UniversalCommand {
@Inject
private VentureChatPlayerApiService playerApiService;
@Inject
public Force(String name) {
super(name);
}
@Override
public void execute(CommandSender sender, String command, String[] args) {
public void executeCommand(CommandSender sender, String command, String[] args) {
if (sender.hasPermission("venturechat.force")) {
if (args.length < 2) {
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()
.replace("{command}", "/force")
.replace("{args}", "[player] [message]"));
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString().replace("{command}", "/force").replace("{args}", "[player] [message]"));
return;
}
VentureChatPlayer player = playerApiService.getOnlineMineverseChatPlayer(args[0]);
if (player == null) {
sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
.replace("{args}", args[0]));
sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", args[0]));
return;
}
String forcemsg = "";
for (int x = 1; x < args.length; x++)
if (args[x].length() > 0)
forcemsg += args[x] + " ";
sender.sendMessage(LocalizedMessage.FORCE_PLAYER.toString()
.replace("{player}", player.getName())
.replace("{message}", forcemsg));
sender.sendMessage(LocalizedMessage.FORCE_PLAYER.toString().replace("{player}", player.getName()).replace("{message}", forcemsg));
player.getPlayer().chat(forcemsg);
return;
}

14
src/main/java/venture/Aust1n46/chat/controllers/commands/Forceall.java
View File

@ -5,20 +5,24 @@ import org.bukkit.command.CommandSender;
import com.google.inject.Inject;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.UniversalCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class Forceall implements VentureCommand {
public class Forceall extends UniversalCommand {
@Inject
private VentureChatPlayerApiService playerApiService;
@Inject
public Forceall(String name) {
super(name);
}
@Override
public void execute(CommandSender sender, String command, String[] args) {
public void executeCommand(CommandSender sender, String command, String[] args) {
if (sender.hasPermission("venturechat.forceall")) {
if (args.length < 1) {
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()
.replace("{command}", "/forceall").replace("{args}", "[message]"));
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString().replace("{command}", "/forceall").replace("{args}", "[message]"));
return;
}
String forcemsg = "";

114
src/main/java/venture/Aust1n46/chat/controllers/commands/Ignore.java Normal file
View File

@ -0,0 +1,114 @@
package venture.Aust1n46.chat.controllers.commands;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import com.google.inject.Inject;
import venture.Aust1n46.chat.controllers.PluginMessageController;
import venture.Aust1n46.chat.initiators.application.VentureChat;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.PlayerCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class Ignore extends PlayerCommand {
@Inject
private VentureChat plugin;
@Inject
private PluginMessageController pluginMessageController;
@Inject
private VentureChatPlayerApiService playerApiService;
@Inject
public Ignore(String name) {
super(name);
}
@Override
public void executeCommand(Player sender, String label, String[] args) {
if (!(sender instanceof Player)) {
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return;
}
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer((Player) sender);
if (args.length == 0) {
mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS_IGNORE.toString());
return;
}
if (args[0].equalsIgnoreCase("list")) {
String ignoreList = "";
for (UUID ignore : mcp.getIgnores()) {
VentureChatPlayer i = playerApiService.getMineverseChatPlayer(ignore);
String iName = ignore.toString();
if (i != null) {
iName = i.getName();
}
ignoreList += ChatColor.RED + iName + ChatColor.WHITE + ", ";
}
mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_LIST_HEADER.toString());
if (ignoreList.length() > 0) {
mcp.getPlayer().sendMessage(ignoreList.substring(0, ignoreList.length() - 2));
}
return;
}
if (mcp.getName().equalsIgnoreCase(args[0])) {
mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_YOURSELF.toString());
return;
}
if (plugin.getConfig().getBoolean("bungeecordmessaging", true)) {
ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream();
DataOutputStream out = new DataOutputStream(byteOutStream);
try {
out.writeUTF("Ignore");
out.writeUTF("Send");
out.writeUTF(args[0]);
out.writeUTF(mcp.getUuid().toString());
pluginMessageController.sendPluginMessage(byteOutStream);
out.close();
} catch (Exception e) {
e.printStackTrace();
}
return;
}
VentureChatPlayer player = playerApiService.getOnlineMineverseChatPlayer(args[0]);
if (player == null) {
mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", args[0]));
return;
}
if (mcp.getIgnores().contains(player.getUuid())) {
mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_OFF.toString().replace("{player}", player.getName()));
mcp.removeIgnore(player.getUuid());
pluginMessageController.synchronize(mcp, true);
return;
}
if (player.getPlayer().hasPermission("venturechat.ignore.bypass")) {
mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_CANT.toString().replace("{player}", player.getName()));
return;
}
mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_ON.toString().replace("{player}", player.getName()));
mcp.addIgnore(player.getUuid());
pluginMessageController.synchronize(mcp, true);
}
@Override
public List<String> tabComplete(CommandSender sender, String alias, String[] args) {
if (plugin.getConfig().getBoolean("bungeecordmessaging", true)) {
List<String> completions = new ArrayList<>();
StringUtil.copyPartialMatches(args[args.length - 1], playerApiService.getNetworkPlayerNames(), completions);
Collections.sort(completions);
return completions;
}
return null;
}
}

115
src/main/java/venture/Aust1n46/chat/controllers/commands/IgnoreCommandExecutor.java
View File

@ -1,115 +0,0 @@
package venture.Aust1n46.chat.controllers.commands;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.command.TabExecutor;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import com.google.inject.Inject;
import venture.Aust1n46.chat.controllers.PluginMessageController;
import venture.Aust1n46.chat.initiators.application.VentureChat;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class IgnoreCommandExecutor implements TabExecutor {
@Inject
private VentureChat plugin;
@Inject
private PluginMessageController pluginMessageController;
@Inject
private VentureChatPlayerApiService playerApiService;
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) {
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return true;
}
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer((Player) sender);
if (args.length == 0) {
mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS_IGNORE.toString());
return true;
}
if (args[0].equalsIgnoreCase("list")) {
String ignoreList = "";
for (UUID ignore : mcp.getIgnores()) {
VentureChatPlayer i = playerApiService.getMineverseChatPlayer(ignore);
String iName = ignore.toString();
if (i != null) {
iName = i.getName();
}
ignoreList += ChatColor.RED + iName + ChatColor.WHITE + ", ";
}
mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_LIST_HEADER.toString());
if (ignoreList.length() > 0) {
mcp.getPlayer().sendMessage(ignoreList.substring(0, ignoreList.length() - 2));
}
return true;
}
if (mcp.getName().equalsIgnoreCase(args[0])) {
mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_YOURSELF.toString());
return true;
}
if (plugin.getConfig().getBoolean("bungeecordmessaging", true)) {
ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream();
DataOutputStream out = new DataOutputStream(byteOutStream);
try {
out.writeUTF("Ignore");
out.writeUTF("Send");
out.writeUTF(args[0]);
out.writeUTF(mcp.getUuid().toString());
pluginMessageController.sendPluginMessage(byteOutStream);
out.close();
} catch (Exception e) {
e.printStackTrace();
}
return true;
}
VentureChatPlayer player = playerApiService.getOnlineMineverseChatPlayer(args[0]);
if (player == null) {
mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
.replace("{args}", args[0]));
return true;
}
if (mcp.getIgnores().contains(player.getUuid())) {
mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_OFF.toString()
.replace("{player}", player.getName()));
mcp.removeIgnore(player.getUuid());
pluginMessageController.synchronize(mcp, true);
return true;
}
if (player.getPlayer().hasPermission("venturechat.ignore.bypass")) {
mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_CANT.toString()
.replace("{player}", player.getName()));
return true;
}
mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_ON.toString()
.replace("{player}", player.getName()));
mcp.addIgnore(player.getUuid());
pluginMessageController.synchronize(mcp, true);
return true;
}
@Override
public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
if (plugin.getConfig().getBoolean("bungeecordmessaging", true)) {
List<String> completions = new ArrayList<>();
StringUtil.copyPartialMatches(args[args.length - 1], playerApiService.getNetworkPlayerNames(), completions);
Collections.sort(completions);
return completions;
}
return null;
}
}

36
src/main/java/venture/Aust1n46/chat/controllers/commands/Kickchannel.java
View File

@ -8,12 +8,12 @@ import com.google.inject.Inject;
import venture.Aust1n46.chat.controllers.PluginMessageController;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.ChatChannel;
import venture.Aust1n46.chat.model.UniversalCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.ConfigService;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class Kickchannel implements VentureCommand {
public class Kickchannel extends UniversalCommand {
@Inject
private PluginMessageController pluginMessageController;
@Inject
@ -21,36 +21,34 @@ public class Kickchannel implements VentureCommand {
@Inject
private ConfigService configService;
@Inject
public Kickchannel(String name) {
super(name);
}
@Override
public void execute(CommandSender sender, String command, String[] args) {
public void executeCommand(CommandSender sender, String command, String[] args) {
if (sender.hasPermission("venturechat.kickchannel")) {
if (args.length < 2) {
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()
.replace("{command}", "/kickchannel")
.replace("{args}", "[player] [channel]"));
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString().replace("{command}", "/kickchannel").replace("{args}", "[player] [channel]"));
return;
}
VentureChatPlayer player = playerApiService.getMineverseChatPlayer(args[0]);
if (player == null) {
sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
.replace("{args}", args[0]));
sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", args[0]));
return;
}
ChatChannel channel = configService.getChannel(args[1]);
if (channel == null) {
sender.sendMessage(LocalizedMessage.INVALID_CHANNEL.toString()
.replace("{args}", args[1]));
sender.sendMessage(LocalizedMessage.INVALID_CHANNEL.toString().replace("{args}", args[1]));
return;
}
sender.sendMessage(LocalizedMessage.KICK_CHANNEL.toString()
.replace("{player}", args[0])
.replace("{channel_color}", channel.getColor() + "")
.replace("{channel_name}", channel.getName()));
sender.sendMessage(LocalizedMessage.KICK_CHANNEL.toString().replace("{player}", args[0]).replace("{channel_color}", channel.getColor() + "").replace("{channel_name}",
channel.getName()));
player.removeListening(channel.getName());
if (player.isOnline()) {
player.getPlayer().sendMessage(LocalizedMessage.LEAVE_CHANNEL.toString()
.replace("{channel_color}", channel.getColor() + "")
.replace("{channel_name}", channel.getName()));
player.getPlayer()
.sendMessage(LocalizedMessage.LEAVE_CHANNEL.toString().replace("{channel_color}", channel.getColor() + "").replace("{channel_name}", channel.getName()));
} else {
player.setModified(true);
}
@ -63,8 +61,8 @@ public class Kickchannel implements VentureCommand {
}
if (player.isOnline()) {
player.getPlayer().sendMessage(LocalizedMessage.MUST_LISTEN_ONE_CHANNEL.toString());
player.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString()
.replace("{channel_color}", ChatColor.valueOf(configService.getDefaultColor().toUpperCase()) + "")
player.getPlayer()
.sendMessage(LocalizedMessage.SET_CHANNEL.toString().replace("{channel_color}", ChatColor.valueOf(configService.getDefaultColor().toUpperCase()) + "")
.replace("{channel_name}", configService.getDefaultChannel().getName()));
} else
player.setModified(true);

25
src/main/java/venture/Aust1n46/chat/controllers/commands/Kickchannelall.java
View File

@ -8,12 +8,12 @@ import com.google.inject.Inject;
import venture.Aust1n46.chat.controllers.PluginMessageController;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.ChatChannel;
import venture.Aust1n46.chat.model.UniversalCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.ConfigService;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class Kickchannelall implements VentureCommand {
public class Kickchannelall extends UniversalCommand {
@Inject
private PluginMessageController pluginMessageController;
@Inject
@ -21,19 +21,21 @@ public class Kickchannelall implements VentureCommand {
@Inject
private ConfigService configService;
@Inject
public Kickchannelall(String name) {
super(name);
}
@Override
public void execute(CommandSender sender, String command, String[] args) {
public void executeCommand(CommandSender sender, String command, String[] args) {
if (sender.hasPermission("venturechat.kickchannelall")) {
if (args.length < 1) {
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()
.replace("{command}", "/kickchannelall")
.replace("{args}", "[player]"));
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString().replace("{command}", "/kickchannelall").replace("{args}", "[player]"));
return;
}
VentureChatPlayer player = playerApiService.getMineverseChatPlayer(args[0]);
if (player == null) {
sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
.replace("{args}", args[0]));
sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", args[0]));
return;
}
boolean isThereABungeeChannel = false;
@ -46,8 +48,7 @@ public class Kickchannelall implements VentureCommand {
}
}
player.clearListening();
sender.sendMessage(LocalizedMessage.KICK_CHANNEL_ALL_SENDER.toString()
.replace("{player}", player.getName()));
sender.sendMessage(LocalizedMessage.KICK_CHANNEL_ALL_SENDER.toString().replace("{player}", player.getName()));
player.addListening(configService.getDefaultChannel().getName());
player.setCurrentChannel(configService.getDefaultChannel());
if (configService.getDefaultChannel().getBungee()) {
@ -59,8 +60,8 @@ public class Kickchannelall implements VentureCommand {
if (player.isOnline()) {
player.getPlayer().sendMessage(LocalizedMessage.KICK_CHANNEL_ALL_PLAYER.toString());
player.getPlayer().sendMessage(LocalizedMessage.MUST_LISTEN_ONE_CHANNEL.toString());
player.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString()
.replace("{channel_color}", ChatColor.valueOf(configService.getDefaultColor().toUpperCase()) + "")
player.getPlayer()
.sendMessage(LocalizedMessage.SET_CHANNEL.toString().replace("{channel_color}", ChatColor.valueOf(configService.getDefaultColor().toUpperCase()) + "")
.replace("{channel_name}", configService.getDefaultChannel().getName()));
} else {
player.setModified(true);

32
src/main/java/venture/Aust1n46/chat/controllers/commands/Leave.java
View File

@ -1,8 +1,6 @@
package venture.Aust1n46.chat.controllers.commands;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.google.inject.Inject;
@ -10,12 +8,12 @@ import com.google.inject.Inject;
import venture.Aust1n46.chat.controllers.PluginMessageController;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.ChatChannel;
import venture.Aust1n46.chat.model.PlayerCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.ConfigService;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class Leave implements VentureCommand {
public class Leave extends PlayerCommand {
@Inject
private PluginMessageController pluginMessageController;
@Inject
@ -23,24 +21,22 @@ public class Leave implements VentureCommand {
@Inject
private ConfigService configService;
@Override
public void execute(CommandSender sender, String command, String[] args) {
if (!(sender instanceof Player)) {
Bukkit.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return;
@Inject
public Leave(String name) {
super(name);
}
@Override
public void executeCommand(Player sender, String command, String[] args) {
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer((Player) sender);
if (args.length > 0) {
ChatChannel channel = configService.getChannel(args[0]);
if (channel == null) {
mcp.getPlayer().sendMessage(LocalizedMessage.INVALID_CHANNEL.toString()
.replace("{args}", args[0]));
mcp.getPlayer().sendMessage(LocalizedMessage.INVALID_CHANNEL.toString().replace("{args}", args[0]));
return;
}
mcp.removeListening(channel.getName());
mcp.getPlayer().sendMessage(LocalizedMessage.LEAVE_CHANNEL.toString()
.replace("{channel_color}", channel.getColor() + "")
.replace("{channel_name}", channel.getName()));
mcp.getPlayer().sendMessage(LocalizedMessage.LEAVE_CHANNEL.toString().replace("{channel_color}", channel.getColor() + "").replace("{channel_name}", channel.getName()));
boolean isThereABungeeChannel = channel.getBungee();
if (mcp.getListening().size() == 0) {
mcp.addListening(configService.getDefaultChannel().getName());
@ -49,8 +45,8 @@ public class Leave implements VentureCommand {
isThereABungeeChannel = true;
}
mcp.getPlayer().sendMessage(LocalizedMessage.MUST_LISTEN_ONE_CHANNEL.toString());
mcp.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString()
.replace("{channel_color}", ChatColor.valueOf(configService.getDefaultColor().toUpperCase()) + "")
mcp.getPlayer()
.sendMessage(LocalizedMessage.SET_CHANNEL.toString().replace("{channel_color}", ChatColor.valueOf(configService.getDefaultColor().toUpperCase()) + "")
.replace("{channel_name}", configService.getDefaultChannel().getName()));
}
if (isThereABungeeChannel) {
@ -58,8 +54,6 @@ public class Leave implements VentureCommand {
}
return;
}
mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()
.replace("{command}", "/leave")
.replace("{args}", "[channel]"));
mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString().replace("{command}", "/leave").replace("{args}", "[channel]"));
}
}

31
src/main/java/venture/Aust1n46/chat/controllers/commands/Listen.java
View File

@ -1,7 +1,5 @@
package venture.Aust1n46.chat.controllers.commands;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.google.inject.Inject;
@ -9,12 +7,12 @@ import com.google.inject.Inject;
import venture.Aust1n46.chat.controllers.PluginMessageController;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.ChatChannel;
import venture.Aust1n46.chat.model.PlayerCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.ConfigService;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class Listen implements VentureCommand {
public class Listen extends PlayerCommand {
@Inject
private PluginMessageController pluginMessageController;
@Inject
@ -22,18 +20,18 @@ public class Listen implements VentureCommand {
@Inject
private ConfigService configService;
@Override
public void execute(CommandSender sender, String command, String[] args) {
if (!(sender instanceof Player)) {
Bukkit.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return;
@Inject
public Listen(String name) {
super(name);
}
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer((Player) sender);
@Override
public void executeCommand(Player player, String command, String[] args) {
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer(player);
if (args.length > 0) {
ChatChannel channel = configService.getChannel(args[0]);
if (channel == null) {
mcp.getPlayer().sendMessage(LocalizedMessage.INVALID_CHANNEL.toString()
.replace("{args}", args[0]));
mcp.getPlayer().sendMessage(LocalizedMessage.INVALID_CHANNEL.toString().replace("{args}", args[0]));
return;
}
if (channel.hasPermission()) {
@ -44,16 +42,13 @@ public class Listen implements VentureCommand {
}
}
mcp.addListening(channel.getName());
mcp.getPlayer().sendMessage(LocalizedMessage.LISTEN_CHANNEL.toString()
.replace("{channel_color}", channel.getColor() + "")
.replace("{channel_name}", channel.getName()));
mcp.getPlayer()
.sendMessage(LocalizedMessage.LISTEN_CHANNEL.toString().replace("{channel_color}", channel.getColor() + "").replace("{channel_name}", channel.getName()));
if (channel.getBungee()) {
pluginMessageController.synchronize(mcp, true);
}
return;
}
mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()
.replace("{command}", "/listen")
.replace("{args}", "[channel]"));
mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString().replace("{command}", "/listen").replace("{args}", "[channel]"));
}
}

17
src/main/java/venture/Aust1n46/chat/controllers/commands/Me.java
View File

@ -6,20 +6,25 @@ import org.bukkit.entity.Player;
import com.google.inject.Inject;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.model.UniversalCommand;
import venture.Aust1n46.chat.service.VentureChatFormatService;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
import venture.Aust1n46.chat.utilities.FormatUtils;
import venture.Aust1n46.chat.service.VentureChatFormatService;
public class Me implements VentureCommand {
public class Me extends UniversalCommand {
@Inject
private VentureChatFormatService formatService;
@Inject
private VentureChatPlayerApiService playerApiService;
@Inject
public Me(String name) {
super(name);
}
@SuppressWarnings("deprecation")
@Override
public void execute(CommandSender sender, String command, String[] args) {
public void executeCommand(CommandSender sender, String command, String[] args) {
if (sender.hasPermission("venturechat.me")) {
if (args.length > 0) {
String msg = "";
@ -44,9 +49,7 @@ public class Me implements VentureCommand {
formatService.broadcastToServer("* " + sender.getName() + msg);
return;
}
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()
.replace("{command}", "/me")
.replace("{args}", "[message]"));
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString().replace("{command}", "/me").replace("{args}", "[message]"));
return;
}
sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString());

219
src/main/java/venture/Aust1n46/chat/controllers/commands/Message.java Normal file
View File

@ -0,0 +1,219 @@
package venture.Aust1n46.chat.controllers.commands;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import com.google.inject.Inject;
import me.clip.placeholderapi.PlaceholderAPI;
import venture.Aust1n46.chat.controllers.PluginMessageController;
import venture.Aust1n46.chat.initiators.application.VentureChat;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.PlayerCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.service.VentureChatFormatService;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
import venture.Aust1n46.chat.utilities.FormatUtils;
public class Message extends PlayerCommand {
@Inject
private VentureChat plugin;
@Inject
private VentureChatFormatService formatService;
@Inject
private PluginMessageController pluginMessageController;
@Inject
private VentureChatPlayerApiService playerApiService;
@Inject
public Message(String name) {
super(name);
}
@Override
public void executeCommand(Player sender, String command, String[] args) {
if (!(sender instanceof Player)) {
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return;
}
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer((Player) sender);
if (args.length == 0) {
mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString().replace("{command}", "/" + command).replace("{args}", "[player] [message]"));
return;
}
if (plugin.getConfig().getBoolean("bungeecordmessaging", true)) {
sendBungeeCordMessage(mcp, command, args);
return;
}
VentureChatPlayer player = playerApiService.getOnlineMineverseChatPlayer(args[0]);
if (player == null) {
mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", args[0]));
return;
}
if (!mcp.getPlayer().canSee(player.getPlayer())) {
mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", args[0]));
return;
}
if (player.getIgnores().contains(mcp.getUuid())) {
mcp.getPlayer().sendMessage(LocalizedMessage.IGNORING_MESSAGE.toString().replace("{player}", player.getName()));
return;
}
if (!player.isMessageToggle()) {
mcp.getPlayer().sendMessage(LocalizedMessage.BLOCKING_MESSAGE.toString().replace("{player}", player.getName()));
return;
}
if (args.length >= 2) {
String msg = "";
String echo = "";
String send = "";
String spy = "";
if (args[1].length() > 0) {
for (int r = 1; r < args.length; r++) {
msg += " " + args[r];
}
if (mcp.isFilter()) {
msg = formatService.FilterChat(msg);
}
if (mcp.getPlayer().hasPermission("venturechat.color.legacy")) {
msg = FormatUtils.FormatStringLegacyColor(msg);
}
if (mcp.getPlayer().hasPermission("venturechat.color")) {
msg = FormatUtils.FormatStringColor(msg);
}
if (mcp.getPlayer().hasPermission("venturechat.format")) {
msg = FormatUtils.FormatString(msg);
}
send = FormatUtils
.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatfrom").replaceAll("sender_", "")));
echo = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatto").replaceAll("sender_", "")));
spy = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatspy").replaceAll("sender_", "")));
send = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), send.replaceAll("receiver_", ""))) + msg;
echo = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), echo.replaceAll("receiver_", ""))) + msg;
spy = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), spy.replaceAll("receiver_", ""))) + msg;
player.setReplyPlayer(mcp.getUuid());
mcp.setReplyPlayer(player.getUuid());
player.getPlayer().sendMessage(send);
mcp.getPlayer().sendMessage(echo);
if (player.isNotifications()) {
formatService.playMessageSound(player);
}
if (!mcp.getPlayer().hasPermission("venturechat.spy.override")) {
for (VentureChatPlayer sp : playerApiService.getOnlineMineverseChatPlayers()) {
if (sp.getName().equals(mcp.getName()) || sp.getName().equals(player.getName())) {
continue;
}
if (sp.isSpy()) {
sp.getPlayer().sendMessage(spy);
}
}
}
}
}
if (args.length == 1) {
if (args[0].length() > 0) {
if (!mcp.hasConversation() || (mcp.hasConversation() && !mcp.getConversation().toString().equals(player.getUuid().toString()))) {
mcp.setConversation(player.getUuid());
if (!mcp.getPlayer().hasPermission("venturechat.spy.override")) {
for (VentureChatPlayer sp : playerApiService.getOnlineMineverseChatPlayers()) {
if (sp.getName().equals(mcp.getName())) {
continue;
}
if (sp.isSpy()) {
sp.getPlayer().sendMessage(LocalizedMessage.ENTER_PRIVATE_CONVERSATION_SPY.toString().replace("{player_sender}", mcp.getName())
.replace("{player_receiver}", player.getName()));
}
}
}
mcp.getPlayer().sendMessage(LocalizedMessage.ENTER_PRIVATE_CONVERSATION.toString().replace("{player_receiver}", player.getName()));
} else {
mcp.setConversation(null);
if (!mcp.getPlayer().hasPermission("venturechat.spy.override")) {
for (VentureChatPlayer sp : playerApiService.getOnlineMineverseChatPlayers()) {
if (sp.getName().equals(mcp.getName())) {
continue;
}
if (sp.isSpy()) {
sp.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION_SPY.toString().replace("{player_sender}", mcp.getName())
.replace("{player_receiver}", player.getName()));
}
}
}
mcp.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION.toString().replace("{player_receiver}", player.getName()));
}
}
}
}
@Override
public List<String> tabComplete(CommandSender sender, String alias, String[] args) {
if (plugin.getConfig().getBoolean("bungeecordmessaging", true)) {
List<String> completions = new ArrayList<>();
StringUtil.copyPartialMatches(args[args.length - 1], playerApiService.getNetworkPlayerNames(), completions);
Collections.sort(completions);
return completions;
}
return null;
}
private void sendBungeeCordMessage(VentureChatPlayer mcp, String command, String[] args) {
if (args.length < 2) {
mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString().replace("{command}", "/" + command).replace("{args}", "[player] [message]"));
return;
}
ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream();
DataOutputStream out = new DataOutputStream(byteOutStream);
StringBuilder msgBuilder = new StringBuilder();
for (int r = 1; r < args.length; r++) {
msgBuilder.append(" " + args[r]);
}
String msg = msgBuilder.toString();
if (mcp.isFilter()) {
msg = formatService.FilterChat(msg);
}
if (mcp.getPlayer().hasPermission("venturechat.color.legacy")) {
msg = FormatUtils.FormatStringLegacyColor(msg);
}
if (mcp.getPlayer().hasPermission("venturechat.color")) {
msg = FormatUtils.FormatStringColor(msg);
}
if (mcp.getPlayer().hasPermission("venturechat.format")) {
msg = FormatUtils.FormatString(msg);
}
String send = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatfrom").replaceAll("sender_", "")));
String echo = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatto").replaceAll("sender_", "")));
String spy = "VentureChat:NoSpy";
if (!mcp.getPlayer().hasPermission("venturechat.spy.override")) {
spy = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatspy").replaceAll("sender_", "")));
}
try {
out.writeUTF("Message");
out.writeUTF("Send");
out.writeUTF(args[0]);
out.writeUTF(mcp.getUuid().toString());
out.writeUTF(mcp.getName());
out.writeUTF(send);
out.writeUTF(echo);
out.writeUTF(spy);
out.writeUTF(msg);
pluginMessageController.sendPluginMessage(byteOutStream);
out.close();
} catch (Exception e) {
e.printStackTrace();
}
}
}

227
src/main/java/venture/Aust1n46/chat/controllers/commands/MessageCommandExecutor.java
View File

@ -1,227 +0,0 @@
package venture.Aust1n46.chat.controllers.commands;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.command.TabExecutor;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
import com.google.inject.Inject;
import me.clip.placeholderapi.PlaceholderAPI;
import venture.Aust1n46.chat.controllers.PluginMessageController;
import venture.Aust1n46.chat.initiators.application.VentureChat;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
import venture.Aust1n46.chat.utilities.FormatUtils;
import venture.Aust1n46.chat.service.VentureChatFormatService;
public class MessageCommandExecutor implements TabExecutor {
@Inject
private VentureChat plugin;
@Inject
private VentureChatFormatService formatService;
@Inject
private PluginMessageController pluginMessageController;
@Inject
private VentureChatPlayerApiService playerApiService;
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!(sender instanceof Player)) {
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return true;
}
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer((Player) sender);
if (args.length == 0) {
mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()
.replace("{command}", "/" + command.getName())
.replace("{args}", "[player] [message]"));
return true;
}
if (plugin.getConfig().getBoolean("bungeecordmessaging", true)) {
sendBungeeCordMessage(mcp, command.getName(), args);
return true;
}
VentureChatPlayer player = playerApiService.getOnlineMineverseChatPlayer(args[0]);
if (player == null) {
mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
.replace("{args}", args[0]));
return true;
}
if (!mcp.getPlayer().canSee(player.getPlayer())) {
mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
.replace("{args}", args[0]));
return true;
}
if (player.getIgnores().contains(mcp.getUuid())) {
mcp.getPlayer().sendMessage(LocalizedMessage.IGNORING_MESSAGE.toString()
.replace("{player}", player.getName()));
return true;
}
if (!player.isMessageToggle()) {
mcp.getPlayer().sendMessage(LocalizedMessage.BLOCKING_MESSAGE.toString()
.replace("{player}", player.getName()));
return true;
}
if (args.length >= 2) {
String msg = "";
String echo = "";
String send = "";
String spy = "";
if (args[1].length() > 0) {
for (int r = 1; r < args.length; r++) {
msg += " " + args[r];
}
if (mcp.isFilter()) {
msg = formatService.FilterChat(msg);
}
if (mcp.getPlayer().hasPermission("venturechat.color.legacy")) {
msg = FormatUtils.FormatStringLegacyColor(msg);
}
if (mcp.getPlayer().hasPermission("venturechat.color")) {
msg = FormatUtils.FormatStringColor(msg);
}
if (mcp.getPlayer().hasPermission("venturechat.format")) {
msg = FormatUtils.FormatString(msg);
}
send = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatfrom").replaceAll("sender_", "")));
echo = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatto").replaceAll("sender_", "")));
spy = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatspy").replaceAll("sender_", "")));
send = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), send.replaceAll("receiver_", ""))) + msg;
echo = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), echo.replaceAll("receiver_", ""))) + msg;
spy = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), spy.replaceAll("receiver_", ""))) + msg;
player.setReplyPlayer(mcp.getUuid());
mcp.setReplyPlayer(player.getUuid());
player.getPlayer().sendMessage(send);
mcp.getPlayer().sendMessage(echo);
if (player.isNotifications()) {
formatService.playMessageSound(player);
}
if (!mcp.getPlayer().hasPermission("venturechat.spy.override")) {
for (VentureChatPlayer sp : playerApiService.getOnlineMineverseChatPlayers()) {
if (sp.getName().equals(mcp.getName()) || sp.getName().equals(player.getName())) {
continue;
}
if (sp.isSpy()) {
sp.getPlayer().sendMessage(spy);
}
}
}
}
}
if (args.length == 1) {
if (args[0].length() > 0) {
if (!mcp.hasConversation() || (mcp.hasConversation() && !mcp.getConversation().toString().equals(player.getUuid().toString()))) {
mcp.setConversation(player.getUuid());
if (!mcp.getPlayer().hasPermission("venturechat.spy.override")) {
for (VentureChatPlayer sp : playerApiService.getOnlineMineverseChatPlayers()) {
if (sp.getName().equals(mcp.getName())) {
continue;
}
if (sp.isSpy()) {
sp.getPlayer().sendMessage(LocalizedMessage.ENTER_PRIVATE_CONVERSATION_SPY.toString()
.replace("{player_sender}", mcp.getName())
.replace("{player_receiver}", player.getName()));
}
}
}
mcp.getPlayer().sendMessage(LocalizedMessage.ENTER_PRIVATE_CONVERSATION.toString()
.replace("{player_receiver}", player.getName()));
} else {
mcp.setConversation(null);
if (!mcp.getPlayer().hasPermission("venturechat.spy.override")) {
for (VentureChatPlayer sp : playerApiService.getOnlineMineverseChatPlayers()) {
if (sp.getName().equals(mcp.getName())) {
continue;
}
if (sp.isSpy()) {
sp.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION_SPY.toString()
.replace("{player_sender}", mcp.getName())
.replace("{player_receiver}", player.getName()));
}
}
}
mcp.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION.toString()
.replace("{player_receiver}", player.getName()));
}
}
}
return true;
}
@Override
public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
if (plugin.getConfig().getBoolean("bungeecordmessaging", true)) {
List<String> completions = new ArrayList<>();
StringUtil.copyPartialMatches(args[args.length - 1], playerApiService.getNetworkPlayerNames(), completions);
Collections.sort(completions);
return completions;
}
return null;
}
private void sendBungeeCordMessage(VentureChatPlayer mcp, String command, String[] args) {
if (args.length < 2) {
mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()
.replace("{command}", "/" + command)
.replace("{args}", "[player] [message]"));
return;
}
ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream();
DataOutputStream out = new DataOutputStream(byteOutStream);
StringBuilder msgBuilder = new StringBuilder();
for (int r = 1; r < args.length; r++) {
msgBuilder.append(" " + args[r]);
}
String msg = msgBuilder.toString();
if (mcp.isFilter()) {
msg = formatService.FilterChat(msg);
}
if (mcp.getPlayer().hasPermission("venturechat.color.legacy")) {
msg = FormatUtils.FormatStringLegacyColor(msg);
}
if (mcp.getPlayer().hasPermission("venturechat.color")) {
msg = FormatUtils.FormatStringColor(msg);
}
if (mcp.getPlayer().hasPermission("venturechat.format")) {
msg = FormatUtils.FormatString(msg);
}
String send = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatfrom").replaceAll("sender_", "")));
String echo = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatto").replaceAll("sender_", "")));
String spy = "VentureChat:NoSpy";
if (!mcp.getPlayer().hasPermission("venturechat.spy.override")) {
spy = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatspy").replaceAll("sender_", "")));
}
try {
out.writeUTF("Message");
out.writeUTF("Send");
out.writeUTF(args[0]);
out.writeUTF(mcp.getUuid().toString());
out.writeUTF(mcp.getName());
out.writeUTF(send);
out.writeUTF(echo);
out.writeUTF(spy);
out.writeUTF(msg);
pluginMessageController.sendPluginMessage(byteOutStream);
out.close();
} catch (Exception e) {
e.printStackTrace();
}
}
}

19
src/main/java/venture/Aust1n46/chat/controllers/commands/MessageToggle.java
View File

@ -1,30 +1,29 @@
package venture.Aust1n46.chat.controllers.commands;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.google.inject.Inject;
import venture.Aust1n46.chat.controllers.PluginMessageController;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.PlayerCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class MessageToggle implements VentureCommand {
public class MessageToggle extends PlayerCommand {
@Inject
private PluginMessageController pluginMessageController;
@Inject
private VentureChatPlayerApiService playerApiService;
@Override
public void execute(CommandSender sender, String command, String[] args) {
if (!(sender instanceof Player)) {
Bukkit.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return;
@Inject
public MessageToggle(String name) {
super(name);
}
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer((Player) sender);
@Override
public void executeCommand(Player player, String command, String[] args) {
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer(player);
if (mcp.getPlayer().hasPermission("venturechat.messagetoggle")) {
if (!mcp.isMessageToggle()) {
mcp.setMessageToggle(true);

84
src/main/java/venture/Aust1n46/chat/controllers/commands/Mute.java
View File

@ -8,7 +8,6 @@ import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
@ -18,14 +17,14 @@ import com.google.inject.Inject;
import venture.Aust1n46.chat.controllers.PluginMessageController;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.ChatChannel;
import venture.Aust1n46.chat.model.UniversalCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.ConfigService;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
import venture.Aust1n46.chat.utilities.FormatUtils;
public class Mute implements VentureCommand {
private static final List<String> COMMON_MUTE_TIMES = Collections.unmodifiableList(Arrays.asList(new String[]{"12h", "15m", "1d", "1h", "1m", "30s"}));
public class Mute extends UniversalCommand {
private static final List<String> COMMON_MUTE_TIMES = Collections.unmodifiableList(Arrays.asList(new String[] { "12h", "15m", "1d", "1h", "1m", "30s" }));
@Inject
private PluginMessageController pluginMessageController;
@ -34,12 +33,16 @@ public class Mute implements VentureCommand {
@Inject
private ConfigService configService;
@Inject
public Mute(String name) {
super(name);
}
@Override
public void execute(CommandSender sender, String command, String[] args) {
public void executeCommand(CommandSender sender, String command, String[] args) {
if (sender.hasPermission("venturechat.mute")) {
if (args.length < 2) {
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString().replace("{command}", "/mute")
.replace("{args}", "[channel] [player] {time} {reason}"));
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString().replace("{command}", "/mute").replace("{args}", "[channel] [player] {time} {reason}"));
return;
}
if (configService.isChannel(args[0])) {
@ -75,9 +78,8 @@ public class Mute implements VentureCommand {
return;
}
if (playerToMute.isMuted(channel.getName())) {
sender.sendMessage(LocalizedMessage.PLAYER_ALREADY_MUTED.toString()
.replace("{player}", playerToMute.getName()).replace("{channel_color}", channel.getColor())
.replace("{channel_name}", channel.getName()));
sender.sendMessage(LocalizedMessage.PLAYER_ALREADY_MUTED.toString().replace("{player}", playerToMute.getName())
.replace("{channel_color}", channel.getColor()).replace("{channel_name}", channel.getName()));
return;
}
@ -85,17 +87,11 @@ public class Mute implements VentureCommand {
if (reason.isEmpty()) {
playerToMute.addMute(channel.getName(), datetime + time);
String timeString = FormatUtils.parseTimeStringFromMillis(time);
sender.sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_TIME.toString()
.replace("{player}", playerToMute.getName())
.replace("{channel_color}", channel.getColor())
.replace("{channel_name}", channel.getName())
.replace("{time}", timeString));
sender.sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_TIME.toString().replace("{player}", playerToMute.getName())
.replace("{channel_color}", channel.getColor()).replace("{channel_name}", channel.getName()).replace("{time}", timeString));
if (playerToMute.isOnline()) {
playerToMute.getPlayer()
.sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER_TIME.toString()
.replace("{channel_color}", channel.getColor())
.replace("{channel_name}", channel.getName())
.replace("{time}", timeString));
playerToMute.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER_TIME.toString().replace("{channel_color}", channel.getColor())
.replace("{channel_name}", channel.getName()).replace("{time}", timeString));
} else {
playerToMute.setModified(true);
}
@ -103,19 +99,12 @@ public class Mute implements VentureCommand {
} else {
playerToMute.addMute(channel.getName(), datetime + time, reason);
String timeString = FormatUtils.parseTimeStringFromMillis(time);
sender.sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_TIME_REASON.toString()
.replace("{player}", playerToMute.getName())
.replace("{channel_color}", channel.getColor())
.replace("{channel_name}", channel.getName())
.replace("{time}", timeString)
sender.sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_TIME_REASON.toString().replace("{player}", playerToMute.getName())
.replace("{channel_color}", channel.getColor()).replace("{channel_name}", channel.getName()).replace("{time}", timeString)
.replace("{reason}", reason));
if (playerToMute.isOnline()) {
playerToMute.getPlayer()
.sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER_TIME_REASON.toString()
.replace("{channel_color}", channel.getColor())
.replace("{channel_name}", channel.getName())
.replace("{time}", timeString)
.replace("{reason}", reason));
playerToMute.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER_TIME_REASON.toString().replace("{channel_color}", channel.getColor())
.replace("{channel_name}", channel.getName()).replace("{time}", timeString).replace("{reason}", reason));
} else {
playerToMute.setModified(true);
}
@ -124,30 +113,22 @@ public class Mute implements VentureCommand {
} else {
if (reason.isEmpty()) {
playerToMute.addMute(channel.getName());
sender.sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER.toString()
.replace("{player}", playerToMute.getName()).replace("{channel_color}", channel.getColor())
.replace("{channel_name}", channel.getName()));
sender.sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER.toString().replace("{player}", playerToMute.getName())
.replace("{channel_color}", channel.getColor()).replace("{channel_name}", channel.getName()));
if (playerToMute.isOnline()) {
playerToMute.getPlayer()
.sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER.toString()
.replace("{channel_color}", channel.getColor())
.replace("{channel_name}", channel.getName()));
playerToMute.getPlayer().sendMessage(
LocalizedMessage.MUTE_PLAYER_PLAYER.toString().replace("{channel_color}", channel.getColor()).replace("{channel_name}", channel.getName()));
} else {
playerToMute.setModified(true);
}
return;
} else {
playerToMute.addMute(channel.getName(), reason);
sender.sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_REASON.toString()
.replace("{player}", playerToMute.getName()).replace("{channel_color}", channel.getColor())
.replace("{channel_name}", channel.getName())
.replace("{reason}", reason));
sender.sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_REASON.toString().replace("{player}", playerToMute.getName())
.replace("{channel_color}", channel.getColor()).replace("{channel_name}", channel.getName()).replace("{reason}", reason));
if (playerToMute.isOnline()) {
playerToMute.getPlayer()
.sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER_REASON.toString()
.replace("{channel_color}", channel.getColor())
.replace("{channel_name}", channel.getName())
.replace("{reason}", reason));
playerToMute.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER_REASON.toString().replace("{channel_color}", channel.getColor())
.replace("{channel_name}", channel.getName()).replace("{reason}", reason));
} else {
playerToMute.setModified(true);
}
@ -155,9 +136,7 @@ public class Mute implements VentureCommand {
}
}
}
sender.sendMessage(LocalizedMessage.CHANNEL_CANNOT_MUTE.toString()
.replace("{channel_color}", channel.getColor())
.replace("{channel_name}", channel.getName()));
sender.sendMessage(LocalizedMessage.CHANNEL_CANNOT_MUTE.toString().replace("{channel_color}", channel.getColor()).replace("{channel_name}", channel.getName()));
return;
}
sender.sendMessage(LocalizedMessage.INVALID_CHANNEL.toString().replace("{args}", args[0]));
@ -167,7 +146,7 @@ public class Mute implements VentureCommand {
}
@Override
public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
public List<String> tabComplete(CommandSender sender, String alias, String[] args) {
List<String> completions = new ArrayList<>();
if (args.length == 1) {
StringUtil.copyPartialMatches(args[0], configService.getChatChannels().stream().map(ChatChannel::getName).collect(Collectors.toList()), completions);
@ -182,7 +161,8 @@ public class Mute implements VentureCommand {
Collections.sort(completions);
return completions;
}
StringUtil.copyPartialMatches(args[1], playerApiService.getOnlineMineverseChatPlayers().stream().filter(mcp -> !mcp.isMuted(chatChannelObj.getName())).map(VentureChatPlayer::getName).collect(Collectors.toList()), completions);
StringUtil.copyPartialMatches(args[1], playerApiService.getOnlineMineverseChatPlayers().stream().filter(mcp -> !mcp.isMuted(chatChannelObj.getName()))
.map(VentureChatPlayer::getName).collect(Collectors.toList()), completions);
Collections.sort(completions);
return completions;
}

28
src/main/java/venture/Aust1n46/chat/controllers/commands/Muteall.java
View File

@ -7,13 +7,13 @@ import com.google.inject.Inject;
import venture.Aust1n46.chat.controllers.PluginMessageController;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.ChatChannel;
import venture.Aust1n46.chat.model.UniversalCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.ConfigService;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
import venture.Aust1n46.chat.utilities.FormatUtils;
public class Muteall implements VentureCommand {
public class Muteall extends UniversalCommand {
@Inject
private PluginMessageController pluginMessageController;
@Inject
@ -21,19 +21,21 @@ public class Muteall implements VentureCommand {
@Inject
private ConfigService configService;
@Inject
public Muteall(String name) {
super(name);
}
@Override
public void execute(CommandSender sender, String command, String[] args) {
public void executeCommand(CommandSender sender, String command, String[] args) {
if (sender.hasPermission("venturechat.mute")) {
if (args.length < 1) {
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()
.replace("{command}", "/muteall")
.replace("{args}", "[player] {reason}"));
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString().replace("{command}", "/muteall").replace("{args}", "[player] {reason}"));
return;
}
VentureChatPlayer player = playerApiService.getMineverseChatPlayer(args[0]);
if (player == null || (!player.isOnline() && !sender.hasPermission("venturechat.mute.offline"))) {
sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
.replace("{args}", args[0]));
sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", args[0]));
return;
}
String reason = "";
@ -57,8 +59,7 @@ public class Muteall implements VentureCommand {
if (bungee) {
pluginMessageController.synchronize(player, true);
}
sender.sendMessage(LocalizedMessage.MUTE_PLAYER_ALL_SENDER.toString()
.replace("{player}", player.getName()));
sender.sendMessage(LocalizedMessage.MUTE_PLAYER_ALL_SENDER.toString().replace("{player}", player.getName()));
if (player.isOnline()) {
player.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_ALL_PLAYER.toString());
} else
@ -77,12 +78,9 @@ public class Muteall implements VentureCommand {
if (bungee) {
pluginMessageController.synchronize(player, true);
}
sender.sendMessage(LocalizedMessage.MUTE_PLAYER_ALL_SENDER_REASON.toString()
.replace("{player}", player.getName())
.replace("{reason}", reason));
sender.sendMessage(LocalizedMessage.MUTE_PLAYER_ALL_SENDER_REASON.toString().replace("{player}", player.getName()).replace("{reason}", reason));
if (player.isOnline()) {
player.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_ALL_PLAYER_REASON.toString()
.replace("{reason}", reason));
player.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_ALL_PLAYER_REASON.toString().replace("{reason}", reason));
} else
player.setModified(true);
return;

18
src/main/java/venture/Aust1n46/chat/controllers/commands/Notifications.java
View File

@ -1,28 +1,26 @@
package venture.Aust1n46.chat.controllers.commands;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.google.inject.Inject;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.PlayerCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class Notifications implements VentureCommand {
public class Notifications extends PlayerCommand {
@Inject
private VentureChatPlayerApiService playerApiService;
@Override
public void execute(CommandSender sender, String command, String[] args) {
if (!(sender instanceof Player)) {
Bukkit.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return;
@Inject
public Notifications(String name) {
super(name);
}
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer((Player) sender);
@Override
public void executeCommand(Player player, String command, String[] args) {
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer(player);
if (!mcp.isNotifications()) {
mcp.setNotifications(true);
mcp.getPlayer().sendMessage(LocalizedMessage.NOTIFICATIONS_ON.toString());

221
src/main/java/venture/Aust1n46/chat/controllers/commands/Party.java
View File

@ -3,19 +3,18 @@ package venture.Aust1n46.chat.controllers.commands;
import static venture.Aust1n46.chat.utilities.FormatUtils.LINE_LENGTH;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.google.inject.Inject;
import venture.Aust1n46.chat.initiators.application.VentureChat;
import venture.Aust1n46.chat.model.PlayerCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.VentureChatFormatService;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
import venture.Aust1n46.chat.utilities.FormatUtils;
public class Party implements VentureCommand {
public class Party extends PlayerCommand {
@Inject
private VentureChat plugin;
@Inject
@ -23,34 +22,34 @@ public class Party implements VentureCommand {
@Inject
private VentureChatPlayerApiService playerApiService;
@Override
public void execute(CommandSender sender, String command, String[] args) {
if(!(sender instanceof Player)) {
plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player.");
return;
@Inject
public Party(String name) {
super(name);
}
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer((Player) sender);
if(!mcp.getPlayer().hasPermission("venturechat.party")) {
@Override
public void executeCommand(Player sender, String command, String[] args) {
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer(sender);
if (!mcp.getPlayer().hasPermission("venturechat.party")) {
mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command!");
return;
}
try {
switch(args[0]) {
switch (args[0]) {
case "host": {
if(!mcp.getPlayer().hasPermission("venturechat.party.host")) {
if (!mcp.getPlayer().hasPermission("venturechat.party.host")) {
mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command!");
return;
}
if(mcp.isHost()) {
if (mcp.isHost()) {
mcp.setHost(false);
mcp.getPlayer().sendMessage(ChatColor.GREEN + "You are no longer hosting a party.");
for(VentureChatPlayer player : playerApiService.getMineverseChatPlayers()) {
if(player.hasParty() && player.getParty().equals(mcp.getParty())) {
for (VentureChatPlayer player : playerApiService.getMineverseChatPlayers()) {
if (player.hasParty() && player.getParty().equals(mcp.getParty())) {
player.setParty(null);
if(player.isOnline()) {
if (player.isOnline()) {
player.getPlayer().sendMessage(ChatColor.RED + mcp.getName() + " is no longer hosting a party.");
}
else {
} else {
player.setModified(true);
}
}
@ -64,21 +63,19 @@ public class Party implements VentureCommand {
break;
}
case "join": {
if(!mcp.getPlayer().hasPermission("venturechat.party.join")) {
if (!mcp.getPlayer().hasPermission("venturechat.party.join")) {
mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command!");
return;
}
if(args.length > 1) {
if (args.length > 1) {
VentureChatPlayer player = playerApiService.getMineverseChatPlayer(args[1]);
if(player != null) {
if(player.isHost()) {
if(!mcp.hasParty()) {
if (player != null) {
if (player.isHost()) {
if (!mcp.hasParty()) {
/*
* if(plugin.getMetadata(player,
* "MineverseChat.party.ban." + tp.getName(),
* plugin)) { player.sendMessage(ChatColor.RED +
* "You are banned from " + tp.getName() +
* "'s party."); break; }
* if(plugin.getMetadata(player, "MineverseChat.party.ban." + tp.getName(),
* plugin)) { player.sendMessage(ChatColor.RED + "You are banned from " +
* tp.getName() + "'s party."); break; }
*/
mcp.getPlayer().sendMessage(ChatColor.GREEN + "Joined " + player.getName() + "'s party.");
mcp.setParty(player.getUuid());
@ -98,21 +95,20 @@ public class Party implements VentureCommand {
break;
}
case "leave": {
if(!mcp.getPlayer().hasPermission("venturechat.party.leave")) {
if (!mcp.getPlayer().hasPermission("venturechat.party.leave")) {
mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command!");
return;
}
if(mcp.hasParty()) {
if (mcp.hasParty()) {
mcp.getPlayer().sendMessage(ChatColor.GREEN + "Leaving " + playerApiService.getMineverseChatPlayer(mcp.getParty()).getName() + "'s party.");
mcp.setParty(null);
if(mcp.isHost()) {
for(VentureChatPlayer player : playerApiService.getMineverseChatPlayers()) {
if(player.hasParty() && player.getParty().equals(mcp.getUuid()) && !player.getName().equals(mcp.getName())) {
if (mcp.isHost()) {
for (VentureChatPlayer player : playerApiService.getMineverseChatPlayers()) {
if (player.hasParty() && player.getParty().equals(mcp.getUuid()) && !player.getName().equals(mcp.getName())) {
player.setParty(null);
if(player.isOnline()) {
if (player.isOnline()) {
player.getPlayer().sendMessage(ChatColor.RED + mcp.getName() + " is no longer hosting a party.");
}
else {
} else {
player.setModified(true);
}
}
@ -125,16 +121,16 @@ public class Party implements VentureCommand {
break;
}
case "kick": {
if(!mcp.getPlayer().hasPermission("venturechat.party.kick")) {
if (!mcp.getPlayer().hasPermission("venturechat.party.kick")) {
mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command!");
return;
}
if(mcp.isHost()) {
if(args.length > 1) {
if (mcp.isHost()) {
if (args.length > 1) {
VentureChatPlayer player = playerApiService.getMineverseChatPlayer(args[1]);
if(player != null) {
if(!player.getName().equals(mcp.getName())) {
if(player.hasParty() && player.getParty().equals(mcp.getUuid())) {
if (player != null) {
if (!player.getName().equals(mcp.getName())) {
if (player.hasParty() && player.getParty().equals(mcp.getUuid())) {
player.setParty(null);
player.getPlayer().sendMessage(ChatColor.RED + "You have been kicked out of " + mcp.getName() + "'s party.");
mcp.getPlayer().sendMessage(ChatColor.RED + "You have kicked " + player.getName() + " out of your party.");
@ -156,59 +152,49 @@ public class Party implements VentureCommand {
break;
}
/*
* case "ban": { if(mcp.isHost()) { if(args.length > 1) { Player tp
* = Bukkit.getPlayer(args[1]); if(tp != null) {
* if(!tp.getName().equals(player.getName())) {
* tp.setMetadata("MineverseChat.party.ban." +
* player.getUniqueId().toString(), new FixedMetadataValue(plugin,
* true)); if(plugin.getMetadataString(tp, "MineverseChat.party",
* plugin).equals(plugin.getMetadataString(player,
* "MineverseChat.party", plugin))) {
* tp.setMetadata("MineverseChat.party", new
* FixedMetadataValue(plugin, "")); } tp.sendMessage(ChatColor.RED +
* "You have been banned from " + player.getName() + "'s party.");
* player.sendMessage(ChatColor.RED + "You have banned " +
* tp.getName() + " from your party."); break; }
* player.sendMessage(ChatColor.RED + "You cannot ban yourself.");
* break; } player.sendMessage(ChatColor.RED + "Player: " +
* ChatColor.GOLD + args[1] + ChatColor.RED + " is not online.");
* break; } player.sendMessage(ChatColor.RED +
* "Invalid command: /party ban [playername]"); break; }
* player.sendMessage(ChatColor.RED +
* "You are not hosting a party."); break; } case "unban": {
* if(plugin.getMetadata(player, "MineverseChat.party.host",
* plugin)) { if(args.length > 1) { Player tp =
* case "ban": { if(mcp.isHost()) { if(args.length > 1) { Player tp =
* Bukkit.getPlayer(args[1]); if(tp != null) {
* if(!tp.getName().equals(player.getName())) {
* tp.setMetadata("MineverseChat.party.ban." + player.getUniqueId(),
* new FixedMetadataValue(plugin, false));
* tp.sendMessage(ChatColor.RED + "You have been unbanned from " +
* player.getName() + "'s party."); player.sendMessage(ChatColor.RED
* + "You have unbanned " + tp.getName() + " from your party.");
* tp.setMetadata("MineverseChat.party.ban." + player.getUniqueId().toString(),
* new FixedMetadataValue(plugin, true)); if(plugin.getMetadataString(tp,
* "MineverseChat.party", plugin).equals(plugin.getMetadataString(player,
* "MineverseChat.party", plugin))) { tp.setMetadata("MineverseChat.party", new
* FixedMetadataValue(plugin, "")); } tp.sendMessage(ChatColor.RED +
* "You have been banned from " + player.getName() + "'s party.");
* player.sendMessage(ChatColor.RED + "You have banned " + tp.getName() +
* " from your party."); break; } player.sendMessage(ChatColor.RED +
* "You cannot ban yourself."); break; } player.sendMessage(ChatColor.RED +
* "Player: " + ChatColor.GOLD + args[1] + ChatColor.RED + " is not online.");
* break; } player.sendMessage(ChatColor.RED +
* "Invalid command: /party ban [playername]"); break; }
* player.sendMessage(ChatColor.RED + "You are not hosting a party."); break; }
* case "unban": { if(plugin.getMetadata(player, "MineverseChat.party.host",
* plugin)) { if(args.length > 1) { Player tp = Bukkit.getPlayer(args[1]); if(tp
* != null) { if(!tp.getName().equals(player.getName())) {
* tp.setMetadata("MineverseChat.party.ban." + player.getUniqueId(), new
* FixedMetadataValue(plugin, false)); tp.sendMessage(ChatColor.RED +
* "You have been unbanned from " + player.getName() + "'s party.");
* player.sendMessage(ChatColor.RED + "You have unbanned " + tp.getName() +
* " from your party."); break; } player.sendMessage(ChatColor.RED +
* "You cannot unban yourself."); break; } player.sendMessage(ChatColor.RED +
* "Player: " + ChatColor.GOLD + args[1] + ChatColor.RED + " is not online.");
* break; } player.sendMessage(ChatColor.RED +
* "You cannot unban yourself."); break; }
* player.sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD +
* args[1] + ChatColor.RED + " is not online."); break; }
* player.sendMessage(ChatColor.RED +
* "Invalid command: /party unban [playername]"); break; }
* player.sendMessage(ChatColor.RED +
* "You are not hosting a party."); break; }
* player.sendMessage(ChatColor.RED + "You are not hosting a party."); break; }
*/
case "info": {
if(!mcp.getPlayer().hasPermission("venturechat.party.info")) {
if (!mcp.getPlayer().hasPermission("venturechat.party.info")) {
mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command!");
return;
}
if(mcp.hasParty() && !mcp.isHost()) {
if (mcp.hasParty() && !mcp.isHost()) {
mcp.getPlayer().sendMessage(ChatColor.GREEN + "You are in " + playerApiService.getMineverseChatPlayer(mcp.getParty()).getName() + "'s party.");
}
else if(mcp.isHost()) {
} else if (mcp.isHost()) {
mcp.getPlayer().sendMessage(ChatColor.GREEN + "You are hosting a party.");
}
else {
} else {
mcp.getPlayer().sendMessage(ChatColor.RED + "You are not hosting a party and you are not in a party.");
}
if(mcp.isPartyChat()) {
if (mcp.isPartyChat()) {
mcp.getPlayer().sendMessage(ChatColor.GREEN + "Party chat on.");
break;
}
@ -216,20 +202,20 @@ public class Party implements VentureCommand {
break;
}
case "chat": {
if(!mcp.getPlayer().hasPermission("venturechat.party.chat")) {
if (!mcp.getPlayer().hasPermission("venturechat.party.chat")) {
mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command!");
return;
}
if(mcp.isPartyChat()) {
if (mcp.isPartyChat()) {
mcp.setPartyChat(false);
mcp.getPlayer().sendMessage(ChatColor.GREEN + "Toggled party chat off.");
break;
}
if(mcp.hasConversation()) {
if (mcp.hasConversation()) {
String tellChat = playerApiService.getMineverseChatPlayer(mcp.getConversation()).getName();
mcp.setConversation(null);
for(VentureChatPlayer p : playerApiService.getOnlineMineverseChatPlayers()) {
if(p.isSpy()) {
for (VentureChatPlayer p : playerApiService.getOnlineMineverseChatPlayers()) {
if (p.isSpy()) {
p.getPlayer().sendMessage(mcp.getName() + " is no longer in a private conversation with " + tellChat + ".");
}
}
@ -240,39 +226,39 @@ public class Party implements VentureCommand {
break;
}
case "help": {
if(!mcp.getPlayer().hasPermission("venturechat.party.help")) {
if (!mcp.getPlayer().hasPermission("venturechat.party.help")) {
mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command!");
return;
}
mcp.getPlayer().sendMessage(ChatColor.GREEN + "/party host\n/party join [player]\n/party leave\n/party kick [player]\n/party ban [player]\n/party unban [player]\n/party info\n/party members [player]\n/party chat\n/party help");
mcp.getPlayer().sendMessage(ChatColor.GREEN
+ "/party host\n/party join [player]\n/party leave\n/party kick [player]\n/party ban [player]\n/party unban [player]\n/party info\n/party members [player]\n/party chat\n/party help");
break;
}
case "members": {
if(!mcp.getPlayer().hasPermission("venturechat.party.members")) {
if (!mcp.getPlayer().hasPermission("venturechat.party.members")) {
mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command!");
return;
}
if(args.length > 1) {
if (args.length > 1) {
VentureChatPlayer player = playerApiService.getMineverseChatPlayer(args[1]);
if(player != null) {
if(player.isHost()) {
if (player != null) {
if (player.isHost()) {
String members = "";
long linecount = LINE_LENGTH;
for(VentureChatPlayer p : playerApiService.getMineverseChatPlayers()) {
if(p.getParty() != null && p.getParty().equals(player.getUuid())) {
if(members.length() + p.getName().length() > linecount) {
for (VentureChatPlayer p : playerApiService.getMineverseChatPlayers()) {
if (p.getParty() != null && p.getParty().equals(player.getUuid())) {
if (members.length() + p.getName().length() > linecount) {
members += "\n";
linecount = linecount + LINE_LENGTH;
}
if(p.isOnline()) {
if (p.isOnline()) {
members += ChatColor.GREEN + p.getName() + ChatColor.WHITE + ", ";
}
else {
} else {
members += ChatColor.RED + p.getName() + ChatColor.WHITE + ", ";
}
}
}
if(members.length() > 2) {
if (members.length() > 2) {
members = members.substring(0, members.length() - 2);
}
mcp.getPlayer().sendMessage(ChatColor.GREEN + "Members in " + player.getName() + "'s party: " + members);
@ -288,34 +274,36 @@ public class Party implements VentureCommand {
break;
}
}
if(args[0].length() > 0) {
if(!args[0].equals("host") && !args[0].equals("join") && !args[0].equals("leave") && !args[0].equals("kick") && !args[0].equals("info") && !args[0].equals("chat") && !args[0].equals("help") && !args[0].equals("members") && !args[0].equals("ban") && !args[0].equals("unban")) {
if(mcp.hasParty()) {
if (args[0].length() > 0) {
if (!args[0].equals("host") && !args[0].equals("join") && !args[0].equals("leave") && !args[0].equals("kick") && !args[0].equals("info") && !args[0].equals("chat")
&& !args[0].equals("help") && !args[0].equals("members") && !args[0].equals("ban") && !args[0].equals("unban")) {
if (mcp.hasParty()) {
String msg = "";
String partyformat = "";
for(int x = 0; x < args.length; x++) {
if(args[x].length() > 0) msg += " " + args[x];
for (int x = 0; x < args.length; x++) {
if (args[x].length() > 0)
msg += " " + args[x];
}
if(mcp.isFilter()) {
if (mcp.isFilter()) {
msg = formatService.FilterChat(msg);
}
if(mcp.getPlayer().hasPermission("venturechat.color.legacy")) {
if (mcp.getPlayer().hasPermission("venturechat.color.legacy")) {
msg = FormatUtils.FormatStringLegacyColor(msg);
}
if(mcp.getPlayer().hasPermission("venturechat.color")) {
if (mcp.getPlayer().hasPermission("venturechat.color")) {
msg = FormatUtils.FormatStringColor(msg);
}
if(mcp.getPlayer().hasPermission("venturechat.format")) {
if (mcp.getPlayer().hasPermission("venturechat.format")) {
msg = FormatUtils.FormatString(msg);
}
if(plugin.getConfig().getString("partyformat").equalsIgnoreCase("Default")) {
if (plugin.getConfig().getString("partyformat").equalsIgnoreCase("Default")) {
partyformat = ChatColor.GREEN + "[" + playerApiService.getMineverseChatPlayer(mcp.getParty()).getName() + "'s Party] " + mcp.getName() + ":" + msg;
} else {
partyformat = FormatUtils.FormatStringAll(plugin.getConfig().getString("partyformat")
.replace("{host}", playerApiService.getMineverseChatPlayer(mcp.getParty()).getName()).replace("{player}", mcp.getName())) + msg;
}
else {
partyformat = FormatUtils.FormatStringAll(plugin.getConfig().getString("partyformat").replace("{host}", playerApiService.getMineverseChatPlayer(mcp.getParty()).getName()).replace("{player}", mcp.getName())) + msg;
}
for(VentureChatPlayer p : playerApiService.getOnlineMineverseChatPlayers()) {
if((p.getParty().equals(mcp.getParty()) || p.isSpy())) {
for (VentureChatPlayer p : playerApiService.getOnlineMineverseChatPlayers()) {
if ((p.getParty().equals(mcp.getParty()) || p.isSpy())) {
p.getPlayer().sendMessage(partyformat);
}
}
@ -324,8 +312,7 @@ public class Party implements VentureCommand {
mcp.getPlayer().sendMessage(ChatColor.RED + "You are not in a party.");
}
}
}
catch(Exception e) {
} catch (Exception e) {
mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid arguments, /party help");
}
return;

27
src/main/java/venture/Aust1n46/chat/controllers/commands/RangedSpy.java
View File

@ -1,27 +1,26 @@
package venture.Aust1n46.chat.controllers.commands;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.google.inject.Inject;
public class RangedSpy implements VentureCommand {
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.PlayerCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class RangedSpy extends PlayerCommand {
@Inject
private VentureChatPlayerApiService playerApiService;
@Override
public void execute(CommandSender sender, String command, String[] args) {
if (!(sender instanceof Player)) {
Bukkit.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return;
@Inject
public RangedSpy(String name) {
super(name);
}
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer((Player) sender);
@Override
public void executeCommand(Player player, String command, String[] args) {
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer((Player) player);
if (mcp.getPlayer().hasPermission("venturechat.rangedspy")) {
if (!mcp.getRangedSpy()) {
mcp.setRangedSpy(true);

37
src/main/java/venture/Aust1n46/chat/controllers/commands/Removemessage.java
View File

@ -20,14 +20,14 @@ import venture.Aust1n46.chat.controllers.PluginMessageController;
import venture.Aust1n46.chat.initiators.application.VentureChat;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.ChatMessage;
import venture.Aust1n46.chat.model.UniversalCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.ConfigService;
import venture.Aust1n46.chat.service.VentureChatFormatService;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
import venture.Aust1n46.chat.utilities.FormatUtils;
public class Removemessage implements VentureCommand {
public class Removemessage extends UniversalCommand {
@Inject
private VentureChat plugin;
@Inject
@ -42,19 +42,25 @@ public class Removemessage implements VentureCommand {
private PacketContainer emptyLinePacketContainer;
private WrappedChatComponent messageDeletedComponentPlayer;
@Inject
public Removemessage(String name) {
super(name);
}
@Inject
public void postConstruct() {
emptyLinePacketContainer = formatService.createPacketPlayOutChat("{\"extra\":[\" \"],\"text\":\"\"}");
messageDeletedComponentPlayer = WrappedChatComponent.fromJson("{\"text\":\"\",\"extra\":[{\"text\":\"\",\"extra\":[" + formatService.convertToJsonColors(FormatUtils.FormatStringAll(plugin.getConfig().getString("messageremovertext"))) + "],\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[" + formatService.convertToJsonColors(FormatUtils.FormatStringAll(plugin.getConfig().getString("messageremoverpermissions"))) + "]}}}]}");
messageDeletedComponentPlayer = WrappedChatComponent.fromJson("{\"text\":\"\",\"extra\":[{\"text\":\"\",\"extra\":["
+ formatService.convertToJsonColors(FormatUtils.FormatStringAll(plugin.getConfig().getString("messageremovertext")))
+ "],\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":["
+ formatService.convertToJsonColors(FormatUtils.FormatStringAll(plugin.getConfig().getString("messageremoverpermissions"))) + "]}}}]}");
}
@Override
@SuppressWarnings({"unchecked", "rawtypes"})
public void execute(CommandSender sender, String command, String[] args) {
@SuppressWarnings({ "unchecked", "rawtypes" })
public void executeCommand(CommandSender sender, String command, String[] args) {
if (args.length == 0) {
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()
.replace("{command}", "/removemessage")
.replace("{args}", "[hashcode] {channel}"));
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString().replace("{command}", "/removemessage").replace("{args}", "[hashcode] {channel}"));
return;
}
final int hash;
@ -89,7 +95,9 @@ public class Removemessage implements VentureCommand {
}
for (ChatMessage message : messages) {
if (message.getHash() == hash) {
WrappedChatComponent removedComponent = p.getPlayer().hasPermission("venturechat.message.bypass") ? Removemessage.this.getMessageDeletedChatComponentAdmin(message) : Removemessage.this.getMessageDeletedChatComponentPlayer();
WrappedChatComponent removedComponent = p.getPlayer().hasPermission("venturechat.message.bypass")
? Removemessage.this.getMessageDeletedChatComponentAdmin(message)
: Removemessage.this.getMessageDeletedChatComponentPlayer();
message.setComponent(removedComponent);
message.setHash(-1);
playerPackets.add(formatService.createPacketPlayOutChat(removedComponent));
@ -97,9 +105,12 @@ public class Removemessage implements VentureCommand {
continue;
}
if (message.getMessage().contains(ChatColor.stripColor(FormatUtils.FormatStringAll(plugin.getConfig().getString("guiicon"))))) {
String submessage = message.getMessage().substring(0, message.getMessage().length() - ChatColor.stripColor(FormatUtils.FormatStringAll(plugin.getConfig().getString("guiicon"))).length());
String submessage = message.getMessage().substring(0,
message.getMessage().length() - ChatColor.stripColor(FormatUtils.FormatStringAll(plugin.getConfig().getString("guiicon"))).length());
if (submessage.hashCode() == hash) {
WrappedChatComponent removedComponent = p.getPlayer().hasPermission("venturechat.message.bypass") ? Removemessage.this.getMessageDeletedChatComponentAdmin(message) : Removemessage.this.getMessageDeletedChatComponentPlayer();
WrappedChatComponent removedComponent = p.getPlayer().hasPermission("venturechat.message.bypass")
? Removemessage.this.getMessageDeletedChatComponentAdmin(message)
: Removemessage.this.getMessageDeletedChatComponentPlayer();
message.setComponent(removedComponent);
message.setHash(-1);
playerPackets.add(formatService.createPacketPlayOutChat(removedComponent));
@ -134,6 +145,8 @@ public class Removemessage implements VentureCommand {
}
public WrappedChatComponent getMessageDeletedChatComponentAdmin(ChatMessage message) {
return WrappedChatComponent.fromJson("[{\"text\":\"\",\"extra\":[{\"text\":\"\",\"extra\":[" + formatService.convertToJsonColors(FormatUtils.FormatStringAll(plugin.getConfig().getString("messageremovertext"))) + "],\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\"," + message.getColoredMessage() + "}}}]}]");
return WrappedChatComponent.fromJson("[{\"text\":\"\",\"extra\":[{\"text\":\"\",\"extra\":["
+ formatService.convertToJsonColors(FormatUtils.FormatStringAll(plugin.getConfig().getString("messageremovertext")))
+ "],\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\"," + message.getColoredMessage() + "}}}]}]");
}
}

38
src/main/java/venture/Aust1n46/chat/controllers/commands/Reply.java
View File

@ -3,7 +3,6 @@ package venture.Aust1n46.chat.controllers.commands;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.google.inject.Inject;
@ -12,13 +11,13 @@ import me.clip.placeholderapi.PlaceholderAPI;
import venture.Aust1n46.chat.controllers.PluginMessageController;
import venture.Aust1n46.chat.initiators.application.VentureChat;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.PlayerCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.VentureChatFormatService;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
import venture.Aust1n46.chat.utilities.FormatUtils;
import venture.Aust1n46.chat.service.VentureChatFormatService;
public class Reply implements VentureCommand {
public class Reply extends PlayerCommand {
@Inject
private VentureChat plugin;
@Inject
@ -28,13 +27,18 @@ public class Reply implements VentureCommand {
@Inject
private VentureChatPlayerApiService playerApiService;
@Inject
public Reply(String name) {
super(name);
}
@Override
public void execute(CommandSender sender, String command, String[] args) {
public void executeCommand(Player sender, String command, String[] args) {
if (!(sender instanceof Player)) {
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return;
}
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer((Player) sender);
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer(sender);
if (args.length > 0) {
if (mcp.hasReplyPlayer()) {
if (plugin.getConfig().getBoolean("bungeecordmessaging", true)) {
@ -52,13 +56,11 @@ public class Reply implements VentureCommand {
return;
}
if (player.getIgnores().contains(mcp.getUuid())) {
mcp.getPlayer().sendMessage(LocalizedMessage.IGNORING_MESSAGE.toString()
.replace("{player}", player.getName()));
mcp.getPlayer().sendMessage(LocalizedMessage.IGNORING_MESSAGE.toString().replace("{player}", player.getName()));
return;
}
if (!player.isMessageToggle()) {
mcp.getPlayer().sendMessage(LocalizedMessage.BLOCKING_MESSAGE.toString()
.replace("{player}", player.getName()));
mcp.getPlayer().sendMessage(LocalizedMessage.BLOCKING_MESSAGE.toString().replace("{player}", player.getName()));
return;
}
String msg = "";
@ -81,9 +83,12 @@ public class Reply implements VentureCommand {
msg = FormatUtils.FormatString(msg);
}
send = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatfrom").replaceAll("sender_", "")));
echo = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatto").replaceAll("sender_", "")));
spy = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatspy").replaceAll("sender_", "")));
send = FormatUtils
.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatfrom").replaceAll("sender_", "")));
echo = FormatUtils
.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatto").replaceAll("sender_", "")));
spy = FormatUtils
.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatspy").replaceAll("sender_", "")));
send = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), send.replaceAll("receiver_", ""))) + msg;
echo = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), echo.replaceAll("receiver_", ""))) + msg;
@ -111,9 +116,7 @@ public class Reply implements VentureCommand {
mcp.getPlayer().sendMessage(LocalizedMessage.NO_PLAYER_TO_REPLY_TO.toString());
return;
}
mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()
.replace("{command}", "/reply")
.replace("{args}", "[message]"));
mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString().replace("{command}", "/reply").replace("{args}", "[message]"));
}
private void sendBungeeCordReply(VentureChatPlayer mcp, String[] args) {
@ -137,7 +140,8 @@ public class Reply implements VentureCommand {
msg = FormatUtils.FormatString(msg);
}
String send = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatfrom").replaceAll("sender_", "")));
String send = FormatUtils
.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatfrom").replaceAll("sender_", "")));
String echo = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatto").replaceAll("sender_", "")));
String spy = "VentureChat:NoSpy";
if (!mcp.getPlayer().hasPermission("venturechat.spy.override")) {

43
src/main/java/venture/Aust1n46/chat/controllers/commands/Setchannel.java
View File

@ -7,12 +7,12 @@ import com.google.inject.Inject;
import venture.Aust1n46.chat.controllers.PluginMessageController;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.ChatChannel;
import venture.Aust1n46.chat.model.UniversalCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.ConfigService;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class Setchannel implements VentureCommand {
public class Setchannel extends UniversalCommand {
@Inject
private PluginMessageController pluginMessageController;
@Inject
@ -20,25 +20,26 @@ public class Setchannel implements VentureCommand {
@Inject
private ConfigService configService;
@Inject
public Setchannel(String name) {
super(name);
}
@Override
public void execute(CommandSender sender, String command, String[] args) {
public void executeCommand(CommandSender sender, String command, String[] args) {
if (sender.hasPermission("venturechat.setchannel")) {
if (args.length < 2) {
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()
.replace("{command}", "/setchannel")
.replace("{args}", "[player] [channel]"));
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString().replace("{command}", "/setchannel").replace("{args}", "[player] [channel]"));
return;
}
VentureChatPlayer player = playerApiService.getMineverseChatPlayer(args[0]);
if (player == null) {
sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
.replace("{args}", args[0]));
sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", args[0]));
return;
}
ChatChannel channel = configService.getChannel(args[1]);
if (channel == null) {
sender.sendMessage(LocalizedMessage.INVALID_CHANNEL.toString()
.replace("{args}", args[1]));
sender.sendMessage(LocalizedMessage.INVALID_CHANNEL.toString().replace("{args}", args[1]));
return;
}
if (channel.hasPermission()) {
@ -48,38 +49,32 @@ public class Setchannel implements VentureCommand {
}
if (!player.getPlayer().hasPermission(channel.getPermission())) {
player.removeListening(channel.getName());
sender.sendMessage(LocalizedMessage.SET_CHANNEL_PLAYER_CHANNEL_NO_PERMISSION.toString()
.replace("{player}", player.getName())
.replace("{channel_color}", channel.getColor() + "")
.replace("{channel_name}", channel.getName()));
sender.sendMessage(LocalizedMessage.SET_CHANNEL_PLAYER_CHANNEL_NO_PERMISSION.toString().replace("{player}", player.getName())
.replace("{channel_color}", channel.getColor() + "").replace("{channel_name}", channel.getName()));
return;
}
}
player.addListening(channel.getName());
player.setCurrentChannel(channel);
sender.sendMessage(LocalizedMessage.SET_CHANNEL_SENDER.toString()
.replace("{player}", player.getName())
.replace("{channel_color}", channel.getColor() + "")
sender.sendMessage(LocalizedMessage.SET_CHANNEL_SENDER.toString().replace("{player}", player.getName()).replace("{channel_color}", channel.getColor() + "")
.replace("{channel_name}", channel.getName()));
if (player.hasConversation()) {
for (VentureChatPlayer p : playerApiService.getOnlineMineverseChatPlayers()) {
if (p.isSpy()) {
p.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION_SPY.toString()
.replace("{player_sender}", player.getName())
p.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION_SPY.toString().replace("{player_sender}", player.getName())
.replace("{player_receiver}", playerApiService.getMineverseChatPlayer(player.getConversation()).getName()));
}
}
if (player.isOnline())
player.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION.toString()
.replace("{player_receiver}", playerApiService.getMineverseChatPlayer(player.getConversation()).getName()));
player.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION.toString().replace("{player_receiver}",
playerApiService.getMineverseChatPlayer(player.getConversation()).getName()));
else
player.setModified(true);
player.setConversation(null);
}
if (player.isOnline())
player.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString()
.replace("{channel_color}", channel.getColor() + "")
.replace("{channel_name}", channel.getName()));
player.getPlayer()
.sendMessage(LocalizedMessage.SET_CHANNEL.toString().replace("{channel_color}", channel.getColor() + "").replace("{channel_name}", channel.getName()));
else {
player.setModified(true);
}

21
src/main/java/venture/Aust1n46/chat/controllers/commands/Setchannelall.java
View File

@ -7,12 +7,12 @@ import com.google.inject.Inject;
import venture.Aust1n46.chat.controllers.PluginMessageController;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.ChatChannel;
import venture.Aust1n46.chat.model.UniversalCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.ConfigService;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class Setchannelall implements VentureCommand {
public class Setchannelall extends UniversalCommand {
@Inject
private PluginMessageController pluginMessageController;
@Inject
@ -20,19 +20,21 @@ public class Setchannelall implements VentureCommand {
@Inject
private ConfigService configService;
@Inject
public Setchannelall(String name) {
super(name);
}
@Override
public void execute(CommandSender sender, String command, String[] args) {
public void executeCommand(CommandSender sender, String command, String[] args) {
if (sender.hasPermission("venturechat.setchannelall")) {
if (args.length < 1) {
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()
.replace("{command}", "/setchannelall")
.replace("{args}", "[player]"));
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString().replace("{command}", "/setchannelall").replace("{args}", "[player]"));
return;
}
VentureChatPlayer player = playerApiService.getMineverseChatPlayer(args[0]);
if (player == null) {
sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
.replace("{args}", args[0]));
sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", args[0]));
return;
}
boolean isThereABungeeChannel = false;
@ -54,8 +56,7 @@ public class Setchannelall implements VentureCommand {
isThereABungeeChannel = true;
}
}
sender.sendMessage(LocalizedMessage.SET_CHANNEL_ALL_SENDER.toString()
.replace("{player}", player.getName()));
sender.sendMessage(LocalizedMessage.SET_CHANNEL_ALL_SENDER.toString().replace("{player}", player.getName()));
if (player.isOnline())
player.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL_ALL_PLAYER.toString());
else

19
src/main/java/venture/Aust1n46/chat/controllers/commands/Spy.java
View File

@ -1,30 +1,29 @@
package venture.Aust1n46.chat.controllers.commands;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.google.inject.Inject;
import venture.Aust1n46.chat.controllers.PluginMessageController;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.PlayerCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class Spy implements VentureCommand {
public class Spy extends PlayerCommand {
@Inject
private PluginMessageController pluginMessageController;
@Inject
private VentureChatPlayerApiService playerApiService;
@Override
public void execute(CommandSender sender, String command, String[] args) {
if (!(sender instanceof Player)) {
Bukkit.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return;
@Inject
public Spy(String name) {
super(name);
}
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer((Player) sender);
@Override
public void executeCommand(Player player, String command, String[] args) {
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer(player);
if (mcp.getPlayer().hasPermission("venturechat.spy")) {
if (!mcp.isSpy()) {
mcp.setSpy(true);

31
src/main/java/venture/Aust1n46/chat/controllers/commands/Unmute.java
View File

@ -7,7 +7,6 @@ import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
@ -17,12 +16,12 @@ import com.google.inject.Inject;
import venture.Aust1n46.chat.controllers.PluginMessageController;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.ChatChannel;
import venture.Aust1n46.chat.model.UniversalCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.ConfigService;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class Unmute implements VentureCommand {
public class Unmute extends UniversalCommand {
@Inject
private PluginMessageController pluginMessageController;
@Inject
@ -30,12 +29,16 @@ public class Unmute implements VentureCommand {
@Inject
private ConfigService configService;
@Inject
public Unmute(String name) {
super(name);
}
@Override
public void execute(CommandSender sender, String command, String[] args) {
public void executeCommand(CommandSender sender, String command, String[] args) {
if (sender.hasPermission("venturechat.mute")) {
if (args.length < 2) {
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString().replace("{command}", "/unmute")
.replace("{args}", "[channel] [player]"));
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString().replace("{command}", "/unmute").replace("{args}", "[channel] [player]"));
return;
}
if (configService.isChannel(args[0])) {
@ -50,19 +53,16 @@ public class Unmute implements VentureCommand {
return;
}
if (!player.isMuted(channel.getName())) {
sender.sendMessage(LocalizedMessage.PLAYER_NOT_MUTED.toString()
.replace("{player}", player.getName()).replace("{channel_color}", channel.getColor())
sender.sendMessage(LocalizedMessage.PLAYER_NOT_MUTED.toString().replace("{player}", player.getName()).replace("{channel_color}", channel.getColor())
.replace("{channel_name}", channel.getName()));
return;
}
player.removeMute(channel.getName());
sender.sendMessage(LocalizedMessage.UNMUTE_PLAYER_SENDER.toString()
.replace("{player}", player.getName()).replace("{channel_color}", channel.getColor())
sender.sendMessage(LocalizedMessage.UNMUTE_PLAYER_SENDER.toString().replace("{player}", player.getName()).replace("{channel_color}", channel.getColor())
.replace("{channel_name}", channel.getName()));
if (player.isOnline()) {
player.getPlayer().sendMessage(LocalizedMessage.UNMUTE_PLAYER_PLAYER.toString()
.replace("{player}", player.getName()).replace("{channel_color}", channel.getColor())
.replace("{channel_name}", channel.getName()));
player.getPlayer().sendMessage(LocalizedMessage.UNMUTE_PLAYER_PLAYER.toString().replace("{player}", player.getName())
.replace("{channel_color}", channel.getColor()).replace("{channel_name}", channel.getName()));
} else {
player.setModified(true);
}
@ -77,7 +77,7 @@ public class Unmute implements VentureCommand {
}
@Override
public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
public List<String> tabComplete(CommandSender sender, String alias, String[] args) {
List<String> completions = new ArrayList<>();
if (args.length == 1) {
StringUtil.copyPartialMatches(args[0], configService.getChatChannels().stream().map(ChatChannel::getName).collect(Collectors.toList()), completions);
@ -92,7 +92,8 @@ public class Unmute implements VentureCommand {
Collections.sort(completions);
return completions;
}
StringUtil.copyPartialMatches(args[1], playerApiService.getOnlineMineverseChatPlayers().stream().filter(mcp -> mcp.isMuted(chatChannelObj.getName())).map(VentureChatPlayer::getName).collect(Collectors.toList()), completions);
StringUtil.copyPartialMatches(args[1], playerApiService.getOnlineMineverseChatPlayers().stream().filter(mcp -> mcp.isMuted(chatChannelObj.getName()))
.map(VentureChatPlayer::getName).collect(Collectors.toList()), completions);
Collections.sort(completions);
return completions;
}

21
src/main/java/venture/Aust1n46/chat/controllers/commands/Unmuteall.java
View File

@ -7,12 +7,12 @@ import com.google.inject.Inject;
import venture.Aust1n46.chat.controllers.PluginMessageController;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.ChatChannel;
import venture.Aust1n46.chat.model.UniversalCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.ConfigService;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
public class Unmuteall implements VentureCommand {
public class Unmuteall extends UniversalCommand {
@Inject
private PluginMessageController pluginMessageController;
@Inject
@ -20,19 +20,21 @@ public class Unmuteall implements VentureCommand {
@Inject
private ConfigService configService;
@Inject
public Unmuteall(String name) {
super(name);
}
@Override
public void execute(CommandSender sender, String command, String[] args) {
public void executeCommand(CommandSender sender, String command, String[] args) {
if (sender.hasPermission("venturechat.mute")) {
if (args.length < 1) {
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()
.replace("{command}", "/unmuteall")
.replace("{args}", "[player]"));
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString().replace("{command}", "/unmuteall").replace("{args}", "[player]"));
return;
}
VentureChatPlayer player = playerApiService.getMineverseChatPlayer(args[0]);
if (player == null || (!player.isOnline() && !sender.hasPermission("venturechat.mute.offline"))) {
sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
.replace("{args}", args[0]));
sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", args[0]));
return;
}
boolean bungee = false;
@ -45,8 +47,7 @@ public class Unmuteall implements VentureCommand {
if (bungee) {
pluginMessageController.synchronize(player, true);
}
sender.sendMessage(LocalizedMessage.UNMUTE_PLAYER_ALL_SENDER.toString()
.replace("{player}", player.getName()));
sender.sendMessage(LocalizedMessage.UNMUTE_PLAYER_ALL_SENDER.toString().replace("{player}", player.getName()));
if (player.isOnline()) {
player.getPlayer().sendMessage(LocalizedMessage.UNMUTE_PLAYER_ALL_PLAYER.toString());
} else

30
src/main/java/venture/Aust1n46/chat/controllers/commands/VentureChatGui.java
View File

@ -6,7 +6,6 @@ import java.util.List;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
@ -20,14 +19,14 @@ import venture.Aust1n46.chat.initiators.application.VentureChat;
import venture.Aust1n46.chat.localization.LocalizedMessage;
import venture.Aust1n46.chat.model.ChatChannel;
import venture.Aust1n46.chat.model.GuiSlot;
import venture.Aust1n46.chat.model.PlayerCommand;
import venture.Aust1n46.chat.model.VentureChatPlayer;
import venture.Aust1n46.chat.model.VentureCommand;
import venture.Aust1n46.chat.service.ConfigService;
import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
import venture.Aust1n46.chat.utilities.FormatUtils;
import venture.Aust1n46.chat.utilities.VersionHandler;
public class VentureChatGui implements VentureCommand {
public class VentureChatGui extends PlayerCommand {
@Inject
private VentureChat plugin;
@Inject
@ -35,24 +34,22 @@ public class VentureChatGui implements VentureCommand {
@Inject
private ConfigService configService;
@Inject
public VentureChatGui(String name) {
super(name);
}
@Override
public void execute(CommandSender sender, String command, String[] args) {
if (!(sender instanceof Player)) {
Bukkit.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return;
}
public void executeCommand(Player player, String command, String[] args) {
if (args.length < 3) {
sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()
.replace("{command}", "/venturechatgui")
.replace("{args}", "[player] [channel] [hashcode]"));
player.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString().replace("{command}", "/venturechatgui").replace("{args}", "[player] [channel] [hashcode]"));
return;
}
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer((Player) sender);
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer(player);
if (mcp.getPlayer().hasPermission("venturechat.gui")) {
VentureChatPlayer target = playerApiService.getMineverseChatPlayer(args[0]);
if (target == null && !args[0].equals("Discord")) {
mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
.replace("{args}", args[0]));
mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", args[0]));
return;
}
if (configService.isChannel(args[1])) {
@ -61,7 +58,7 @@ public class VentureChatGui implements VentureCommand {
try {
hash = Integer.parseInt(args[2]);
} catch (Exception e) {
sender.sendMessage(LocalizedMessage.INVALID_HASH.toString());
player.sendMessage(LocalizedMessage.INVALID_HASH.toString());
return;
}
if (args[0].equals("Discord")) {
@ -71,8 +68,7 @@ public class VentureChatGui implements VentureCommand {
this.openInventory(mcp, target, channel, hash);
return;
}
mcp.getPlayer().sendMessage(LocalizedMessage.INVALID_CHANNEL.toString()
.replace("{args}", args[1]));
mcp.getPlayer().sendMessage(LocalizedMessage.INVALID_CHANNEL.toString().replace("{args}", args[1]));
return;
}
mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString());

59
src/main/java/venture/Aust1n46/chat/controllers/commands/Venturechat.java
View File

@ -1,58 +1,25 @@
package venture.Aust1n46.chat.controllers.commands;
import venture.Aust1n46.chat.initiators.application.VentureChat;
import venture.Aust1n46.chat.localization.InternalMessage;
//import net.md_5.bungee.api.chat.ClickEvent;
//import net.md_5.bungee.api.chat.ComponentBuilder;
//import net.md_5.bungee.api.chat.HoverEvent;
//import net.md_5.bungee.api.chat.TextComponent;
//import net.minecraft.server.v1_15_R1.IChatBaseComponent;
//import net.minecraft.server.v1_15_R1.PacketPlayOutChat;
import venture.Aust1n46.chat.model.VentureCommand;
//import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
//import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
//import org.bukkit.entity.Player;
import com.google.inject.Inject;
public class Venturechat implements VentureCommand {
import venture.Aust1n46.chat.initiators.application.VentureChat;
import venture.Aust1n46.chat.localization.InternalMessage;
import venture.Aust1n46.chat.model.UniversalCommand;
public class Venturechat extends UniversalCommand {
@Inject
private VentureChat plugin;
@Override
public void execute(CommandSender sender, String command, String[] args) {
sender.sendMessage(InternalMessage.VENTURECHAT_VERSION.toString()
.replace("{version}", plugin.getDescription().getVersion()));
sender.sendMessage(InternalMessage.VENTURECHAT_AUTHOR.toString());
// if (sender instanceof Player && plugin.getConfig().getString("loglevel", "info").equals("debug")) {
// Player player = (Player) sender;
// String title = ChatColor.GOLD + " | " + ChatColor.BLUE.toString() + ChatColor.BOLD + "SpigotAPI chat message" + ChatColor.RESET + ChatColor.GOLD + " | ";
// String spaces = " ";
// TextComponent tcSpaces = new TextComponent(spaces);
// TextComponent message = new TextComponent(title);
// message.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Click here to rank up!").create()));
// message.setClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "Sample SpigotAPI Click Event"));
// tcSpaces.addExtra(message);
// player.spigot().sendMessage(tcSpaces);
//
//// sendActionBar(player, "NMS ActionBar message");
// }
@Inject
public Venturechat(String name) {
super(name);
}
// public static void sendActionBar(Player player, String message) {
// message= message.replaceAll("%player%", player.getDisplayName());
// message = ChatColor.translateAlternateColorCodes('&', message);
// CraftPlayer p = (CraftPlayer) player;
// IChatBaseComponent cbc = IChatBaseComponent.ChatSerializer.a("{\"text\": \"" + message + "\"}");
// PacketPlayOutChat ppoc = new PacketPlayOutChat(cbc);
// try {
// MineverseChat.posField.set(ppoc, MineverseChat.chatMessageType.getEnumConstants()[2]);
// }
// catch (Exception e) {
// e.printStackTrace();
// }
// p.getHandle().playerConnection.sendPacket(ppoc);
// }
@Override
public void executeCommand(CommandSender sender, String command, String[] args) {
sender.sendMessage(InternalMessage.VENTURECHAT_VERSION.toString().replace("{version}", plugin.getDescription().getVersion()));
sender.sendMessage(InternalMessage.VENTURECHAT_AUTHOR.toString());
}
}

2
src/main/java/venture/Aust1n46/chat/controllers/proxy/VentureChatProxyController.java
View File

@ -398,7 +398,7 @@ public class VentureChatProxyController {
out.writeUTF(spy);
out.writeUTF(msg);
source.getServers().forEach(serv -> {
if(!send.isEmpty()) {
if(!serv.isEmpty()) {
source.sendPluginMessage(serv.getName(), outstream.toByteArray());
}
});

17
src/main/java/venture/Aust1n46/chat/model/VentureCommand.java
View File

@ -1,17 +0,0 @@
package venture.Aust1n46.chat.model;
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<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
return null;
}
}