Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-12-17 22:57:51 +01:00
Code Issues Projects Releases Wiki Activity

Update ChatExtensions for 1.16.4

Browse Source 
Fixes #1044
This commit is contained in:
Dan Mulloy 2020-12-27 00:04:11 -05:00
parent 1545a88e06
commit 13b3d8679d
No known key found for this signature in database
GPG Key ID: BFACD592A5F0DFD6
1 changed files with 23 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/main/java/com/comphenix/protocol/utility/ChatExtensions.java
View File

@ -17,27 +17,20 @@
package com.comphenix.protocol.utility; package com.comphenix.protocol.utility;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Modifier; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.UUID;
import com.comphenix.protocol.wrappers.WrappedChatComponent;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import com.comphenix.protocol.PacketType; import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.ProtocolManager; import com.comphenix.protocol.ProtocolManager;
import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.injector.PacketConstructor;
import com.comphenix.protocol.injector.packet.PacketRegistry;
import com.comphenix.protocol.reflect.FieldAccessException; import com.comphenix.protocol.reflect.FieldAccessException;
import com.comphenix.protocol.reflect.FuzzyReflection;
import com.comphenix.protocol.reflect.accessors.Accessors;
import com.comphenix.protocol.reflect.accessors.MethodAccessor;
import com.comphenix.protocol.reflect.fuzzy.FuzzyMatchers;
import com.comphenix.protocol.reflect.fuzzy.FuzzyMethodContract;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.Iterables;
/** /**
* Utility methods for sending chat messages. * Utility methods for sending chat messages.
@ -46,14 +39,9 @@ import com.google.common.collect.Iterables;
*/ */
public class ChatExtensions { public class ChatExtensions {
// Used to sent chat messages // Used to sent chat messages
private ProtocolManager manager; private final ProtocolManager manager;
// The chat packet constructor private static final UUID SERVER_UUID = new UUID(0L, 0L);
private static volatile PacketConstructor chatConstructor;
// Whether or not we have to use the post-1.6.1 chat format
private static volatile Constructor<?> jsonConstructor = getJsonFormatConstructor();
private static volatile MethodAccessor messageFactory;
public ChatExtensions(ProtocolManager manager) { public ChatExtensions(ProtocolManager manager) {
this.manager = manager; this.manager = manager;
@ -100,51 +88,19 @@ public class ChatExtensions {
* @param message - the message to send. * @param message - the message to send.
* @return The packets. * @return The packets.
*/ */
public static PacketContainer[] createChatPackets(String message) { public static List<PacketContainer> createChatPackets(String message) {
if (jsonConstructor != null) { List<PacketContainer> packets = new ArrayList<>();
if (chatConstructor == null) { WrappedChatComponent[] components = WrappedChatComponent.fromChatMessage(message);
Class<?> messageClass = jsonConstructor.getParameterTypes()[0]; for (WrappedChatComponent component : components) {
chatConstructor = PacketConstructor.DEFAULT.withPacket(PacketType.Play.Server.CHAT, new Object[] { messageClass }); PacketContainer packet = new PacketContainer(PacketType.Play.Server.CHAT);
packet.getChatComponents().write(0, component);
// Try one of the string constructors if (MinecraftVersion.NETHER_UPDATE_2.atOrAbove()) {
if (MinecraftReflection.isUsingNetty()) { packet.getUUIDs().write(0, SERVER_UUID);
messageFactory = Accessors.getMethodAccessor(
MinecraftReflection.getCraftMessageClass(), "fromString", String.class);
} else {
messageFactory = Accessors.getMethodAccessor(
FuzzyReflection.fromClass(messageClass).getMethod(
FuzzyMethodContract.newBuilder().
requireModifier(Modifier.STATIC).
parameterCount(1).
parameterExactType(String.class).
returnTypeMatches(FuzzyMatchers.matchParent()).
build())
);
}
} }
packets.add(packet);
// Minecraft 1.7.2 and later
if (MinecraftReflection.isUsingNetty()) {
Object[] components = (Object[]) messageFactory.invoke(null, message);
PacketContainer[] packets = new PacketContainer[components.length];
for (int i = 0; i < components.length; i++) {
packets[i] = chatConstructor.createPacket(components[i]);
}
return packets;
// Minecraft 1.6.1 - 1.6.4
} else {
return new PacketContainer[] { chatConstructor.createPacket(messageFactory.invoke(null, message)) };
}
} else {
if (chatConstructor == null) {
chatConstructor = PacketConstructor.DEFAULT.withPacket(PacketType.Play.Server.CHAT, new Object[] { message });
}
// Minecraft 1.6.0 and earlier
return new PacketContainer[] { chatConstructor.createPacket(message) };
} }
return packets;
} }
/** /**
@ -203,27 +159,11 @@ public class ChatExtensions {
int current = 0; int current = 0;
// Find the longest line // Find the longest line
for (int i = 0; i < lines.length; i++) { for (String line : lines) {
if (current < lines[i].length()) if (current < line.length())
current = lines[i].length(); current = line.length();
} }
return current; return current;
} }
/**
* Retrieve a constructor for post-1.6.1 chat packets.
* @return A constructor for JSON-based packets.
*/
static Constructor<?> getJsonFormatConstructor() {
Class<?> chatPacket = PacketRegistry.getPacketClassFromType(PacketType.Play.Server.CHAT, true);
List<Constructor<?>> list = FuzzyReflection.fromClass(chatPacket).getConstructorList(
FuzzyMethodContract.newBuilder().
parameterCount(1).
parameterMatches(MinecraftReflection.getMinecraftObjectMatcher()).
build()
);
// First element or NULL
return Iterables.getFirst(list, null);
}
} }