From 22043d568472bec586704b984b1f1c67eaadf504 Mon Sep 17 00:00:00 2001
From: Chaofan <herbix@163.com>
Date: Sat, 12 Oct 2024 12:36:51 +0800
Subject: [PATCH] Fix for basemod update

---
 .../RenderCustomDynamicVariablePatches.java   | 12 ++++-------
 .../ReplaceDynamicVariableExprEditor.java     | 21 ++-----------------
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/src/main/java/EmojiMod/patches/BaseMod/RenderCustomDynamicVariablePatches.java b/src/main/java/EmojiMod/patches/BaseMod/RenderCustomDynamicVariablePatches.java
index c1f0a77..2e8cef1 100644
--- a/src/main/java/EmojiMod/patches/BaseMod/RenderCustomDynamicVariablePatches.java
+++ b/src/main/java/EmojiMod/patches/BaseMod/RenderCustomDynamicVariablePatches.java
@@ -2,18 +2,14 @@
 
 import EmojiMod.patches.com.megacrit.cardcrawl.RenderDescriptionExprEditor;
 import EmojiMod.patches.com.megacrit.cardcrawl.ReplaceDynamicVariableExprEditor;
-import EmojiMod.patches.com.megacrit.cardcrawl.cards.AbstractCard.AbstractCardPatches;
-import basemod.patches.com.megacrit.cardcrawl.cards.AbstractCard.RenderCustomDynamicVariable;
 import com.evacipated.cardcrawl.modthespire.lib.SpirePatch;
-import com.megacrit.cardcrawl.cards.AbstractCard;
-import com.megacrit.cardcrawl.screens.SingleCardViewPopup;
 import javassist.expr.ExprEditor;
 
 public class RenderCustomDynamicVariablePatches {
 
     @SpirePatch(
             clz = basemod.patches.com.megacrit.cardcrawl.cards.AbstractCard.RenderCustomDynamicVariable.Inner.class,
-            method = "myRenderDynamicVariable"
+            method = "subRenderDynamicVariable"
     )
     public static class ReplaceNumberWithEmojiAbstractCardPatch {
         public static ExprEditor Instrument() {
@@ -23,7 +19,7 @@ public static ExprEditor Instrument() {
 
     @SpirePatch(
             clz = basemod.patches.com.megacrit.cardcrawl.screens.SingleCardViewPopup.RenderCustomDynamicVariable.Inner.class,
-            method = "myRenderDynamicVariable"
+            method = "subRenderDynamicVariable"
     )
     public static class ReplaceNumberWithEmojiSingleCardViewPopupPatch {
         public static ExprEditor Instrument() {
@@ -33,7 +29,7 @@ public static ExprEditor Instrument() {
 
     @SpirePatch(
             clz = basemod.patches.com.megacrit.cardcrawl.cards.AbstractCard.RenderCustomDynamicVariable.Inner.class,
-            method = "myRenderDynamicVariable"
+            method = "subRenderDynamicVariable"
     )
     public static class LineSpacingDynamicVarAbstractCardPatch {
         public static ExprEditor Instrument() {
@@ -48,7 +44,7 @@ public static ExprEditor Instrument() {
 
     @SpirePatch(
             clz = basemod.patches.com.megacrit.cardcrawl.screens.SingleCardViewPopup.RenderCustomDynamicVariable.Inner.class,
-            method = "myRenderDynamicVariable"
+            method = "subRenderDynamicVariable"
     )
     public static class LineSpacingDynamicVarSingleCardViewPopupPatch {
         public static ExprEditor Instrument() {
diff --git a/src/main/java/EmojiMod/patches/com/megacrit/cardcrawl/ReplaceDynamicVariableExprEditor.java b/src/main/java/EmojiMod/patches/com/megacrit/cardcrawl/ReplaceDynamicVariableExprEditor.java
index ab31593..3dcdf3d 100644
--- a/src/main/java/EmojiMod/patches/com/megacrit/cardcrawl/ReplaceDynamicVariableExprEditor.java
+++ b/src/main/java/EmojiMod/patches/com/megacrit/cardcrawl/ReplaceDynamicVariableExprEditor.java
@@ -1,36 +1,19 @@
 package EmojiMod.patches.com.megacrit.cardcrawl;
 
-import EmojiMod.EmojiMod;
 import EmojiMod.util.EmojiMappingUtils;
 import javassist.CannotCompileException;
 import javassist.expr.ExprEditor;
 import javassist.expr.MethodCall;
 
-import java.util.stream.Collectors;
-
 public class ReplaceDynamicVariableExprEditor extends ExprEditor {
-
-    private int callCount;
-
-    public ReplaceDynamicVariableExprEditor() {
-        callCount = 0;
-    }
-
     @Override
     public void edit(MethodCall m) throws CannotCompileException {
-        if (m.getClassName().equals("java.lang.StringBuilder") && m.getMethodName().equals("append")) {
-            if (callCount != 3) {
-                callCount++;
-                return;
-            }
-
+        if (m.getClassName().equals(Integer.class.getName()) && m.getMethodName().equals("toString")) {
             m.replace(
         "{" +
-                    "$_ = stringBuilder.append(" + EmojiMappingUtils.class.getName() + ".replaceIntWithEmoji(num));" +
+                    "$_ = " + EmojiMappingUtils.class.getName() + ".replaceIntWithEmoji($1);" +
                 "}"
             );
-
-            callCount++;
         }
 
     }