Update

src/me/ByteEdit/boxes/CompilationBox.java

@@ -1,7 +1,6 @@
 package me.ByteEdit.boxes;
 
 import java.awt.BorderLayout;
-import java.awt.Color;
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -22,7 +21,6 @@ import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.KeyStroke;
-import javax.swing.UIManager;
 import javax.swing.border.EmptyBorder;
 import javax.tools.JavaCompiler;
 import javax.tools.SimpleJavaFileObject;
@@ -36,6 +34,7 @@ import org.objectweb.asm.tree.ClassNode;
 
 import me.ByteEdit.edit.Disassembler;
 import me.ByteEdit.main.Main;
+import me.ByteEdit.main.ThemeManager;
 
 public class CompilationBox extends JFrame {
 
@@ -46,32 +45,25 @@ public class CompilationBox extends JFrame {
 
 	public CompilationBox() {
 		compSuccess = new CompilationSuccess();
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+		ThemeManager.registerFrames(compSuccess);
 		setTitle("Java Compiler");
 		setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
 		setBounds((int) (Toolkit.getDefaultToolkit().getScreenSize().getWidth() / 2 - 400),
 				(int) (Toolkit.getDefaultToolkit().getScreenSize().getHeight() / 2 - 200), 800, 400);
 		contentPane = new JPanel();
-		contentPane.setBackground(Main.dark ? new Color(0x2F2F2F) : Color.GRAY);
 		contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
 		setContentPane(contentPane);
 		contentPane.setLayout(new BorderLayout(0, 0));
 
-		Main.theme.apply(textArea);
+		ThemeManager.registerTextArea(textArea);
 		textArea.setEditable(true);
 		textArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA);
 		textArea.setCodeFoldingEnabled(true);
-		textArea.setBackground(Main.dark ? new Color(0x2F2F2F) : Color.LIGHT_GRAY);
 
 		RTextScrollPane scrollPane = new RTextScrollPane();
 		scrollPane.setViewportView(textArea);
 		scrollPane.setLineNumbersEnabled(true);
 		scrollPane.setFoldIndicatorEnabled(true);
-		scrollPane.getGutter().setBackground(Main.dark ? new Color(0x2F2F2F) : Color.LIGHT_GRAY);
 		contentPane.add(scrollPane);
 
 		KeyStroke ctrlS = KeyStroke.getKeyStroke(KeyEvent.VK_S, KeyEvent.CTRL_DOWN_MASK);

src/me/ByteEdit/boxes/CompilationSuccess.java

@@ -1,19 +1,17 @@
 package me.ByteEdit.boxes;
 
 import java.awt.BorderLayout;
-import java.awt.Color;
 import java.awt.Toolkit;
 
 import javax.swing.JFrame;
 import javax.swing.JPanel;
-import javax.swing.UIManager;
 import javax.swing.border.EmptyBorder;
 
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
 import org.fife.ui.rtextarea.RTextScrollPane;
 
-import me.ByteEdit.main.Main;
+import me.ByteEdit.main.ThemeManager;
 
 public class CompilationSuccess extends JFrame {
 
@@ -21,32 +19,24 @@ public class CompilationSuccess extends JFrame {
 	RSyntaxTextArea textArea = new RSyntaxTextArea();
 
 	public CompilationSuccess() {
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
 		setTitle("Java Compiler - Result");
 		setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
 		setBounds((int) (Toolkit.getDefaultToolkit().getScreenSize().getWidth() / 2 - 400),
 				(int) (Toolkit.getDefaultToolkit().getScreenSize().getHeight() / 2 - 200), 800, 400);
 		contentPane = new JPanel();
-		contentPane.setBackground(Main.dark ? new Color(0x2F2F2F) : Color.GRAY);
 		contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
 		setContentPane(contentPane);
 		contentPane.setLayout(new BorderLayout(0, 0));
 
-		Main.theme.apply(textArea);
+		ThemeManager.registerTextArea(textArea);
 		textArea.setEditable(true);
 		textArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA_DISASSEMBLE);
 		textArea.setCodeFoldingEnabled(true);
-		textArea.setBackground(Main.dark ? new Color(0x2F2F2F) : Color.LIGHT_GRAY);
 
 		RTextScrollPane scrollPane = new RTextScrollPane();
 		scrollPane.setViewportView(textArea);
 		scrollPane.setLineNumbersEnabled(true);
 		scrollPane.setFoldIndicatorEnabled(true);
-		scrollPane.getGutter().setBackground(Main.dark ? new Color(0x2F2F2F) : Color.LIGHT_GRAY);
 		contentPane.add(scrollPane);
 	}
 }

src/me/ByteEdit/boxes/GlobalSearchBox.java

@@ -15,7 +15,6 @@ 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 org.objectweb.asm.tree.AbstractInsnNode;
@@ -27,6 +26,7 @@ import org.objectweb.asm.tree.MethodNode;
 
 import me.ByteEdit.boxes.GlobalSearchOpenBox.Info;
 import me.ByteEdit.main.Main;
+import me.ByteEdit.main.ThemeManager;
 import me.ByteEdit.utils.UnicodeUtils;
 
 public class GlobalSearchBox extends JFrame {
@@ -43,12 +43,8 @@ public class GlobalSearchBox extends JFrame {
 	private GlobalSearchOpenBox openBox;
 
 	public GlobalSearchBox() {
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
 		openBox = new GlobalSearchOpenBox();
+		ThemeManager.registerFrames(openBox);
 		setResizable(false);
 		setTitle("Global Search");
 		setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);

src/me/ByteEdit/boxes/GlobalSearchOpenBox.java

@@ -8,7 +8,6 @@ import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.ListSelectionModel;
-import javax.swing.UIManager;
 import javax.swing.border.EmptyBorder;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -24,11 +23,6 @@ public class GlobalSearchOpenBox extends JFrame {
 	DefaultListModel<Info> model;
 
 	public GlobalSearchOpenBox() {
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
 		setResizable(false);
 		setTitle("Global Search - Result");
 		setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);

src/me/ByteEdit/boxes/OptionBox.java

@@ -5,7 +5,6 @@ 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 {
@@ -15,11 +14,6 @@ public class OptionBox extends JFrame {
 	public JCheckBox chckbxComputeMax;
 
 	public OptionBox() {
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
 		setResizable(false);
 		setTitle("Options");
 		setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);

src/me/ByteEdit/boxes/SearchBox.java

@@ -15,7 +15,6 @@ 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;
@@ -28,11 +27,6 @@ public class SearchBox extends JFrame {
 	public JCheckBox chckbxCaseSensitive;
 
 	public SearchBox() {
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
 		setResizable(false);
 		setTitle("Find/Replace");
 		setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);

src/me/ByteEdit/boxes/ThemeBox.java

@@ -0,0 +1,101 @@
+package me.ByteEdit.boxes;
+
+import java.awt.BorderLayout;
+import java.awt.Font;
+import java.awt.Toolkit;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.DefaultListModel;
+import javax.swing.JFrame;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.ListSelectionModel;
+import javax.swing.UIManager;
+import javax.swing.UIManager.LookAndFeelInfo;
+import javax.swing.border.EmptyBorder;
+
+import com.formdev.flatlaf.FlatDarculaLaf;
+import com.formdev.flatlaf.FlatDarkLaf;
+import com.formdev.flatlaf.FlatIntelliJLaf;
+import com.formdev.flatlaf.FlatLightLaf;
+import com.formdev.flatlaf.intellijthemes.FlatAllIJThemes;
+
+import me.ByteEdit.main.ThemeManager;
+
+public class ThemeBox extends JFrame {
+
+	private JPanel contentPane;
+	private final JScrollPane scrollPane = new JScrollPane();
+	private final JList<LAFI> list;
+
+	public ThemeBox() {
+		setTitle("Theme Chooser");
+		setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
+		setBounds((int) (Toolkit.getDefaultToolkit().getScreenSize().getWidth() / 2 - 200),
+				(int) (Toolkit.getDefaultToolkit().getScreenSize().getHeight() / 2 - 200), 400, 400);
+		contentPane = new JPanel();
+		contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
+		setContentPane(contentPane);
+		contentPane.setLayout(new BorderLayout(0, 0));
+
+		contentPane.add(scrollPane, BorderLayout.CENTER);
+		DefaultListModel<LAFI> model = new DefaultListModel<>();
+		list = new JList(model);
+		list.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent e) {
+				if (e.getClickCount() == 2) {
+					LAFI lafi = model.get(list.locationToIndex(e.getPoint()));
+					if (lafi.className != null)
+						ThemeManager.changeUIManager(lafi.className, lafi.isDark);
+				}
+			}
+		});
+		list.setFont(new Font("Tahoma", Font.BOLD, 18));
+		list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+
+		model.addElement(new LAFI(null, "--- Installed Themes ---"));
+		for (LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) {
+			model.addElement(new LAFI(info.getClassName(), info.getName(), false));
+		}
+
+		model.addElement(new LAFI(null, "--- Core Themes ---"));
+		model.addElement(new LAFI(FlatLightLaf.class.getName(), "Flat Light", false));
+		model.addElement(new LAFI(FlatDarkLaf.class.getName(), "Flat Dark", true));
+		model.addElement(new LAFI(FlatIntelliJLaf.class.getName(), "Flat IntelliJ", false));
+		model.addElement(new LAFI(FlatDarculaLaf.class.getName(), "Flat Darcula", true));
+
+		model.addElement(new LAFI(null, "--- IntelliJ Themes ---"));
+		for (LookAndFeelInfo info : FlatAllIJThemes.INFOS) {
+			model.addElement(new LAFI(info.getClassName(), info.getName()));
+		}
+
+		scrollPane.setViewportView(list);
+	}
+
+	static class LAFI {
+		final String className;
+		final String name;
+		final Boolean isDark;
+
+		public LAFI(String className, String name) {
+			this.className = className;
+			this.name = name;
+			this.isDark = null;
+		}
+
+		public LAFI(String className, String name, boolean isDark) {
+			this.className = className;
+			this.name = name;
+			this.isDark = Boolean.valueOf(isDark);
+		}
+
+		@Override
+		public String toString() {
+			return name;
+		}
+	}
+
+}

src/me/ByteEdit/boxes/TypeOpenBox.java

@@ -11,7 +11,6 @@ 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;
@@ -27,11 +26,6 @@ public class TypeOpenBox extends JFrame {
 	public JTextField txtSearch;
 
 	public TypeOpenBox() {
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
 		setResizable(false);
 		setTitle("Open Type");
 		setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);

src/me/ByteEdit/boxes/UnicodeBox.java

@@ -9,7 +9,6 @@ import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
-import javax.swing.UIManager;
 import javax.swing.border.EmptyBorder;
 
 import me.ByteEdit.main.Main;
@@ -20,11 +19,6 @@ public class UnicodeBox extends JFrame {
 	private JPanel contentPane;
 
 	public UnicodeBox() {
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
 		setResizable(false);
 		setTitle("Unicode Converter");
 		setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);

src/me/ByteEdit/edit/Assembler.java

@@ -292,7 +292,7 @@ public class Assembler {
 					}
 				}
 			}
-			HashMap<Label, Integer> methodLabelMap = new HashMap<Label, Integer>();
+			HashMap<LabelNode, Integer> methodLabelMap = new HashMap<LabelNode, Integer>();
 			annotationsForNext.clear();
 			MethodNode node = null;
 			String temp = "";
@@ -348,12 +348,12 @@ public class Assembler {
 							String signat = sp[5].equals("null") ? null : UnicodeUtils.unescape(sp[5]);
 							LabelNode _start = null;
 							LabelNode _end = null;
-							for (Entry<Label, Integer> entry : methodLabelMap.entrySet()) {
-								if (entry.getValue() == start) {
-									_start = new LabelNode(entry.getKey());
+							for (Entry<LabelNode, Integer> entry : methodLabelMap.entrySet()) {
+								if (entry.getValue().intValue() == start) {
+									_start = entry.getKey();
 								}
-								if (entry.getValue() == end) {
-									_end = new LabelNode(entry.getKey());
+								if (entry.getValue().intValue() == end) {
+									_end = entry.getKey();
 								}
 							}
 							node.localVariables.add(new LocalVariableNode(UnicodeUtils.unescape(sp[0]),
@@ -368,15 +368,15 @@ public class Assembler {
 							LabelNode _start = null;
 							LabelNode _end = null;
 							LabelNode _handler = null;
-							for (Entry<Label, Integer> entry : methodLabelMap.entrySet()) {
-								if (entry.getValue() == start) {
-									_start = new LabelNode(entry.getKey());
+							for (Entry<LabelNode, Integer> entry : methodLabelMap.entrySet()) {
+								if (entry.getValue().intValue() == start) {
+									_start = entry.getKey();
 								}
-								if (entry.getValue() == end) {
-									_end = new LabelNode(entry.getKey());
+								if (entry.getValue().intValue() == end) {
+									_end = entry.getKey();
 								}
-								if (entry.getValue() == handler) {
-									_handler = new LabelNode(entry.getKey());
+								if (entry.getValue().intValue() == handler) {
+									_handler = entry.getKey();
 								}
 							}
 							node.tryCatchBlocks.add(new TryCatchBlockNode(_start, _end, _handler,
@@ -625,28 +625,28 @@ public class Assembler {
 		}
 	}
 
-	private static AbstractInsnNode getNode(String s, HashMap<Label, Integer> labels) throws Exception {
+	private static AbstractInsnNode getNode(String s, HashMap<LabelNode, Integer> labels) throws Exception {
 		if (s.startsWith("// label ")) {
 			int labelNr = Integer.parseInt(s.substring(9));
-			for (Map.Entry<Label, Integer> entry : labels.entrySet()) {
+			for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
 				if (entry.getValue() == labelNr) {
-					return new LabelNode(entry.getKey());
+					return entry.getKey();
 				}
 			}
-			Label l = new Label();
-			labels.put(l, labelNr);
-			return new LabelNode(l);
+			LabelNode ln = new LabelNode(new Label());
+			labels.put(ln, labelNr);
+			return ln;
 		} else if (s.startsWith("// line ")) {
 			s = s.substring(8);
 			int labelNr = Integer.parseInt(s.split(" ")[1]);
-			for (Map.Entry<Label, Integer> entry : labels.entrySet()) {
+			for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
 				if (entry.getValue() == labelNr) {
-					return new LineNumberNode(Integer.parseInt(s.split(" ")[0]), new LabelNode(entry.getKey()));
+					return new LineNumberNode(Integer.parseInt(s.split(" ")[0]), entry.getKey());
 				}
 			}
-			Label l = new Label();
-			labels.put(l, labelNr);
-			return new LineNumberNode(Integer.parseInt(s.split(" ")[0]), new LabelNode(l));
+			LabelNode ln = new LabelNode(new Label());
+			labels.put(ln, labelNr);
+			return new LineNumberNode(Integer.parseInt(s.split(" ")[0]), ln);
 		} else if (s.startsWith("// frame ")) {
 			String str1 = s.substring(7);
 			String str = str1.substring(str1.indexOf(' ', 3) + 1);
@@ -674,16 +674,16 @@ public class Assembler {
 							if (asd.startsWith("(label) ")) {
 								int labelNr = Integer.parseInt(asd.split(" ")[1]);
 								boolean found = false;
-								for (Map.Entry<Label, Integer> entry : labels.entrySet()) {
+								for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
 									if (entry.getValue() == labelNr) {
-										arr.add(new LabelNode(entry.getKey()));
+										arr.add(entry.getKey());
 										found = true;
 									}
 								}
 								if (!found) {
-									Label lb = new Label();
-									labels.put(lb, labelNr);
-									arr.add(new LabelNode(lb));
+									LabelNode ln = new LabelNode(new Label());
+									labels.put(ln, labelNr);
+									arr.add(ln);
 								}
 							} else {
 								arr.add(ClassUtil.getCastedValue(asd.split(" ")[1], asd.split("\\) ")[0].substring(1)));
@@ -720,16 +720,16 @@ public class Assembler {
 							if (asd.startsWith("(label) ")) {
 								int labelNr = Integer.parseInt(asd.split(" ")[1]);
 								boolean found = false;
-								for (Map.Entry<Label, Integer> entry : labels.entrySet()) {
+								for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
 									if (entry.getValue() == labelNr) {
-										arr.add(new LabelNode(entry.getKey()));
+										arr.add(entry.getKey());
 										found = true;
 									}
 								}
 								if (!found) {
-									Label l = new Label();
-									labels.put(l, labelNr);
-									arr.add(new LabelNode(l));
+									LabelNode ln = new LabelNode(new Label());
+									labels.put(ln, labelNr);
+									arr.add(ln);
 								}
 							} else {
 								arr.add(ClassUtil.getCastedValue(asd.split(" ")[1], asd.split("\\) ")[0].substring(1)));
@@ -1115,179 +1115,179 @@ public class Assembler {
 			}
 			case "ifeq": {
 				int labelNr = Integer.parseInt(s.split(" ")[1]);
-				for (Map.Entry<Label, Integer> entry : labels.entrySet()) {
+				for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
 					if (entry.getValue() == labelNr) {
-						return new JumpInsnNode(153, new LabelNode(entry.getKey()));
+						return new JumpInsnNode(153, entry.getKey());
 					}
 				}
-				Label l = new Label();
-				labels.put(l, labelNr);
-				return new JumpInsnNode(153, new LabelNode(l));
+				LabelNode ln = new LabelNode(new Label());
+				labels.put(ln, labelNr);
+				return new JumpInsnNode(153, ln);
 			}
 			case "ifne": {
 				int labelNr = Integer.parseInt(s.split(" ")[1]);
-				for (Map.Entry<Label, Integer> entry : labels.entrySet()) {
+				for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
 					if (entry.getValue() == labelNr) {
-						return new JumpInsnNode(154, new LabelNode(entry.getKey()));
+						return new JumpInsnNode(154, entry.getKey());
 					}
 				}
-				Label l = new Label();
-				labels.put(l, labelNr);
-				return new JumpInsnNode(154, new LabelNode(l));
+				LabelNode ln = new LabelNode(new Label());
+				labels.put(ln, labelNr);
+				return new JumpInsnNode(154, ln);
 			}
 			case "iflt": {
 				int labelNr = Integer.parseInt(s.split(" ")[1]);
-				for (Map.Entry<Label, Integer> entry : labels.entrySet()) {
+				for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
 					if (entry.getValue() == labelNr) {
-						return new JumpInsnNode(155, new LabelNode(entry.getKey()));
+						return new JumpInsnNode(155, entry.getKey());
 					}
 				}
-				Label l = new Label();
-				labels.put(l, labelNr);
-				return new JumpInsnNode(155, new LabelNode(l));
+				LabelNode ln = new LabelNode(new Label());
+				labels.put(ln, labelNr);
+				return new JumpInsnNode(155, ln);
 			}
 			case "ifge": {
 				int labelNr = Integer.parseInt(s.split(" ")[1]);
-				for (Map.Entry<Label, Integer> entry : labels.entrySet()) {
+				for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
 					if (entry.getValue() == labelNr) {
-						return new JumpInsnNode(156, new LabelNode(entry.getKey()));
+						return new JumpInsnNode(156, entry.getKey());
 					}
 				}
-				Label l = new Label();
-				labels.put(l, labelNr);
-				return new JumpInsnNode(156, new LabelNode(l));
+				LabelNode ln = new LabelNode(new Label());
+				labels.put(ln, labelNr);
+				return new JumpInsnNode(156, ln);
 			}
 			case "ifgt": {
 				int labelNr = Integer.parseInt(s.split(" ")[1]);
-				for (Map.Entry<Label, Integer> entry : labels.entrySet()) {
+				for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
 					if (entry.getValue() == labelNr) {
-						return new JumpInsnNode(157, new LabelNode(entry.getKey()));
+						return new JumpInsnNode(157, entry.getKey());
 					}
 				}
-				Label l = new Label();
-				labels.put(l, labelNr);
-				return new JumpInsnNode(157, new LabelNode(l));
+				LabelNode ln = new LabelNode(new Label());
+				labels.put(ln, labelNr);
+				return new JumpInsnNode(157, ln);
 			}
 			case "ifle": {
 				int labelNr = Integer.parseInt(s.split(" ")[1]);
-				for (Map.Entry<Label, Integer> entry : labels.entrySet()) {
+				for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
 					if (entry.getValue() == labelNr) {
-						return new JumpInsnNode(158, new LabelNode(entry.getKey()));
+						return new JumpInsnNode(158, entry.getKey());
 					}
 				}
-				Label l = new Label();
-				labels.put(l, labelNr);
-				return new JumpInsnNode(158, new LabelNode(l));
+				LabelNode ln = new LabelNode(new Label());
+				labels.put(ln, labelNr);
+				return new JumpInsnNode(158, ln);
 			}
 			case "if_icmpeq": {
 				int labelNr = Integer.parseInt(s.split(" ")[1]);
-				for (Map.Entry<Label, Integer> entry : labels.entrySet()) {
+				for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
 					if (entry.getValue() == labelNr) {
-						return new JumpInsnNode(159, new LabelNode(entry.getKey()));
+						return new JumpInsnNode(159, entry.getKey());
 					}
 				}
-				Label l = new Label();
-				labels.put(l, labelNr);
-				return new JumpInsnNode(159, new LabelNode(l));
+				LabelNode ln = new LabelNode(new Label());
+				labels.put(ln, labelNr);
+				return new JumpInsnNode(159, ln);
 			}
 			case "if_icmpne": {
 				int labelNr = Integer.parseInt(s.split(" ")[1]);
-				for (Map.Entry<Label, Integer> entry : labels.entrySet()) {
+				for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
 					if (entry.getValue() == labelNr) {
-						return new JumpInsnNode(160, new LabelNode(entry.getKey()));
+						return new JumpInsnNode(160, entry.getKey());
 					}
 				}
-				Label l = new Label();
-				labels.put(l, labelNr);
-				return new JumpInsnNode(160, new LabelNode(l));
+				LabelNode ln = new LabelNode(new Label());
+				labels.put(ln, labelNr);
+				return new JumpInsnNode(160, ln);
 			}
 			case "if_icmplt": {
 				int labelNr = Integer.parseInt(s.split(" ")[1]);
-				for (Map.Entry<Label, Integer> entry : labels.entrySet()) {
+				for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
 					if (entry.getValue() == labelNr) {
-						return new JumpInsnNode(161, new LabelNode(entry.getKey()));
+						return new JumpInsnNode(161, entry.getKey());
 					}
 				}
-				Label l = new Label();
-				labels.put(l, labelNr);
-				return new JumpInsnNode(161, new LabelNode(l));
+				LabelNode ln = new LabelNode(new Label());
+				labels.put(ln, labelNr);
+				return new JumpInsnNode(161, ln);
 			}
 			case "if_icmpge": {
 				int labelNr = Integer.parseInt(s.split(" ")[1]);
-				for (Map.Entry<Label, Integer> entry : labels.entrySet()) {
+				for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
 					if (entry.getValue() == labelNr) {
-						return new JumpInsnNode(162, new LabelNode(entry.getKey()));
+						return new JumpInsnNode(162, entry.getKey());
 					}
 				}
-				Label l = new Label();
-				labels.put(l, labelNr);
-				return new JumpInsnNode(162, new LabelNode(l));
+				LabelNode ln = new LabelNode(new Label());
+				labels.put(ln, labelNr);
+				return new JumpInsnNode(162, ln);
 			}
 			case "if_icmpgt": {
 				int labelNr = Integer.parseInt(s.split(" ")[1]);
-				for (Map.Entry<Label, Integer> entry : labels.entrySet()) {
+				for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
 					if (entry.getValue() == labelNr) {
-						return new JumpInsnNode(163, new LabelNode(entry.getKey()));
+						return new JumpInsnNode(163, entry.getKey());
 					}
 				}
-				Label l = new Label();
-				labels.put(l, labelNr);
-				return new JumpInsnNode(163, new LabelNode(l));
+				LabelNode ln = new LabelNode(new Label());
+				labels.put(ln, labelNr);
+				return new JumpInsnNode(163, ln);
 			}
 			case "if_icmple": {
 				int labelNr = Integer.parseInt(s.split(" ")[1]);
-				for (Map.Entry<Label, Integer> entry : labels.entrySet()) {
+				for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
 					if (entry.getValue() == labelNr) {
-						return new JumpInsnNode(164, new LabelNode(entry.getKey()));
+						return new JumpInsnNode(164, entry.getKey());
 					}
 				}
-				Label l = new Label();
-				labels.put(l, labelNr);
-				return new JumpInsnNode(164, new LabelNode(l));
+				LabelNode ln = new LabelNode(new Label());
+				labels.put(ln, labelNr);
+				return new JumpInsnNode(164, ln);
 			}
 			case "if_acmpeq": {
 				int labelNr = Integer.parseInt(s.split(" ")[1]);
-				for (Map.Entry<Label, Integer> entry : labels.entrySet()) {
+				for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
 					if (entry.getValue() == labelNr) {
-						return new JumpInsnNode(165, new LabelNode(entry.getKey()));
+						return new JumpInsnNode(165, entry.getKey());
 					}
 				}
-				Label l = new Label();
-				labels.put(l, labelNr);
-				return new JumpInsnNode(165, new LabelNode(l));
+				LabelNode ln = new LabelNode(new Label());
+				labels.put(ln, labelNr);
+				return new JumpInsnNode(165, ln);
 			}
 			case "if_acmpne": {
 				int labelNr = Integer.parseInt(s.split(" ")[1]);
-				for (Map.Entry<Label, Integer> entry : labels.entrySet()) {
+				for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
 					if (entry.getValue() == labelNr) {
-						return new JumpInsnNode(166, new LabelNode(entry.getKey()));
+						return new JumpInsnNode(166, entry.getKey());
 					}
 				}
-				Label l = new Label();
-				labels.put(l, labelNr);
-				return new JumpInsnNode(166, new LabelNode(l));
+				LabelNode ln = new LabelNode(new Label());
+				labels.put(ln, labelNr);
+				return new JumpInsnNode(166, ln);
 			}
 			case "goto": {
 				int labelNr = Integer.parseInt(s.split(" ")[1]);
-				for (Map.Entry<Label, Integer> entry : labels.entrySet()) {
+				for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
 					if (entry.getValue() == labelNr) {
-						return new JumpInsnNode(167, new LabelNode(entry.getKey()));
+						return new JumpInsnNode(167, entry.getKey());
 					}
 				}
-				Label l = new Label();
-				labels.put(l, labelNr);
-				return new JumpInsnNode(167, new LabelNode(l));
+				LabelNode ln = new LabelNode(new Label());
+				labels.put(ln, labelNr);
+				return new JumpInsnNode(167, ln);
 			}
 			case "jsr": {
 				int labelNr = Integer.parseInt(s.split(" ")[1]);
-				for (Map.Entry<Label, Integer> entry : labels.entrySet()) {
+				for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
 					if (entry.getValue() == labelNr) {
-						return new JumpInsnNode(168, new LabelNode(entry.getKey()));
+						return new JumpInsnNode(168, entry.getKey());
 					}
 				}
-				Label l = new Label();
-				labels.put(l, labelNr);
-				return new JumpInsnNode(168, new LabelNode(l));
+				LabelNode ln = new LabelNode(new Label());
+				labels.put(ln, labelNr);
+				return new JumpInsnNode(168, ln);
 			}
 			case "ret": {
 				return new VarInsnNode(169, Integer.parseInt(s.split(" ")[1]));
@@ -1307,9 +1307,9 @@ public class Assembler {
 				LabelNode dflt = null;
 				if (!split2[2].substring(9).equals("null")) {
 					int dfltLabelNr = Integer.parseInt(split2[2].substring(9));
-					for (Entry<Label, Integer> entry : labels.entrySet()) {
+					for (Entry<LabelNode, Integer> entry : labels.entrySet()) {
 						if (entry.getValue() == dfltLabelNr) {
-							dflt = new LabelNode(entry.getKey());
+							dflt = entry.getKey();
 							labelIDs.put(BigInteger.valueOf(dfltLabelNr), dflt);
 						}
 						labelMap.replaceAll(new BiFunction<SwitchIntContainer, LabelNode, LabelNode>() {
@@ -1317,7 +1317,7 @@ public class Assembler {
 							@Override
 							public LabelNode apply(SwitchIntContainer t, LabelNode u) {
 								if (entry.getValue().intValue() == t.getId()) {
-									return new LabelNode(entry.getKey());
+									return entry.getKey();
 								}
 								return u;
 							}
@@ -1325,9 +1325,9 @@ public class Assembler {
 						});
 					}
 					if (dflt == null) {
-						Label l = new Label();
-						labels.put(l, dfltLabelNr);
-						dflt = new LabelNode(l);
+						LabelNode ln = new LabelNode(new Label());
+						labels.put(ln, dfltLabelNr);
+						dflt = ln;
 						labelIDs.put(BigInteger.valueOf(dfltLabelNr), dflt);
 					}
 				} else {
@@ -1338,9 +1338,8 @@ public class Assembler {
 				for (Entry<SwitchIntContainer, LabelNode> entry : labelMap.entrySet()) {
 					LabelNode ln;
 					if (((ln = labelIDs.get(BigInteger.valueOf(entry.getKey().getId()))) == null)) {
-						Label l = new Label();
-						labels.put(l, entry.getKey().getId());
-						ln = new LabelNode(l);
+						ln = new LabelNode(new Label());
+						labels.put(ln, entry.getKey().getId());
 						labelIDs.put(BigInteger.valueOf(entry.getKey().getId()), ln);
 					}
 					arr[counter] = ln;
@@ -1374,9 +1373,9 @@ public class Assembler {
 				}
 				LabelNode dflt = null;
 				int labelNr = Integer.parseInt(split2[0].substring(9));
-				for (Entry<Label, Integer> entry : labels.entrySet()) {
+				for (Entry<LabelNode, Integer> entry : labels.entrySet()) {
 					if (entry.getValue() == labelNr) {
-						dflt = new LabelNode(entry.getKey());
+						dflt = entry.getKey();
 						labelIDs.put(BigInteger.valueOf(labelNr), dflt);
 					}
 					labelMap.replaceAll(new BiFunction<SwitchIntContainer, LabelNode, LabelNode>() {
@@ -1384,7 +1383,7 @@ public class Assembler {
 						@Override
 						public LabelNode apply(SwitchIntContainer t, LabelNode u) {
 							if (entry.getValue().intValue() == t.getId()) {
-								return new LabelNode(entry.getKey());
+								return entry.getKey();
 							}
 							return u;
 						}
@@ -1392,9 +1391,9 @@ public class Assembler {
 					});
 				}
 				if (dflt == null) {
-					Label l = new Label();
-					labels.put(l, labelNr);
-					dflt = new LabelNode(l);
+					LabelNode ln = new LabelNode(new Label());
+					labels.put(ln, labelNr);
+					dflt = ln;
 					labelIDs.put(BigInteger.valueOf(labelNr), dflt);
 				}
 				LabelNode[] arr = new LabelNode[labelMap.size()];
@@ -1402,9 +1401,8 @@ public class Assembler {
 				for (Entry<SwitchIntContainer, LabelNode> entry : labelMap.entrySet()) {
 					LabelNode ln;
 					if (((ln = labelIDs.get(BigInteger.valueOf(entry.getKey().getId()))) == null)) {
-						Label l = new Label();
-						labels.put(l, entry.getKey().getId());
-						ln = new LabelNode(l);
+						ln = new LabelNode(new Label());
+						labels.put(ln, entry.getKey().getId());
 						labelIDs.put(BigInteger.valueOf(entry.getKey().getId()), ln);
 					}
 					arr[counter] = ln;
@@ -1582,25 +1580,25 @@ public class Assembler {
 			}
 			case "ifnull": {
 				int labelNr = Integer.parseInt(s.split(" ")[1]);
-				for (Map.Entry<Label, Integer> entry : labels.entrySet()) {
+				for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
 					if (entry.getValue() == labelNr) {
-						return new JumpInsnNode(198, new LabelNode(entry.getKey()));
+						return new JumpInsnNode(198, entry.getKey());
 					}
 				}
-				Label l = new Label();
-				labels.put(l, labelNr);
-				return new JumpInsnNode(198, new LabelNode(l));
+				LabelNode ln = new LabelNode(new Label());
+				labels.put(ln, labelNr);
+				return new JumpInsnNode(198, ln);
 			}
 			case "ifnonnull": {
 				int labelNr = Integer.parseInt(s.split(" ")[1]);
-				for (Map.Entry<Label, Integer> entry : labels.entrySet()) {
+				for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
 					if (entry.getValue() == labelNr) {
-						return new JumpInsnNode(199, new LabelNode(entry.getKey()));
+						return new JumpInsnNode(199, entry.getKey());
 					}
 				}
-				Label l = new Label();
-				labels.put(l, labelNr);
-				return new JumpInsnNode(199, new LabelNode(l));
+				LabelNode ln = new LabelNode(new Label());
+				labels.put(ln, labelNr);
+				return new JumpInsnNode(199, ln);
 			}
 			default:
 				throw new IllegalArgumentException("Illegal Instruction: " + s);

src/me/ByteEdit/edit/Disassembler.java

@@ -4,6 +4,12 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.objectweb.asm.Handle;
 import org.objectweb.asm.Label;
@@ -40,6 +46,9 @@ import me.ByteEdit.utils.UnicodeUtils;
 
 public class Disassembler {
 
+	private static final ExecutorService exec = Executors
+			.newFixedThreadPool((Runtime.getRuntime().availableProcessors() + 1) / 2);
+
 	public static String disassemble(ClassNode classNode) {
 		return disassemble(classNode, null).getDisassembly();
 	}
@@ -74,12 +83,68 @@ public class Disassembler {
 			return new DisassembleTuple("ClassNode is null! This is not a valid java class file!");
 		}
 		try {
-			int lineFound = -1;
-			String s = "";
-			s += "// #Annotations:\n";
-			if (classNode.visibleAnnotations != null && !classNode.visibleAnnotations.isEmpty()) {
-				for (AnnotationNode annotationNode : classNode.visibleAnnotations) {
-					s += "@" + UnicodeUtils.escapeWithSpaces(annotationNode.desc);
+			AtomicInteger lineFound = new AtomicInteger(-1);
+			StringContext ctx = new StringContext(16);
+			ctx.next("// #Annotations:\n");
+			ctx.next(doAnnotations(classNode.visibleAnnotations));
+			ctx.next("// #Class v:" + classNode.version + "\n");
+			if (classNode.signature != null)
+				ctx.next("// #Signature: " + UnicodeUtils.escapeWithSpaces(classNode.signature) + "\n");
+			if (classNode.outerMethod != null)
+				ctx.next("// #OuterMethod: " + (classNode.outerMethod == null ? "null"
+						: (UnicodeUtils.escapeWithSpaces(classNode.outerMethod) + " "
+								+ UnicodeUtils.escapeWithSpaces(classNode.outerMethodDesc)))
+						+ "\n");
+			if (classNode.outerClass != null)
+				ctx.next("// #OuterClass: " + UnicodeUtils.escapeWithSpaces(classNode.outerClass) + "\n");
+			ctx.next("// #InnerClasses:\n");
+			if (classNode.innerClasses != null) {
+				String ics = "";
+				for (InnerClassNode icn : classNode.innerClasses) {
+					ics += "// " + UnicodeUtils.escapeWithSpaces(icn.name) + " "
+							+ UnicodeUtils.escapeWithSpaces(icn.outerName) + " "
+							+ UnicodeUtils.escapeWithSpaces(icn.innerName)
+							+ (icn.access == 0 ? "" : " " + ClassUtil.getAccessFlagsFull(icn.access).trim()) + "\n";
+				}
+				ctx.next(ics);
+			}
+			ctx.next(ClassUtil.getAccessFlagsClass(classNode.access) + UnicodeUtils.escapeWithSpaces(classNode.name)
+					+ " ");
+			ctx.next("extends " + UnicodeUtils.escapeWithSpaces(classNode.superName) + " ");
+			if (classNode.interfaces != null && !classNode.interfaces.isEmpty()) {
+				String interfaceStr = "";
+				for (String interfc : classNode.interfaces) {
+					if (interfaceStr.isEmpty()) {
+						interfaceStr += UnicodeUtils.escapeWithSpaces(interfc);
+					} else {
+						interfaceStr += ", " + UnicodeUtils.escapeWithSpaces(interfc);
+					}
+				}
+				if (!interfaceStr.isEmpty())
+					ctx.next("implements " + interfaceStr + " ");
+			}
+			ctx.next("{\n// #SourceFile: "
+					+ (classNode.sourceFile == null ? "null" : UnicodeUtils.escape(classNode.sourceFile))
+					+ "\n\n// #Fields\n");
+			ctx.next(doFields(classNode.fields, nodeToFind, lineFound));
+			ctx.next("\n// #Methods\n");
+			ctx.next(doMethods(classNode.methods, classNode.name, nodeToFind, lineFound));
+			ctx.next("}\n");
+			return new DisassembleTuple(ctx.finish(), lineFound.get());
+		} catch (Throwable e) {
+			return new DisassembleTuple("Class couldn't be decompiled:\n" + e.getClass().getName() + ": "
+					+ e.getMessage() + "\n"
+					+ Arrays.toString(e.getStackTrace()).replace(", ", "\n\tat ").replace("[", "\tat ").replace("]", "")
+					+ "\n");
+		}
+	}
+
+	private static String doAnnotations(List<AnnotationNode> annotations) {
+		if (annotations == null)
+			return "";
+		StringContext ctx = new StringContext(annotations.size());
+		for (AnnotationNode annotationNode : annotations) {
+			String s = "@" + UnicodeUtils.escapeWithSpaces(annotationNode.desc);
 			if (annotationNode.values != null && !annotationNode.values.isEmpty()) {
 				s += " (";
 				boolean valBefore = true;
@@ -136,45 +201,130 @@ public class Disassembler {
 				s += ")";
 			}
 			s += "\n";
+			ctx.next(s);
 		}
+		return ctx.finish();
 	}
-			s += "// #Class v:" + classNode.version + "\n";
-			if (classNode.signature != null)
-				s += "// #Signature: " + UnicodeUtils.escapeWithSpaces(classNode.signature) + "\n";
-			if (classNode.outerMethod != null)
-				s += "// #OuterMethod: " + (classNode.outerMethod == null ? "null"
-						: (UnicodeUtils.escapeWithSpaces(classNode.outerMethod) + " "
-								+ UnicodeUtils.escapeWithSpaces(classNode.outerMethodDesc)))
-						+ "\n";
-			if (classNode.outerClass != null)
-				s += "// #OuterClass: " + UnicodeUtils.escapeWithSpaces(classNode.outerClass) + "\n";
-			s += "// #InnerClasses:\n";
-			if (classNode.innerClasses != null) {
-				for (InnerClassNode icn : classNode.innerClasses) {
-					s += "// " + UnicodeUtils.escapeWithSpaces(icn.name) + " "
-							+ UnicodeUtils.escapeWithSpaces(icn.outerName) + " "
-							+ UnicodeUtils.escapeWithSpaces(icn.innerName)
-							+ (icn.access == 0 ? "" : " " + ClassUtil.getAccessFlagsFull(icn.access).trim()) + "\n";
-				}
-			}
-			s += ClassUtil.getAccessFlagsClass(classNode.access) + UnicodeUtils.escapeWithSpaces(classNode.name) + " ";
-			s += "extends " + UnicodeUtils.escapeWithSpaces(classNode.superName) + " ";
-			if (classNode.interfaces != null && !classNode.interfaces.isEmpty()) {
-				String interfaceStr = "";
-				for (String interfc : classNode.interfaces) {
-					if (interfaceStr.isEmpty()) {
-						interfaceStr += UnicodeUtils.escapeWithSpaces(interfc);
+
+	private static String doMethods(List<MethodNode> methods, String className, Object nodeToFind,
+			AtomicInteger lineFound) throws InterruptedException, ExecutionException {
+		Future<String>[] futures = new Future[methods.size()];
+		for (int i = 0; i < futures.length; i++) {
+			MethodNode mn = methods.get(i);
+			futures[i] = exec.submit(new Callable<String>() {
+				@Override
+				public String call() throws Exception {
+					String ms = "";
+					try {
+						ms += "\t// #Max: l:" + mn.maxLocals + " s:" + mn.maxStack + "\n";
+						if (mn.signature != null)
+							ms += "\t// #Signature: " + UnicodeUtils.escapeWithSpaces(mn.signature) + "\n";
+						String[] dis = disassembleMethod(className, mn);
+						ms += dis[2];
+						ms += dis[1];
+						if (mn.visibleAnnotations != null && !mn.visibleAnnotations.isEmpty()) {
+							for (AnnotationNode annotationNode : mn.visibleAnnotations) {
+								ms += "\t@" + annotationNode.desc;
+								if (annotationNode.values != null && !annotationNode.values.isEmpty()) {
+									ms += " (";
+									boolean valBefore = true;
+									for (Object o : annotationNode.values) {
+										if (valBefore) {
+											ms += o + " = [";
+											valBefore = false;
+											continue;
 										} else {
-						interfaceStr += ", " + UnicodeUtils.escapeWithSpaces(interfc);
+											if (o instanceof String[]) {
+												String[] arr = (String[]) o;
+												boolean w8ing = false;
+												for (String rofl : arr) {
+													if (!w8ing) {
+														ms += UnicodeUtils.escapeWithSpaces(rofl) + "/";
+														w8ing = true;
+													} else {
+														ms += UnicodeUtils.escapeWithSpaces(rofl) + "]";
 													}
 												}
-				if (!interfaceStr.isEmpty())
-					s += "implements " + interfaceStr + " ";
+												ms += ", ";
+											} else if (o instanceof List) {
+												List list = (List) o;
+												ms += "{ ";
+												for (Object obj : list) {
+													if (obj instanceof String[]) {
+														String[] arr = (String[]) obj;
+														boolean w8ing = false;
+														for (String rofl : arr) {
+															if (!w8ing) {
+																ms += UnicodeUtils.escapeWithSpaces(rofl) + "/";
+																w8ing = true;
+															} else {
+																ms += UnicodeUtils.escapeWithSpaces(rofl);
 															}
-			s += "{\n// #SourceFile: "
-					+ (classNode.sourceFile == null ? "null" : UnicodeUtils.escape(classNode.sourceFile))
-					+ "\n\n// #Fields\n";
-			for (FieldNode fn : classNode.fields) {
+														}
+													} else {
+														ms += "\"" + UnicodeUtils.escape(String.valueOf(obj)) + "\"";
+													}
+													ms += ", ";
+												}
+												ms = ms.substring(0, ms.length() - 2);
+												ms += " }]";
+											} else {
+												ms += "(" + o.getClass().getName().replace(".", "/") + ") " + o + "], ";
+											}
+											valBefore = true;
+										}
+									}
+									if (ms.endsWith(", "))
+										ms = ms.substring(0, ms.length() - 2);
+									ms += ")";
+								}
+								ms += "\n";
+							}
+						}
+						if (mn.equals(nodeToFind)) {
+							lineFound.set(ms.split("\\n").length);
+						}
+						ms += "\t" + ClassUtil.getAccessFlagsFull(mn.access) + UnicodeUtils.escapeWithSpaces(mn.name)
+								+ " " + UnicodeUtils.escapeWithSpaces(mn.desc) + " ";
+						if (mn.exceptions != null && !mn.exceptions.isEmpty()) {
+							String exceptionStr = "";
+							for (String exc : mn.exceptions) {
+								if (exceptionStr.isEmpty()) {
+									exceptionStr += UnicodeUtils.escapeWithSpaces(exc);
+								} else {
+									exceptionStr += ", " + UnicodeUtils.escapeWithSpaces(exc);
+								}
+							}
+							if (!exceptionStr.isEmpty())
+								ms += "throws " + exceptionStr + " ";
+						}
+						ms += "{\n";
+						ms += dis[0];
+						ms += "\t}\n\n";
+					} catch (Exception e) {
+						ms += "\t\t// Method couldn't be disassembled:\n\t\t// " + e.getClass().getName() + ": "
+								+ e.getMessage() + "\n" + Arrays.toString(e.getStackTrace())
+										.replace(", ", "\n\t\t// \tat ").replace("[", "\t\t// \tat ").replace("]", "")
+								+ "\n\t}\n\n";
+					}
+					return ms;
+				}
+			});
+		}
+		StringContext ctx = new StringContext(futures.length);
+		for (Future<String> f : futures) {
+			ctx.next(f.get());
+		}
+		String s = ctx.finish();
+		if (s.isEmpty())
+			return "\n";
+		return s;
+	}
+
+	private static String doFields(List<FieldNode> fields, Object nodeToFind, AtomicInteger lineFound) {
+		StringContext ctx = new StringContext(fields.size());
+		for (FieldNode fn : fields) {
+			String s = "";
 			if (fn.signature != null)
 				s += "\t// #Signature: " + UnicodeUtils.escapeWithSpaces(fn.signature) + "\n";
 			if (fn.visibleAnnotations != null && !fn.visibleAnnotations.isEmpty()) {
@@ -237,7 +387,7 @@ public class Disassembler {
 				}
 			}
 			if (fn.equals(nodeToFind)) {
-					lineFound = s.split("\\n").length;
+				lineFound.set(s.split("\\n").length);
 			}
 			s += "\t" + ClassUtil.getAccessFlagsFull(fn.access).replace("varargs", "transient")
 					+ UnicodeUtils.escapeWithSpaces(fn.desc) + " " + UnicodeUtils.escapeWithSpaces(fn.name);
@@ -245,155 +395,66 @@ public class Disassembler {
 				s += " = " + ClassUtil.getDecompiledValue(fn.value, fn.desc, true);
 			}
 			s += "\n";
+			ctx.next(s);
 		}
-			s += "\n// #Methods\n";
-			for (MethodNode mn : classNode.methods) {
-				try {
-					s += "\t// #Max: l:" + mn.maxLocals + " s:" + mn.maxStack + "\n";
-					if (mn.signature != null)
-						s += "\t// #Signature: " + UnicodeUtils.escapeWithSpaces(mn.signature) + "\n";
-					String[] dis = disassembleMethod(classNode.name, mn);
-					s += dis[2];
-					s += dis[1];
-					if (mn.visibleAnnotations != null && !mn.visibleAnnotations.isEmpty()) {
-						for (AnnotationNode annotationNode : mn.visibleAnnotations) {
-							s += "\t@" + annotationNode.desc;
-							if (annotationNode.values != null && !annotationNode.values.isEmpty()) {
-								s += " (";
-								boolean valBefore = true;
-								for (Object o : annotationNode.values) {
-									if (valBefore) {
-										s += o + " = [";
-										valBefore = false;
-										continue;
-									} else {
-										if (o instanceof String[]) {
-											String[] arr = (String[]) o;
-											boolean w8ing = false;
-											for (String rofl : arr) {
-												if (!w8ing) {
-													s += UnicodeUtils.escapeWithSpaces(rofl) + "/";
-													w8ing = true;
-												} else {
-													s += UnicodeUtils.escapeWithSpaces(rofl) + "]";
-												}
-											}
-											s += ", ";
-										} else if (o instanceof List) {
-											List list = (List) o;
-											s += "{ ";
-											for (Object obj : list) {
-												if (obj instanceof String[]) {
-													String[] arr = (String[]) obj;
-													boolean w8ing = false;
-													for (String rofl : arr) {
-														if (!w8ing) {
-															s += UnicodeUtils.escapeWithSpaces(rofl) + "/";
-															w8ing = true;
-														} else {
-															s += UnicodeUtils.escapeWithSpaces(rofl);
-														}
-													}
-												} else {
-													s += "\"" + UnicodeUtils.escape(String.valueOf(obj)) + "\"";
-												}
-												s += ", ";
-											}
-											s = s.substring(0, s.length() - 2);
-											s += " }]";
-										} else {
-											s += "(" + o.getClass().getName().replace(".", "/") + ") " + o + "], ";
-										}
-										valBefore = true;
-									}
-								}
-								if (s.endsWith(", "))
-									s = s.substring(0, s.length() - 2);
-								s += ")";
-							}
-							s += "\n";
-						}
-					}
-					if (mn.equals(nodeToFind)) {
-						lineFound = s.split("\\n").length;
-					}
-					s += "\t" + ClassUtil.getAccessFlagsFull(mn.access) + UnicodeUtils.escapeWithSpaces(mn.name) + " "
-							+ UnicodeUtils.escapeWithSpaces(mn.desc) + " ";
-					if (mn.exceptions != null && !mn.exceptions.isEmpty()) {
-						String exceptionStr = "";
-						for (String exc : mn.exceptions) {
-							if (exceptionStr.isEmpty()) {
-								exceptionStr += UnicodeUtils.escapeWithSpaces(exc);
-							} else {
-								exceptionStr += ", " + UnicodeUtils.escapeWithSpaces(exc);
-							}
-						}
-						if (!exceptionStr.isEmpty())
-							s += "throws " + exceptionStr + " ";
-					}
-					s += "{\n";
-					s += dis[0];
-					s += "\t}\n\n";
-				} catch (Exception e) {
-					s += "\t\t// Method couldn't be disassembled:\n\t\t// "
-							+ e.getClass().getName() + ": " + e.getMessage() + "\n" + Arrays.toString(e.getStackTrace())
-									.replace(", ", "\n\t\t// \tat ").replace("[", "\t\t// \tat ").replace("]", "")
-							+ "\n\t}\n\n";
-				}
-			}
-			s += "}\n";
-			return new DisassembleTuple(s, lineFound);
-		} catch (Throwable e) {
-			return new DisassembleTuple("Class couldn't be decompiled:\n" + e.getClass().getName() + ": "
-					+ e.getMessage() + "\n"
-					+ Arrays.toString(e.getStackTrace()).replace(", ", "\n\tat ").replace("[", "\tat ").replace("]", "")
-					+ "\n");
-		}
+		return ctx.finish();
 	}
 
 	private static String[] disassembleMethod(String className, MethodNode mn) {
 		HashMap<Label, Integer> labels = new HashMap<Label, Integer>();
-		String s = "";
-		String localVarTable = "";
-		String tryCatchTable = "";
+		String localVarTable;
+		String tryCatchTable;
 		for (AbstractInsnNode n : mn.instructions.toArray()) {
 			if (n instanceof LabelNode) {
 				labels.put(((LabelNode) n).getLabel(), labels.size() + 1);
 			}
 		}
 		if (mn.localVariables != null && !mn.localVariables.isEmpty()) {
-			localVarTable = "\t// #LocalVars:\n";
-			for (LocalVariableNode lvn : mn.localVariables) {
-				localVarTable += "\t// " + UnicodeUtils.escapeWithSpaces(lvn.name) + ": "
+			List<LocalVariableNode> list = mn.localVariables;
+			StringContext ctx = new StringContext(list.size() + 1);
+			ctx.next("\t// #LocalVars:\n");
+			for (LocalVariableNode lvn : list) {
+				ctx.next("\t// " + UnicodeUtils.escapeWithSpaces(lvn.name) + ": "
 						+ UnicodeUtils.escapeWithSpaces(lvn.desc) + " i:" + lvn.index + " s:"
 						+ labels.get(lvn.start.getLabel()) + " e:" + labels.get(lvn.end.getLabel()) + " sig:"
-						+ UnicodeUtils.escapeWithSpaces(lvn.signature) + "\n";
-			}
+						+ UnicodeUtils.escapeWithSpaces(lvn.signature) + "\n");
 			}
+			localVarTable = ctx.finish();
+		} else
+			localVarTable = "";
 		if (mn.tryCatchBlocks != null && !mn.tryCatchBlocks.isEmpty()) {
-			tryCatchTable = "\t// #TryCatch:\n";
+			List<TryCatchBlockNode> list = mn.tryCatchBlocks;
+			StringContext ctx = new StringContext(list.size() + 1);
+			ctx.next("\t// #TryCatch:\n");
 			for (TryCatchBlockNode tcbn : mn.tryCatchBlocks) {
-				tryCatchTable += "\t// " + UnicodeUtils.escapeWithSpaces(tcbn.type) + " s:"
-						+ labels.get(tcbn.start.getLabel()) + " e:" + labels.get(tcbn.end.getLabel()) + " h:"
-						+ labels.get(tcbn.handler.getLabel()) + "\n";
+				ctx.next("\t// " + UnicodeUtils.escapeWithSpaces(tcbn.type) + " s:" + labels.get(tcbn.start.getLabel())
+						+ " e:" + labels.get(tcbn.end.getLabel()) + " h:" + labels.get(tcbn.handler.getLabel()) + "\n");
 			}
+			tryCatchTable = ctx.finish();
+		} else
+			tryCatchTable = "";
+		AbstractInsnNode[] insns = mn.instructions.toArray();
+		StringContext ctx = new StringContext(insns.length);
+		for (AbstractInsnNode n : insns) {
+			ctx.next(disassembleInstruction(n, labels));
 		}
-		for (AbstractInsnNode n : mn.instructions.toArray()) {
-			s += disassembleInstruction(n, labels);
-		}
-		return new String[] { s, localVarTable, tryCatchTable };
+		return new String[] { ctx.finish(), localVarTable, tryCatchTable };
 	}
 
-	public static String disassembleInstruction(AbstractInsnNode n, HashMap<Label, Integer> labels) {
-		if (FieldInsnNode.class.isInstance(n)) {
+	public static final HashMap<Class, InstructionInterface> iiMap = new HashMap<>();
+
+	static {
+		iiMap.put(FieldInsnNode.class, (n, labels) -> {
 			FieldInsnNode node = (FieldInsnNode) n;
 			return "\t\t" + OpcodesReverse.reverseOpcode(node.getOpcode()) + " "
 					+ UnicodeUtils.escapeWithSpaces(node.desc) + " " + UnicodeUtils.escapeWithSpaces(node.owner) + "/"
 					+ UnicodeUtils.escapeWithSpaces(node.name).replace("/", "\\u002F") + "\n";
-		} else if (LabelNode.class.isInstance(n)) {
+		});
+		iiMap.put(LabelNode.class, (n, labels) -> {
 			LabelNode node = (LabelNode) n;
 			return "\t\t// label " + labels.get(node.getLabel()) + "\n";
-		} else if (FrameNode.class.isInstance(n)) {
+		});
+		iiMap.put(FrameNode.class, (n, labels) -> {
 			FrameNode node = (FrameNode) n;
 			String type = "";
 			switch (node.type) {
@@ -470,10 +531,12 @@ public class Disassembler {
 			}
 			s += "\n";
 			return s;
-		} else if (LineNumberNode.class.isInstance(n)) {
+		});
+		iiMap.put(LineNumberNode.class, (n, labels) -> {
 			LineNumberNode node = (LineNumberNode) n;
 			return "\t\t// line " + node.line + " " + labels.get(node.start.getLabel()) + "\n";
-		} else if (InvokeDynamicInsnNode.class.isInstance(n)) {
+		});
+		iiMap.put(InvokeDynamicInsnNode.class, (n, labels) -> {
 			InvokeDynamicInsnNode node = (InvokeDynamicInsnNode) n;
 			String s = "\t\t" + OpcodesReverse.reverseOpcode(node.getOpcode()) + " [\n\t\t\tname: "
 					+ UnicodeUtils.escapeWithSpaces(node.name).replace("/", "\\u002F") + "\n\t\t\tdesc: "
@@ -484,7 +547,7 @@ public class Disassembler {
 					+ node.bsm.isInterface() + "\n\t\t\t\ttag: " + OpcodesReverse.reverseHandleOpcode(node.bsm.getTag())
 					+ "\n\t\t\t]\n\t\t\targs: [\n";
 			for (Object l : node.bsmArgs) {
-				if (l.getClass().getName().equals("org.objectweb.asm.Type")) {
+				if (l instanceof Type) {
 					Type type = (Type) l;
 					int valueBegin = type.valueBegin;
 					int valueEnd = type.valueEnd;
@@ -494,7 +557,7 @@ public class Disassembler {
 							+ "\n\t\t\t\t\tstart: " + valueBegin + "\n\t\t\t\t\tend: " + valueEnd + "\n\t\t\t\t\tbuf: "
 							+ ClassUtil.getDecompiledValue(buf, "");
 					s += "\n\t\t\t\t]\n";
-				} else if (l.getClass().getName().equals("org.objectweb.asm.Handle")) {
+				} else if (l instanceof Handle) {
 					Handle h = (Handle) l;
 					s += "\t\t\t\tHandle: [\n\t\t\t\t\tname: "
 							+ UnicodeUtils.escapeWithSpaces(h.getName()).replace("/", "\\u002F") + "\n\t\t\t\t\towner: "
@@ -508,31 +571,26 @@ public class Disassembler {
 			}
 			s += "\t\t\t]\n\t\t]\n";
 			return s;
-		} else if (MethodInsnNode.class.isInstance(n)) {
+		});
+		iiMap.put(MethodInsnNode.class, (n, labels) -> {
 			MethodInsnNode node = (MethodInsnNode) n;
 			return "\t\t" + OpcodesReverse.reverseOpcode(node.getOpcode()) + " "
 					+ UnicodeUtils.escapeWithSpaces(node.desc) + " " + UnicodeUtils.escapeWithSpaces(node.owner) + "/"
 					+ UnicodeUtils.escapeWithSpaces(node.name).replace("/", "\\u002F") + "\n";
-		} else if (TypeInsnNode.class.isInstance(n)) {
+		});
+		iiMap.put(TypeInsnNode.class, (n, labels) -> {
 			TypeInsnNode node = (TypeInsnNode) n;
 			return "\t\t" + OpcodesReverse.reverseOpcode(node.getOpcode()) + " "
 					+ UnicodeUtils.escapeWithSpaces(node.desc) + "\n";
-		} else if (MultiANewArrayInsnNode.class.isInstance(n)) {
+		});
+		iiMap.put(MultiANewArrayInsnNode.class, (n, labels) -> {
 			MultiANewArrayInsnNode node = (MultiANewArrayInsnNode) n;
 			return "\t\t" + OpcodesReverse.reverseOpcode(node.getOpcode()) + " "
 					+ UnicodeUtils.escapeWithSpaces(node.desc) + " " + node.dims + "\n";
-		} else if (LdcInsnNode.class.isInstance(n)) {
+		});
+		iiMap.put(LdcInsnNode.class, (n, labels) -> {
 			LdcInsnNode node = (LdcInsnNode) n;
-			switch (node.cst.getClass().getSimpleName()) {
-			case "String":
-			case "Double":
-			case "Integer":
-			case "Float":
-			case "Long": {
-				return "\t\t" + OpcodesReverse.reverseOpcode(node.getOpcode()) + " "
-						+ ClassUtil.getDecompiledValue(node.cst, "") + "\n";
-			}
-			case "Type": {
+			if (node.cst instanceof Type) {
 				Type type = (Type) node.cst;
 				int valueBegin = type.valueBegin;
 				int valueEnd = type.valueEnd;
@@ -543,19 +601,20 @@ public class Disassembler {
 						+ valueEnd + "\n\t\t\tbuf: " + ClassUtil.getDecompiledValue(buf, "");
 				s += "\n\t\t]\n";
 				return s;
+			} else {
+				return "\t\t" + OpcodesReverse.reverseOpcode(node.getOpcode()) + " "
+						+ ClassUtil.getDecompiledValue(node.cst, "") + "\n";
 			}
-			default: {
-				return "\t\tUNRESOLVED TYPE! " + OpcodesReverse.reverseOpcode(node.getOpcode()) + " "
-						+ node.cst.getClass().getName().replace(".", "/") + " " + node.cst + "\n";
-			}
-			}
-		} else if (VarInsnNode.class.isInstance(n)) {
+		});
+		iiMap.put(VarInsnNode.class, (n, labels) -> {
 			VarInsnNode node = (VarInsnNode) n;
 			return "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + " " + node.var + "\n";
-		} else if (InsnNode.class.isInstance(n)) {
+		});
+		iiMap.put(InsnNode.class, (n, labels) -> {
 			InsnNode node = (InsnNode) n;
 			return "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + "\n";
-		} else if (IntInsnNode.class.isInstance(n)) {
+		});
+		iiMap.put(IntInsnNode.class, (n, labels) -> {
 			IntInsnNode node = (IntInsnNode) n;
 			if (n.getOpcode() == Opcodes.NEWARRAY) {
 				return "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + " "
@@ -563,11 +622,13 @@ public class Disassembler {
 			} else {
 				return "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + " " + node.operand + "\n";
 			}
-		} else if (JumpInsnNode.class.isInstance(n)) {
+		});
+		iiMap.put(JumpInsnNode.class, (n, labels) -> {
 			JumpInsnNode node = (JumpInsnNode) n;
 			return "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + " " + labels.get(node.label.getLabel())
 					+ "\n";
-		} else if (TableSwitchInsnNode.class.isInstance(n)) {
+		});
+		iiMap.put(TableSwitchInsnNode.class, (n, labels) -> {
 			TableSwitchInsnNode node = (TableSwitchInsnNode) n;
 			String s = "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + " [\n\t\t\tmin: " + node.min
 					+ "\n\t\t\tmax: " + node.max + "\n\t\t\tdefault: " + labels.get(node.dflt.getLabel())
@@ -577,7 +638,8 @@ public class Disassembler {
 			}
 			s += "\t\t\t]\n\t\t]\n";
 			return s;
-		} else if (LookupSwitchInsnNode.class.isInstance(n)) {
+		});
+		iiMap.put(LookupSwitchInsnNode.class, (n, labels) -> {
 			LookupSwitchInsnNode node = (LookupSwitchInsnNode) n;
 			String s = "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + " [\n\t\t\tdefault: "
 					+ labels.get(node.dflt.getLabel()) + "\n\t\t\tkeys: [\n";
@@ -590,13 +652,24 @@ public class Disassembler {
 			}
 			s += "\t\t\t]\n\t\t]\n";
 			return s;
-		} else if (IincInsnNode.class.isInstance(n)) {
+		});
+		iiMap.put(IincInsnNode.class, (n, labels) -> {
 			IincInsnNode node = (IincInsnNode) n;
 			return "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + " " + node.var + " " + node.incr + "\n";
-		} else {
+		});
+	}
+
+	static interface InstructionInterface {
+		String apply(AbstractInsnNode n, HashMap<Label, Integer> labels);
+	}
+
+	public static String disassembleInstruction(AbstractInsnNode n, HashMap<Label, Integer> labels) {
+		InstructionInterface ii = iiMap.get(n.getClass());
+		if (ii != null)
+			return ii.apply(n, labels);
+		else
 			return "\t\tNOT HANDLED! " + OpcodesReverse.reverseOpcode(n.getOpcode()) + " "
 					+ n.getClass().getSimpleName() + "\n";
 	}
-	}
 
 }

src/me/ByteEdit/edit/JavaAssemblyTokenMaker.java

@@ -2857,8 +2857,8 @@ public class JavaAssemblyTokenMaker extends AbstractJFlexCTokenMaker {
 	 * @see #addToken(int, int, int)
 	 */
 	private void addHyperlinkToken(int start, int end, int tokenType) {
-		int so = start + offsetShift;
-		addToken(zzBuffer, start, end, tokenType, so, true);
+		super.addToken(zzBuffer, start, end, tokenType, start + offsetShift, true);
+		zzStartRead = zzMarkedPos;
 	}
 
 	/**
@@ -2867,7 +2867,8 @@ public class JavaAssemblyTokenMaker extends AbstractJFlexCTokenMaker {
 	 * @param tokenType The token's type.
 	 */
 	private void addToken(int tokenType) {
-		addToken(zzStartRead, zzMarkedPos - 1, tokenType);
+		super.addToken(zzBuffer, zzStartRead, zzMarkedPos - 1, tokenType, zzStartRead + offsetShift, false);
+		zzStartRead = zzMarkedPos;
 	}
 
 	/**
@@ -2877,8 +2878,8 @@ public class JavaAssemblyTokenMaker extends AbstractJFlexCTokenMaker {
 	 * @see #addHyperlinkToken(int, int, int)
 	 */
 	private void addToken(int start, int end, int tokenType) {
-		int so = start + offsetShift;
-		addToken(zzBuffer, start, end, tokenType, so, false);
+		super.addToken(zzBuffer, start, end, tokenType, start + offsetShift, false);
+		zzStartRead = zzMarkedPos;
 	}
 
 	/**

src/me/ByteEdit/edit/StringContext.java

@@ -0,0 +1,40 @@
+package me.ByteEdit.edit;
+
+/**
+ * This is a quiet fast String concatenation helper class. It appears to be a
+ * lot faster than Java's StringBuilder class, especially for very large
+ * Strings, which will be made by the Disassembler.
+ */
+public class StringContext {
+
+	private String[] arrs;
+	private int idx;
+	private int len;
+
+	public StringContext(int amt) {
+		if (amt > 0)
+			arrs = new String[amt];
+	}
+
+	public void next(String s) {
+		len += (arrs[idx++] = s).length();
+	}
+
+	public String finish() {
+		if (arrs == null)
+			return "";
+		char[] full = new char[len];
+		int off = 0;
+		for (int i = 0; i < idx; i++) {
+			int len = arrs[i].length();
+			arrs[i].getChars(0, len, full, off);
+			off += len;
+			arrs[i] = null;
+		}
+		String s = new String(full);
+		arrs = null;
+		full = null;
+		return s;
+	}
+
+}

src/me/ByteEdit/main/Main.java

@@ -1,6 +1,5 @@
 package me.ByteEdit.main;
 
-import java.awt.Color;
 import java.awt.Component;
 import java.awt.EventQueue;
 import java.awt.Font;
@@ -29,7 +28,6 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.Enumeration;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.jar.JarEntry;
@@ -43,13 +41,15 @@ import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JSplitPane;
 import javax.swing.JTree;
 import javax.swing.KeyStroke;
-import javax.swing.UIManager;
 import javax.swing.border.EmptyBorder;
 import javax.swing.event.TreeExpansionEvent;
 import javax.swing.event.TreeExpansionListener;
@@ -70,7 +70,6 @@ import org.fife.ui.autocomplete.DefaultCompletionProvider;
 import org.fife.ui.autocomplete.ShorthandCompletion;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
-import org.fife.ui.rsyntaxtextarea.Theme;
 import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser;
 import org.fife.ui.rsyntaxtextarea.folding.FoldParserManager;
 import org.fife.ui.rtextarea.RTextScrollPane;
@@ -85,6 +84,7 @@ import me.ByteEdit.boxes.GlobalSearchBox;
 import me.ByteEdit.boxes.OptionBox;
 import me.ByteEdit.boxes.RenameBox;
 import me.ByteEdit.boxes.SearchBox;
+import me.ByteEdit.boxes.ThemeBox;
 import me.ByteEdit.boxes.TypeOpenBox;
 import me.ByteEdit.boxes.UnicodeBox;
 import me.ByteEdit.edit.Assembler;
@@ -111,13 +111,11 @@ public class Main extends JFrame {
 	public static UnicodeBox unicodeBox;
 	public static RenameBox renameBox;
 	public static CompilationBox compilationBox;
+	public static ThemeBox themeBox;
 	public static JTree tree;
 	public static RTextScrollPane scrollPane_ByteEdit;
-	public static Theme theme;
 	public static File saveFolder;
 
-	public static HashSet<String> fakedFolders = new HashSet<>();
-
 	public static final Object treeLock = new Object();
 
 	/**
@@ -130,11 +128,13 @@ public class Main extends JFrame {
 				try {
 					Main frame = new Main();
 					frame.setVisible(true);
+					ThemeManager.applyRSTATheme();
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
 			}
 		});
+
 	}
 
 	/**
@@ -200,23 +200,12 @@ public class Main extends JFrame {
 		return provider;
 	}
 
-	public static boolean dark = true;
-
 	/**
 	 * Create the frame.
 	 */
 	public Main() {
 		INSTANCE = this;
-		File light = new File(System.getProperty("java.io.tmpdir") + File.pathSeparator + "ByteEditLight.conf");
-		if (light.exists()) {
-			dark = false;
-		}
-		try {
-			theme = Theme.load(getClass().getClassLoader()
-					.getResourceAsStream(dark ? "org/fife/eclipse_dark.xml" : "org/fife/eclipse.xml"));
-		} catch (IOException e2) {
-			e2.printStackTrace();
-		}
+		ThemeManager.registerFrames(this);
 		globalSearchBox = new GlobalSearchBox();
 		searchBox = new SearchBox();
 		typeOpenBox = new TypeOpenBox();
@@ -224,22 +213,134 @@ public class Main extends JFrame {
 		unicodeBox = new UnicodeBox();
 		renameBox = new RenameBox();
 		compilationBox = new CompilationBox();
+		themeBox = new ThemeBox();
+		ThemeManager.registerFrames(globalSearchBox);
+		ThemeManager.registerFrames(searchBox);
+		ThemeManager.registerFrames(typeOpenBox);
+		ThemeManager.registerFrames(optionBox);
+		ThemeManager.registerFrames(unicodeBox);
+		ThemeManager.registerFrames(renameBox);
+		ThemeManager.registerFrames(compilationBox);
+		ThemeManager.registerFrames(themeBox);
+		ThemeManager.load();
 		setTitle("ByteEdit");
 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		setBounds((int) (Toolkit.getDefaultToolkit().getScreenSize().getWidth() / 2 - 407),
 				(int) (Toolkit.getDefaultToolkit().getScreenSize().getHeight() / 2 - 237), 814, 474);
+
+		menuBar = new JMenuBar();
+		setJMenuBar(menuBar);
+
+		mnFile = new JMenu("File");
+		menuBar.add(mnFile);
+
+		mntmOpenJar = new JMenuItem("Open Jar");
+		mntmOpenJar.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent arg0) {
+				final JFileChooser fileChooser = new JFileChooser(saveFolder) {
+
+					@Override
+					protected JDialog createDialog(final Component parent) throws HeadlessException {
+						final JDialog dialog = super.createDialog(parent);
+						dialog.setAlwaysOnTop(true);
+						return dialog;
+					}
+				};
+				fileChooser.setDialogTitle("Open File");
+				fileChooser.setFileSelectionMode(0);
+				fileChooser.setAcceptAllFileFilterUsed(false);
+				fileChooser.addChoosableFileFilter(new FileNameExtensionFilter("Jar File", "jar"));
+				final int action = fileChooser.showOpenDialog(Main.this);
+				if (action == 0) {
+					final File file = fileChooser.getSelectedFile();
+					saveFolder = file.getParentFile();
+					boolean shouldSave = false;
+					if (file.exists()) {
+						synchronized (treeLock) {
+							jarFile = file;
+							saveFolder = file.getParentFile();
+							isChangingFile = true;
 							try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (Exception e) {
+								Main.this.setTitle("ByteEdit - Loading '" + jarFile.getCanonicalPath() + "'");
+							} catch (IOException ex) {
+								Main.this.setTitle("ByteEdit - Loading '" + jarFile.getAbsolutePath() + "'");
+							}
+							new Thread(new Runnable() {
+								public void run() {
+									try {
+										ArchiveTreeModel model = new ArchiveTreeModel(new JarFile(jarFile));
+										EventQueue.invokeLater(new Runnable() {
+											public void run() {
+												synchronized (treeLock) {
+													tree.setModel(model);
+													txtByteEditView.setText("");
+													currentNodeName = null;
+													globalSearchBox.setVisible(false);
+													searchBox.setVisible(false);
+													typeOpenBox.setVisible(false);
+													optionBox.setVisible(false);
+													unicodeBox.setVisible(false);
+													renameBox.setVisible(false);
+													compilationBox.setVisible(false);
+													isChangingFile = false;
+													Main.this.setTitle("ByteEdit");
+												}
+											}
+										});
+									} catch (IOException e) {
 										e.printStackTrace();
 									}
+								}
+							}).start();
+						}
+					}
+				}
+			}
+		});
+		mnFile.add(mntmOpenJar);
+
+		mntmSaveBytecode = new JMenuItem("Save Bytecode");
+		mntmSaveBytecode.addActionListener(e -> saveCurrentClassNode());
+		mnFile.add(mntmSaveBytecode);
+
+		mntmSaveJar = new JMenuItem("Save Jar");
+		mntmSaveJar.addActionListener(e -> save());
+		mnFile.add(mntmSaveJar);
+
+		mnSearch = new JMenu("Search");
+		menuBar.add(mnSearch);
+
+		mntmSearchMembers = new JMenuItem("Search Members");
+		mnSearch.add(mntmSearchMembers);
+
+		mntmSearch = new JMenuItem("Search");
+		mnSearch.add(mntmSearch);
+		mntmSearch.addActionListener(e -> searchBox.setVisible(true));
+		mntmSearchMembers.addActionListener(e -> globalSearchBox.setVisible(true));
+
+		mnWindow = new JMenu("Window");
+		menuBar.add(mnWindow);
+
+		mntmThemes = new JMenuItem("Themes");
+		mntmThemes.addActionListener(e -> themeBox.setVisible(true));
+		mnWindow.add(mntmThemes);
+
+		mntmOpenType = new JMenuItem("Open Type");
+		mntmOpenType.addActionListener(e -> typeOpenBox.setVisible(true));
+		mnWindow.add(mntmOpenType);
+
+		mntmUnicode = new JMenuItem("Unicode Helper");
+		mntmUnicode.addActionListener(e -> unicodeBox.setVisible(true));
+		mnWindow.add(mntmUnicode);
+
+		mntmCompiler = new JMenuItem("Compiler");
+		mntmCompiler.addActionListener(e -> compilationBox.setVisible(true));
+		mnWindow.add(mntmCompiler);
 		contentPane = new JPanel();
-		contentPane.setBackground(dark ? new Color(0x2F2F2F) : Color.GRAY);
 		contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
 		setContentPane(contentPane);
 		contentPane.setLayout(new GridLayout(0, 1, 0, 0));
 		JSplitPane splitPane = new JSplitPane();
-		splitPane.setBackground(dark ? new Color(0x2F2F2F) : Color.GRAY);
 		splitPane.setResizeWeight(0.2);
 		contentPane.add(splitPane);
 		JScrollPane scrollPane = new JScrollPane();
@@ -316,14 +417,9 @@ public class Main extends JFrame {
 			}
 		});
 		tree.setFont(new Font("Verdana", Font.PLAIN, 11));
-		tree.setBackground(dark ? new Color(0x2F2F2F) : Color.LIGHT_GRAY);
 		tree.setCellRenderer(new DefaultTreeCellRenderer() {
 			{
 				putClientProperty("html.disable", Boolean.TRUE);
-				setBackgroundNonSelectionColor(dark ? new Color(0x2F2F2F) : Color.LIGHT_GRAY);
-				setBackgroundSelectionColor(Color.GRAY);
-				setTextNonSelectionColor(dark ? new Color(0xeeeeee) : Color.BLACK);
-				setTextSelectionColor(dark ? new Color(0xeeeeee) : Color.BLACK);
 			}
 		});
 		scrollPane.setViewportView(tree);
@@ -443,6 +539,7 @@ public class Main extends JFrame {
 							}
 						}
 						txtByteEditView.setText(dis);
+						if (dis.length() > prev)
 							txtByteEditView.setCaretPosition(prev);
 					} catch (Exception e2) {
 						e2.printStackTrace();
@@ -460,120 +557,56 @@ public class Main extends JFrame {
 		KeyStroke ctrlE = KeyStroke.getKeyStroke(KeyEvent.VK_E, KeyEvent.CTRL_DOWN_MASK);
 		KeyStroke ctrlB = KeyStroke.getKeyStroke(KeyEvent.VK_B, KeyEvent.CTRL_DOWN_MASK);
 		// global
-		txtByteEditView.registerKeyboardAction(new ActionListener() {
-
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				if (light.exists())
-					light.delete();
-				else
-					try {
-						light.createNewFile();
-					} catch (IOException e1) {
-					}
-				dark = !dark;
-				JOptionPane.showMessageDialog(Main.this,
-						"Theme switched to " + (dark ? "Dark" : "Light") + ".\nPlease restart ByteEdit.",
-						"Theme changed", JOptionPane.INFORMATION_MESSAGE);
-			}
-		}, ctrlB, JComponent.WHEN_IN_FOCUSED_WINDOW);
-		txtByteEditView.registerKeyboardAction(new ActionListener() {
-
-			@Override
-			public void actionPerformed(ActionEvent e) {
+		txtByteEditView.registerKeyboardAction(e -> themeBox.setVisible(true), ctrlB,
+				JComponent.WHEN_IN_FOCUSED_WINDOW);
+		txtByteEditView.registerKeyboardAction(e -> {
 			globalSearchBox.setVisible(true);
 			globalSearchBox.txtString.requestFocusInWindow();
 			globalSearchBox.txtString.select(0, globalSearchBox.txtString.getText().length());
-			}
 		}, ctrlG, JComponent.WHEN_IN_FOCUSED_WINDOW);
-		txtByteEditView.registerKeyboardAction(new ActionListener() {
-
-			@Override
-			public void actionPerformed(ActionEvent e) {
+		txtByteEditView.registerKeyboardAction(e -> {
 			searchBox.setVisible(true);
 			searchBox.txtFind.requestFocusInWindow();
 			searchBox.txtFind.select(0, searchBox.txtFind.getText().length());
-			}
 		}, ctrlF, JComponent.WHEN_IN_FOCUSED_WINDOW);
-		txtByteEditView.registerKeyboardAction(new ActionListener() {
-
-			@Override
-			public void actionPerformed(ActionEvent e) {
+		txtByteEditView.registerKeyboardAction(e -> {
 			typeOpenBox.setVisible(true);
 			typeOpenBox.txtSearch.requestFocusInWindow();
 			typeOpenBox.txtSearch.select(0, typeOpenBox.txtSearch.getText().length());
-			}
 		}, ctrlT, JComponent.WHEN_IN_FOCUSED_WINDOW);
-		txtByteEditView.registerKeyboardAction(new ActionListener() {
-
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				optionBox.setVisible(true);
-			}
-		}, ctrlO, JComponent.WHEN_IN_FOCUSED_WINDOW);
-		txtByteEditView.registerKeyboardAction(new ActionListener() {
-
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				unicodeBox.setVisible(true);
-			}
-		}, ctrlU, JComponent.WHEN_IN_FOCUSED_WINDOW);
-		txtByteEditView.registerKeyboardAction(new ActionListener() {
-
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				compilationBox.setVisible(true);
-			}
-		}, ctrlE, JComponent.WHEN_IN_FOCUSED_WINDOW);
+		txtByteEditView.registerKeyboardAction(e -> optionBox.setVisible(true), ctrlO,
+				JComponent.WHEN_IN_FOCUSED_WINDOW);
+		txtByteEditView.registerKeyboardAction(e -> unicodeBox.setVisible(true), ctrlU,
+				JComponent.WHEN_IN_FOCUSED_WINDOW);
+		txtByteEditView.registerKeyboardAction(e -> compilationBox.setVisible(true), ctrlE,
+				JComponent.WHEN_IN_FOCUSED_WINDOW);
 		// specific
-		tree.registerKeyboardAction(new ActionListener() {
-
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				save();
-			}
-		}, ctrlS, JComponent.WHEN_FOCUSED);
-		txtByteEditView.registerKeyboardAction(new ActionListener() {
-
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				saveCurrentClassNode();
-			}
-		}, ctrlS, JComponent.WHEN_FOCUSED);
-		txtByteEditView.registerKeyboardAction(new ActionListener() {
-
-			@Override
-			public void actionPerformed(ActionEvent e) {
+		tree.registerKeyboardAction(e -> save(), ctrlS, JComponent.WHEN_FOCUSED);
+		txtByteEditView.registerKeyboardAction(e -> saveCurrentClassNode(), ctrlS, JComponent.WHEN_FOCUSED);
+		txtByteEditView.registerKeyboardAction(e -> {
 			try {
 				goToSelected();
 			} catch (BadLocationException e1) {
 				e1.printStackTrace();
 			}
-			}
 		}, ctrlG, JComponent.WHEN_FOCUSED);
-		txtByteEditView.registerKeyboardAction(new ActionListener() {
-
-			@Override
-			public void actionPerformed(ActionEvent e) {
+		txtByteEditView.registerKeyboardAction(e -> {
 			try {
 				renameSelected();
 			} catch (BadLocationException e1) {
 				e1.printStackTrace();
 			}
-			}
 		}, ctrlR, JComponent.WHEN_FOCUSED);
 		txtByteEditView.setEditable(true);
 		txtByteEditView.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA_DISASSEMBLE);
 		txtByteEditView.setCodeFoldingEnabled(true);
 		scrollPane_ByteEdit = new RTextScrollPane();
-		theme.apply(txtByteEditView);
+		ThemeManager.registerTextArea(txtByteEditView);
 
 		splitPane.setRightComponent(scrollPane_ByteEdit);
-		txtByteEditView.setBackground(dark ? new Color(0x2F2F2F) : Color.LIGHT_GRAY);
 		scrollPane_ByteEdit.setViewportView(txtByteEditView);
 		scrollPane_ByteEdit.setLineNumbersEnabled(true);
 		scrollPane_ByteEdit.setFoldIndicatorEnabled(true);
-		scrollPane_ByteEdit.getGutter().setBackground(dark ? new Color(0x2F2F2F) : Color.LIGHT_GRAY);
 	}
 
 	private final Pattern jumpableInstructionPattern = Pattern.compile("^\t\t(?!//|\t+).+ .+");
@@ -732,8 +765,7 @@ public class Main extends JFrame {
 	}
 
 	public static int selectFileWithSearch(String s, Object nodeToFind) {
-		if (s != null && (s.endsWith(".class")
-				|| (s.endsWith(".class/") && fakedFolders.contains(s.substring(0, s.length() - 7))))) {
+		if (s != null && s.endsWith(".class")) {
 			currentNodeName = s;
 			int lineFound = -1;
 			ClassNode classNode = classNodes.get(s);
@@ -787,14 +819,49 @@ public class Main extends JFrame {
 		if (action == 0) {
 			final File file = fileChooser.getSelectedFile();
 			saveFolder = file.getParentFile();
+			boolean shouldSave = false;
 			if (file.exists()) {
 				int dialogResult = JOptionPane.showConfirmDialog(null, "This file already exists! Overwrite it?",
 						"Warning", JOptionPane.YES_NO_OPTION);
 				if (dialogResult == JOptionPane.YES_OPTION) {
 					save(file, classNodes.values());
+					shouldSave = true;
 				}
 			} else {
+				shouldSave = true;
+			}
+
+			if (shouldSave)
+				synchronized (treeLock) {
+					if (isChangingFile) {
+						return;
+					}
+					try {
+						isChangingFile = true;
+						try {
+							Main.this.setTitle("ByteEdit - Saving '" + file.getCanonicalPath() + "'");
+						} catch (IOException ex) {
+							Main.this.setTitle("ByteEdit - Saving '" + file.getAbsolutePath() + "'");
+						}
+						new Thread(new Runnable() {
+							public void run() {
+								synchronized (treeLock) {
 									save(file, classNodes.values());
+									EventQueue.invokeLater(new Runnable() {
+										public void run() {
+											synchronized (treeLock) {
+												isChangingFile = false;
+												Main.this.setTitle("ByteEdit");
+											}
+										}
+									});
+								}
+							}
+						}).start();
+					} catch (Throwable t) {
+						t.printStackTrace();
+						showError(t);
+					}
 				}
 		}
 	}
@@ -838,10 +905,10 @@ public class Main extends JFrame {
 			if (optionBox.chckbxComputeMax.isSelected()) {
 				computeFlags |= ClassWriter.COMPUTE_MAXS;
 			}
-			for (ClassNode element : classes) {
+			for (ClassNode node : classes) {
 				ClassWriter writer = new ClassWriter(computeFlags);
-				element.accept(writer);
-				output.putNextEntry(new JarEntry(getFullName(element.name)));
+				node.accept(writer);
+				output.putNextEntry(new JarEntry(getFullName(node.name)));
 				output.write(writer.toByteArray());
 				output.closeEntry();
 			}
@@ -869,12 +936,24 @@ public class Main extends JFrame {
 	}
 
 	public static String getFullName(String s) {
-		if (fakedFolders.contains(s))
-			return s + ".class/";
-		else
 		return s + ".class";
 	}
 
+	private static final Pattern SLASH = Pattern.compile("/");
+	private JMenuBar menuBar;
+	private JMenu mnFile;
+	private JMenuItem mntmOpenJar;
+	private JMenuItem mntmSaveBytecode;
+	private JMenuItem mntmSaveJar;
+	private JMenu mnWindow;
+	private JMenuItem mntmThemes;
+	private JMenuItem mntmSearchMembers;
+	private JMenuItem mntmSearch;
+	private JMenuItem mntmOpenType;
+	private JMenuItem mntmUnicode;
+	private JMenuItem mntmCompiler;
+	private JMenu mnSearch;
+
 	class ArchiveTreeModel extends DefaultTreeModel {
 
 		public ArrayList<String> paths = new ArrayList<>();
@@ -898,20 +977,20 @@ public class Main extends JFrame {
 					byte[] data = toByteArray(jar.getInputStream(next));
 					if (next.getSize() != 0 && !next.getName().startsWith("META-INF")
 							&& (next.getName().endsWith(".class") || next.getName().endsWith(".class/"))) {
-						if ((next.getName().contains("/")
-								? (!next.getName().split("/")[next.getName().split("/").length - 1].contains("$"))
-								: (!next.getName().contains("$")))
-								|| (next.getName().startsWith("$") || next.getName().contains("$$")
-										|| next.getName().endsWith("$"))) {
-							paths.add(next.getName());
-							if (next.getName().endsWith(".class/") && next.getSize() != 0)
-								fakedFolders.add(next.getName().substring(0, next.getName().length() - 7));
-						}
 						try {
 							ClassReader reader = new ClassReader(data);
 							ClassNode node = new ClassNode();
 							reader.accept(node, 0);
-							classNodes.put(next.getName(), node);
+							classNodes.put(getFullName(node.name), node);
+
+							if ((next.getName().contains("/")
+									? (!SLASH.split(next.getName())[SLASH.split(next.getName()).length - 1]
+											.contains("$"))
+									: (!next.getName().contains("$")))
+									|| (next.getName().startsWith("$") || next.getName().contains("$$")
+											|| next.getName().endsWith("$"))) {
+								paths.add(getFullName(node.name));
+							}
 						} catch (Exception e) {
 							OTHER_FILES.put(next.getName(), data);
 						}
@@ -950,7 +1029,10 @@ public class Main extends JFrame {
 			// Windows-like sorting (like file explorer)
 			List<String> tmp = new ArrayList<>(paths);
 
-			List<String> folders = tmp.stream().filter(s -> s.contains("/")).map(s -> {
+			List<String> folders = tmp.stream().filter(s -> {
+				int c = countSlashes(s, 50);
+				return c > 0 && c < 50;
+			}).map(s -> {
 				int idx = s.lastIndexOf('/');
 				if (idx == s.length() - 1)
 					idx = s.lastIndexOf('/', idx - 1);
@@ -982,7 +1064,10 @@ public class Main extends JFrame {
 			tmp.addAll(0, folders);
 
 			for (String s : tmp) {
-				String[] elements = s.split("/");
+				String[] elements = SLASH.split(s, 50);
+				if (elements.length >= 50) {
+					((ByteEditTreeNode) getRoot()).add(new ByteEditTreeNode(s, s));
+				} else {
 					ByteEditTreeNode currentNode = (ByteEditTreeNode) getRoot();
 					for (int i = 0; i < elements.length; i++) {
 						String token = elements[i];
@@ -995,6 +1080,7 @@ public class Main extends JFrame {
 					}
 				}
 			}
+		}
 
 		private ByteEditTreeNode findNode(ByteEditTreeNode parent, String name) {
 			Enumeration<?> e = parent.children();
@@ -1006,6 +1092,18 @@ public class Main extends JFrame {
 			}
 			return null;
 		}
+
+		private int countSlashes(String s, int max) {
+			int count = 0;
+			for (char c : s.toCharArray()) {
+				if (c == '/') {
+					count++;
+					if (count == max)
+						break;
+				}
+			}
+			return count;
+		}
 	}
 
 	private static class FurtherExpandingTreeExpansionListener implements TreeExpansionListener {

src/me/ByteEdit/main/ThemeManager.java

@@ -0,0 +1,110 @@
+package me.ByteEdit.main;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.JFrame;
+import javax.swing.LookAndFeel;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+
+import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
+import org.fife.ui.rsyntaxtextarea.Theme;
+
+import com.formdev.flatlaf.IntelliJTheme;
+import com.formdev.flatlaf.intellijthemes.FlatArcDarkIJTheme;
+
+public class ThemeManager {
+
+	private static boolean dark = true;
+
+	private static File file;
+
+	private static Theme rstaThemeDark, rstaThemeLight;
+
+	private static List<RSyntaxTextArea> textAreas = new ArrayList();
+	private static List<JFrame> frames = new ArrayList();
+
+	static {
+		String s = System.getenv("APPDATA");
+		if (s == null)
+			s = System.getProperty("user.home");
+		file = new File(s, "ByteEditTheme.conf");
+	}
+
+	public static void save() {
+		try (BufferedWriter wr = new BufferedWriter(new FileWriter(file))) {
+			wr.write(UIManager.getLookAndFeel().getClass().getName() + "\n");
+			wr.write(Boolean.toString(dark));
+		} catch (Exception ex) {
+			ex.printStackTrace();
+		}
+	}
+
+	public static void load() {
+		try {
+			rstaThemeDark = Theme
+					.load(ThemeManager.class.getClassLoader().getResourceAsStream("org/fife/eclipse_dark.xml"));
+			rstaThemeLight = Theme
+					.load(ThemeManager.class.getClassLoader().getResourceAsStream("org/fife/eclipse.xml"));
+		} catch (IOException ex) {
+			ex.printStackTrace();
+		}
+
+		String theme = null;
+		if (file.exists()) {
+			try (BufferedReader read = new BufferedReader(new FileReader(file))) {
+				theme = read.readLine();
+				boolean dark = Boolean.parseBoolean(read.readLine());
+				changeUIManager(theme, dark);
+			} catch (Exception ex) {
+				ex.printStackTrace();
+			}
+		} else {
+			theme = FlatArcDarkIJTheme.class.getName();
+			changeUIManager(theme, true);
+		}
+	}
+
+	public static void changeUIManager(String clazz, Boolean isDark) {
+		try {
+			UIManager.setLookAndFeel(clazz);
+			LookAndFeel laf = UIManager.getLookAndFeel();
+			boolean nextDark = false;
+			if (laf instanceof IntelliJTheme.ThemeLaf) {
+				IntelliJTheme.ThemeLaf t = (IntelliJTheme.ThemeLaf) laf;
+				nextDark = t.isDark();
+			} else if (isDark != null) {
+				nextDark = isDark.booleanValue();
+			}
+			if (nextDark != dark) {
+				dark = nextDark;
+				applyRSTATheme();
+			}
+			frames.forEach(SwingUtilities::updateComponentTreeUI);
+			save();
+		} catch (Exception ex) {
+			ex.printStackTrace();
+		}
+	}
+
+	public static void applyRSTATheme() {
+		Theme theme = dark ? rstaThemeDark : rstaThemeLight;
+		textAreas.forEach(theme::apply);
+	}
+
+	public static void registerFrames(JFrame frame) {
+		frames.add(frame);
+	}
+
+	public static void registerTextArea(RSyntaxTextArea textArea) {
+		textAreas.add(textArea);
+	}
+
+}

src/me/ByteEdit/utils/ClassUtil.java

@@ -522,28 +522,28 @@ public class ClassUtil {
 		return count;
 	}
 
+	public static final HashMap<Class, DecompilationInterface> diMap = new HashMap<>();
+
+	static {
+		diMap.put(String.class, (o, desc, escapeSpaces) -> "\""
+				+ (escapeSpaces ? UnicodeUtils.escapeWithSpaces((String) o) : UnicodeUtils.escape((String) o)) + "\"");
+		diMap.put(Integer.class,
+				(o, desc, escape) -> desc.equals("Z") ? (((int) o) == 0 ? "false" : "true") : o.toString());
+		diMap.put(Long.class, (o, desc, escape) -> o.toString() + "l");
+		diMap.put(Float.class, (o, desc, escape) -> o.toString() + "f");
+	}
+
+	static interface DecompilationInterface {
+		String apply(Object o, String desc, boolean escape);
+	}
+
 	public static String getDecompiledValue(Object o, String desc, boolean escapeSpaces) {
-		switch (o.getClass().getName()) {
-		case "java.lang.String": {
-			return "\"" + (escapeSpaces ? UnicodeUtils.escapeWithSpaces((String) o) : UnicodeUtils.escape((String) o))
-					+ "\"";
-		}
-		case "java.lang.Integer": {
-			if (desc.equals("Z")) {
-				return ((int) o) == 0 ? "false" : "true";
-			}
+		DecompilationInterface di = diMap.get(o.getClass());
+		if (di != null)
+			return di.apply(o, desc, escapeSpaces);
+		else
 			return o.toString();
 	}
-		case "java.lang.Long": {
-			return o.toString() + "l";
-		}
-		case "java.lang.Float": {
-			return o.toString() + "f";
-		}
-		default:
-			return o.toString();
-		}
-	}
 
 	public static String getDecompiledValue(Object o, String desc) {
 		return getDecompiledValue(o, desc, false);

src/me/ByteEdit/utils/UnicodeUtils.java

@@ -82,26 +82,46 @@ public class UnicodeUtils {
 		if (s == null) {
 			return null;
 		}
-		s = escape(s).replace(" ", "\\u0020");
-		if (s.startsWith("/")) {
-			s = "\\u002F" + s.substring(1);
+		StringBuilder sb = new StringBuilder();
+		char[] arr = s.toCharArray();
+		int i = 0;
+		int len = arr.length;
+		boolean addSlash = false;
+
+		if (len > 0) {
+			if (arr[0] == '/') {
+				sb.append("\\u002F");
+				i++;
 			}
-		if (s.endsWith("/")) {
-			s = s.substring(0, s.length() - 1) + "\\u002F";
+			if (arr[len - 1] == '/') {
+				addSlash = true;
+				len--;
 			}
-		return s;
 		}
 
-	public static String escape(String s) {
-		if (s == null) {
-			return null;
-		}
-		StringBuilder sb = new StringBuilder();
-		for (char c : s.toCharArray()) {
-			if (isPrintable(c)) {
-				sb.append(c);
-			} else {
+		for (; i < len; i++) {
+			char c = arr[i];
 			switch (c) {
+			case 'Ä':
+			case 'ä':
+			case 'Ö':
+			case 'ö':
+			case 'Ü':
+			case 'ü':
+			case 'ß':
+			case '€':
+			case '©':
+			case '®':
+			case '«':
+			case '»':
+			case '§':
+			case '£':
+			case '¥':
+				sb.append(c);
+				break;
+			case ' ':
+				sb.append("\\u0020");
+				break;
 			case '\b':
 				sb.append("\\b");
 				break;
@@ -124,14 +144,26 @@ public class UnicodeUtils {
 				sb.append("\\\\");
 				break;
 			default:
+				if (c > ' ' && c <= '~') {
+					sb.append(c);
+				} else {
 					sb.append(String.format("\\u%04X", (int) c));
 				}
+				break;
 			}
 		}
+
+		if (addSlash)
+			sb.append("\\u002F");
 		return sb.toString();
 	}
 
-	private static boolean isPrintable(char c) {
+	public static String escape(String s) {
+		if (s == null) {
+			return null;
+		}
+		StringBuilder sb = new StringBuilder();
+		for (char c : s.toCharArray()) {
 			switch (c) {
 			case 'Ä':
 			case 'ä':
@@ -148,13 +180,39 @@ public class UnicodeUtils {
 			case '§':
 			case '£':
 			case '¥':
-			return true;
+				sb.append(c);
+				break;
+			case '\b':
+				sb.append("\\b");
+				break;
+			case '\t':
+				sb.append("\\t");
+				break;
+			case '\n':
+				sb.append("\\n");
+				break;
+			case '\r':
+				sb.append("\\r");
+				break;
+			case '\f':
+				sb.append("\\f");
+				break;
 			case '"':
+				sb.append("\\\"");
+				break;
 			case '\\':
-			return false;
+				sb.append("\\\\");
+				break;
 			default:
-			return c >= ' ' && c <= '~';
+				if (c >= ' ' && c <= '~') {
+					sb.append(c);
+				} else {
+					sb.append(String.format("\\u%04X", (int) c));
 				}
+				break;
+			}
+		}
+		return sb.toString();
 	}
 
 }