From 08af91a3f75fe6f15a11cf82e5473986893cfbcc Mon Sep 17 00:00:00 2001
From: SuspiciousActivity
 <38253929+SuspiciousActivity@users.noreply.github.com>
Date: Thu, 25 Nov 2021 22:02:43 +0100
Subject: [PATCH] added deobfuscation: noop remover

---
 src/me/ByteEdit/edit/Disassembler.java | 3 +++
 src/me/ByteEdit/main/Main.java         | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/me/ByteEdit/edit/Disassembler.java b/src/me/ByteEdit/edit/Disassembler.java
index d074e59..8aa084a 100644
--- a/src/me/ByteEdit/edit/Disassembler.java
+++ b/src/me/ByteEdit/edit/Disassembler.java
@@ -311,6 +311,7 @@ public class Disassembler implements IDecompiler {
 
 		InsnList insnList = mn.instructions;
 		boolean deobfNumbers = Main.INSTANCE.mntmNumbers.isSelected();
+		boolean deobfNops = Main.INSTANCE.mntmNops.isSelected();
 
 		ArrayList<Label> labelsReversed = deobfNumbers ? new ArrayList<>() : null;
 
@@ -362,6 +363,8 @@ public class Disassembler implements IDecompiler {
 
 		StringContext ctx = new StringContext(insnList.size());
 		for (AbstractInsnNode n = insnList.getFirst(); n != null; n = n.getNext()) {
+			if (deobfNops && n.getOpcode() == Opcodes.NOP)
+				continue;
 			ctx.next(disassembleInstruction(n, labels, hs));
 		}
 		return new String[] { ctx.finish(), localVarTable, tryCatchTable };
diff --git a/src/me/ByteEdit/main/Main.java b/src/me/ByteEdit/main/Main.java
index f7ea59a..a9f6f84 100644
--- a/src/me/ByteEdit/main/Main.java
+++ b/src/me/ByteEdit/main/Main.java
@@ -142,7 +142,7 @@ public class Main extends JFrame {
 	private JMenuItem rdbtnmntm10000;
 	public JCheckBoxMenuItem mntmMultithreaded;
 	private JMenu mnDeobfuscation;
-	public JCheckBoxMenuItem mntmNumbers;
+	public JCheckBoxMenuItem mntmNumbers, mntmNops;
 
 	public static final Object treeLock = new Object();
 
@@ -424,6 +424,9 @@ public class Main extends JFrame {
 
 		mntmNumbers = new JCheckBoxMenuItem("Numbers");
 		mnDeobfuscation.add(mntmNumbers);
+		
+		mntmNops = new JCheckBoxMenuItem("Nops");
+		mnDeobfuscation.add(mntmNops);
 
 		contentPane = new JPanel();
 		contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));