Skip to content

Support for Kilt's chat hooks. // Compatability with NeoForge chat-using mods. #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexyzer wants to merge 1 commit into
base: 1.21
Choose a base branch
from
Open

Support for Kilt's chat hooks. // Compatability with NeoForge chat-using mods. #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions src/main/java/eu/pb4/styledchat/mixin/ServerPlayNetworkManagerMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,9 @@
import eu.pb4.styledchat.config.ConfigManager;
import eu.pb4.styledchat.ducks.ExtPlayNetworkHandler;
import eu.pb4.styledchat.StyledChatUtils;
import net.minecraft.network.ClientConnection;
import net.minecraft.network.message.MessageDecorator;
import net.minecraft.network.message.MessageType;
import net.minecraft.network.message.SignedMessage;
import net.minecraft.network.packet.c2s.common.ClientOptionsC2SPacket;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ConnectedClientData;
import net.minecraft.server.network.ServerPlayNetworkHandler;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.*;
Expand All @@ -24,8 +20,6 @@
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

import java.util.concurrent.CompletableFuture;

@Mixin(ServerPlayNetworkHandler.class)
public abstract class ServerPlayNetworkManagerMixin implements ExtPlayNetworkHandler {

Expand All @@ -42,10 +36,14 @@ private Text styledChat_replaceDisconnectMessage(Text text) {

@Redirect(method = "method_44900", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/message/MessageDecorator;decorate(Lnet/minecraft/server/network/ServerPlayerEntity;Lnet/minecraft/text/Text;)Lnet/minecraft/text/Text;"))
private Text styledChat_replaceDecorator2(MessageDecorator instance, ServerPlayerEntity player, Text text) {

//Call original function for Kilt's hooks
var original = instance.decorate(player, text);

if (player != null) {
return StyledChatUtils.formatFor(PlaceholderContext.of(player), text.getString());
return StyledChatUtils.formatFor(PlaceholderContext.of(player), original.getString());
} else {
return StyledChatUtils.formatFor(PlaceholderContext.of(StyledChatMod.server), text.getString());
return StyledChatUtils.formatFor(PlaceholderContext.of(StyledChatMod.server), original.getString());
}
}

Expand Down