|
|
|
@@ -1,75 +1,52 @@
|
|
|
|
|
package cn.revaria.chatplus.mixin;
|
|
|
|
|
|
|
|
|
|
import io.netty.util.internal.StringUtil;
|
|
|
|
|
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
|
|
|
|
|
import net.minecraft.SharedConstants;
|
|
|
|
|
import net.minecraft.block.AbstractBlock;
|
|
|
|
|
import net.minecraft.block.AirBlock;
|
|
|
|
|
import net.minecraft.block.Block;
|
|
|
|
|
import net.minecraft.entity.EquipmentSlot;
|
|
|
|
|
import net.minecraft.item.Item;
|
|
|
|
|
import net.minecraft.MinecraftVersion;
|
|
|
|
|
import net.minecraft.item.ItemStack;
|
|
|
|
|
import net.minecraft.item.Items;
|
|
|
|
|
import net.minecraft.network.message.LastSeenMessageList;
|
|
|
|
|
import net.minecraft.network.message.MessageChain;
|
|
|
|
|
import net.minecraft.network.message.MessageType;
|
|
|
|
|
import net.minecraft.network.message.SignedMessage;
|
|
|
|
|
import net.minecraft.network.message.MessageChainTaskQueue;
|
|
|
|
|
import net.minecraft.server.MinecraftServer;
|
|
|
|
|
import net.minecraft.network.ClientConnection;
|
|
|
|
|
import net.minecraft.network.message.*;
|
|
|
|
|
import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket;
|
|
|
|
|
import net.minecraft.network.listener.ServerPlayPacketListener;
|
|
|
|
|
import net.minecraft.server.MinecraftServer;
|
|
|
|
|
import net.minecraft.server.filter.FilteredMessage;
|
|
|
|
|
import net.minecraft.server.network.ServerPlayerEntity;
|
|
|
|
|
import net.minecraft.server.network.ConnectedClientData;
|
|
|
|
|
import net.minecraft.server.network.ServerCommonNetworkHandler;
|
|
|
|
|
import net.minecraft.server.network.ServerPlayNetworkHandler;
|
|
|
|
|
import net.minecraft.text.LiteralTextContent;
|
|
|
|
|
import net.minecraft.server.network.ServerPlayerEntity;
|
|
|
|
|
import net.minecraft.text.MutableText;
|
|
|
|
|
import net.minecraft.text.Text;
|
|
|
|
|
import net.minecraft.item.AirBlockItem;
|
|
|
|
|
import net.minecraft.text.TextContent;
|
|
|
|
|
import net.minecraft.util.Formatting;
|
|
|
|
|
import net.minecraft.nbt.NbtCompound;
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
import org.apache.logging.log4j.core.jmx.Server;
|
|
|
|
|
import org.slf4j.Logger;
|
|
|
|
|
import net.minecraft.util.StringHelper;
|
|
|
|
|
import org.spongepowered.asm.mixin.Final;
|
|
|
|
|
import org.spongepowered.asm.mixin.Mixin;
|
|
|
|
|
import org.spongepowered.asm.mixin.Mutable;
|
|
|
|
|
import org.spongepowered.asm.mixin.Shadow;
|
|
|
|
|
import org.spongepowered.asm.mixin.injection.At;
|
|
|
|
|
import org.spongepowered.asm.mixin.injection.Inject;
|
|
|
|
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
|
|
|
import com.google.gson.Gson;
|
|
|
|
|
import com.google.gson.GsonBuilder;
|
|
|
|
|
|
|
|
|
|
import java.time.Instant;
|
|
|
|
|
import java.lang.reflect.Field;
|
|
|
|
|
import java.lang.reflect.InvocationTargetException;
|
|
|
|
|
import java.lang.reflect.Method;
|
|
|
|
|
import java.util.ArrayDeque;
|
|
|
|
|
import java.util.Deque;
|
|
|
|
|
import java.util.Objects;
|
|
|
|
|
import java.util.Optional;
|
|
|
|
|
import java.util.concurrent.CompletableFuture;
|
|
|
|
|
import java.util.regex.Matcher;
|
|
|
|
|
import java.util.regex.Pattern;
|
|
|
|
|
|
|
|
|
|
@Mixin(ServerPlayNetworkHandler.class)
|
|
|
|
|
public abstract class MixinChat {
|
|
|
|
|
@Shadow @Final
|
|
|
|
|
static Logger LOGGER;
|
|
|
|
|
|
|
|
|
|
@Final
|
|
|
|
|
@Shadow
|
|
|
|
|
private MinecraftServer server;
|
|
|
|
|
|
|
|
|
|
@Shadow
|
|
|
|
|
public abstract void disconnect(Text reason);
|
|
|
|
|
public abstract class MixinChat extends ServerCommonNetworkHandler {
|
|
|
|
|
public MixinChat(MinecraftServer server, ClientConnection connection, ConnectedClientData clientData) {
|
|
|
|
|
super(server, connection, clientData);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Final
|
|
|
|
|
@Shadow
|
|
|
|
|
private MessageChainTaskQueue messageChainTaskQueue;
|
|
|
|
|
|
|
|
|
|
@Shadow
|
|
|
|
|
private ServerPlayerEntity player;
|
|
|
|
|
public ServerPlayerEntity player;
|
|
|
|
|
|
|
|
|
|
@Shadow protected abstract Optional<LastSeenMessageList> validateMessage(String message, Instant timestamp, LastSeenMessageList.Acknowledgment acknowledgment);
|
|
|
|
|
// @Shadow protected abstract Optional<LastSeenMessageList> validateMessage(LastSeenMessageList.Acknowledgment acknowledgment);
|
|
|
|
|
|
|
|
|
|
@Shadow protected abstract Optional<LastSeenMessageList> validateAcknowledgment(LastSeenMessageList.Acknowledgment acknowledgment);
|
|
|
|
|
|
|
|
|
|
@Shadow protected abstract SignedMessage getSignedMessage(ChatMessageC2SPacket packet, LastSeenMessageList lastSeenMessages) throws MessageChain.MessageChainException;
|
|
|
|
|
|
|
|
|
@@ -86,7 +63,7 @@ public abstract class MixinChat {
|
|
|
|
|
if (hasIllegalCharacter(packet.chatMessage())) {
|
|
|
|
|
disconnect(Text.translatable("multiplayer.disconnect.illegal_characters"));
|
|
|
|
|
} else {
|
|
|
|
|
Optional<LastSeenMessageList> optional = this.validateMessage(packet.chatMessage(), packet.timestamp(), packet.acknowledgment());
|
|
|
|
|
Optional<LastSeenMessageList> optional = this.validateAcknowledgment(packet.acknowledgment());
|
|
|
|
|
if (optional.isPresent()) {
|
|
|
|
|
if (!packet.chatMessage().startsWith("/")){
|
|
|
|
|
|
|
|
|
@@ -105,9 +82,9 @@ public abstract class MixinChat {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
MutableText changedText = MutableText.of(TextContent.EMPTY);
|
|
|
|
|
for (int i = 0; i < messages.length; i++) {
|
|
|
|
|
changedText.append(Text.of(messages[i]));
|
|
|
|
|
MutableText changedText = Text.empty();
|
|
|
|
|
for (String message : messages) {
|
|
|
|
|
changedText.append(Text.of(message));
|
|
|
|
|
if (!itemDeque.isEmpty()) {
|
|
|
|
|
ItemStack itemStack;
|
|
|
|
|
if (itemDeque.getFirst() == -1) {
|
|
|
|
@@ -122,10 +99,43 @@ public abstract class MixinChat {
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
SignedMessage signedMessage = getSignedMessage(packet, (LastSeenMessageList) optional.get());
|
|
|
|
|
/*server.getPlayerManager().broadcast(signedMessage.withUnsignedContent(
|
|
|
|
|
changedText
|
|
|
|
|
), player, MessageType.params(MessageType.CHAT, player));*/
|
|
|
|
|
handleDecoratedMessage(signedMessage.withUnsignedContent(changedText));
|
|
|
|
|
server.getPlayerManager().broadcast(signedMessage.withUnsignedContent(
|
|
|
|
|
changedText
|
|
|
|
|
), player, MessageType.params(MessageType.CHAT, player));
|
|
|
|
|
|
|
|
|
|
// Compatible with mod "Discord Integration"
|
|
|
|
|
try {
|
|
|
|
|
Class<?> DiscordIntegrationMod = Class.forName("de.erdbeerbaerlp.dcintegration.architectury.DiscordIntegrationMod");
|
|
|
|
|
Method handleChatMessage = DiscordIntegrationMod.getMethod("handleChatMessage", SignedMessage.class, ServerPlayerEntity.class);
|
|
|
|
|
handleChatMessage.invoke(null, signedMessage.withUnsignedContent(changedText), player);
|
|
|
|
|
} catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException |
|
|
|
|
|
IllegalAccessException ignored) { }
|
|
|
|
|
|
|
|
|
|
// Compatible with mod "Dynmap"
|
|
|
|
|
String[] minecraftVersion = MinecraftVersion.CURRENT.getName().split("\\.");
|
|
|
|
|
int minecraftPatchVersion = minecraftVersion.length == 3 ? Integer.parseInt(minecraftVersion[2]) : 0;
|
|
|
|
|
for (int i = minecraftPatchVersion; i >= 0; i--){
|
|
|
|
|
String version = minecraftVersion[0] + "." + minecraftVersion[1] + (i == 0 ? "" : ("." + i));
|
|
|
|
|
try {
|
|
|
|
|
/*
|
|
|
|
|
Warning: Using reflection can make the code harder to maintain, debug, and understand.
|
|
|
|
|
Statement: DynmapMod.plugin.chathandler.handleChat()
|
|
|
|
|
*/
|
|
|
|
|
Class<?> DynmapMod = Class.forName("org.dynmap.fabric_" + version.replaceAll("\\.", "_") + ".DynmapMod");
|
|
|
|
|
Field pluginField = DynmapMod.getField("plugin");
|
|
|
|
|
Object plugin = pluginField.get(null);
|
|
|
|
|
Class<?> pluginClass = plugin.getClass();
|
|
|
|
|
Field chatHandlerField = pluginClass.getDeclaredField("chathandler");
|
|
|
|
|
chatHandlerField.setAccessible(true);
|
|
|
|
|
Object chatHandler = chatHandlerField.get(plugin);
|
|
|
|
|
Class<?> chatHandlerClass = chatHandler.getClass();
|
|
|
|
|
Method handleChat = chatHandlerClass.getMethod("handleChat", ServerPlayerEntity.class, String.class);
|
|
|
|
|
handleChat.invoke(chatHandler, player, signedMessage.withUnsignedContent(changedText).getContent().getString());
|
|
|
|
|
break;
|
|
|
|
|
} catch (ClassNotFoundException | NoSuchMethodException | NoSuchFieldException | NullPointerException |
|
|
|
|
|
IllegalAccessException | InvocationTargetException ignored) { }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} catch (MessageChain.MessageChainException e) {
|
|
|
|
|
handleMessageChainException(e);
|
|
|
|
|
}
|
|
|
|
@@ -133,19 +143,17 @@ public abstract class MixinChat {
|
|
|
|
|
this.server.submit(() -> {
|
|
|
|
|
SignedMessage signedMessage;
|
|
|
|
|
try {
|
|
|
|
|
signedMessage = this.getSignedMessage(packet, (LastSeenMessageList) optional.get());
|
|
|
|
|
signedMessage = this.getSignedMessage(packet, optional.get());
|
|
|
|
|
} catch (MessageChain.MessageChainException var6) {
|
|
|
|
|
handleMessageChainException(var6);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CompletableFuture<FilteredMessage> completableFuture = filterText(signedMessage.getSignedContent());
|
|
|
|
|
CompletableFuture<Text> completableFuture2 = this.server.getMessageDecorator().decorate(this.player, signedMessage.getContent());
|
|
|
|
|
messageChainTaskQueue.append((executor) -> {
|
|
|
|
|
return CompletableFuture.allOf(completableFuture, completableFuture2).thenAcceptAsync((void_) -> {
|
|
|
|
|
SignedMessage signedMessage2 = signedMessage.withUnsignedContent((Text) completableFuture2.join()).withFilterMask(((FilteredMessage) completableFuture.join()).mask());
|
|
|
|
|
handleDecoratedMessage(signedMessage2);
|
|
|
|
|
}, executor);
|
|
|
|
|
Text decoratedMessage = this.server.getMessageDecorator().decorate(this.player, signedMessage.getContent());
|
|
|
|
|
messageChainTaskQueue.append(completableFuture, filteredMessage -> {
|
|
|
|
|
SignedMessage message = signedMessage.withUnsignedContent(decoratedMessage).withFilterMask(filteredMessage.mask());
|
|
|
|
|
this.handleDecoratedMessage(message);
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
@@ -158,7 +166,7 @@ public abstract class MixinChat {
|
|
|
|
|
|
|
|
|
|
private static boolean hasIllegalCharacter(String message) {
|
|
|
|
|
for(int i = 0; i < message.length(); ++i) {
|
|
|
|
|
if (!SharedConstants.isValidChar(message.charAt(i))) {
|
|
|
|
|
if (!StringHelper.isValidChar(message.charAt(i))) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
CPTProgrammer