update ASM 9.2

Fixed POP2 instruction in StackBasedCalculator.

src/me/ByteEdit/boxes/CompilationBox.java

@@ -15,6 +15,8 @@ import java.io.StringWriter;
 import java.net.URI;
 import java.nio.file.Files;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.swing.JComponent;
 import javax.swing.JFrame;
@@ -106,7 +108,7 @@ public class CompilationBox extends JFrame {
 							null, Arrays.asList(new JavaSourceFromString("Compiled", source))).call();
 					String res = out.toString();
 					if (res.isEmpty()) {
-						SingleThreadedExecutor.execute(() -> {
+						SingleThreadedExecutor.submit(() -> {
 							try {
 								File clazz = new File(tmpFolder, "Compiled.class");
 								ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -122,7 +124,13 @@ public class CompilationBox extends JFrame {
 								ClassNode node = new ClassNode();
 								read.accept(node, 0);
 								EnumDecompiler decompiler = EnumDecompiler.BYTEEDIT;
-								String dis = decompiler.getDecompiler().decompile(node);
+								ClassNode mainNode = node;
+
+								Map<String, ClassNode> classNodes;
+								synchronized (Main.classNodes) {
+									classNodes = new HashMap<>(Main.classNodes);
+								}
+								classNodes.put("Compiled", node);
 								File[] files = tmpFolder.listFiles();
 								if (files != null)
 									for (File f : files) {
@@ -137,22 +145,26 @@ public class CompilationBox extends JFrame {
 										read = new ClassReader(baos.toByteArray());
 										node = new ClassNode();
 										read.accept(node, 0);
-										dis += "\n" + decompiler.getDecompiler().decompile(node);
+										classNodes.put(node.name, node);
 									}
-								compSuccess.textArea.setText(dis);
+								compSuccess.textArea
+										.setText(decompiler.getDecompiler().decompile(mainNode, classNodes));
 								compSuccess.setVisible(true);
 							} catch (IOException e2) {
 								e2.printStackTrace();
 							}
-						});
-
-					} else {
-						JOptionPane.showMessageDialog(CompilationBox.this, res, "Error!", JOptionPane.ERROR_MESSAGE);
-					}
+							try {
 								for (File f : tmpFolder.listFiles()) {
 									Files.delete(f.toPath());
 								}
 								Files.delete(tmpFolder.toPath());
+							} catch (IOException e2) {
+								e2.printStackTrace();
+							}
+						});
+					} else {
+						JOptionPane.showMessageDialog(CompilationBox.this, res, "Error!", JOptionPane.ERROR_MESSAGE);
+					}
 				} catch (IOException e1) {
 					e1.printStackTrace();
 				}

src/me/ByteEdit/boxes/GlobalSearchBox.java

@@ -1,8 +1,6 @@
 package me.ByteEdit.boxes;
 
 import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.util.HashSet;
 import java.util.Set;
@@ -60,13 +58,7 @@ public class GlobalSearchBox extends JFrame {
 		contentPane.add(lblFind);
 		txtString = new JTextField();
 		KeyStroke enter = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0);
-		txtString.registerKeyboardAction(new ActionListener() {
-
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				find();
-			}
-		}, enter, JComponent.WHEN_IN_FOCUSED_WINDOW);
+		txtString.registerKeyboardAction(e -> find(), enter, JComponent.WHEN_IN_FOCUSED_WINDOW);
 		txtString.setBounds(91, 22, 149, 20);
 		contentPane.add(txtString);
 		txtString.setColumns(10);
@@ -74,12 +66,7 @@ public class GlobalSearchBox extends JFrame {
 		chckbxCaseSensitive.setBounds(10, 199, 114, 23);
 		contentPane.add(chckbxCaseSensitive);
 		JButton btnFind = new JButton("Find");
-		btnFind.addActionListener(new ActionListener() {
-
-			public void actionPerformed(ActionEvent e) {
-				find();
-			}
-		});
+		btnFind.addActionListener(e -> find());
 		btnFind.setBounds(130, 199, 110, 23);
 		contentPane.add(btnFind);
 
@@ -92,12 +79,7 @@ public class GlobalSearchBox extends JFrame {
 		contentPane.add(lblOwner);
 
 		txtOwner = new JTextField();
-		txtOwner.addActionListener(new ActionListener() {
-
-			public void actionPerformed(ActionEvent e) {
-				find();
-			}
-		});
+		txtOwner.addActionListener(e -> find());
 		txtOwner.setColumns(10);
 		txtOwner.setBounds(91, 78, 149, 20);
 		contentPane.add(txtOwner);
@@ -107,12 +89,7 @@ public class GlobalSearchBox extends JFrame {
 		contentPane.add(lblName);
 
 		txtName = new JTextField();
-		txtName.addActionListener(new ActionListener() {
-
-			public void actionPerformed(ActionEvent e) {
-				find();
-			}
-		});
+		txtName.addActionListener(e -> find());
 		txtName.setColumns(10);
 		txtName.setBounds(91, 106, 149, 20);
 		contentPane.add(txtName);
@@ -122,12 +99,7 @@ public class GlobalSearchBox extends JFrame {
 		contentPane.add(lblDesc);
 
 		txtDesc = new JTextField();
-		txtDesc.addActionListener(new ActionListener() {
-
-			public void actionPerformed(ActionEvent e) {
-				find();
-			}
-		});
+		txtDesc.addActionListener(e -> find());
 		txtDesc.setColumns(10);
 		txtDesc.setBounds(91, 134, 149, 20);
 		contentPane.add(txtDesc);
@@ -194,9 +166,7 @@ public class GlobalSearchBox extends JFrame {
 				}
 			}
 		}
-		for (Info s : set) {
-			openBox.model.addElement(s);
-		}
+		set.forEach(openBox.model::addElement);
 		openBox.setVisible(true);
 	}
 }

src/me/ByteEdit/boxes/GlobalSearchOpenBox.java

@@ -37,12 +37,10 @@ public class GlobalSearchOpenBox extends JFrame {
 		JList<Info> list = new JList(model);
 		list.addListSelectionListener(new ListSelectionListener() {
 			public void valueChanged(ListSelectionEvent e) {
-				SingleThreadedExecutor.execute(() -> {
 				Info val = list.getSelectedValue();
-					if (val != null && !val.owner.equals(Main.currentNodeName)) {
-						Main.selectFile(val.nodePath);
+				if (!e.getValueIsAdjusting() && val != null && !val.owner.equals(Main.currentNodeName)) {
+					SingleThreadedExecutor.submit(() -> Main.selectFile(val.owner + ".class"));
 				}
-				});
 			}
 		});
 
@@ -59,14 +57,12 @@ public class GlobalSearchOpenBox extends JFrame {
 		String name;
 		String desc;
 		MethodNode mn;
-		String nodePath;
 
 		public Info(String owner, String name, String desc, MethodNode mn) {
 			this.owner = owner;
 			this.name = name;
 			this.desc = desc;
 			this.mn = mn;
-			nodePath = Main.getFullName(owner);
 		}
 
 		@Override

src/me/ByteEdit/boxes/RenameBox.java

@@ -79,7 +79,7 @@ public class RenameBox extends JFrame {
 					JOptionPane.showMessageDialog(null, "Desc not set!", "Error!", JOptionPane.ERROR_MESSAGE);
 					return;
 				}
-				ClassNode clazz = Main.classNodes.get(Main.getFullName(className));
+				ClassNode clazz = Main.classNodes.get(className);
 				if (clazz == null) {
 					JOptionPane.showMessageDialog(null, "ClassNode not found!", "Error!", JOptionPane.ERROR_MESSAGE);
 					return;
@@ -94,7 +94,7 @@ public class RenameBox extends JFrame {
 					if (newDesc.startsWith("(")) { // method
 						ClassNode lastHit = clazz;
 						while (clazz != null && clazz.superName != null) {
-							ClassNode tmp = Main.classNodes.get(Main.getFullName(clazz.superName));
+							ClassNode tmp = Main.classNodes.get(clazz.superName);
 							if (tmp != null) {
 								boolean found = false;
 								for (MethodNode mn : clazz.methods) {
@@ -127,7 +127,7 @@ public class RenameBox extends JFrame {
 										extendsMyClass = true;
 										break;
 									}
-									ClassNode tmp = Main.classNodes.get(Main.getFullName(checkCN.superName));
+									ClassNode tmp = Main.classNodes.get(checkCN.superName);
 									if (tmp != null) {
 										checkCN = tmp;
 									} else {
@@ -211,7 +211,7 @@ public class RenameBox extends JFrame {
 					}
 				}
 
-				SingleThreadedExecutor.execute(() -> {
+				SingleThreadedExecutor.submit(() -> {
 					// refresh
 					Main.decompileCurrentNode();
 					name = newName;

src/me/ByteEdit/boxes/SearchBox.java

@@ -125,7 +125,6 @@ public class SearchBox extends JFrame {
 	public void replace() {
 		if (!Main.decompiler.isEditable())
 			return;
-		String txt = Main.txtByteEditView.getText();
 		int startPos = Main.txtByteEditView.getSelectionStart();
 		Main.txtByteEditView.replaceSelection(txtReplace.getText());
 		Main.txtByteEditView.select(startPos, startPos + txtReplace.getText().length());

src/me/ByteEdit/boxes/TypeOpenBox.java

@@ -40,12 +40,11 @@ public class TypeOpenBox extends JFrame {
 		DefaultListModel<String> model = new DefaultListModel<>();
 		JList<String> list = new JList(model);
 		list.addListSelectionListener(new ListSelectionListener() {
-
+			@Override
 			public void valueChanged(ListSelectionEvent e) {
 				String val = list.getSelectedValue();
-				if (val != null && !val.equals(Main.currentNodeName)) {
-
-					SingleThreadedExecutor.execute(() -> Main.selectFile(val));
+				if (!e.getValueIsAdjusting() && val != null && !val.equals(Main.currentNodeName)) {
+					SingleThreadedExecutor.submit(() -> Main.selectFile(val + ".class"));
 				}
 			}
 		});
@@ -80,19 +79,17 @@ public class TypeOpenBox extends JFrame {
 				}
 				String search = UnicodeUtils.unescape(null, txtSearch.getText(), true).toLowerCase();
 				if (search.contains("/")) {
-					for (String s : Main.classNodes.keySet()) {
-						String className = s.substring(0, s.length() - 6);
-						if (!className.contains("$") && className.toLowerCase().startsWith(search)) {
-							model.addElement(s);
+					for (String fullName : Main.classNodes.keySet()) {
+						if (!fullName.contains("$") && fullName.toLowerCase().startsWith(search)) {
+							model.addElement(fullName);
 						}
 					}
 				} else {
-					for (String s : Main.classNodes.keySet()) {
-						String[] split = s.split("/");
+					for (String fullName : Main.classNodes.keySet()) {
+						String[] split = fullName.split("/");
 						String className = split[split.length - 1];
-						className = className.substring(0, className.length() - 6);
 						if (!className.contains("$") && className.toLowerCase().startsWith(search)) {
-							model.addElement(s);
+							model.addElement(fullName);
 						}
 					}
 				}

src/me/ByteEdit/decompiler/CFRDecompiler.java

@@ -5,22 +5,17 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.reflect.Field;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.benf.cfr.reader.PluginRunner;
 import org.benf.cfr.reader.api.ClassFileSource;
 import org.benf.cfr.reader.bytecode.analysis.parse.utils.Pair;
-import org.benf.cfr.reader.entities.ClassFile;
-import org.benf.cfr.reader.entities.Method;
-import org.benf.cfr.reader.entities.constantpool.ConstantPool;
 import org.benf.cfr.reader.state.ClassFileSourceImpl;
-import org.benf.cfr.reader.state.DCCommonState;
-import org.benf.cfr.reader.util.bytestream.BaseByteData;
+import org.benf.cfr.reader.util.MiscConstants.Version;
 import org.benf.cfr.reader.util.getopt.OptionsImpl;
-import org.benf.cfr.reader.util.output.ToStringDumper;
 import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.MethodNode;
 
 public class CFRDecompiler implements IDecompiler {
 
@@ -79,17 +74,24 @@ public class CFRDecompiler implements IDecompiler {
 		options.put("sugarenums", "true");
 		options.put("tidymonitors", "true");
 		options.put("usenametable", "true");
+
+		try {
+			Field f = Version.class.getDeclaredField("version");
+			f.setAccessible(true);
+			f.set(null, "ByteEdit");
+		} catch (Exception ex) {
+		}
 	}
 
 	@Override
-	public String decompile(ClassNode cn) {
-		return doDecompilation(cn, getBytes(cn), null);
+	public String decompile(ClassNode cn, Map<String, ClassNode> classNodes) {
+		return doDecompilation(cn, IDecompiler.getBytes(cn), classNodes);
 	}
 
-	private static String doDecompilation(ClassNode cn, byte[] b, MethodNode mn) {
+	private static String doDecompilation(ClassNode cn, byte[] b, Map<String, ClassNode> classNodes) {
 		try {
 			HashMap<String, String> ops = options;
-			ClassFileSource cfs = new ClassFileSource() {
+			ClassFileSource cfs = new ClassFileSourceImpl(new OptionsImpl(Collections.EMPTY_MAP)) {
 
 				@Override
 				public void informAnalysisRelativePathDetail(String a, String b) {
@@ -103,10 +105,16 @@ public class CFRDecompiler implements IDecompiler {
 				@Override
 				public Pair<byte[], String> getClassFileContent(String path) throws IOException {
 					String name = path.substring(0, path.length() - 6);
-					if (name.equals(cn.name)) {
+					if (name.equals(cn.name))
 						return Pair.make(b, name);
+					// try loading other classes from jar
+					ClassNode node;
+					synchronized (classNodes) {
+						node = classNodes.get(name);
 					}
-					return null; // cfr loads unnecessary classes
+					if (node != null)
+						return Pair.make(IDecompiler.getBytes(node), name);
+					return super.getClassFileContent(path);
 				}
 
 				@Override
@@ -114,24 +122,7 @@ public class CFRDecompiler implements IDecompiler {
 					throw new RuntimeException();
 				}
 			};
-			PluginRunner runner = new PluginRunner(ops, cfs);
-			if (mn != null) {
-				BaseByteData data = new BaseByteData(b);
-				ClassFile cf = new ClassFile(data, "", initDCState(ops, cfs));
-				Field cpf = Method.class.getDeclaredField("cp");
-				Field descI = Method.class.getDeclaredField("descriptorIndex");
-				descI.setAccessible(true);
-				cpf.setAccessible(true);
-				for (Method m : cf.getMethodByName(mn.name)) {
-					ConstantPool cp = (ConstantPool) cpf.get(m);
-					if (cp.getUTF8Entry(descI.getInt(m)).getValue().equals(mn.desc)) {
-						ToStringDumper tsd = new ToStringDumper();
-						m.dump(tsd, true);
-						return tsd.toString();
-					}
-				}
-			}
-			String decompilation = runner.getDecompilationFor(cn.name);
+			String decompilation = new PluginRunner(ops, cfs).getDecompilationFor(cn.name);
 			System.gc(); // cfr has a performance bug
 			return decompilation;
 		} catch (Exception e) {
@@ -142,12 +133,4 @@ public class CFRDecompiler implements IDecompiler {
 			return sw.toString();
 		}
 	}
-
-	private static DCCommonState initDCState(Map<String, String> optionsMap, ClassFileSource classFileSource) {
-		OptionsImpl options = new OptionsImpl(optionsMap);
-		if (classFileSource == null)
-			classFileSource = new ClassFileSourceImpl(options);
-		DCCommonState dcCommonState = new DCCommonState(options, classFileSource);
-		return dcCommonState;
-	}
 }

src/me/ByteEdit/decompiler/EnumDecompiler.java

@@ -6,8 +6,7 @@ import me.ByteEdit.edit.Disassembler;
 
 public enum EnumDecompiler {
 	BYTEEDIT("ByteEdit", new Disassembler(), false), PROCYON("Procyon", new ProcyonDecompiler()),
-	FERNFLOWER("FernFlower", new FernflowerDecompiler()), JD_GUI("JD-GUI", new JDDecompiler()),
-	CFR("CFR", new CFRDecompiler());
+	JD_GUI("JD-GUI", new JDDecompiler()), CFR("CFR", new CFRDecompiler());
 
 	private final String name;
 	private final IDecompiler decompiler;

src/me/ByteEdit/decompiler/FernflowerDecompiler.java

@@ -1,143 +0,0 @@
-package me.ByteEdit.decompiler;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.HashMap;
-import java.util.Map.Entry;
-import java.util.jar.Manifest;
-
-import org.jetbrains.java.decompiler.main.Fernflower;
-import org.jetbrains.java.decompiler.main.extern.IBytecodeProvider;
-import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
-import org.jetbrains.java.decompiler.main.extern.IResultSaver;
-import org.jetbrains.java.decompiler.struct.ContextUnit;
-import org.jetbrains.java.decompiler.struct.StructClass;
-import org.jetbrains.java.decompiler.struct.StructContext;
-import org.jetbrains.java.decompiler.struct.lazy.LazyLoader;
-import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.MethodNode;
-
-public class FernflowerDecompiler implements IBytecodeProvider, IResultSaver, IDecompiler {
-
-	private byte[] bytes;
-	private String returned;
-
-	public static final HashMap<String, Boolean> options = new HashMap<>();
-
-	static {
-		options.put("rbr", true);
-		options.put("rsy", false);
-		options.put("din", true);
-		options.put("dc4", true);
-		options.put("das", true);
-		options.put("hes", true);
-		options.put("hdc", true);
-		options.put("dgs", false);
-		options.put("ner", true);
-		options.put("den", true);
-		options.put("rgn", true);
-		options.put("lit", false);
-		options.put("asc", true);
-		options.put("bto", true);
-		options.put("nns", false);
-		options.put("uto", true);
-		options.put("udv", true);
-		options.put("rer", true);
-		options.put("fdi", true);
-		options.put("ren", false);
-		options.put("inn", true);
-		options.put("lac", false);
-	}
-
-	@Override
-	public String decompile(ClassNode cn) {
-		return doDecompilation(cn, getBytes(cn), null);
-	}
-
-	public String doDecompilation(ClassNode cn, byte[] b, MethodNode mn) {
-		try {
-			// TODO decompile method only
-			this.bytes = b;
-			HashMap<String, Object> map = new HashMap<>();
-			for (Entry<String, Boolean> entry : options.entrySet()) {
-				map.put(entry.getKey(), entry.getValue() ? "1" : "0");
-			}
-			Fernflower f = new Fernflower(this, this, map, new IFernflowerLogger() {
-				@Override
-				public void writeMessage(String message, Throwable t) {
-				}
-
-				@Override
-				public void writeMessage(String message, Severity severity) {
-				}
-
-				@Override
-				public boolean accepts(Severity severity) {
-					return false;
-				}
-			});
-			StructContext sc = f.getStructContext();
-			StructClass cl = new StructClass(b, true, sc.getLoader());
-			sc.getClasses().put(cn.name, cl);
-			// instead of loading a file use custom bridge, created a few getters
-			String fakePath = new File("none.class").getAbsolutePath();
-			ContextUnit unit = new ContextUnit(ContextUnit.TYPE_FOLDER, null, fakePath, true, sc.getSaver(),
-					sc.getDecompiledData());
-			sc.getUnits().put(fakePath, unit);
-			unit.addClass(cl, "none.class");
-			sc.getLoader().addClassLink(cn.name, new LazyLoader.Link(LazyLoader.Link.CLASS, fakePath, null));
-
-			f.decompileContext();
-			return returned;
-		} catch (Exception e) {
-			e.printStackTrace();
-			StringWriter sw = new StringWriter();
-			PrintWriter pw = new PrintWriter(sw);
-			e.printStackTrace(pw);
-			return sw.toString();
-		}
-	}
-
-	@Override
-	public byte[] getBytecode(String externalPath, String internalPath) throws IOException {
-		return bytes;
-	}
-
-	// we can ignore most of those methods because we do not want to save the output
-	// as a file
-	@Override
-	public void saveFolder(String path) {
-	}
-
-	@Override
-	public void copyFile(String source, String path, String entryName) {
-	}
-
-	@Override
-	public void saveClassFile(String path, String qualifiedName, String entryName, String content, int[] mapping) {
-		this.returned = content;
-	}
-
-	@Override
-	public void createArchive(String path, String archiveName, Manifest manifest) {
-	}
-
-	@Override
-	public void saveDirEntry(String path, String archiveName, String entryName) {
-	}
-
-	@Override
-	public void copyEntry(String source, String path, String archiveName, String entry) {
-	}
-
-	@Override
-	public void saveClassEntry(String path, String archiveName, String qualifiedName, String entryName,
-			String content) {
-	}
-
-	@Override
-	public void closeArchive(String path, String archiveName) {
-	}
-}

src/me/ByteEdit/decompiler/IDecompiler.java

@@ -1,13 +1,15 @@
 package me.ByteEdit.decompiler;
 
+import java.util.Map;
+
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.ClassNode;
 
 public interface IDecompiler {
 
-	String decompile(ClassNode cn);
+	String decompile(ClassNode cn, Map<String, ClassNode> classNodes);
 
-	default byte[] getBytes(ClassNode cn) {
+	static byte[] getBytes(ClassNode cn) {
 		ClassWriter classWriter = new ClassWriter(0);
 		cn.accept(classWriter);
 		return classWriter.toByteArray();

src/me/ByteEdit/decompiler/JDDecompiler.java

@@ -1,18 +1,26 @@
 package me.ByteEdit.decompiler;
 
+import java.util.Map;
+
 import org.jd.core.v1.ClassFileToJavaSourceDecompiler;
 import org.jd.core.v1.api.loader.Loader;
 import org.jd.core.v1.api.loader.LoaderException;
 import org.jd.core.v1.api.printer.Printer;
-import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.ClassNode;
 
-import me.ByteEdit.main.Main;
-
 public class JDDecompiler implements Loader, Printer, IDecompiler {
 
+	protected static final String TAB = "    ";
+	protected static final String NEWLINE = "\n";
+
+	protected int indentationCount = 0;
+	protected StringBuilder sb = new StringBuilder();
+
+	private Map<String, ClassNode> classNodes;
+
 	@Override
-	public String decompile(ClassNode cn) {
+	public String decompile(ClassNode cn, Map<String, ClassNode> classNodes) {
+		this.classNodes = classNodes;
 		ClassFileToJavaSourceDecompiler decompiler = new ClassFileToJavaSourceDecompiler();
 		try {
 			decompiler.decompile(this, this, cn.name);
@@ -32,22 +40,21 @@ public class JDDecompiler implements Loader, Printer, IDecompiler {
 
 	@Override
 	public boolean canLoad(String internalName) {
-		return Main.classNodes.containsKey(internalName + ".class");
+		synchronized (classNodes) {
+			return classNodes.containsKey(internalName);
+		}
 	}
 
 	@Override
 	public byte[] load(String internalName) throws LoaderException {
-		ClassNode cl = Main.classNodes.get(internalName + ".class");
-		ClassWriter cw = new ClassWriter(0);
-		cl.accept(cw);
-		return cw.toByteArray();
+		ClassNode node;
+		synchronized (classNodes) {
+			node = classNodes.get(internalName);
+		}
+		if (node != null)
+			return IDecompiler.getBytes(node);
+		throw new LoaderException("Failed to load '" + internalName + "'");
 	}
-
-	protected static final String TAB = "  ";
-	protected static final String NEWLINE = "\n";
-
-	protected int indentationCount = 0;
-	protected StringBuilder sb = new StringBuilder();
 
 	@Override
 	public String toString() {

src/me/ByteEdit/decompiler/ProcyonDecompiler.java

@@ -3,9 +3,9 @@ package me.ByteEdit.decompiler;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.reflect.Field;
+import java.util.Map;
 
 import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.MethodNode;
 
 import com.strobel.assembler.InputTypeLoader;
 import com.strobel.assembler.metadata.Buffer;
@@ -20,11 +20,11 @@ import com.strobel.decompiler.PlainTextOutput;
 public class ProcyonDecompiler implements IDecompiler {
 
 	@Override
-	public String decompile(ClassNode cn) {
-		return doDecompilation(cn, getBytes(cn), null);
+	public String decompile(ClassNode cn, Map<String, ClassNode> classNodes) {
+		return doDecompilation(cn, IDecompiler.getBytes(cn), classNodes);
 	}
 
-	private static String doDecompilation(ClassNode cn, byte[] b, MethodNode mn) {
+	private static String doDecompilation(ClassNode cn, byte[] b, Map<String, ClassNode> classNodes) {
 		try {
 			// TODO decompile method only
 			DecompilerSettings settings = new DecompilerSettings();
@@ -48,9 +48,18 @@ public class ProcyonDecompiler implements IDecompiler {
 						buffer.putByteArray(b, 0, b.length);
 						buffer.position(0);
 						return true;
-					} else {
-						return backLoader.tryLoadType(s, buffer);
 					}
+					ClassNode node;
+					synchronized (classNodes) {
+						node = classNodes.get(s);
+					}
+					if (node != null) {
+						byte[] data = IDecompiler.getBytes(node);
+						buffer.putByteArray(data, 0, data.length);
+						buffer.position(0);
+						return true;
+					}
+					return backLoader.tryLoadType(s, buffer);
 				}
 			});
 			TypeReference type = metadataSystem.lookupType(cn.name);

src/me/ByteEdit/decompiler/SingleThreadedExecutor.java

@@ -4,16 +4,30 @@ import java.util.concurrent.LinkedBlockingQueue;
 
 public class SingleThreadedExecutor {
 
+	// We don't need to run every Runnable,
+	// we only care about the last submitted Runnable.
+	private static final Object lock = new Object();
+	private static Runnable runnable;
 	private static final LinkedBlockingQueue<Runnable> queue = new LinkedBlockingQueue<>();
 
 	private static final Thread thread = new Thread(() -> {
-		while (true) {
 		try {
-				queue.take().run();
+			while (true) {
+				Runnable r = null;
+				synchronized (lock) {
+					while (runnable == null)
+						lock.wait();
+					r = runnable;
+					runnable = null;
+				}
+				try {
+					r.run();
 				} catch (Throwable e) {
 					e.printStackTrace();
 				}
 			}
+		} catch (InterruptedException e) {
+		}
 	}, "SingleThreadedExecutor");
 
 	static {
@@ -21,7 +35,10 @@ public class SingleThreadedExecutor {
 		thread.start();
 	}
 
-	public static void execute(Runnable r) {
-		queue.add(r);
+	public static void submit(Runnable r) {
+		synchronized (lock) {
+			runnable = r;
+			lock.notifyAll();
+		}
 	}
 }

src/me/ByteEdit/edit/Assembler.java

@@ -4,6 +4,7 @@ import java.io.BufferedReader;
 import java.io.StringReader;
 import java.math.BigInteger;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -339,6 +340,8 @@ public class Assembler {
 						tryCatchBlocksToParse.clear();
 						stage = 0;
 					} else if (s.startsWith("// #Signature: ")) {
+						if (node == null)
+							throw new IllegalStateException("node is null");
 						node.signature = UnicodeUtils.unescape(hsr, s.substring(15));
 					} else if (s.equals("// #TryCatch:")) {
 						stage = 1;
@@ -352,6 +355,8 @@ public class Assembler {
 							localVarsToParse.add(s);
 						}
 					} else if (s.equals("}")) {
+						if (node == null)
+							throw new IllegalStateException("node is null");
 						if (!annotationsForNext.isEmpty()) {
 							if (node.visibleAnnotations == null) {
 								node.visibleAnnotations = new ArrayList<>();
@@ -404,6 +409,8 @@ public class Assembler {
 						}
 						clazz.methods.add(node);
 					} else if (!s.startsWith("\t")) {
+						if (node == null)
+							throw new IllegalStateException("node is null");
 						s = s.substring(0, s.length() - 2);
 						if (s.contains(" throws ")) {
 							String exceptions = s.substring(s.lastIndexOf(" throws ") + 8);
@@ -477,6 +484,8 @@ public class Assembler {
 						s = s.substring(1);
 						if (!temp.isEmpty()) {
 							if (s.equals("]")) {
+								if (node == null)
+									throw new IllegalStateException("node is null");
 								temp += s;
 								node.instructions.add(getNode(hsr, temp, methodLabelMap));
 								temp = "";
@@ -487,6 +496,8 @@ public class Assembler {
 							if (s.endsWith("[")) {
 								temp += s + "\n";
 							} else {
+								if (node == null)
+									throw new IllegalStateException("node is null");
 								node.instructions.add(getNode(hsr, s, methodLabelMap));
 							}
 						}
@@ -508,6 +519,7 @@ public class Assembler {
 			return null;
 		} finally {
 			try {
+				if (read != null)
 					read.close();
 			} catch (Exception e) {
 			}
@@ -562,7 +574,9 @@ public class Assembler {
 				String value = split2[1];
 				if (value.endsWith("]"))
 					value = value.substring(0, value.length() - 1);
-				if (value.startsWith("{ ")) {
+				if (value.equals("{ }")) {
+					node.values.add(Collections.EMPTY_LIST);
+				} else if (value.startsWith("{ ")) {
 					String split3[] = splitWithStrings(value.substring(2, value.length() - 2));
 					List<Object> list = new ArrayList<>();
 					for (String rofl : split3) {
@@ -760,14 +774,8 @@ public class Assembler {
 				String str = consolidateStrings(split, 1);
 				Object val;
 				try {
-					if (str.startsWith("Type: ")) {
-						str = str.substring(8, str.length() - 2);
-						String[] split2 = str.split("\n\t");
-						String type = split2[0].substring(7);
-						// Reflection
-						val = new Type(ClassUtil.getIDFromClassNameForType(type),
-								UnicodeUtils.unescape(hsr, split2[3].substring(6, split2[3].length() - 1)),
-								Integer.parseInt(split2[1].substring(7)), Integer.parseInt(split2[2].substring(5)));
+					if (str.startsWith("Type ")) {
+						val = Type.getType(UnicodeUtils.unescape(hsr, str.substring(6, str.length() - 1), true));
 					} else if (str.startsWith("\"") && str.endsWith("\"")) {
 						val = UnicodeUtils.unescape(hsr, str.substring(1, str.length() - 1), true);
 					} else if (str.startsWith("#")) {
@@ -1445,17 +1453,7 @@ public class Assembler {
 				for (int i = 10; i < sp.length - 1; i++) {
 					String st = sp[i].substring(1);
 					if (st.equals("]")) {
-						if (stage == 1) {
-							try {
-								// Reflection
-								args.add(new Type(ClassUtil.getIDFromClassNameForType(vals.get(0).substring(6)),
-										UnicodeUtils.unescape(hsr, vals.get(3).substring(6, vals.get(3).length() - 1)),
-										Integer.parseInt(vals.get(1).substring(7)),
-										Integer.parseInt(vals.get(2).substring(5))));
-							} catch (Exception e) {
-								throw e;
-							}
-						} else if (stage == 2) {
+						if (stage == 2) {
 							args.add(new Handle(OpcodesReverse.getHandleOpcode(vals.get(4).substring(5)),
 									UnicodeUtils.unescape(hsr, vals.get(1).substring(7)),
 									UnicodeUtils.unescape(hsr, vals.get(0).substring(6)),
@@ -1464,11 +1462,8 @@ public class Assembler {
 							vals.clear();
 						}
 						stage = 0;
-					} else if (st.equals("Type: [")) {
-						stage = 1;
-					} else if (stage == 1) {
-						st = st.substring(1);
-						vals.add(st);
+					} else if (st.startsWith("Type ")) {
+						args.add(Type.getType(UnicodeUtils.unescape(hsr, st.substring(6, st.length() - 1), true)));
 					} else if (st.equals("Handle: [")) {
 						vals.clear();
 						stage = 2;
@@ -1559,9 +1554,9 @@ public class Assembler {
 	private static Object[] parseFrameList(HugeStringsRev hsr, String str, HashMap<LabelNode, Integer> labels) {
 		ArrayList<Object> list = new ArrayList<>();
 		String l = str.substring(1, str.length() - 1);
-		if (l.isEmpty()) {
+		if (l.isEmpty())
 			return EMPTY_OBJECT_ARRAY;
-		} else {
+
 		for (String asd : l.split(", ")) {
 			if (!asd.startsWith("(")) {
 				int frameType = ClassUtil.getFrameTypeByName(asd);
@@ -1591,6 +1586,5 @@ public class Assembler {
 		}
 		return list.toArray(new Object[list.size()]);
 	}
-	}
 
 }

src/me/ByteEdit/edit/Disassembler.java

@@ -21,6 +21,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
@@ -69,8 +71,21 @@ public class Disassembler implements IDecompiler {
 			.newFixedThreadPool((Runtime.getRuntime().availableProcessors() + 1) / 2);
 
 	@Override
-	public String decompile(ClassNode cn) {
-		return disassemble(cn);
+	public String decompile(ClassNode cn, Map<String, ClassNode> classNodes) {
+		String name = cn.name;
+		StringBuilder dis = new StringBuilder(disassemble(cn));
+		synchronized (classNodes) {
+			for (Entry<String, ClassNode> entry : classNodes.entrySet()) {
+				if (entry.getKey().contains("$")) {
+					String[] split = entry.getKey().split("\\$");
+					if (split[0].equals(name)) {
+						dis.append('\n');
+						dis.append(disassemble(entry.getValue()));
+					}
+				}
+			}
+		}
+		return dis.toString();
 	}
 
 	private static String disassemble(ClassNode classNode) {
@@ -127,7 +142,7 @@ public class Disassembler implements IDecompiler {
 			ctx.next("\n// #Fields\n");
 			ctx.next(doFields(classNode.fields, hs));
 			ctx.next("\n// #Methods\n");
-			ctx.next(doMethods(classNode.methods, classNode.name, hs));
+			ctx.next(doMethods(classNode.methods, hs));
 			ctx.next("}\n");
 
 			if (!hs.isEmpty())
@@ -154,7 +169,7 @@ public class Disassembler implements IDecompiler {
 						s += o + " = [";
 						valBefore = false;
 						continue;
-					} else {
+					}
 					if (o instanceof String[]) {
 						String[] arr = (String[]) o;
 						boolean w8ing = false;
@@ -187,8 +202,12 @@ public class Disassembler implements IDecompiler {
 							}
 							s += ", ";
 						}
+						if (s.endsWith(", ")) {
 							s = s.substring(0, s.length() - 2);
 							s += " }], ";
+						} else {
+							s += "}], ";
+						}
 					} else if (o instanceof String) {
 						s += "\"" + UnicodeUtils.escapeWithSpaces(hs, (String) o) + "\"], ";
 					} else {
@@ -196,7 +215,6 @@ public class Disassembler implements IDecompiler {
 					}
 					valBefore = true;
 				}
-				}
 				if (s.endsWith(", "))
 					s = s.substring(0, s.length() - 2);
 				s += ")";
@@ -207,7 +225,7 @@ public class Disassembler implements IDecompiler {
 		return ctx.finish();
 	}
 
-	private static String doMethods(List<MethodNode> methods, String className, HugeStrings hs)
+	private static String doMethods(List<MethodNode> methods, HugeStrings hs)
 			throws InterruptedException, ExecutionException {
 		boolean multithreaded = Main.INSTANCE.mntmMultithreaded.isSelected();
 		Future<String>[] futures = new Future[methods.size()];
@@ -221,7 +239,7 @@ public class Disassembler implements IDecompiler {
 						ms += "\t// #Max: l:" + mn.maxLocals + " s:" + mn.maxStack + "\n";
 						if (mn.signature != null)
 							ms += "\t// #Signature: " + UnicodeUtils.escapeWithSpaces(hs, mn.signature) + "\n";
-						String[] dis = disassembleMethod(className, mn, hs);
+						String[] dis = disassembleMethod(mn, hs);
 						ms += dis[2];
 						ms += dis[1];
 						if (mn.visibleAnnotations != null && !mn.visibleAnnotations.isEmpty())
@@ -286,20 +304,21 @@ public class Disassembler implements IDecompiler {
 		return ctx.finish();
 	}
 
-	private static String[] disassembleMethod(String className, MethodNode mn, HugeStrings hs) {
+	private static String[] disassembleMethod(MethodNode mn, HugeStrings hs) {
 		HashMap<Label, Integer> labels = new HashMap<Label, Integer>();
 		String localVarTable;
 		String tryCatchTable;
 
 		InsnList insnList = mn.instructions;
 		boolean deobfNumbers = Main.INSTANCE.mntmNumbers.isSelected();
+		boolean deobfNops = Main.INSTANCE.mntmNops.isSelected();
 
 		ArrayList<Label> labelsReversed = deobfNumbers ? new ArrayList<>() : null;
 
 		for (AbstractInsnNode n = insnList.getFirst(); n != null; n = n.getNext()) {
 			if (n instanceof LabelNode) {
 				int id = labels.size() + 1;
-				if (deobfNumbers)
+				if (deobfNumbers && labelsReversed != null)
 					labelsReversed.add(((LabelNode) n).getLabel());
 				labels.put(((LabelNode) n).getLabel(), id);
 			}
@@ -336,7 +355,7 @@ public class Disassembler implements IDecompiler {
 			insnList = calc.get();
 			int i = 0;
 			for (AbstractInsnNode n = insnList.getFirst(); n != null; n = n.getNext()) {
-				if (n instanceof LabelNode) {
+				if (n instanceof LabelNode && labelsReversed != null) {
 					((LabelNode) n).setLabel(labelsReversed.get(i++));
 				}
 			}
@@ -344,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 };
@@ -359,9 +380,8 @@ public class Disassembler implements IDecompiler {
 			if (n.getOpcode() == Opcodes.NEWARRAY) {
 				return "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + " "
 						+ ClassUtil.getArrayTypeByID(node.operand) + "\n";
-			} else {
-				return "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + " " + node.operand + "\n";
 			}
+			return "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + " " + node.operand + "\n";
 		}
 		case VAR_INSN: {
 			VarInsnNode node = (VarInsnNode) n;
@@ -396,15 +416,7 @@ public class Disassembler implements IDecompiler {
 					+ "\n\t\t\t]\n\t\t\targs: [\n";
 			for (Object l : node.bsmArgs) {
 				if (l instanceof Type) {
-					Type type = (Type) l;
-					int valueBegin = type.valueBegin;
-					int valueEnd = type.valueEnd;
-					String buf = type.valueBuffer;
-					// Reflection
-					s += "\t\t\t\tType: [\n\t\t\t\t\ttype: " + ClassUtil.getClassNameFromType(type)
-							+ "\n\t\t\t\t\tstart: " + valueBegin + "\n\t\t\t\t\tend: " + valueEnd + "\n\t\t\t\t\tbuf: "
-							+ ClassUtil.getDecompiledValue(buf, "", hs);
-					s += "\n\t\t\t\t]\n";
+					s += "\t\t\t\tType " + ClassUtil.getDecompiledValue(((Type) l).getDescriptor(), "", hs) + "\n";
 				} else if (l instanceof Handle) {
 					Handle h = (Handle) l;
 					s += "\t\t\t\tHandle: [\n\t\t\t\t\tname: "
@@ -433,17 +445,9 @@ public class Disassembler implements IDecompiler {
 		case LDC_INSN: {
 			LdcInsnNode node = (LdcInsnNode) n;
 			if (node.cst instanceof Type) {
-				Type type = (Type) node.cst;
-				int valueBegin = type.valueBegin;
-				int valueEnd = type.valueEnd;
-				String buf = type.valueBuffer;
-				// Reflection
-				String s = "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + " Type: [\n\t\t\ttype: "
-						+ ClassUtil.getClassNameFromType(type) + "\n\t\t\tstart: " + valueBegin + "\n\t\t\tend: "
-						+ valueEnd + "\n\t\t\tbuf: " + ClassUtil.getDecompiledValue(buf, "", hs);
-				s += "\n\t\t]\n";
-				return s;
-			} else {
+				return "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + " Type "
+						+ ClassUtil.getDecompiledValue(((Type) node.cst).getDescriptor(), "", hs) + "\n";
+			}
 			String decomp = ClassUtil.getDecompiledValue(node.cst, "", hs);
 			if (node.cst instanceof String) {
 				if (decomp.startsWith("\"#") && decomp.endsWith("\""))
@@ -453,7 +457,6 @@ public class Disassembler implements IDecompiler {
 			}
 			return "\t\t" + OpcodesReverse.reverseOpcode(node.getOpcode()) + " " + decomp + "\n";
 		}
-		}
 		case IINC_INSN: {
 			IincInsnNode node = (IincInsnNode) n;
 			return "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + " " + node.var + " " + node.incr + "\n";

src/me/ByteEdit/edit/OptionBox.java

@@ -1,60 +0,0 @@
-package me.ByteEdit.edit;
-
-import java.awt.EventQueue;
-import java.awt.Toolkit;
-
-import javax.swing.JCheckBox;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.UIManager;
-import javax.swing.border.EmptyBorder;
-
-public class OptionBox extends JFrame {
-
-	private JPanel contentPane;
-	public JCheckBox chckbxComputeFrames;
-	public JCheckBox chckbxComputeMax;
-
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		EventQueue.invokeLater(new Runnable() {
-
-			public void run() {
-				try {
-					OptionBox frame = new OptionBox();
-					frame.setVisible(true);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		});
-	}
-
-	/**
-	 * Create the frame.
-	 */
-	public OptionBox() {
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		setResizable(false);
-		setTitle("Options");
-		setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
-		setBounds((int) (Toolkit.getDefaultToolkit().getScreenSize().getWidth() / 2 - 150),
-				(int) (Toolkit.getDefaultToolkit().getScreenSize().getHeight() / 2 - 100), 300, 200);
-		contentPane = new JPanel();
-		contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
-		setContentPane(contentPane);
-		contentPane.setLayout(null);
-		chckbxComputeFrames = new JCheckBox("Compute Frames");
-		chckbxComputeFrames.setBounds(6, 7, 138, 23);
-		contentPane.add(chckbxComputeFrames);
-		chckbxComputeMax = new JCheckBox("Compute Max");
-		chckbxComputeMax.setBounds(6, 33, 138, 23);
-		contentPane.add(chckbxComputeMax);
-	}
-}

src/me/ByteEdit/edit/SearchBox.java

@@ -1,153 +0,0 @@
-package me.ByteEdit.edit;
-
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.util.regex.Pattern;
-
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.KeyStroke;
-import javax.swing.UIManager;
-import javax.swing.border.EmptyBorder;
-
-import me.ByteEdit.main.Main;
-
-public class SearchBox extends JFrame {
-
-	public JPanel contentPane;
-	public JTextField txtFind;
-	public JTextField txtReplace;
-	public JCheckBox chckbxCaseSensitive;
-
-	/**
-	 * Create the frame.
-	 */
-	public SearchBox() {
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		setResizable(false);
-		setTitle("Find/Replace");
-		setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
-		setBounds((int) (Toolkit.getDefaultToolkit().getScreenSize().getWidth() / 2 - 128),
-				(int) (Toolkit.getDefaultToolkit().getScreenSize().getHeight() / 2 - 181), 256, 262);
-		contentPane = new JPanel();
-		contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
-		setContentPane(contentPane);
-		contentPane.setLayout(null);
-		JLabel lblFind = new JLabel("Find:");
-		lblFind.setBounds(10, 25, 71, 14);
-		contentPane.add(lblFind);
-		txtFind = new JTextField();
-		KeyStroke enter = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0);
-		txtFind.registerKeyboardAction(new ActionListener() {
-
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				find();
-			}
-		}, enter, JComponent.WHEN_IN_FOCUSED_WINDOW);
-		txtFind.setBounds(91, 22, 149, 20);
-		contentPane.add(txtFind);
-		txtFind.setColumns(10);
-		JLabel lblReplaceWith = new JLabel("Replace with:");
-		lblReplaceWith.setBounds(10, 53, 71, 14);
-		contentPane.add(lblReplaceWith);
-		txtReplace = new JTextField();
-		txtReplace.setColumns(10);
-		txtReplace.setBounds(91, 50, 149, 20);
-		contentPane.add(txtReplace);
-		chckbxCaseSensitive = new JCheckBox("Case sensitive");
-		chckbxCaseSensitive.setBounds(10, 103, 230, 23);
-		contentPane.add(chckbxCaseSensitive);
-		JButton btnFind = new JButton("Find");
-		btnFind.addActionListener(new ActionListener() {
-
-			public void actionPerformed(ActionEvent e) {
-				find();
-			}
-		});
-		btnFind.setBounds(10, 150, 110, 23);
-		contentPane.add(btnFind);
-		JButton btnReplacefind = new JButton("Replace/Find");
-		btnReplacefind.addActionListener(new ActionListener() {
-
-			public void actionPerformed(ActionEvent e) {
-				replaceFind();
-			}
-		});
-		btnReplacefind.setBounds(130, 150, 110, 23);
-		contentPane.add(btnReplacefind);
-		JButton btnReplace = new JButton("Replace");
-		btnReplace.addActionListener(new ActionListener() {
-
-			public void actionPerformed(ActionEvent e) {
-				replace();
-			}
-		});
-		btnReplace.setBounds(10, 184, 110, 23);
-		contentPane.add(btnReplace);
-		JButton btnReplaceAll = new JButton("Replace All");
-		btnReplaceAll.addActionListener(new ActionListener() {
-
-			public void actionPerformed(ActionEvent e) {
-				replaceAll();
-			}
-		});
-		btnReplaceAll.setBounds(130, 184, 110, 23);
-		contentPane.add(btnReplaceAll);
-	}
-
-	public void find() {
-		int startPos = Main.txtByteEditView.getCaretPosition();
-		String toFind = txtFind.getText();
-		String txt = chckbxCaseSensitive.isSelected() ? Main.txtByteEditView.getText().substring(startPos)
-				: Main.txtByteEditView.getText().substring(startPos).toLowerCase();
-		int index = txt.indexOf(chckbxCaseSensitive.isSelected() ? toFind : toFind.toLowerCase());
-		if (index == -1) {
-			txt = chckbxCaseSensitive.isSelected() ? Main.txtByteEditView.getText()
-					: Main.txtByteEditView.getText().toLowerCase();
-			index = txt.indexOf(chckbxCaseSensitive.isSelected() ? toFind : toFind.toLowerCase());
-			startPos = 0;
-			if (index == -1) {
-				return;
-			}
-		}
-		Main.txtByteEditView.select(startPos + index, startPos + index + toFind.length());
-	}
-
-	public void replaceFind() {
-		replace();
-		find();
-	}
-
-	public void replace() {
-		String txt = Main.txtByteEditView.getText();
-		int startPos = Main.txtByteEditView.getSelectionStart();
-		Main.txtByteEditView.replaceSelection(txtReplace.getText());
-		Main.txtByteEditView.select(startPos, startPos + txtReplace.getText().length());
-	}
-
-	public void replaceAll() {
-		String toFind = txtFind.getText();
-		String toReplace = txtReplace.getText();
-		String txt = Main.txtByteEditView.getText();
-		int prev = Main.txtByteEditView.getCaretPosition();
-		if (chckbxCaseSensitive.isSelected()) {
-			Main.txtByteEditView.replaceRange(txt.replace(toFind, toReplace), 0, txt.length());
-		} else {
-			Main.txtByteEditView.replaceRange(txt.replaceAll("(?i)" + Pattern.quote(toFind), toReplace), 0,
-					txt.length());
-		}
-		Main.txtByteEditView.setCaretPosition(prev);
-	}
-}

src/me/ByteEdit/edit/StackBasedCalculator.java

@@ -580,8 +580,10 @@ public class StackBasedCalculator implements Opcodes, Runnable {
 				change(node);
 				return false;
 			case POP2:
+				Number val = stack.pop();
+				if (!(val instanceof Long) && !(val instanceof Double)) {
 					stack.pop();
-				stack.pop();
+				}
 				change(node);
 				return false;
 			case SWAP: {

src/me/ByteEdit/edit/TypeOpenBox.java

@@ -1,121 +0,0 @@
-package me.ByteEdit.edit;
-
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.DefaultListModel;
-import javax.swing.JFrame;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextField;
-import javax.swing.ListSelectionModel;
-import javax.swing.UIManager;
-import javax.swing.border.EmptyBorder;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-
-import me.ByteEdit.decompiler.SingleThreadedExecutor;
-import me.ByteEdit.main.Main;
-
-public class TypeOpenBox extends JFrame {
-
-	public JPanel contentPane;
-	public JTextField txtSearch;
-
-	/**
-	 * Create the frame.
-	 */
-	public TypeOpenBox() {
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		setResizable(false);
-		setTitle("Open Type");
-		setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
-		setBounds((int) (Toolkit.getDefaultToolkit().getScreenSize().getWidth() / 2 - 200),
-				(int) (Toolkit.getDefaultToolkit().getScreenSize().getHeight() / 2 - 140), 400, 280);
-		contentPane = new JPanel();
-		contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
-		setContentPane(contentPane);
-		contentPane.setLayout(null);
-
-		DefaultListModel<String> model = new DefaultListModel<>();
-		JList<String> list = new JList(model);
-		list.addListSelectionListener(new ListSelectionListener() {
-
-			public void valueChanged(ListSelectionEvent e) {
-				String val = list.getSelectedValue();
-				if (val != null && !val.equals(Main.currentNodeName)) {
-
-					SingleThreadedExecutor.execute(() -> Main.selectFile(val));
-				}
-			}
-		});
-
-		txtSearch = new JTextField();
-		txtSearch.addActionListener(new ActionListener() {
-
-			public void actionPerformed(ActionEvent e) {
-				if (model.size() == 1) {
-					list.setSelectedIndex(0);
-				}
-			}
-		});
-		txtSearch.getDocument().addDocumentListener(new DocumentListener() {
-
-			public void changedUpdate(DocumentEvent e) {
-				updateList();
-			}
-
-			public void removeUpdate(DocumentEvent e) {
-				updateList();
-			}
-
-			public void insertUpdate(DocumentEvent e) {
-				updateList();
-			}
-
-			public void updateList() {
-				model.clear();
-				if (txtSearch.getText().isEmpty()) {
-					return;
-				}
-				String search = txtSearch.getText().toLowerCase();
-				if (search.contains("/")) {
-					for (String s : Main.classNodes.keySet()) {
-						String className = s.substring(0, s.length() - 6);
-						if (!className.contains("$") && className.toLowerCase().startsWith(search)) {
-							model.addElement(s);
-						}
-					}
-				} else {
-					for (String s : Main.classNodes.keySet()) {
-						String[] split = s.split("/");
-						String className = split[split.length - 1];
-						className = className.substring(0, className.length() - 6);
-						if (!className.contains("$") && className.toLowerCase().startsWith(search)) {
-							model.addElement(s);
-						}
-					}
-				}
-			}
-		});
-		txtSearch.setBounds(10, 11, 374, 20);
-		contentPane.add(txtSearch);
-		txtSearch.setColumns(10);
-
-		JScrollPane scrollPane = new JScrollPane();
-		scrollPane.setBounds(10, 46, 374, 194);
-		contentPane.add(scrollPane);
-
-		list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		scrollPane.setViewportView(list);
-	}
-
-}

src/me/ByteEdit/main/ArchiveTreeModel.java

@@ -40,7 +40,7 @@ public class ArchiveTreeModel extends DefaultTreeModel {
 		super(new ByteEditTreeNode(jar.getName().split(File.separator.equals("\\") ? "\\\\"
 				: File.separator)[jar.getName().split(File.separator.equals("\\") ? "\\\\" : File.separator).length
 						- 1]));
-		this.newCreated = true;
+		this.newCreated = false;
 		this.jar = jar;
 		this.classNodes = classNodes;
 		this.otherFiles = otherFiles;
@@ -61,7 +61,7 @@ public class ArchiveTreeModel extends DefaultTreeModel {
 						ClassReader reader = new ClassReader(data);
 						ClassNode node = new ClassNode();
 						reader.accept(node, 0);
-						classNodes.put(Main.getFullName(node.name), node);
+						classNodes.put(node.name, node);
 
 						if ((next.getName().contains("/")
 								? (!Main.patternSlash
@@ -70,7 +70,7 @@ public class ArchiveTreeModel extends DefaultTreeModel {
 								: (!next.getName().contains("$")))
 								|| (next.getName().startsWith("$") || next.getName().contains("$$")
 										|| next.getName().endsWith("$"))) {
-							paths.add(Main.getFullName(node.name));
+							paths.add(node.name + ".class");
 						}
 					} catch (Exception e) {
 						otherFiles.put(next.getName(), data);
@@ -89,7 +89,7 @@ public class ArchiveTreeModel extends DefaultTreeModel {
 		}
 	}
 
-	private int getSlashCount(String s) {
+	private static int getSlashCount(String s) {
 		int count = 0;
 		for (char c : s.toCharArray()) {
 			if (c == '/')

src/me/ByteEdit/main/HugeStringsToolTips.java

@@ -85,9 +85,8 @@ public class HugeStringsToolTips implements ToolTipSupplier {
 					} catch (IOException e1) {
 					}
 					break;
-				} else {
-					len += asm.length();
 				}
+				len += asm.length();
 			}
 		} catch (Exception e1) {
 		}

src/me/ByteEdit/main/Main.java

@@ -54,8 +54,6 @@ import javax.swing.JSplitPane;
 import javax.swing.JTree;
 import javax.swing.KeyStroke;
 import javax.swing.border.EmptyBorder;
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import javax.swing.text.BadLocationException;
 import javax.swing.tree.DefaultTreeCellRenderer;
@@ -91,6 +89,7 @@ import me.ByteEdit.utils.ClassUtil;
 import me.ByteEdit.utils.OpcodesReverse;
 import me.ByteEdit.utils.UnicodeUtils;
 
+// ASM 9.2
 public class Main extends JFrame {
 
 	public static Main INSTANCE;
@@ -144,7 +143,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();
 
@@ -168,7 +167,7 @@ public class Main extends JFrame {
 	/**
 	 * Create a simple provider that adds some Java-related completions.
 	 */
-	private CompletionProvider createCompletionProvider() {
+	private static CompletionProvider createCompletionProvider() {
 		DefaultCompletionProvider provider = new DefaultCompletionProvider();
 		for (int i = 0; i < 200; i++) {
 			String s = OpcodesReverse.reverseOpcode(i);
@@ -290,7 +289,6 @@ public class Main extends JFrame {
 				if (action == 0) {
 					final File file = fileChooser.getSelectedFile();
 					saveFolder = file.getParentFile();
-					boolean shouldSave = false;
 					if (file.exists()) {
 						synchronized (treeLock) {
 							jarFile = file;
@@ -306,7 +304,7 @@ public class Main extends JFrame {
 									try {
 										ArchiveTreeModel model = new ArchiveTreeModel(new ZipFile(jarFile), classNodes,
 												otherFiles);
-										EventQueue.invokeLater(new Runnable() {
+										EventQueue.invokeAndWait(new Runnable() {
 											public void run() {
 												synchronized (treeLock) {
 													tree.setModel(model);
@@ -323,7 +321,7 @@ public class Main extends JFrame {
 												}
 											}
 										});
-									} catch (IOException e) {
+									} catch (Exception e) {
 										e.printStackTrace();
 									}
 								}
@@ -428,6 +426,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));
 		setContentPane(contentPane);
@@ -461,7 +462,7 @@ public class Main extends JFrame {
 									try {
 										ArchiveTreeModel model = new ArchiveTreeModel(new ZipFile(jarFile), classNodes,
 												otherFiles);
-										EventQueue.invokeLater(new Runnable() {
+										EventQueue.invokeAndWait(new Runnable() {
 											public void run() {
 												synchronized (treeLock) {
 													tree.setModel(model);
@@ -470,7 +471,7 @@ public class Main extends JFrame {
 												}
 											}
 										});
-									} catch (IOException e) {
+									} catch (Exception e) {
 										e.printStackTrace();
 									}
 								}
@@ -486,19 +487,19 @@ public class Main extends JFrame {
 					String s = ((ByteEditTreeNode) tree.getSelectionPath().getLastPathComponent()).path;
 					if (JOptionPane.showConfirmDialog(INSTANCE, "Do you want to delete\n\"" + s + "\"?", "Delete",
 							JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
-						String substr = s.substring(0, s.length() - 6);
+						s = s.substring(0, s.length() - 6);
 						ArrayList<String> toRemove = new ArrayList<>();
 						for (String key : Main.classNodes.keySet()) {
 							if (key.contains("$")) {
 								String[] split = key.split("\\$");
-								if (split[0].equals(substr)) {
+								if (split[0].equals(s)) {
 									toRemove.add(key);
 								}
 							}
 						}
 						ArchiveTreeModel model = (ArchiveTreeModel) tree.getModel();
 						classNodes.remove(s);
-						model.paths.remove(s);
+						model.paths.remove(s + ".class");
 						for (String rem : toRemove) {
 							classNodes.remove(rem);
 						}
@@ -515,17 +516,8 @@ public class Main extends JFrame {
 			}
 		});
 		scrollPane.setViewportView(tree);
-		tree.addTreeSelectionListener(new TreeSelectionListener() {
-
-			public void valueChanged(TreeSelectionEvent e) {
-				synchronized (treeLock) {
-					if (!isChangingFile) {
-						SingleThreadedExecutor.execute(
-								() -> selectFile(((ByteEditTreeNode) e.getPath().getLastPathComponent()).path));
-					}
-				}
-			}
-		});
+		tree.addTreeSelectionListener(e -> SingleThreadedExecutor
+				.submit(() -> selectFile(((ByteEditTreeNode) e.getPath().getLastPathComponent()).path)));
 		new DropTarget(tree, new DropTargetListener() {
 
 			@Override
@@ -557,7 +549,7 @@ public class Main extends JFrame {
 											try {
 												ArchiveTreeModel model = new ArchiveTreeModel(new ZipFile(jarFile),
 														classNodes, otherFiles);
-												EventQueue.invokeLater(new Runnable() {
+												EventQueue.invokeAndWait(new Runnable() {
 													public void run() {
 														synchronized (treeLock) {
 															tree.setModel(model);
@@ -574,7 +566,7 @@ public class Main extends JFrame {
 														}
 													}
 												});
-											} catch (IOException e) {
+											} catch (Exception e) {
 												e.printStackTrace();
 											}
 										}
@@ -618,7 +610,7 @@ public class Main extends JFrame {
 			@Override
 			public void keyReleased(KeyEvent e) {
 				if (e.getKeyCode() == 116 && currentNodeName != null) { // F5
-					SingleThreadedExecutor.execute(Main::decompileCurrentNode);
+					SingleThreadedExecutor.submit(Main::decompileCurrentNode);
 				}
 			}
 		});
@@ -673,23 +665,23 @@ public class Main extends JFrame {
 			public void itemStateChanged(ItemEvent e) {
 				if (e.getStateChange() == ItemEvent.SELECTED) {
 					EnumDecompiler selected = (EnumDecompiler) e.getItem();
-					SingleThreadedExecutor.execute(() -> {
+					SingleThreadedExecutor.submit(() -> {
 						decompiler = selected;
-						if (currentNodeName != null) {
 						decompileCurrentNode();
 						try {
 							EventQueue.invokeAndWait(() -> {
+								synchronized (treeLock) {
 									txtByteEditView.setCaretPosition(0);
 									try {
 										txtByteEditView.setSyntaxEditingStyle(decompiler.getSyntaxStyle());
 									} catch (Throwable t) {
 									}
 									txtByteEditView.setEditable(decompiler.isEditable());
+								}
 							});
 						} catch (Exception e1) {
 							e1.printStackTrace();
 						}
-						}
 					});
 				}
 			}
@@ -760,7 +752,7 @@ public class Main extends JFrame {
 		}
 	}
 
-	private void saveCurrentClassNode() {
+	private static void saveCurrentClassNode() {
 		String txt = txtByteEditView.getText();
 		for (String s : txt.split("\\/\\/ #Annotations:\n")) {
 			if (s.isEmpty())
@@ -769,15 +761,15 @@ public class Main extends JFrame {
 			if (node == null) {
 				continue;
 			}
-			if (classNodes.replace(getFullName(node.name), node) == null) {
-				classNodes.put(getFullName(node.name), node);
+			if (classNodes.replace(node.name, node) == null) {
+				classNodes.put(node.name, node);
 				ArchiveTreeModel model;
 				if (tree.getModel().getClass().equals(DefaultTreeModel.class)) {
 					tree.setModel(model = new ArchiveTreeModel(classNodes, otherFiles));
 				} else {
 					model = (ArchiveTreeModel) tree.getModel();
 				}
-				String name = getFullName(node.name);
+				String name = node.name + ".class";
 				if (name.contains("/") ? (!name.split("/")[name.split("/").length - 1].contains("$"))
 						: (!name.contains("$"))) {
 					model.paths.add(name);
@@ -791,26 +783,21 @@ public class Main extends JFrame {
 	}
 
 	public static void decompileCurrentNode() {
+		if (currentNodeName == null)
+			return;
 		try {
 			EnumDecompiler decompiler = Main.decompiler;
 			String current = currentNodeName;
 			ClassNode classNode = classNodes.get(current);
 			int prev = txtByteEditView.getCaretPosition();
-			String dis = decompiler.getDecompiler().decompile(classNode);
-			String substr = current.substring(0, current.length() - 6);
-			synchronized (Main.classNodes) {
-				for (Entry<String, ClassNode> entry : Main.classNodes.entrySet()) {
-					if (entry.getKey().contains("$")) {
-						String[] split = entry.getKey().split("\\$");
-						if (split[0].equals(substr)) {
-							dis += "\n" + decompiler.getDecompiler().decompile(entry.getValue());
-						}
-					}
-				}
-			}
+			String dis = decompiler.getDecompiler().decompile(classNode, Main.classNodes);
+			EventQueue.invokeAndWait(() -> {
+				synchronized (treeLock) {
 					txtByteEditView.setText(dis);
 					if (dis.length() > prev)
 						txtByteEditView.setCaretPosition(prev);
+				}
+			});
 		} catch (Exception e2) {
 			e2.printStackTrace();
 		}
@@ -818,6 +805,7 @@ public class Main extends JFrame {
 
 	public static void selectFile(String s) {
 		if (s != null && s.endsWith(".class")) {
+			s = s.substring(0, s.length() - 6);
 			currentNodeName = s;
 			decompileCurrentNode();
 			txtByteEditView.setCaretPosition(0);
@@ -869,14 +857,16 @@ public class Main extends JFrame {
 							public void run() {
 								synchronized (treeLock) {
 									save(file, classNodes.values());
-									EventQueue.invokeLater(new Runnable() {
+									try {
+										EventQueue.invokeAndWait(new Runnable() {
 											public void run() {
-											synchronized (treeLock) {
 												isChangingFile = false;
 												Main.this.setTitle("ByteEdit");
 											}
-										}
 										});
+									} catch (Exception e) {
+										e.printStackTrace();
+									}
 								}
 							}
 						}).start();
@@ -930,7 +920,7 @@ public class Main extends JFrame {
 			for (ClassNode node : classes) {
 				ClassWriter writer = new ClassWriter(computeFlags);
 				node.accept(writer);
-				output.putNextEntry(new ZipEntry(getFullName(node.name)));
+				output.putNextEntry(new ZipEntry(node.name + ".class"));
 				output.write(writer.toByteArray());
 				output.closeEntry();
 			}
@@ -956,8 +946,4 @@ public class Main extends JFrame {
 	public static void showError(String s) {
 		JOptionPane.showMessageDialog(INSTANCE, s, "Error!", JOptionPane.ERROR_MESSAGE);
 	}
-
-	public static String getFullName(String s) {
-		return s + ".class";
-	}
 }

src/me/ByteEdit/utils/ClassUtil.java

@@ -320,12 +320,10 @@ public class ClassUtil {
 			s += "enum ";
 			acc ^= ACC_ENUM;
 		}
-		if (acc == access) {
+		if (acc == access)
 			return s;
-		} else {
 		return "0x" + Integer.toHexString(access) + " ";
 	}
-	}
 
 	/**
 	 * @return { JavaType, Import }
@@ -544,7 +542,6 @@ public class ClassUtil {
 		DecompilationInterface di = diMap.get(o.getClass());
 		if (di != null)
 			return di.apply(o, desc, escapeSpaces, hs);
-		else
 		return o.toString();
 	}
 

src/me/ByteEdit/utils/UnicodeUtils.java

@@ -84,12 +84,10 @@ public class UnicodeUtils {
 			sb.append(c);
 		}
 		if (stage != 0) {
-			if (unicodeBuffer != 0) {
+			if (unicodeBuffer != 0)
 				throw new IllegalArgumentException("The unicode at the end is incomplete.");
-			} else {
 			throw new IllegalArgumentException("'\\' at the end is invalid.");
 		}
-		}
 		return sb.toString();
 	}