mirror of
https://github.com/AtlasMediaGroup/TotalFreedomMod.git
synced 2024-11-04 15:26:05 +00:00
FS-143 Resolution (#42)
* Bump to patch version. * Fixes FS-143 Various changes to make it work better with logging and things like that.
This commit is contained in:
parent
dca5e30291
commit
27f5f18962
2
pom.xml
2
pom.xml
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
<groupId>me.totalfreedom</groupId>
|
<groupId>me.totalfreedom</groupId>
|
||||||
<artifactId>TotalFreedomMod</artifactId>
|
<artifactId>TotalFreedomMod</artifactId>
|
||||||
<version>2021.02</version>
|
<version>2021.02-Patch.01-RC01</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
@ -23,6 +23,7 @@ import org.bukkit.entity.Player;
|
|||||||
|
|
||||||
public class DiscordToAdminChatListener extends ListenerAdapter
|
public class DiscordToAdminChatListener extends ListenerAdapter
|
||||||
{
|
{
|
||||||
|
|
||||||
DiscordToMinecraftListener dtml = new DiscordToMinecraftListener();
|
DiscordToMinecraftListener dtml = new DiscordToMinecraftListener();
|
||||||
|
|
||||||
public static net.md_5.bungee.api.ChatColor getColor(Displayable display)
|
public static net.md_5.bungee.api.ChatColor getColor(Displayable display)
|
||||||
@ -37,17 +38,29 @@ public class DiscordToAdminChatListener extends ListenerAdapter
|
|||||||
{
|
{
|
||||||
Member member = event.getMember();
|
Member member = event.getMember();
|
||||||
String tag = dtml.getDisplay(member);
|
String tag = dtml.getDisplay(member);
|
||||||
StringBuilder message = new StringBuilder(ChatColor.DARK_GRAY + "[" + ChatColor.DARK_AQUA + "Discord" + ChatColor.DARK_GRAY + "] " + ChatColor.RESET);
|
|
||||||
Message msg = event.getMessage();
|
Message msg = event.getMessage();
|
||||||
|
String mediamessage = ChatColor.YELLOW + " [Media]";
|
||||||
|
|
||||||
message.append(msg.getContentDisplay());
|
StringBuilder logmessage = new StringBuilder(ChatColor.DARK_GRAY + "[" + ChatColor.DARK_AQUA + "Discord" + ChatColor.DARK_GRAY + "] " + ChatColor.RESET);
|
||||||
|
String lm = ChatColor.DARK_RED + member.getEffectiveName() + " "
|
||||||
|
+ ChatColor.DARK_GRAY + tag + ChatColor.DARK_GRAY
|
||||||
|
+ ChatColor.WHITE + ": " + ChatColor.GOLD + FUtil.colorize(msg.getContentDisplay());
|
||||||
|
logmessage.append(lm);
|
||||||
|
|
||||||
ComponentBuilder builder = new ComponentBuilder(msg.toString());
|
if (!msg.getAttachments().isEmpty())
|
||||||
|
{
|
||||||
|
|
||||||
FLog.info(message.toString());
|
logmessage.append(mediamessage); // Actually for logging...
|
||||||
|
|
||||||
|
}
|
||||||
|
FLog.info(logmessage.toString());
|
||||||
|
|
||||||
Bukkit.getOnlinePlayers().stream().filter(player -> TotalFreedomMod.getPlugin().al.isAdmin(player)).forEach(player ->
|
Bukkit.getOnlinePlayers().stream().filter(player -> TotalFreedomMod.getPlugin().al.isAdmin(player)).forEach(player ->
|
||||||
{
|
{
|
||||||
|
StringBuilder message = new StringBuilder(ChatColor.DARK_GRAY + "[" + ChatColor.DARK_AQUA + "Discord" + ChatColor.DARK_GRAY + "] " + ChatColor.RESET);
|
||||||
|
|
||||||
|
ComponentBuilder builder = new ComponentBuilder(message.toString());
|
||||||
|
|
||||||
Admin admin = TotalFreedomMod.getPlugin().al.getAdmin(player);
|
Admin admin = TotalFreedomMod.getPlugin().al.getAdmin(player);
|
||||||
String format = admin.getAcFormat();
|
String format = admin.getAcFormat();
|
||||||
if (!Strings.isNullOrEmpty(format))
|
if (!Strings.isNullOrEmpty(format))
|
||||||
@ -59,6 +72,7 @@ public class DiscordToAdminChatListener extends ListenerAdapter
|
|||||||
.replace("%rankcolor%", color.toString())
|
.replace("%rankcolor%", color.toString())
|
||||||
.replace("%msg%", FUtil.colorize(msg.getContentDisplay()));
|
.replace("%msg%", FUtil.colorize(msg.getContentDisplay()));
|
||||||
builder.append(FUtil.colorize(m));
|
builder.append(FUtil.colorize(m));
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -72,14 +86,13 @@ public class DiscordToAdminChatListener extends ListenerAdapter
|
|||||||
{
|
{
|
||||||
for (Message.Attachment attachment : msg.getAttachments())
|
for (Message.Attachment attachment : msg.getAttachments())
|
||||||
{
|
{
|
||||||
TextComponent text = new TextComponent(ChatColor.YELLOW + "[Media]");
|
TextComponent text = new TextComponent(mediamessage);
|
||||||
text.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, attachment.getUrl()));
|
text.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, attachment.getUrl()));
|
||||||
builder.append(text);
|
builder.append(text);
|
||||||
message.append("[Media]"); // for logging
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
player.spigot().sendMessage(builder.create());
|
player.spigot().sendMessage(builder.create());
|
||||||
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user