Updated to use independant SocialSpy module
This commit is contained in:
@@ -27,60 +27,4 @@ command reply {
|
||||
help Sends a direct message to the last person you talked to.;
|
||||
perm utils.message;
|
||||
}
|
||||
}
|
||||
|
||||
command socialspy {
|
||||
format {
|
||||
run config_format_default;
|
||||
help Resets your format back to the default: &e%s;
|
||||
}
|
||||
format [string:format...] {
|
||||
run config_format format;
|
||||
help Specifies your ss format. Use /socialspy format_help to get info about how the format works.;
|
||||
}
|
||||
format_help {
|
||||
run format_help;
|
||||
help Displays info about the format command;
|
||||
}
|
||||
prefix {
|
||||
run config_prefix_default;
|
||||
help Resets your color back to the default (light gray color code);
|
||||
}
|
||||
prefix [string:prefix] {
|
||||
run config_prefix prefix;
|
||||
help Sets your prefix to the specified term.;
|
||||
}
|
||||
commands list {
|
||||
run commands_list;
|
||||
help Displays all commands you're listening to.;
|
||||
}
|
||||
commands add [string:command] {
|
||||
run commands_add command;
|
||||
help Adds a command to the list of commands that you're listening to.;
|
||||
}
|
||||
commands del [string:command] {
|
||||
run commands_del command;
|
||||
help Deletes a command from the list of commands that you're listening to.;
|
||||
}
|
||||
|
||||
stripcolor on {
|
||||
run stripcolor_on;
|
||||
}
|
||||
stripcolor off {
|
||||
run stripcolor_off;
|
||||
}
|
||||
stripcolor {
|
||||
run stripcolor;
|
||||
}
|
||||
on {
|
||||
run on;
|
||||
}
|
||||
off {
|
||||
run off;
|
||||
}
|
||||
[empty] {
|
||||
run toggle;
|
||||
}
|
||||
perm utils.socialspy;
|
||||
type player;
|
||||
}
|
||||
@@ -1,27 +1,23 @@
|
||||
package com.redstoner.modules.message;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.OfflinePlayer;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.json.simple.JSONArray;
|
||||
|
||||
import com.nemez.cmdmgr.Command;
|
||||
import com.nemez.cmdmgr.Command.AsyncType;
|
||||
import com.nemez.cmdmgr.CommandManager;
|
||||
import com.redstoner.annotations.Version;
|
||||
import com.redstoner.coremods.moduleLoader.ModuleLoader;
|
||||
import com.redstoner.misc.BroadcastFilter;
|
||||
import com.redstoner.misc.Main;
|
||||
import com.redstoner.misc.Utils;
|
||||
import com.redstoner.modules.Module;
|
||||
import com.redstoner.modules.datamanager.DataManager;
|
||||
import com.redstoner.modules.socialspy.Socialspy;
|
||||
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
|
||||
@Version(major = 3, minor = 1, revision = 6, compatible = 3)
|
||||
@Version(major = 3, minor = 2, revision = 0, compatible = 3)
|
||||
public class Message implements Module
|
||||
{
|
||||
HashMap<CommandSender, CommandSender> replyTargets = new HashMap<CommandSender, CommandSender>();
|
||||
@@ -48,14 +44,15 @@ public class Message implements Module
|
||||
else
|
||||
{
|
||||
message = Utils.colorify(message, sender);
|
||||
spyBroadcast(sender, p, message, "/m", new BroadcastFilter()
|
||||
{
|
||||
@Override
|
||||
public boolean sendTo(CommandSender recipient)
|
||||
if (ModuleLoader.getModule("Socialspy") != null)
|
||||
Socialspy.spyBroadcast(sender, p, message, "/m", new BroadcastFilter()
|
||||
{
|
||||
return !(recipient.equals(sender) || recipient.equals(target));
|
||||
}
|
||||
});
|
||||
@Override
|
||||
public boolean sendTo(CommandSender recipient)
|
||||
{
|
||||
return !(recipient.equals(sender) || recipient.equals(target));
|
||||
}
|
||||
});
|
||||
Utils.sendMessage(sender, "&6[&cme &6-> " + Utils.getName(p) + "&6] ", "§f" + message, '&');
|
||||
Utils.sendMessage(p, "&6[" + Utils.getName(sender) + " &6-> &cme&6] ", "§f" + message, '&');
|
||||
replyTargets.put(sender, p);
|
||||
@@ -76,253 +73,18 @@ public class Message implements Module
|
||||
else
|
||||
{
|
||||
message = Utils.colorify(message, sender);
|
||||
spyBroadcast(sender, target, message, "/m", new BroadcastFilter()
|
||||
{
|
||||
@Override
|
||||
public boolean sendTo(CommandSender recipient)
|
||||
if (ModuleLoader.getModule("Socialspy") != null)
|
||||
Socialspy.spyBroadcast(sender, target, message, "/m", new BroadcastFilter()
|
||||
{
|
||||
return !(recipient.equals(sender) || recipient.equals(target));
|
||||
}
|
||||
});
|
||||
@Override
|
||||
public boolean sendTo(CommandSender recipient)
|
||||
{
|
||||
return !(recipient.equals(sender) || recipient.equals(target));
|
||||
}
|
||||
});
|
||||
Utils.sendMessage(sender, "&6[&cme &6-> " + Utils.getName(target) + "&6] ", "§f" + message, '&');
|
||||
Utils.sendMessage(target, "&6[" + Utils.getName(sender) + " &6-> &cme&6] ", "§f" + message, '&');
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Command(hook = "config_prefix_default")
|
||||
public boolean prefixDefault(CommandSender sender)
|
||||
{
|
||||
return prefix(sender, getDefaultPrefix());
|
||||
}
|
||||
|
||||
@Command(hook = "config_prefix")
|
||||
public boolean prefix(CommandSender sender, String prefix)
|
||||
{
|
||||
Utils.sendMessage(sender, null, "Set your socialspy prefix to: " + prefix);
|
||||
DataManager.setData(sender, "prefix", prefix);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Command(hook = "config_format_default")
|
||||
public boolean configFormatDefault(CommandSender sender)
|
||||
{
|
||||
return configFormat(sender, getDefaultFormat());
|
||||
}
|
||||
|
||||
@Command(hook = "config_format")
|
||||
public boolean configFormat(CommandSender sender, String format)
|
||||
{
|
||||
Utils.sendMessage(sender, null, "Set your socialspy format to: " + format);
|
||||
DataManager.setData(sender, "format", format);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Command(hook = "stripcolor_on")
|
||||
public boolean stripcolorOn(CommandSender sender)
|
||||
{
|
||||
Utils.sendMessage(sender, null, "Enabled stripping colors!");
|
||||
DataManager.setData(sender, "stripcolor", true);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Command(hook = "stripcolor_off")
|
||||
public boolean stripcolorOff(CommandSender sender)
|
||||
{
|
||||
Utils.sendMessage(sender, null, "Disabled stripping colors!");
|
||||
DataManager.setData(sender, "stripcolor", false);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Command(hook = "stripcolor")
|
||||
public boolean stripcolor(CommandSender sender)
|
||||
{
|
||||
boolean b = (boolean) DataManager.getOrDefault(sender, "stripcolor", true);
|
||||
Utils.sendMessage(sender, null, (b ? "Disabled" : "Enabled") + " stripping colors!");
|
||||
DataManager.setData(sender, "stripcolor", !b);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Command(hook = "on")
|
||||
public boolean spyOn(CommandSender sender)
|
||||
{
|
||||
Utils.sendMessage(sender, null, "Enabled socialspy!");
|
||||
DataManager.setData(sender, "enabled", true);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Command(hook = "off")
|
||||
public boolean spyOff(CommandSender sender)
|
||||
{
|
||||
Utils.sendMessage(sender, null, "Disabled socialspy!");
|
||||
DataManager.setData(sender, "enabled", false);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Command(hook = "toggle")
|
||||
public boolean spyToggle(CommandSender sender)
|
||||
{
|
||||
boolean b = (boolean) DataManager.getOrDefault(sender, "enabled", false);
|
||||
Utils.sendMessage(sender, null, (b ? "Disabled" : "Enabled") + " socialspy!");
|
||||
DataManager.setData(sender, "enabled", !b);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Command(hook = "format_help")
|
||||
public boolean formatInfo(CommandSender sender)
|
||||
{
|
||||
Utils.sendModuleHeader(sender, "Socialspy");
|
||||
Utils.sendMessage(sender, "", " Format placeholders:");
|
||||
Utils.sendMessage(sender, "", " &c%s&eender &7(display name) | &c%S&eender &7(real name)", '&');
|
||||
Utils.sendMessage(sender, "", " &c%t&earget &7(display name) | &c%T&earget &7(real name)", '&');
|
||||
Utils.sendMessage(sender, "", " &p%s&erefix &7(see prefix option)", '&');
|
||||
Utils.sendMessage(sender, "", " &m%s&eessage", '&');
|
||||
Utils.sendMessage(sender, "", " &c%s&eommand", '&');
|
||||
Utils.sendMessage(sender, "", " Any other text will be put as literal text. Use %% to escape any %.", '&');
|
||||
Utils.sendMessage(sender, "", " The default format is: '§e" + getDefaultFormat());
|
||||
Utils.sendMessage(sender, "", " The default prefix is: '§e" + getDefaultPrefix());
|
||||
return true;
|
||||
}
|
||||
|
||||
@Command(hook = "commands_list")
|
||||
public boolean commands_list(CommandSender sender)
|
||||
{
|
||||
Utils.sendModuleHeader(sender, "Socialspy");
|
||||
JSONArray commands = (JSONArray) DataManager.getOrDefault(sender, "commands", getDefaultCommandList());
|
||||
if (commands == null || commands.size() == 0)
|
||||
Utils.sendErrorMessage(sender, "", "You are not listening to any commands!");
|
||||
else
|
||||
{
|
||||
Utils.sendMessage(sender, "", "You are listening to the following " + commands.size() + " commands:");
|
||||
Utils.sendMessage(sender, "", Arrays.toString(commands.toArray()));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private final JSONArray getDefaultCommandList()
|
||||
{
|
||||
JSONArray commands = new JSONArray();
|
||||
commands.add("/m");
|
||||
commands.add("/r");
|
||||
return commands;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Command(hook = "commands_add")
|
||||
public boolean commands_add(CommandSender sender, String command)
|
||||
{
|
||||
JSONArray commands = (JSONArray) DataManager.getOrDefault(sender, "commands", getDefaultCommandList());
|
||||
commands.add(command);
|
||||
DataManager.setData(sender, "commands", commands);
|
||||
Utils.sendMessage(sender, "&8[&2Socialspy&8]", "You are now spying on &e" + command, '&');
|
||||
return true;
|
||||
}
|
||||
|
||||
@Command(hook = "commands_del")
|
||||
public boolean commands_del(CommandSender sender, String command)
|
||||
{
|
||||
JSONArray commands = (JSONArray) DataManager.getOrDefault(sender, "commands", getDefaultCommandList());
|
||||
commands.remove(command);
|
||||
DataManager.setData(sender, "commands", commands);
|
||||
Utils.sendMessage(sender, "&8[&2Socialspy&8]", "You are no longer spying on &e" + command, '&');
|
||||
return true;
|
||||
}
|
||||
|
||||
public static void spyBroadcast(CommandSender sender, CommandSender target, String message, String command,
|
||||
BroadcastFilter filter)
|
||||
{
|
||||
for (Player p : Bukkit.getOnlinePlayers())
|
||||
{
|
||||
if ((boolean) DataManager.getOrDefault(p, "enabled", false))
|
||||
if (p.hasPermission("utils.socialspy"))
|
||||
{
|
||||
if (filter == null || filter.sendTo(p))
|
||||
Utils.sendMessage(p, "", formatMessage(p, sender, target, message, command));
|
||||
Utils.sendMessage(p, "", formatMessage(p, sender, target, message, command));
|
||||
}
|
||||
else
|
||||
DataManager.setData(sender, "enabled", false);
|
||||
}
|
||||
}
|
||||
|
||||
public static void spyBroadcast(CommandSender sender, String target, String message, String command,
|
||||
BroadcastFilter filter)
|
||||
{
|
||||
for (Player p : Bukkit.getOnlinePlayers())
|
||||
{
|
||||
if ((boolean) DataManager.getOrDefault(p, "enabled", false))
|
||||
if (p.hasPermission("utils.socialspy"))
|
||||
{
|
||||
if (filter == null || filter.sendTo(p))
|
||||
Utils.sendMessage(p, "", formatMessage(p, sender, target, message, command));
|
||||
}
|
||||
else
|
||||
DataManager.setData(sender, "enabled", false);
|
||||
}
|
||||
}
|
||||
|
||||
private static String formatMessage(CommandSender formatHolder, CommandSender sender, CommandSender target,
|
||||
String message, String command)
|
||||
{
|
||||
if ((boolean) DataManager.getOrDefault(formatHolder, "stripcolor", false))
|
||||
message = ChatColor.stripColor(message);
|
||||
String format = (String) DataManager.getOrDefault(formatHolder, "format", getDefaultFormat());
|
||||
// Replace escaped % with placeholder
|
||||
format = format.replace("%%", "§§");
|
||||
// Sender name
|
||||
format = format.replace("%s", Utils.getName(sender));
|
||||
format = format.replace("%S", sender.getName());
|
||||
// Target name
|
||||
format = format.replace("%t", Utils.getName(target));
|
||||
format = format.replace("%T", target.getName());
|
||||
// Prefix
|
||||
String prefix = (String) DataManager.getOrDefault(formatHolder, "prefix", getDefaultPrefix());
|
||||
format = format.replace("%p", prefix);
|
||||
// Apply colors to halfway replaced String
|
||||
format = ChatColor.translateAlternateColorCodes('&', format);
|
||||
// Insert command and message
|
||||
format = format.replace("%c", command);
|
||||
format = format.replace("%m", message);
|
||||
// Convert placeholder back
|
||||
format = format.replace("§§", "%%");
|
||||
return format;
|
||||
}
|
||||
|
||||
private static String formatMessage(CommandSender formatHolder, CommandSender sender, String target, String message,
|
||||
String command)
|
||||
{
|
||||
if ((boolean) DataManager.getOrDefault(formatHolder, "stripcolor", false))
|
||||
message = ChatColor.stripColor(message);
|
||||
String format = (String) DataManager.getOrDefault(formatHolder, "format", getDefaultFormat());
|
||||
// Replace escaped % with placeholder
|
||||
format = format.replace("%%", "§§");
|
||||
// Sender name
|
||||
format = format.replace("%s", Utils.getName(sender));
|
||||
format = format.replace("%S", sender.getName());
|
||||
// Target name
|
||||
format = format.replace("%t", target);
|
||||
format = format.replace("%T", target);
|
||||
// Prefix
|
||||
String prefix = (String) DataManager.getOrDefault(formatHolder, "prefix", getDefaultPrefix());
|
||||
format = format.replace("%p", prefix);
|
||||
// Apply colors to halfway replaced String
|
||||
format = ChatColor.translateAlternateColorCodes('&', format);
|
||||
// Insert command and message
|
||||
format = format.replace("%c", command);
|
||||
format = format.replace("%m", message);
|
||||
// Convert placeholder back
|
||||
format = format.replace("§§", "%%");
|
||||
return format;
|
||||
}
|
||||
|
||||
private static final String getDefaultFormat()
|
||||
{
|
||||
return "%s &7to %t %p: %m";
|
||||
}
|
||||
|
||||
private static final String getDefaultPrefix()
|
||||
{
|
||||
return "&7";
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user