Skip to content

Fix for basemod update #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
herbix wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for basemod update #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions src/main/java/EmojiMod/patches/BaseMod/RenderCustomDynamicVariablePatches.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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() {
Expand All @@ -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() {
Expand All @@ -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() {
Expand Down
21 changes: 2 additions & 19 deletions src/main/java/EmojiMod/patches/com/megacrit/cardcrawl/ReplaceDynamicVariableExprEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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++;
}

}
Expand Down