diff --git a/NotSoEssential-Forge/src/main/java/com/github/scherso/notsoessential/ChatComponentSanitizer.java b/NotSoEssential-Forge/src/main/java/com/github/scherso/notsoessential/ChatComponentSanitizer.java new file mode 100644 index 0000000..a19b84d --- /dev/null +++ b/NotSoEssential-Forge/src/main/java/com/github/scherso/notsoessential/ChatComponentSanitizer.java @@ -0,0 +1,40 @@ +package com.github.scherso.notsoessential; + +import net.minecraft.util.ChatComponentScore; +import net.minecraft.util.ChatComponentSelector; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.IChatComponent; + +public final class ChatComponentSanitizer +{ + + private ChatComponentSanitizer() {} + + /** + * Vanilla can't serialize Essential's UTextComponent, which crashes LabyMod's chat. + * Anything that isn't a vanilla component is copied into a ChatComponentText. + * + * @param component component about to be serialized + * @return the component, or a vanilla copy of it + */ + public static IChatComponent sanitize(IChatComponent component) + { + if (component == null + || component instanceof ChatComponentText + || component instanceof ChatComponentTranslation + || component instanceof ChatComponentScore + || component instanceof ChatComponentSelector) + return (component); + + final ChatComponentText copy = new ChatComponentText(component.getUnformattedTextForChat()); + copy.setChatStyle(component.getChatStyle().createShallowCopy()); + + /* Siblings get sanitized when the serializer recurses into them. */ + for (Object sibling : component.getSiblings()) + copy.appendSibling((IChatComponent) sibling); + + return (copy); + } + +} diff --git a/NotSoEssential-Forge/src/main/java/com/github/scherso/notsoessential/asm/ClassTransformer.java b/NotSoEssential-Forge/src/main/java/com/github/scherso/notsoessential/asm/ClassTransformer.java index 0972eea..0f6171d 100644 --- a/NotSoEssential-Forge/src/main/java/com/github/scherso/notsoessential/asm/ClassTransformer.java +++ b/NotSoEssential-Forge/src/main/java/com/github/scherso/notsoessential/asm/ClassTransformer.java @@ -34,6 +34,7 @@ public class ClassTransformer implements IClassTransformer public ClassTransformer() { + registerTransformer(new ChatComponentSerializerTransformer()); registerTransformer(new CommandConfigTransformer()); registerTransformer(new ConnectionManagerKtTransformer()); registerTransformer(new ConnectionManagerTransformer()); diff --git a/NotSoEssential-Forge/src/main/java/com/github/scherso/notsoessential/asm/transformer/ChatComponentSerializerTransformer.java b/NotSoEssential-Forge/src/main/java/com/github/scherso/notsoessential/asm/transformer/ChatComponentSerializerTransformer.java new file mode 100644 index 0000000..20de8b4 --- /dev/null +++ b/NotSoEssential-Forge/src/main/java/com/github/scherso/notsoessential/asm/transformer/ChatComponentSerializerTransformer.java @@ -0,0 +1,60 @@ +package com.github.scherso.notsoessential.asm.transformer; + +import com.github.scherso.notsoessential.asm.ITransformer; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.tree.VarInsnNode; + +import static org.objectweb.asm.Opcodes.*; + +public class ChatComponentSerializerTransformer implements ITransformer +{ + + /* Used to find the compiled serialize method, its name and first argument are obfuscated. */ + private static final String SERIALIZE_TAIL = + ";Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;"; + + @Override + public String getClassName() + { + return ("net.minecraft.util.IChatComponent$Serializer"); + } + + /** + * Runs the component through {@link com.github.scherso.notsoessential.ChatComponentSanitizer} + * at the head of {@code serialize}, fixing the crash with LabyMod on Essential's UTextComponent. + * + *

The class is still obfuscated when this runs, so {@code serialize} is found by its + * descriptor instead of its name.

+ * + * @param classNode transformed class node + * @param name transformed class name + */ + @Override + public void transform(ClassNode classNode, String name) + { + for (MethodNode method : classNode.methods) + { + if (!method.desc.startsWith("(L") || !method.desc.endsWith(SERIALIZE_TAIL)) continue; + + /* Skip the extra (Object, ...) overload the compiler adds, it just calls this one. */ + final String component = Type.getArgumentTypes(method.desc)[0].getInternalName(); + if (component.equals("java/lang/Object")) continue; + + method.instructions.insert(this.createInsnList( + new VarInsnNode(ALOAD, 1), + new MethodInsnNode( + INVOKESTATIC, + "com/github/scherso/notsoessential/ChatComponentSanitizer", + "sanitize", + "(L" + component + ";)L" + component + ";", + false + ), + new VarInsnNode(ASTORE, 1) + )); + } + } + +}