Altitude/Chat
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed chat not sending messages by bypassing Microsoft's chat report system

Browse Source
This commit is contained in:
Stijn 2022-06-24 21:11:54 +02:00
parent 35ad214901
commit 66a058225d
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java
View File

@ -10,10 +10,7 @@ import com.alttd.chat.objects.ModifiableString;
import com.alttd.chat.objects.Toggleable; import com.alttd.chat.objects.Toggleable;
import com.alttd.chat.util.GalaxyUtility; import com.alttd.chat.util.GalaxyUtility;
import com.alttd.chat.util.Utility; import com.alttd.chat.util.Utility;
import io.papermc.paper.chat.ChatRenderer;
import io.papermc.paper.event.player.AsyncChatEvent; import io.papermc.paper.event.player.AsyncChatEvent;
import jdk.jshell.execution.Util;
import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextReplacementConfig; import net.kyori.adventure.text.TextReplacementConfig;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
@ -24,19 +21,20 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class ChatListener implements Listener, ChatRenderer { import java.util.Set;
import java.util.stream.Collectors;
public class ChatListener implements Listener {
@EventHandler(ignoreCancelled = true) @EventHandler(ignoreCancelled = true)
public void onPlayerChat(AsyncChatEvent event) { public void onPlayerChat(AsyncChatEvent event) {
event.setCancelled(true); //Always cancel the event because we do not want to deal with Microsoft's stupid bans
Toggleable toggleable = Toggleable.getToggleable(event.getPlayer().getUniqueId()); Toggleable toggleable = Toggleable.getToggleable(event.getPlayer().getUniqueId());
if (toggleable != null) { if (toggleable != null) {
event.setCancelled(true);
toggleable.sendMessage(event.getPlayer(), event.message()); toggleable.sendMessage(event.getPlayer(), event.message());
return; return;
} }
if (ChatPlugin.getInstance().serverMuted() && !event.getPlayer().hasPermission("chat.bypass-server-muted")) { if (ChatPlugin.getInstance().serverMuted() && !event.getPlayer().hasPermission("chat.bypass-server-muted")) {
event.setCancelled(true);
Player player = event.getPlayer(); Player player = event.getPlayer();
GalaxyUtility.sendBlockedNotification("Chat Muted", player, event.message(), ""); GalaxyUtility.sendBlockedNotification("Chat Muted", player, event.message(), "");
return; return;
@ -45,8 +43,10 @@ public class ChatListener implements Listener, ChatRenderer {
Player player = event.getPlayer(); Player player = event.getPlayer();
// ChatUser user = ChatUserManager.getChatUser(player.getUniqueId()); // ChatUser user = ChatUserManager.getChatUser(player.getUniqueId());
event.viewers().removeIf(audience -> audience instanceof Player receiver Set<Player> receivers = event.viewers().stream().filter(audience -> audience instanceof Player)
&& ChatUserManager.getChatUser(receiver.getUniqueId()).getIgnoredPlayers().contains(player.getUniqueId())); .map(audience -> (Player) audience)
.filter(receiver -> ChatUserManager.getChatUser(receiver.getUniqueId()).getIgnoredPlayers().contains(player.getUniqueId()))
.collect(Collectors.toSet());
Component input = event.message(); Component input = event.message();
String message = PlainTextComponentSerializer.plainText().serialize(input); String message = PlainTextComponentSerializer.plainText().serialize(input);
@ -67,20 +67,21 @@ public class ChatListener implements Listener, ChatRenderer {
} }
Component component = Utility.parseMiniMessage(Utility.formatText(message)); Component component = Utility.parseMiniMessage(Utility.formatText(message));
// message = Utility.formatText(message); component = component.replaceText(
// TagResolver placeholders = TagResolver.resolver( TextReplacementConfig.builder()
// Placeholder.unparsed("message", message) .once()
// ); .matchLiteral("[i]")
component = component .replacement(ChatHandler.itemComponent(player.getInventory().getItemInMainHand()))
// Component component = Utility.parseMiniMessage("<message>", placeholders) .build());
.replaceText(TextReplacementConfig.builder().once().matchLiteral("[i]").replacement(ChatHandler.itemComponent(player.getInventory().getItemInMainHand())).build());
event.message(component); component = render(player, component);
event.renderer(this); player.sendMessage(component);
for (Player receiver : receivers) {
receiver.sendMessage(component);
}
} }
@Override public @NotNull Component render(@NotNull Player player, @NotNull Component message) {
public @NotNull Component render(@NotNull Player player, @NotNull Component sourceDisplayName, @NotNull Component message, @NotNull Audience viewer) {
ChatUser user = ChatUserManager.getChatUser(player.getUniqueId()); ChatUser user = ChatUserManager.getChatUser(player.getUniqueId());
TagResolver placeholders = TagResolver.resolver( TagResolver placeholders = TagResolver.resolver(
Placeholder.component("sender", user.getDisplayName()), Placeholder.component("sender", user.getDisplayName()),