From 1d8816861e38610358166aaaa2fdfeb6ea945790 Mon Sep 17 00:00:00 2001
From: FengMing <83573615+3093FengMing@users.noreply.github.com>
Date: Sat, 8 Apr 2023 15:36:38 +0800
Subject: [PATCH] fix issues#5

---
 src/main/java/me/fengming/vaultpatcher/ThePatcher.java   | 2 +-
 .../fengming/vaultpatcher/mixin/BaseComponentMixin.java  | 2 ++
 .../fengming/vaultpatcher/mixin/TextComponentMixin.java  | 9 ++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/me/fengming/vaultpatcher/ThePatcher.java b/src/main/java/me/fengming/vaultpatcher/ThePatcher.java
index e9b4d19..23f66b0 100644
--- a/src/main/java/me/fengming/vaultpatcher/ThePatcher.java
+++ b/src/main/java/me/fengming/vaultpatcher/ThePatcher.java
@@ -11,7 +11,7 @@ public ThePatcher() {
     }
 
     public static String patch(String string, String method) {
-        if (string == null || string.equals("") || string.isBlank()) {
+        if (string == null || string.equals("")) {
             return string;
         }
         if (!VaultPatcherConfig.getOptimize().isDisableExport()) {
diff --git a/src/main/java/me/fengming/vaultpatcher/mixin/BaseComponentMixin.java b/src/main/java/me/fengming/vaultpatcher/mixin/BaseComponentMixin.java
index 79283b1..30d3266 100644
--- a/src/main/java/me/fengming/vaultpatcher/mixin/BaseComponentMixin.java
+++ b/src/main/java/me/fengming/vaultpatcher/mixin/BaseComponentMixin.java
@@ -33,6 +33,7 @@ public abstract class BaseComponentMixin {
             )
     )
     private FormattedText proxy_getVisualOrder(FormattedText p_128116_) {
+        if (p_128116_ instanceof TranslatableComponent) return p_128116_;
         if (p_128116_ instanceof TextComponent text) {
             String c = ThePatcher.patch(text.getText(), "BaseComponent#getVisualOrder");
             if (c != null && !c.equals("")) {
@@ -44,6 +45,7 @@ private FormattedText proxy_getVisualOrder(FormattedText p_128116_) {
 
     @Inject(method = "append", at = @At("HEAD"), cancellable = true)
     private void proxy_append(Component p_130585_, CallbackInfoReturnable<MutableComponent> cir) {
+        if (p_130585_ instanceof TranslatableComponent) return;
         if (p_130585_ instanceof TextComponent text) {
             String c = ThePatcher.patch(text.getText(), "BaseComponent#append");
             if (c != null && !c.equals("")) {
diff --git a/src/main/java/me/fengming/vaultpatcher/mixin/TextComponentMixin.java b/src/main/java/me/fengming/vaultpatcher/mixin/TextComponentMixin.java
index 146b6e2..ecd2fd0 100644
--- a/src/main/java/me/fengming/vaultpatcher/mixin/TextComponentMixin.java
+++ b/src/main/java/me/fengming/vaultpatcher/mixin/TextComponentMixin.java
@@ -28,16 +28,15 @@ private void proxy_getContents(CallbackInfoReturnable<String> cir) {
         if (c != null && !c.equals("")) {
             this.text = c;
             cir.setReturnValue(c);
-        }
+        } else cir.setReturnValue(this.text);
     }
 
     @Inject(method = "getText", at = @At("HEAD"), cancellable = true)
     private void proxy_getText(CallbackInfoReturnable<String> cir) {
         String c = ThePatcher.patch(this.getText_(), "TextComponent#getText");
-        if (c != null && !c.equals("")) {
-            this.text = c;
-            cir.setReturnValue(c);
-        }
+        if (c == null) {
+            cir.setReturnValue(this.text);
+        } else cir.setReturnValue(this.text);
     }
 
 }