From ac247a89ca0d255e5b4c180a6637d93507a3ec74 Mon Sep 17 00:00:00 2001
From: SuspiciousActivity
 <38253929+SuspiciousActivity@users.noreply.github.com>
Date: Fri, 27 Nov 2020 01:01:30 +0100
Subject: [PATCH] Fixed number deobfuscator

---
 src/me/ByteEdit/edit/Disassembler.java        | 30 ++++++++++++++-----
 .../ByteEdit/edit/StackBasedCalculator.java   | 19 +++++++++++-
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/me/ByteEdit/edit/Disassembler.java b/src/me/ByteEdit/edit/Disassembler.java
index 511e3b3..e914e79 100644
--- a/src/me/ByteEdit/edit/Disassembler.java
+++ b/src/me/ByteEdit/edit/Disassembler.java
@@ -24,6 +24,7 @@ import org.objectweb.asm.tree.FieldNode;
 import org.objectweb.asm.tree.FrameNode;
 import org.objectweb.asm.tree.IincInsnNode;
 import org.objectweb.asm.tree.InnerClassNode;
+import org.objectweb.asm.tree.InsnList;
 import org.objectweb.asm.tree.InsnNode;
 import org.objectweb.asm.tree.IntInsnNode;
 import org.objectweb.asm.tree.InvokeDynamicInsnNode;
@@ -419,9 +420,18 @@ public class Disassembler {
 		HashMap<Label, Integer> labels = new HashMap<Label, Integer>();
 		String localVarTable;
 		String tryCatchTable;
-		for (AbstractInsnNode n : mn.instructions.toArray()) {
+
+		InsnList insnList = mn.instructions;
+		boolean deobfNumbers = Main.INSTANCE.mntmNumbers.isSelected();
+
+		ArrayList<Label> labelsReversed = deobfNumbers ? new ArrayList<>() : null;
+
+		for (AbstractInsnNode n = insnList.getFirst(); n != null; n = n.getNext()) {
 			if (n instanceof LabelNode) {
-				labels.put(((LabelNode) n).getLabel(), labels.size() + 1);
+				int id = labels.size() + 1;
+				if (deobfNumbers)
+					labelsReversed.add(((LabelNode) n).getLabel());
+				labels.put(((LabelNode) n).getLabel(), id);
 			}
 		}
 		if (mn.localVariables != null && !mn.localVariables.isEmpty()) {
@@ -450,14 +460,20 @@ public class Disassembler {
 		} else
 			tryCatchTable = "";
 
-		if (Main.INSTANCE.mntmNumbers.isSelected()) {
-			StackBasedCalculator calc = new StackBasedCalculator(mn.instructions);
+		if (deobfNumbers) {
+			StackBasedCalculator calc = new StackBasedCalculator(insnList);
 			calc.run();
+			insnList = calc.get();
+			int i = 0;
+			for (AbstractInsnNode n = insnList.getFirst(); n != null; n = n.getNext()) {
+				if (n instanceof LabelNode) {
+					((LabelNode) n).setLabel(labelsReversed.get(i++));
+				}
+			}
 		}
 
-		AbstractInsnNode[] insns = mn.instructions.toArray();
-		StringContext ctx = new StringContext(insns.length);
-		for (AbstractInsnNode n : insns) {
+		StringContext ctx = new StringContext(insnList.size());
+		for (AbstractInsnNode n = insnList.getFirst(); n != null; n = n.getNext()) {
 			ctx.next(disassembleInstruction(n, labels, hs));
 		}
 		return new String[] { ctx.finish(), localVarTable, tryCatchTable };
diff --git a/src/me/ByteEdit/edit/StackBasedCalculator.java b/src/me/ByteEdit/edit/StackBasedCalculator.java
index f8b16ed..459e680 100644
--- a/src/me/ByteEdit/edit/StackBasedCalculator.java
+++ b/src/me/ByteEdit/edit/StackBasedCalculator.java
@@ -1,6 +1,7 @@
 package me.ByteEdit.edit;
 
 import java.util.EmptyStackException;
+import java.util.HashMap;
 import java.util.Stack;
 
 import org.objectweb.asm.Opcodes;
@@ -8,6 +9,7 @@ import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.InsnList;
 import org.objectweb.asm.tree.InsnNode;
 import org.objectweb.asm.tree.IntInsnNode;
+import org.objectweb.asm.tree.LabelNode;
 import org.objectweb.asm.tree.LdcInsnNode;
 
 public class StackBasedCalculator implements Opcodes, Runnable {
@@ -19,7 +21,22 @@ public class StackBasedCalculator implements Opcodes, Runnable {
 	private boolean isAtEnd = false;
 
 	public StackBasedCalculator(InsnList insns) {
-		this.insns = insns;
+		this.insns = new InsnList();
+
+		HashMap<LabelNode, LabelNode> labelMap = new HashMap<>();
+		for (AbstractInsnNode node = insns.getFirst(); node != null; node = node.getNext()) {
+			if (node.getType() == 8) {
+				labelMap.put((LabelNode) node, new LabelNode());
+			}
+		}
+
+		for (AbstractInsnNode node = insns.getFirst(); node != null; node = node.getNext()) {
+			this.insns.add(node.clone(labelMap));
+		}
+	}
+
+	public InsnList get() {
+		return insns;
 	}
 
 	@Override