From 6ef0b0b64522ae45bf3747b26bd6dc5f58358f82 Mon Sep 17 00:00:00 2001
From: Wyvest <45589059+Wyvest@users.noreply.github.com>
Date: Sun, 6 Feb 2022 10:39:36 +0700
Subject: 1.3.0

---
 .../mixin/RedactionNameHighlightMixin.java         | 22 ++++++++++++++++++++++
 .../chatting/mixin/WyvtilsListenerMixin.java       |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/cc/woverflow/chatting/mixin/RedactionNameHighlightMixin.java

(limited to 'src/main/java/cc/woverflow/chatting/mixin')

diff --git a/src/main/java/cc/woverflow/chatting/mixin/RedactionNameHighlightMixin.java b/src/main/java/cc/woverflow/chatting/mixin/RedactionNameHighlightMixin.java
new file mode 100644
index 0000000..eab1bfe
--- /dev/null
+++ b/src/main/java/cc/woverflow/chatting/mixin/RedactionNameHighlightMixin.java
@@ -0,0 +1,22 @@
+package cc.woverflow.chatting.mixin;
+
+import cc.woverflow.chatting.utils.RenderUtils;
+import org.spongepowered.asm.mixin.Dynamic;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Pseudo
+@Mixin(targets = "net.wyvest.redaction.features.NameHighlight")
+public class RedactionNameHighlightMixin {
+
+    @Dynamic("REDACTION")
+    @Inject(method = "highlightName", at = @At("HEAD"), cancellable = true)
+    private static void onNameHighlight(String text, CallbackInfoReturnable<String> cir) {
+        if (RenderUtils.getBypassNameHighlight()) {
+            cir.setReturnValue(text);
+        }
+    }
+}
diff --git a/src/main/java/cc/woverflow/chatting/mixin/WyvtilsListenerMixin.java b/src/main/java/cc/woverflow/chatting/mixin/WyvtilsListenerMixin.java
index f5b7cfb..4c7448e 100644
--- a/src/main/java/cc/woverflow/chatting/mixin/WyvtilsListenerMixin.java
+++ b/src/main/java/cc/woverflow/chatting/mixin/WyvtilsListenerMixin.java
@@ -16,6 +16,6 @@ public class WyvtilsListenerMixin {
     @Dynamic("Wyvtils")
     @Inject(method = "onStringRendered", at = @At("HEAD"), cancellable = true, remap = false)
     private void cancelStringRender(@Coerce Object a, CallbackInfo ci) {
-        if (RenderUtils.getBypassWyvtils()) ci.cancel();
+        if (RenderUtils.getBypassNameHighlight()) ci.cancel();
     }
 }
-- 
cgit