diff --git a/patches/minecraft/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch b/patches/minecraft/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch index a5b92b1e03..741f125f0f 100644 --- a/patches/minecraft/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch +++ b/patches/minecraft/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch @@ -39,16 +39,16 @@ for(int i = 0; i < s.length(); ++i) { if (!SharedConstants.m_136188_(s.charAt(i))) { -@@ -1129,8 +_,11 @@ +@@ -1129,8 +_,10 @@ String s1 = p_143629_.m_143722_(); Component component = s1.isEmpty() ? null : new TranslatableComponent("chat.type.text", this.f_9743_.m_5446_(), s1); Component component1 = new TranslatableComponent("chat.type.text", this.f_9743_.m_5446_(), s); -+ component1 = net.minecraftforge.common.ForgeHooks.onServerChatEvent(this, s, component1); -+ Component finalComponent = component1; -+ if (finalComponent != null) - this.f_9745_.m_6846_().m_143991_(component1, (p_184197_) -> { +- this.f_9745_.m_6846_().m_143991_(component1, (p_184197_) -> { - return this.f_9743_.m_143421_(p_184197_) ? component : component1; -+ return this.f_9743_.m_143421_(p_184197_) ? component : finalComponent; ++ var event = net.minecraftforge.common.ForgeHooks.onServerChatEvent(this, s, component1, s1, component); ++ if (event != null && event.getComponent() != null) ++ this.f_9745_.m_6846_().m_143991_(event.getComponent(), (p_184197_) -> { ++ return this.f_9743_.m_143421_(p_184197_) ? event.getFilteredComponent() : event.getComponent(); }, ChatType.CHAT, this.f_9743_.m_142081_()); } diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index 8cda2ed5fe..5f2c85422a 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -428,15 +428,23 @@ public class ForgeHooks return !MinecraftForge.EVENT_BUS.post(new VanillaGameEvent(level, cause, vanillaEvent, position)); } + @Deprecated @Nullable public static Component onServerChatEvent(ServerGamePacketListenerImpl net, String raw, Component comp) { - ServerChatEvent event = new ServerChatEvent(net.player, raw, comp); + var event = onServerChatEvent(net, raw, comp, null, null); + return event == null ? null : event.getComponent(); + } + + @Nullable + public static ServerChatEvent onServerChatEvent(ServerGamePacketListenerImpl net, String raw, Component comp, @Nullable String filtered, @Nullable Component filteredComp) + { + ServerChatEvent event = new ServerChatEvent(net.player, raw, comp, filtered, filteredComp); if (MinecraftForge.EVENT_BUS.post(event)) { return null; } - return event.getComponent(); + return event; } @@ -1484,7 +1492,7 @@ public class ForgeHooks return fallback; } } - + private static BannerPattern[] nonPatternItems; private static int totalPatternRows; @@ -1514,7 +1522,7 @@ public class ForgeHooks { return nonPatternItems[index].ordinal(); } - + public static boolean shouldSuppressEnderManAnger(EnderMan enderMan, Player player, ItemStack mask) { return mask.isEnderMask(player, enderMan) || MinecraftForge.EVENT_BUS.post(new EnderManAngerEvent(enderMan, player)); diff --git a/src/main/java/net/minecraftforge/event/ServerChatEvent.java b/src/main/java/net/minecraftforge/event/ServerChatEvent.java index b0592a2c79..17941b7cab 100644 --- a/src/main/java/net/minecraftforge/event/ServerChatEvent.java +++ b/src/main/java/net/minecraftforge/event/ServerChatEvent.java @@ -7,6 +7,9 @@ package net.minecraftforge.event; import net.minecraft.network.protocol.game.ServerboundChatPacket; import net.minecraft.server.level.ServerPlayer; + +import javax.annotation.Nullable; + import net.minecraft.network.chat.Component; import net.minecraft.server.network.ServerGamePacketListenerImpl; import net.minecraftforge.common.ForgeHooks; @@ -33,29 +36,44 @@ import net.minecraftforge.eventbus.api.Cancelable; @Cancelable public class ServerChatEvent extends net.minecraftforge.eventbus.api.Event { - private final String message, username; + private final String message; + @Nullable + private final String filteredMessage; + private final String username; private final ServerPlayer player; + @Nullable private Component component; + @Nullable + private Component filteredComponent; + + @Deprecated public ServerChatEvent(ServerPlayer player, String message, Component component) + { + this(player, message, component, null, null); + } + + public ServerChatEvent(ServerPlayer player, String message, Component component, @Nullable String filteredMessage, @Nullable Component filteredComponent) { super(); this.message = message; + this.filteredMessage = filteredMessage; this.player = player; this.username = player.getGameProfile().getName(); this.component = component; + this.filteredComponent = filteredComponent; } - public void setComponent(Component e) - { + public void setComponent(Component e) { this.component = e; + if (this.message.equals(filteredMessage)) + setFilteredComponent(e); } - public Component getComponent() - { - return this.component; - } - + public void setFilteredComponent(Component e) { this.filteredComponent = e; } + public Component getComponent() { return this.component; } + public Component getFilteredComponent() { return this.filteredComponent; } public String getMessage() { return this.message; } + public String getFilteredMessage() { return this.filteredMessage; } public String getUsername() { return this.username; } public ServerPlayer getPlayer() { return this.player; } }