Better frames

src/me/ByteEdit/boxes/GlobalSearchBox.java

@@ -137,7 +137,7 @@ public class GlobalSearchBox extends JFrame {
 		openBox.model.clear();
 		Set<Info> set = new HashSet<>();
 		if (!txtString.getText().isEmpty()) {
-			String str = UnicodeUtils.unescape(txtString.getText());
+			String str = UnicodeUtils.unescape(null, txtString.getText(), true);
 			if (ignoreCase) {
 				str = str.toLowerCase();
 			}
@@ -157,11 +157,11 @@ public class GlobalSearchBox extends JFrame {
 				}
 			}
 		} else {
-			String owner = UnicodeUtils.unescape(txtOwner.getText());
+			String owner = UnicodeUtils.unescape(null, txtOwner.getText(), true);
 			boolean wildCardOwner = owner.isEmpty();
-			String name = UnicodeUtils.unescape(txtName.getText());
+			String name = UnicodeUtils.unescape(null, txtName.getText(), true);
 			boolean wildCardName = name.isEmpty();
-			String desc = UnicodeUtils.unescape(txtDesc.getText());
+			String desc = UnicodeUtils.unescape(null, txtDesc.getText(), true);
 			boolean wildCardDesc = desc.isEmpty();
 			for (ClassNode cn : Main.classNodes.values()) {
 				for (MethodNode mn : cn.methods) {

src/me/ByteEdit/boxes/RenameBox.java

@@ -84,8 +84,8 @@ public class RenameBox extends JFrame {
 					JOptionPane.showMessageDialog(null, "ClassNode not found!", "Error!", JOptionPane.ERROR_MESSAGE);
 					return;
 				}
-				String newName = UnicodeUtils.unescape(txtName.getText());
+				String newName = UnicodeUtils.unescape(null, txtName.getText(), true);
-				String newDesc = UnicodeUtils.unescape(txtDesc.getText());
+				String newDesc = UnicodeUtils.unescape(null, txtDesc.getText(), true);
 				if (ClassUtil.isObjectClassMethod(newName, newDesc, true)) {
 					JOptionPane.showMessageDialog(null, "Invalid name!", "Error!", JOptionPane.ERROR_MESSAGE);
 					return;

src/me/ByteEdit/boxes/TypeOpenBox.java

@@ -76,7 +76,7 @@ public class TypeOpenBox extends JFrame {
 				if (txtSearch.getText().isEmpty()) {
 					return;
 				}
-				String search = UnicodeUtils.unescape(txtSearch.getText()).toLowerCase();
+				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);

src/me/ByteEdit/boxes/UnicodeBox.java

@@ -36,7 +36,7 @@ public class UnicodeBox extends JFrame {
 
 			public void actionPerformed(ActionEvent e) {
 				try {
-					textArea.setText(UnicodeUtils.escape(textArea.getText()));
+					textArea.setText(UnicodeUtils.escape(null, textArea.getText(), true));
 				} catch (IllegalArgumentException ex) {
 					Main.showError(ex.getMessage());
 				}
@@ -50,7 +50,7 @@ public class UnicodeBox extends JFrame {
 
 			public void actionPerformed(ActionEvent e) {
 				try {
-					textArea.setText(UnicodeUtils.unescape(textArea.getText()));
+					textArea.setText(UnicodeUtils.unescape(null, textArea.getText(), true));
 				} catch (IllegalArgumentException ex) {
 					Main.showError(ex.getMessage());
 				}

src/me/ByteEdit/edit/Assembler.java

@@ -1,5 +1,6 @@
 package me.ByteEdit.edit;
 
+import java.io.BufferedReader;
 import java.io.StringReader;
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -9,6 +10,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.function.BiFunction;
+import java.util.regex.Pattern;
 
 import javax.swing.text.BadLocationException;
 
@@ -51,30 +53,47 @@ import me.ByteEdit.utils.UnicodeUtils;
 
 public class Assembler {
 
+	public static final Pattern SPACE = Pattern.compile(" ");
+
 	public static ClassNode assemble(String input) {
 		Main.txtByteEditView.removeAllLineHighlights();
 		CustomBufferedReader read = null;
 		try {
 			ClassNode clazz = new ClassNode();
+			HugeStringsRev hsr = new HugeStringsRev();
+			try (BufferedReader reader = new BufferedReader(new StringReader(input))) {
+				String s;
+				while (!(s = reader.readLine()).startsWith("// #SourceFile: ")) {
+				}
+				while (!(s = reader.readLine()).equals("// #Fields")) {
+					if (s.startsWith("#")) {
+						String[] split = SPACE.split(s, 2);
+						hsr.add(Integer.parseInt(split[0].substring(1, split[0].length() - 1)),
+								UnicodeUtils.unescape(null, split[1], true));
+					}
+				}
+			}
 			read = new CustomBufferedReader(new StringReader(input));
 			String s;
 			while (!(s = read.readLine()).startsWith("// #Class v:")) {
 				if (clazz.visibleAnnotations == null) {
 					clazz.visibleAnnotations = new ArrayList<>();
 				}
-				clazz.visibleAnnotations.add(parseAnnotation(s));
+				clazz.visibleAnnotations.add(parseAnnotation(hsr, s));
 			}
 			clazz.version = Integer.parseInt(s.substring(12));
 			while ((s = read.readLine()).startsWith("// ")) {
 				if (s.startsWith("// #Signature: ")) {
-					clazz.signature = s.substring(15).equals("null") ? null : UnicodeUtils.unescape(s.substring(15));
+					clazz.signature = s.substring(15).equals("null") ? null
+							: UnicodeUtils.unescape(hsr, s.substring(15));
 				} else if (s.startsWith("// #OuterClass: ")) {
-					clazz.outerClass = s.substring(16).equals("null") ? null : UnicodeUtils.unescape(s.substring(16));
+					clazz.outerClass = s.substring(16).equals("null") ? null
+							: UnicodeUtils.unescape(hsr, s.substring(16));
 				} else if (s.startsWith("// #OuterMethod: ")) {
 					String[] split = s.split(" ");
 					if (split.length > 3) {
-						clazz.outerMethod = UnicodeUtils.unescape(split[2]);
+						clazz.outerMethod = UnicodeUtils.unescape(hsr, split[2]);
-						clazz.outerMethodDesc = UnicodeUtils.unescape(split[3]);
+						clazz.outerMethodDesc = UnicodeUtils.unescape(hsr, split[3]);
 					}
 				} else if (s.equals("// #InnerClasses:")) {
 					clazz.innerClasses = new ArrayList<>();
@@ -137,9 +156,9 @@ public class Assembler {
 							access ^= ClassUtil.ACC_MANDATED;
 						}
 					}
-					clazz.innerClasses.add(new InnerClassNode(UnicodeUtils.unescape(split[1]),
+					clazz.innerClasses.add(new InnerClassNode(UnicodeUtils.unescape(hsr, split[1]),
-							split[2].equals("null") ? null : UnicodeUtils.unescape(split[2]),
+							split[2].equals("null") ? null : UnicodeUtils.unescape(hsr, split[2]),
-							split[3].equals("null") ? null : UnicodeUtils.unescape(split[3]), access));
+							split[3].equals("null") ? null : UnicodeUtils.unescape(hsr, split[3]), access));
 				}
 			}
 			{
@@ -148,14 +167,14 @@ public class Assembler {
 					String interfaces = s.substring(s.lastIndexOf(" implements ") + 12);
 					clazz.interfaces = new ArrayList<>();
 					for (String interf : interfaces.split(", ")) {
-						clazz.interfaces.add(UnicodeUtils.unescape(interf));
+						clazz.interfaces.add(UnicodeUtils.unescape(hsr, interf));
 					}
 					s = s.substring(0, s.lastIndexOf(" implements "));
 				}
-				clazz.superName = UnicodeUtils.unescape(s.substring(s.lastIndexOf(" extends ") + 9));
+				clazz.superName = UnicodeUtils.unescape(hsr, s.substring(s.lastIndexOf(" extends ") + 9));
 				s = s.substring(0, s.lastIndexOf(" extends "));
 				String[] split = s.split(" ");
-				clazz.name = UnicodeUtils.unescape(split[split.length - 1]);
+				clazz.name = UnicodeUtils.unescape(hsr, split[split.length - 1]);
 				clazz.access = ClassUtil.ACC_SUPER;
 				switch (split[split.length - 2]) {
 				case "class":
@@ -192,7 +211,7 @@ public class Assembler {
 				}
 			}
 			s = read.readLine();
-			clazz.sourceFile = s.substring(16).equals("null") ? null : UnicodeUtils.unescape(s.substring(16));
+			clazz.sourceFile = s.substring(16).equals("null") ? null : UnicodeUtils.unescape(hsr, s.substring(16));
 			while (!(s = read.readLine()).equals("// #Fields")) {
 			}
 			clazz.fields = new ArrayList<>();
@@ -207,7 +226,7 @@ public class Assembler {
 					annotationsForNext.add(s);
 				} else {
 					if (s.startsWith("// #Signature: ")) {
-						signature = UnicodeUtils.unescape(s.substring(15));
+						signature = UnicodeUtils.unescape(hsr, s.substring(15));
 					} else {
 						String[] split = s.split(" ");
 						boolean hasValue = false;
@@ -218,9 +237,9 @@ public class Assembler {
 						if (hasValue) {
 							split = s.substring(0, s.indexOf(" = ")).split(" ");
 						}
-						String name = UnicodeUtils.unescape(split[split.length - 1]);
+						String name = UnicodeUtils.unescape(hsr, split[split.length - 1]);
-						String desc = UnicodeUtils.unescape(split[split.length - 2]);
+						String desc = UnicodeUtils.unescape(hsr, split[split.length - 2]);
-						value = getValue((String) value, desc);
+						value = getValue(hsr, (String) value, desc);
 						int access = 0;
 						if (split.length > 2) {
 							String cons = consolidateStrings(split, 0, split.length - 2);
@@ -283,7 +302,7 @@ public class Assembler {
 								node.visibleAnnotations = new ArrayList<>();
 							}
 							for (String anno : annotationsForNext) {
-								node.visibleAnnotations.add(parseAnnotation(anno));
+								node.visibleAnnotations.add(parseAnnotation(hsr, anno));
 							}
 							annotationsForNext.clear();
 						}
@@ -319,7 +338,7 @@ public class Assembler {
 						tryCatchBlocksToParse.clear();
 						stage = 0;
 					} else if (s.startsWith("// #Signature: ")) {
-						node.signature = UnicodeUtils.unescape(s.substring(15));
+						node.signature = UnicodeUtils.unescape(hsr, s.substring(15));
 					} else if (s.equals("// #TryCatch:")) {
 						stage = 1;
 					} else if (s.equals("// #LocalVars:")) {
@@ -337,7 +356,7 @@ public class Assembler {
 								node.visibleAnnotations = new ArrayList<>();
 							}
 							for (String anno : annotationsForNext) {
-								node.visibleAnnotations.add(parseAnnotation(anno));
+								node.visibleAnnotations.add(parseAnnotation(hsr, anno));
 							}
 							annotationsForNext.clear();
 						}
@@ -345,7 +364,7 @@ public class Assembler {
 							String[] sp = st.split(":");
 							int start = Integer.parseInt(sp[3].substring(0, sp[3].length() - 2));
 							int end = Integer.parseInt(sp[4].substring(0, sp[4].length() - 4));
-							String signat = sp[5].equals("null") ? null : UnicodeUtils.unescape(sp[5]);
+							String signat = sp[5].equals("null") ? null : UnicodeUtils.unescape(hsr, sp[5]);
 							LabelNode _start = null;
 							LabelNode _end = null;
 							for (Entry<LabelNode, Integer> entry : methodLabelMap.entrySet()) {
@@ -356,9 +375,9 @@ public class Assembler {
 									_end = entry.getKey();
 								}
 							}
-							node.localVariables.add(new LocalVariableNode(UnicodeUtils.unescape(sp[0]),
+							node.localVariables.add(new LocalVariableNode(UnicodeUtils.unescape(hsr, sp[0]),
-									UnicodeUtils.unescape(sp[1].substring(1, sp[1].length() - 2)), signat, _start, _end,
+									UnicodeUtils.unescape(hsr, sp[1].substring(1, sp[1].length() - 2)), signat, _start,
-									Integer.parseInt(sp[2].substring(0, sp[2].length() - 2))));
+									_end, Integer.parseInt(sp[2].substring(0, sp[2].length() - 2))));
 						}
 						for (String st : tryCatchBlocksToParse) {
 							String[] sp = st.split(" ");
@@ -380,7 +399,7 @@ public class Assembler {
 								}
 							}
 							node.tryCatchBlocks.add(new TryCatchBlockNode(_start, _end, _handler,
-									sp[0].equals("null") ? null : UnicodeUtils.unescape(sp[0])));
+									sp[0].equals("null") ? null : UnicodeUtils.unescape(hsr, sp[0])));
 						}
 						clazz.methods.add(node);
 					} else if (!s.startsWith("\t")) {
@@ -388,13 +407,13 @@ public class Assembler {
 						if (s.contains(" throws ")) {
 							String exceptions = s.substring(s.lastIndexOf(" throws ") + 8);
 							for (String excp : exceptions.split(", ")) {
-								node.exceptions.add(UnicodeUtils.unescape(excp));
+								node.exceptions.add(UnicodeUtils.unescape(hsr, excp));
 							}
 							s = s.substring(0, s.lastIndexOf(" throws "));
 						}
 						String[] split = s.split(" ");
-						node.desc = UnicodeUtils.unescape(split[split.length - 1]);
+						node.desc = UnicodeUtils.unescape(hsr, split[split.length - 1]);
-						node.name = UnicodeUtils.unescape(split[split.length - 2]);
+						node.name = UnicodeUtils.unescape(hsr, split[split.length - 2]);
 						int access = 0;
 						if (split.length > 2) {
 							String cons = consolidateStrings(split, 0, split.length - 2);
@@ -458,7 +477,7 @@ public class Assembler {
 						if (!temp.isEmpty()) {
 							if (s.equals("]")) {
 								temp += s;
-								node.instructions.add(getNode(temp, methodLabelMap));
+								node.instructions.add(getNode(hsr, temp, methodLabelMap));
 								temp = "";
 							} else {
 								temp += s + "\n";
@@ -467,7 +486,7 @@ public class Assembler {
 							if (s.endsWith("[")) {
 								temp += s + "\n";
 							} else {
-								node.instructions.add(getNode(s, methodLabelMap));
+								node.instructions.add(getNode(hsr, s, methodLabelMap));
 							}
 						}
 					}
@@ -496,31 +515,37 @@ public class Assembler {
 		ArrayList<String> ret = new ArrayList<>();
 		String[] split = s.split(", ");
 		String building = null;
+		boolean inString = false;
 
 		for (int i = 0; i < split.length; i++) {
 			if (split[i].startsWith("(")) {
 				ret.add(split[i]);
-			} else if (split[i].endsWith("\"")) {
+			} else if (split[i].startsWith("\"") && split[i].endsWith("\"")) {
+				ret.add(split[i]);
+			} else if (split[i].endsWith("\"") && inString) {
 				if (building == null)
 					ret.add(split[i]);
 				else
 					ret.add(building + ", " + split[i]);
 				building = null;
-			} else {
+			} else if (inString || split[i].startsWith("\"")) {
+				inString = true;
 				if (building == null)
 					building = split[i];
 				else
 					building += ", " + split[i];
+			} else {
+				ret.add(split[i]);
 			}
 		}
 
 		return ret.toArray(new String[0]);
 	}
 
-	private static AnnotationNode parseAnnotation(String s) {
+	private static AnnotationNode parseAnnotation(HugeStringsRev hsr, String s) {
 		s = s.substring(1);
 		String[] split = s.split(" ");
-		AnnotationNode node = new AnnotationNode(UnicodeUtils.unescape(split[0]));
+		AnnotationNode node = new AnnotationNode(UnicodeUtils.unescape(hsr, split[0]));
 		if (split.length > 1) {
 			if (node.values == null) {
 				node.values = new ArrayList<>();
@@ -538,7 +563,7 @@ public class Assembler {
 					String split3[] = splitWithStrings(value.substring(2, value.length() - 2));
 					List<Object> list = new ArrayList<>();
 					for (String rofl : split3) {
-						rofl = UnicodeUtils.unescape(rofl);
+						rofl = UnicodeUtils.unescape(hsr, rofl);
 						if (rofl.startsWith("\"")) {
 							int index = rofl.lastIndexOf("\"");
 							list.add(rofl.substring(1, index));
@@ -552,7 +577,7 @@ public class Assembler {
 					}
 					node.values.add(list);
 				} else {
-					value = UnicodeUtils.unescape(value);
+					value = UnicodeUtils.unescape(hsr, value);
 					if (value.startsWith("\"")) {
 						int index = value.lastIndexOf("\"");
 						node.values.add(value.substring(1, index));
@@ -596,7 +621,7 @@ public class Assembler {
 		return ret;
 	}
 
-	private static Object getValue(String s, String to) {
+	private static Object getValue(HugeStringsRev hsr, String s, String to) {
 		if (s == null) {
 			return null;
 		}
@@ -618,14 +643,15 @@ public class Assembler {
 		case "S":
 			return Short.parseShort(s);
 		case "Ljava/lang/String;":
-			return UnicodeUtils.unescape(s.substring(1, s.length() - 1));
+			return UnicodeUtils.unescape(hsr, s.substring(1, s.length() - 1));
 		default: {
 			return null;
 		}
 		}
 	}
 
-	private static AbstractInsnNode getNode(String s, HashMap<LabelNode, Integer> labels) throws Exception {
+	private static AbstractInsnNode getNode(HugeStringsRev hsr, String s, HashMap<LabelNode, Integer> labels)
+			throws Exception {
 		if (s.startsWith("// label ")) {
 			int labelNr = Integer.parseInt(s.substring(9));
 			for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
@@ -648,124 +674,41 @@ public class Assembler {
 			labels.put(ln, labelNr);
 			return new LineNumberNode(Integer.parseInt(s.split(" ")[0]), ln);
 		} else if (s.startsWith("// frame ")) {
-			String str1 = s.substring(7);
+			String str1 = s.substring(9);
-			String str = str1.substring(str1.indexOf(' ', 3) + 1);
+			String[] split = str1.split(" ", 2);
-			Object[] local;
-			Object[] stack;
-			ArrayList<Object> arr = new ArrayList<>();
-			if (str.startsWith("l:null")) {
-				local = new Object[0];
-			} else {
-				String l = str.substring(3, str.indexOf("s:") - 2);
-				if (l.isEmpty()) {
-					local = new Object[0];
-				} else {
-					for (String asd : l.split(", ")) {
-						if (!asd.startsWith("(")) {
-							int frameType = ClassUtil.getFrameTypeByName(asd);
-							if (frameType != -1)
-								arr.add(new Integer(frameType));
-							else {
-								String frame = UnicodeUtils.unescape(asd);
-								frame = frame.substring(1, frame.length() - 1);
-								arr.add(frame);
-							}
-						} else {
-							if (asd.startsWith("(label) ")) {
-								int labelNr = Integer.parseInt(asd.split(" ")[1]);
-								boolean found = false;
-								for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
-									if (entry.getValue() == labelNr) {
-										arr.add(entry.getKey());
-										found = true;
-									}
-								}
-								if (!found) {
-									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)));
-							}
-						}
-					}
-					local = new Object[arr.size()];
-					int c = 0;
-					for (Object o : arr) {
-						local[c] = o;
-						c++;
-					}
-				}
-			}
-			arr.clear();
-			if (str.endsWith("s:null")) {
-				stack = new Object[0];
-			} else {
-				String st = str.substring(str.indexOf("s:") + 3, str.length() - 1);
-				if (st.isEmpty()) {
-					stack = new Object[0];
-				} else {
-					for (String asd : st.split(", ")) {
-						if (!asd.startsWith("(")) {
-							int frameType = ClassUtil.getFrameTypeByName(asd);
-							if (frameType != -1)
-								arr.add(new Integer(frameType));
-							else {
-								String frame = UnicodeUtils.unescape(asd);
-								frame = frame.substring(1, frame.length() - 1);
-								arr.add(frame);
-							}
-						} else {
-							if (asd.startsWith("(label) ")) {
-								int labelNr = Integer.parseInt(asd.split(" ")[1]);
-								boolean found = false;
-								for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
-									if (entry.getValue() == labelNr) {
-										arr.add(entry.getKey());
-										found = true;
-									}
-								}
-								if (!found) {
-									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)));
-							}
-						}
-					}
-					stack = new Object[arr.size()];
-					int c = 0;
-					for (Object o : arr) {
-						stack[c] = o;
-						c++;
-					}
-				}
-			}
 			int type = 0;
-			switch (str1.substring(str1.indexOf(' ', 1) + 1, str1.indexOf(' ', 3))) {
+			Object[] local = null;
-			case "NEW":
+			Object[] stack = null;
-				type = Opcodes.F_NEW;
+			int localLen = 0;
-				break;
+			int stackLen = 0;
-			case "FULL":
+			switch (split[0].toUpperCase()) {
-				type = Opcodes.F_FULL;
-				break;
-			case "APPEND":
-				type = Opcodes.F_APPEND;
-				break;
-			case "CHOP":
-				type = Opcodes.F_CHOP;
-				break;
 			case "SAME":
 				type = Opcodes.F_SAME;
 				break;
 			case "SAME1":
 				type = Opcodes.F_SAME1;
+				stack = parseFrameList(hsr, split[1], labels);
+				stackLen = stack.length;
+				break;
+			case "CHOP":
+				type = Opcodes.F_CHOP;
+				localLen = Integer.parseInt(split[1]);
+				break;
+			case "APPEND":
+				type = Opcodes.F_APPEND;
+				local = parseFrameList(hsr, split[1], labels);
+				localLen = local.length;
+				break;
+			case "FULL":
+				type = Opcodes.F_FULL;
+				split = split[1].split("\\] \\[", 2);
+				local = parseFrameList(hsr, split[0] + "]", labels);
+				localLen = local.length;
+				stack = parseFrameList(hsr, "[" + split[1], labels);
+				stackLen = stack.length;
 				break;
 			}
-			return new FrameNode(type, local.length, local, stack.length, stack);
+			return new FrameNode(type, localLen, local, stackLen, stack);
 		} else {
 			String[] split = s.split(" ");
 			String command = split[0];
@@ -803,10 +746,10 @@ public class Assembler {
 			case "dconst_1":
 				return new InsnNode(15);
 			case "bipush": {
-				return new IntInsnNode(16, Integer.parseInt(split[1]));
+				return new IntInsnNode(16, (byte) Integer.parseInt(split[1]));
 			}
 			case "sipush": {
-				return new IntInsnNode(17, Integer.parseInt(split[1]));
+				return new IntInsnNode(17, (short) Integer.parseInt(split[1]));
 			}
 			case "ldc": {
 				String str = consolidateStrings(split, 1);
@@ -818,10 +761,12 @@ public class Assembler {
 						String type = split2[0].substring(7);
 						// Reflection
 						val = new Type(ClassUtil.getIDFromClassNameForType(type),
-								UnicodeUtils.unescape(split2[3].substring(6, split2[3].length() - 1)),
+								UnicodeUtils.unescape(hsr, split2[3].substring(6, split2[3].length() - 1)),
 								Integer.parseInt(split2[1].substring(7)), Integer.parseInt(split2[2].substring(5)));
 					} else if (str.startsWith("\"") && str.endsWith("\"")) {
-						val = UnicodeUtils.unescape(str.substring(1, str.length() - 1));
+						val = UnicodeUtils.unescape(hsr, str.substring(1, str.length() - 1), true);
+					} else if (str.startsWith("#")) {
+						val = UnicodeUtils.unescape(hsr, str);
 					} else if (str.endsWith("l")) {
 						val = Long.parseLong(str.substring(0, str.length() - 1));
 					} else if (str.endsWith("f")) {
@@ -1437,50 +1382,54 @@ public class Assembler {
 			case "getstatic": {
 				String target = split[2];
 				int index = target.lastIndexOf("/");
-				return new FieldInsnNode(178, UnicodeUtils.unescape(target.substring(0, index)),
+				return new FieldInsnNode(178, UnicodeUtils.unescape(hsr, target.substring(0, index)),
-						UnicodeUtils.unescape(target.substring(index + 1)), UnicodeUtils.unescape(split[1]));
+						UnicodeUtils.unescape(hsr, target.substring(index + 1)), UnicodeUtils.unescape(hsr, split[1]));
 			}
 			case "putstatic": {
 				String target = split[2];
 				int index = target.lastIndexOf("/");
-				return new FieldInsnNode(179, UnicodeUtils.unescape(target.substring(0, index)),
+				return new FieldInsnNode(179, UnicodeUtils.unescape(hsr, target.substring(0, index)),
-						UnicodeUtils.unescape(target.substring(index + 1)), UnicodeUtils.unescape(split[1]));
+						UnicodeUtils.unescape(hsr, target.substring(index + 1)), UnicodeUtils.unescape(hsr, split[1]));
 			}
 			case "getfield": {
 				String target = split[2];
 				int index = target.lastIndexOf("/");
-				return new FieldInsnNode(180, UnicodeUtils.unescape(target.substring(0, index)),
+				return new FieldInsnNode(180, UnicodeUtils.unescape(hsr, target.substring(0, index)),
-						UnicodeUtils.unescape(target.substring(index + 1)), UnicodeUtils.unescape(split[1]));
+						UnicodeUtils.unescape(hsr, target.substring(index + 1)), UnicodeUtils.unescape(hsr, split[1]));
 			}
 			case "putfield": {
 				String target = split[2];
 				int index = target.lastIndexOf("/");
-				return new FieldInsnNode(181, UnicodeUtils.unescape(target.substring(0, index)),
+				return new FieldInsnNode(181, UnicodeUtils.unescape(hsr, target.substring(0, index)),
-						UnicodeUtils.unescape(target.substring(index + 1)), UnicodeUtils.unescape(split[1]));
+						UnicodeUtils.unescape(hsr, target.substring(index + 1)), UnicodeUtils.unescape(hsr, split[1]));
 			}
 			case "invokevirtual": {
 				String target = split[2];
 				int index = target.lastIndexOf("/");
-				return new MethodInsnNode(182, UnicodeUtils.unescape(target.substring(0, index)),
+				return new MethodInsnNode(182, UnicodeUtils.unescape(hsr, target.substring(0, index)),
-						UnicodeUtils.unescape(target.substring(index + 1)), UnicodeUtils.unescape(split[1]), false);
+						UnicodeUtils.unescape(hsr, target.substring(index + 1)), UnicodeUtils.unescape(hsr, split[1]),
+						false);
 			}
 			case "invokespecial": {
 				String target = split[2];
 				int index = target.lastIndexOf("/");
-				return new MethodInsnNode(183, UnicodeUtils.unescape(target.substring(0, index)),
+				return new MethodInsnNode(183, UnicodeUtils.unescape(hsr, target.substring(0, index)),
-						UnicodeUtils.unescape(target.substring(index + 1)), UnicodeUtils.unescape(split[1]), false);
+						UnicodeUtils.unescape(hsr, target.substring(index + 1)), UnicodeUtils.unescape(hsr, split[1]),
+						false);
 			}
 			case "invokestatic": {
 				String target = split[2];
 				int index = target.lastIndexOf("/");
-				return new MethodInsnNode(184, UnicodeUtils.unescape(target.substring(0, index)),
+				return new MethodInsnNode(184, UnicodeUtils.unescape(hsr, target.substring(0, index)),
-						UnicodeUtils.unescape(target.substring(index + 1)), UnicodeUtils.unescape(split[1]), false);
+						UnicodeUtils.unescape(hsr, target.substring(index + 1)), UnicodeUtils.unescape(hsr, split[1]),
+						false);
 			}
 			case "invokeinterface": {
 				String target = split[2];
 				int index = target.lastIndexOf("/");
-				return new MethodInsnNode(185, UnicodeUtils.unescape(target.substring(0, index)),
+				return new MethodInsnNode(185, UnicodeUtils.unescape(hsr, target.substring(0, index)),
-						UnicodeUtils.unescape(target.substring(index + 1)), UnicodeUtils.unescape(split[1]), true);
+						UnicodeUtils.unescape(hsr, target.substring(index + 1)), UnicodeUtils.unescape(hsr, split[1]),
+						true);
 			}
 			case "invokedynamic": {
 				String str = s.substring(16, s.length() - 2).replace("", "");
@@ -1495,7 +1444,7 @@ public class Assembler {
 							try {
 								// Reflection
 								args.add(new Type(ClassUtil.getIDFromClassNameForType(vals.get(0).substring(6)),
-										UnicodeUtils.unescape(vals.get(3).substring(6, vals.get(3).length() - 1)),
+										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) {
@@ -1503,9 +1452,9 @@ public class Assembler {
 							}
 						} else if (stage == 2) {
 							args.add(new Handle(OpcodesReverse.getHandleOpcode(vals.get(4).substring(5)),
-									UnicodeUtils.unescape(vals.get(1).substring(7)),
+									UnicodeUtils.unescape(hsr, vals.get(1).substring(7)),
-									UnicodeUtils.unescape(vals.get(0).substring(6)),
+									UnicodeUtils.unescape(hsr, vals.get(0).substring(6)),
-									UnicodeUtils.unescape(vals.get(2).substring(6)),
+									UnicodeUtils.unescape(hsr, vals.get(2).substring(6)),
 									Boolean.parseBoolean(vals.get(3).substring(13))));
 							vals.clear();
 						}
@@ -1523,7 +1472,7 @@ public class Assembler {
 						vals.add(st);
 					} else if (stage == 0) {
 						if (st.startsWith("\"") && st.endsWith("\"")) {
-							args.add(UnicodeUtils.unescape(st.substring(1, st.length() - 1)));
+							args.add(UnicodeUtils.unescape(hsr, st.substring(1, st.length() - 1)));
 						} else if (st.endsWith("l")) {
 							args.add(Long.parseLong(st.substring(0, st.length() - 1)));
 						} else if (st.endsWith("f")) {
@@ -1541,21 +1490,23 @@ public class Assembler {
 					_args[stage] = o;
 					stage++;
 				}
-				return new InvokeDynamicInsnNode(UnicodeUtils.unescape(sp[0].substring(7)),
+				return new InvokeDynamicInsnNode(UnicodeUtils.unescape(hsr, sp[0].substring(7)),
-						UnicodeUtils.unescape(sp[1].substring(6)),
+						UnicodeUtils.unescape(hsr, sp[1].substring(6)),
 						new Handle(OpcodesReverse.getHandleOpcode(sp[7].substring(6)),
-								UnicodeUtils.unescape(sp[4].substring(8)), UnicodeUtils.unescape(sp[3].substring(7)),
+								UnicodeUtils.unescape(hsr, sp[4].substring(8)),
-								UnicodeUtils.unescape(sp[5].substring(7)), Boolean.parseBoolean(sp[6].substring(14))),
+								UnicodeUtils.unescape(hsr, sp[3].substring(7)),
+								UnicodeUtils.unescape(hsr, sp[5].substring(7)),
+								Boolean.parseBoolean(sp[6].substring(14))),
 						_args);
 			}
 			case "new": {
-				return new TypeInsnNode(187, UnicodeUtils.unescape(split[1]));
+				return new TypeInsnNode(187, UnicodeUtils.unescape(hsr, split[1]));
 			}
 			case "newarray": {
 				return new IntInsnNode(188, ClassUtil.getArrayIDByType(split[1]));
 			}
 			case "anewarray": {
-				return new TypeInsnNode(189, UnicodeUtils.unescape(split[1]));
+				return new TypeInsnNode(189, UnicodeUtils.unescape(hsr, split[1]));
 			}
 			case "arraylength": {
 				return new InsnNode(190);
@@ -1564,10 +1515,10 @@ public class Assembler {
 				return new InsnNode(191);
 			}
 			case "checkcast": {
-				return new TypeInsnNode(192, UnicodeUtils.unescape(split[1]));
+				return new TypeInsnNode(192, UnicodeUtils.unescape(hsr, split[1]));
 			}
 			case "instanceof": {
-				return new TypeInsnNode(193, UnicodeUtils.unescape(split[1]));
+				return new TypeInsnNode(193, UnicodeUtils.unescape(hsr, split[1]));
 			}
 			case "monitorenter": {
 				return new InsnNode(194);
@@ -1576,7 +1527,7 @@ public class Assembler {
 				return new InsnNode(195);
 			}
 			case "multianewarray": {
-				return new MultiANewArrayInsnNode(UnicodeUtils.unescape(split[1]), Integer.parseInt(split[2]));
+				return new MultiANewArrayInsnNode(UnicodeUtils.unescape(hsr, split[1]), Integer.parseInt(split[2]));
 			}
 			case "ifnull": {
 				int labelNr = Integer.parseInt(s.split(" ")[1]);
@@ -1605,4 +1556,48 @@ 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()) {
+			return new Object[0];
+		} else {
+			for (String asd : l.split(", ")) {
+				if (!asd.startsWith("(")) {
+					int frameType = ClassUtil.getFrameTypeByName(asd);
+					if (frameType != -1)
+						list.add(new Integer(frameType));
+					else
+						list.add(UnicodeUtils.unescape(hsr, asd.substring(1, asd.length() - 1)));
+				} else {
+					if (asd.startsWith("(label) ")) {
+						int labelNr = Integer.parseInt(asd.split(" ")[1]);
+						boolean found = false;
+						for (Map.Entry<LabelNode, Integer> entry : labels.entrySet()) {
+							if (entry.getValue() == labelNr) {
+								list.add(entry.getKey());
+								found = true;
+							}
+						}
+						if (!found) {
+							LabelNode ln = new LabelNode(new Label());
+							labels.put(ln, labelNr);
+							list.add(ln);
+						}
+					} else {
+						list.add(ClassUtil.getCastedValue(asd.split(" ")[1], asd.split("\\) ")[0].substring(1)));
+					}
+				}
+			}
+			Object[] arr = new Object[list.size()];
+			int c = 0;
+			for (Object o : list) {
+				arr[c] = o;
+				c++;
+			}
+			return arr;
+		}
+	}
+
 }

src/me/ByteEdit/edit/Disassembler.java

@@ -1,5 +1,22 @@
 package me.ByteEdit.edit;
 
+import static org.objectweb.asm.tree.AbstractInsnNode.FIELD_INSN;
+import static org.objectweb.asm.tree.AbstractInsnNode.FRAME;
+import static org.objectweb.asm.tree.AbstractInsnNode.IINC_INSN;
+import static org.objectweb.asm.tree.AbstractInsnNode.INSN;
+import static org.objectweb.asm.tree.AbstractInsnNode.INT_INSN;
+import static org.objectweb.asm.tree.AbstractInsnNode.INVOKE_DYNAMIC_INSN;
+import static org.objectweb.asm.tree.AbstractInsnNode.JUMP_INSN;
+import static org.objectweb.asm.tree.AbstractInsnNode.LABEL;
+import static org.objectweb.asm.tree.AbstractInsnNode.LDC_INSN;
+import static org.objectweb.asm.tree.AbstractInsnNode.LINE;
+import static org.objectweb.asm.tree.AbstractInsnNode.LOOKUPSWITCH_INSN;
+import static org.objectweb.asm.tree.AbstractInsnNode.METHOD_INSN;
+import static org.objectweb.asm.tree.AbstractInsnNode.MULTIANEWARRAY_INSN;
+import static org.objectweb.asm.tree.AbstractInsnNode.TABLESWITCH_INSN;
+import static org.objectweb.asm.tree.AbstractInsnNode.TYPE_INSN;
+import static org.objectweb.asm.tree.AbstractInsnNode.VAR_INSN;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -9,6 +26,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.concurrent.FutureTask;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.objectweb.asm.Handle;
@@ -23,7 +41,7 @@ import org.objectweb.asm.tree.FieldNode;
 import org.objectweb.asm.tree.FrameNode;
 import org.objectweb.asm.tree.IincInsnNode;
 import org.objectweb.asm.tree.InnerClassNode;
-import org.objectweb.asm.tree.InsnNode;
+import org.objectweb.asm.tree.InsnList;
 import org.objectweb.asm.tree.IntInsnNode;
 import org.objectweb.asm.tree.InvokeDynamicInsnNode;
 import org.objectweb.asm.tree.JumpInsnNode;
@@ -40,6 +58,7 @@ import org.objectweb.asm.tree.TryCatchBlockNode;
 import org.objectweb.asm.tree.TypeInsnNode;
 import org.objectweb.asm.tree.VarInsnNode;
 
+import me.ByteEdit.main.Main;
 import me.ByteEdit.utils.ClassUtil;
 import me.ByteEdit.utils.OpcodesReverse;
 import me.ByteEdit.utils.UnicodeUtils;
@@ -83,53 +102,60 @@ public class Disassembler {
 			return new DisassembleTuple("ClassNode is null! This is not a valid java class file!");
 		}
 		try {
+			HugeStrings hs = new HugeStrings();
 			AtomicInteger lineFound = new AtomicInteger(-1);
-			StringContext ctx = new StringContext(16);
+			StringContext ctx = new StringContext(18);
 			ctx.next("// #Annotations:\n");
-			ctx.next(doAnnotations(classNode.visibleAnnotations));
+			ctx.next(doAnnotations(classNode.visibleAnnotations, hs));
 			ctx.next("// #Class v:" + classNode.version + "\n");
 			if (classNode.signature != null)
-				ctx.next("// #Signature: " + UnicodeUtils.escapeWithSpaces(classNode.signature) + "\n");
+				ctx.next("// #Signature: " + UnicodeUtils.escapeWithSpaces(hs, classNode.signature) + "\n");
 			if (classNode.outerMethod != null)
-				ctx.next("// #OuterMethod: " + (classNode.outerMethod == null ? "null"
+				ctx.next(
-						: (UnicodeUtils.escapeWithSpaces(classNode.outerMethod) + " "
+						"// #OuterMethod: "
-								+ UnicodeUtils.escapeWithSpaces(classNode.outerMethodDesc)))
+								+ (classNode.outerMethod == null ? "null"
-						+ "\n");
+										: (UnicodeUtils.escapeWithSpaces(hs, classNode.outerMethod) + " "
+												+ UnicodeUtils.escapeWithSpaces(hs, classNode.outerMethodDesc)))
+								+ "\n");
 			if (classNode.outerClass != null)
-				ctx.next("// #OuterClass: " + UnicodeUtils.escapeWithSpaces(classNode.outerClass) + "\n");
+				ctx.next("// #OuterClass: " + UnicodeUtils.escapeWithSpaces(hs, classNode.outerClass) + "\n");
 			ctx.next("// #InnerClasses:\n");
 			if (classNode.innerClasses != null) {
 				String ics = "";
 				for (InnerClassNode icn : classNode.innerClasses) {
-					ics += "// " + UnicodeUtils.escapeWithSpaces(icn.name) + " "
+					ics += "// " + UnicodeUtils.escapeWithSpaces(hs, icn.name) + " "
-							+ UnicodeUtils.escapeWithSpaces(icn.outerName) + " "
+							+ UnicodeUtils.escapeWithSpaces(hs, icn.outerName) + " "
-							+ UnicodeUtils.escapeWithSpaces(icn.innerName)
+							+ UnicodeUtils.escapeWithSpaces(hs, 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(ClassUtil.getAccessFlagsClass(classNode.access) + UnicodeUtils.escapeWithSpaces(hs, classNode.name)
 					+ " ");
-			ctx.next("extends " + UnicodeUtils.escapeWithSpaces(classNode.superName) + " ");
+			ctx.next("extends " + UnicodeUtils.escapeWithSpaces(hs, classNode.superName) + " ");
 			if (classNode.interfaces != null && !classNode.interfaces.isEmpty()) {
 				String interfaceStr = "";
 				for (String interfc : classNode.interfaces) {
 					if (interfaceStr.isEmpty()) {
-						interfaceStr += UnicodeUtils.escapeWithSpaces(interfc);
+						interfaceStr += UnicodeUtils.escapeWithSpaces(hs, interfc);
 					} else {
-						interfaceStr += ", " + UnicodeUtils.escapeWithSpaces(interfc);
+						interfaceStr += ", " + UnicodeUtils.escapeWithSpaces(hs, interfc);
 					}
 				}
 				if (!interfaceStr.isEmpty())
 					ctx.next("implements " + interfaceStr + " ");
 			}
 			ctx.next("{\n// #SourceFile: "
-					+ (classNode.sourceFile == null ? "null" : UnicodeUtils.escape(classNode.sourceFile))
+					+ (classNode.sourceFile == null ? "null" : UnicodeUtils.escape(hs, classNode.sourceFile)) + "\n");
-					+ "\n\n// #Fields\n");
+			int hugeIdx = ctx.next("");
-			ctx.next(doFields(classNode.fields, nodeToFind, lineFound));
+			ctx.next("\n// #Fields\n");
+			ctx.next(doFields(classNode.fields, nodeToFind, lineFound, hs));
 			ctx.next("\n// #Methods\n");
-			ctx.next(doMethods(classNode.methods, classNode.name, nodeToFind, lineFound));
+			ctx.next(doMethods(classNode.methods, classNode.name, nodeToFind, lineFound, hs));
 			ctx.next("}\n");
+
+			if (!hs.isEmpty())
+				ctx.set(hugeIdx, hs.makeStringsList());
 			return new DisassembleTuple(ctx.finish(), lineFound.get());
 		} catch (Throwable e) {
 			return new DisassembleTuple("Class couldn't be decompiled:\n" + e.getClass().getName() + ": "
@@ -139,12 +165,12 @@ public class Disassembler {
 		}
 	}
 
-	private static String doAnnotations(List<AnnotationNode> annotations) {
+	private static String doAnnotations(List<AnnotationNode> annotations, HugeStrings hs) {
 		if (annotations == null)
 			return "";
 		StringContext ctx = new StringContext(annotations.size());
 		for (AnnotationNode annotationNode : annotations) {
-			String s = "@" + UnicodeUtils.escapeWithSpaces(annotationNode.desc);
+			String s = "@" + UnicodeUtils.escapeWithSpaces(hs, annotationNode.desc);
 			if (annotationNode.values != null && !annotationNode.values.isEmpty()) {
 				s += " (";
 				boolean valBefore = true;
@@ -159,10 +185,10 @@ public class Disassembler {
 							boolean w8ing = false;
 							for (String rofl : arr) {
 								if (!w8ing) {
-									s += UnicodeUtils.escapeWithSpaces(rofl) + "/";
+									s += UnicodeUtils.escapeWithSpaces(hs, rofl) + "/";
 									w8ing = true;
 								} else {
-									s += UnicodeUtils.escapeWithSpaces(rofl) + "]";
+									s += UnicodeUtils.escapeWithSpaces(hs, rofl) + "]";
 								}
 							}
 							s += ", ";
@@ -175,21 +201,21 @@ public class Disassembler {
 									boolean w8ing = false;
 									for (String rofl : arr) {
 										if (!w8ing) {
-											s += UnicodeUtils.escapeWithSpaces(rofl) + "/";
+											s += UnicodeUtils.escapeWithSpaces(hs, rofl) + "/";
 											w8ing = true;
 										} else {
-											s += UnicodeUtils.escapeWithSpaces(rofl);
+											s += UnicodeUtils.escapeWithSpaces(hs, rofl);
 										}
 									}
 								} else {
-									s += "\"" + UnicodeUtils.escape(String.valueOf(obj)) + "\"";
+									s += "\"" + UnicodeUtils.escape(hs, String.valueOf(obj)) + "\"";
 								}
 								s += ", ";
 							}
 							s = s.substring(0, s.length() - 2);
 							s += " }]";
 						} else if (o instanceof String) {
-							s += "\"" + UnicodeUtils.escapeWithSpaces((String) o) + "\"], ";
+							s += "\"" + UnicodeUtils.escapeWithSpaces(hs, (String) o) + "\"], ";
 						} else {
 							s += "(" + o.getClass().getName().replace(".", "/") + ") " + o + "], ";
 						}
@@ -207,19 +233,20 @@ public class Disassembler {
 	}
 
 	private static String doMethods(List<MethodNode> methods, String className, Object nodeToFind,
-			AtomicInteger lineFound) throws InterruptedException, ExecutionException {
+			AtomicInteger lineFound, HugeStrings hs) throws InterruptedException, ExecutionException {
+		boolean multithreaded = Main.INSTANCE.mntmMultithreaded.isSelected();
 		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>() {
+			Callable<String> callable = 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";
+							ms += "\t// #Signature: " + UnicodeUtils.escapeWithSpaces(hs, mn.signature) + "\n";
-						String[] dis = disassembleMethod(className, mn);
+						String[] dis = disassembleMethod(className, mn, hs);
 						ms += dis[2];
 						ms += dis[1];
 						if (mn.visibleAnnotations != null && !mn.visibleAnnotations.isEmpty()) {
@@ -239,10 +266,10 @@ public class Disassembler {
 												boolean w8ing = false;
 												for (String rofl : arr) {
 													if (!w8ing) {
-														ms += UnicodeUtils.escapeWithSpaces(rofl) + "/";
+														ms += UnicodeUtils.escapeWithSpaces(hs, rofl) + "/";
 														w8ing = true;
 													} else {
-														ms += UnicodeUtils.escapeWithSpaces(rofl) + "]";
+														ms += UnicodeUtils.escapeWithSpaces(hs, rofl) + "]";
 													}
 												}
 												ms += ", ";
@@ -255,14 +282,15 @@ public class Disassembler {
 														boolean w8ing = false;
 														for (String rofl : arr) {
 															if (!w8ing) {
-																ms += UnicodeUtils.escapeWithSpaces(rofl) + "/";
+																ms += UnicodeUtils.escapeWithSpaces(hs, rofl) + "/";
 																w8ing = true;
 															} else {
-																ms += UnicodeUtils.escapeWithSpaces(rofl);
+																ms += UnicodeUtils.escapeWithSpaces(hs, rofl);
 															}
 														}
 													} else {
-														ms += "\"" + UnicodeUtils.escape(String.valueOf(obj)) + "\"";
+														ms += "\"" + UnicodeUtils.escape(hs, String.valueOf(obj))
+																+ "\"";
 													}
 													ms += ", ";
 												}
@@ -284,15 +312,16 @@ public class Disassembler {
 						if (mn.equals(nodeToFind)) {
 							lineFound.set(ms.split("\\n").length);
 						}
-						ms += "\t" + ClassUtil.getAccessFlagsFull(mn.access) + UnicodeUtils.escapeWithSpaces(mn.name)
+						ms += "\t" + ClassUtil.getAccessFlagsFull(mn.access)
-								+ " " + UnicodeUtils.escapeWithSpaces(mn.desc) + " ";
+								+ UnicodeUtils.escapeWithSpaces(hs, mn.name) + " "
+								+ UnicodeUtils.escapeWithSpaces(hs, mn.desc) + " ";
 						if (mn.exceptions != null && !mn.exceptions.isEmpty()) {
 							String exceptionStr = "";
 							for (String exc : mn.exceptions) {
 								if (exceptionStr.isEmpty()) {
-									exceptionStr += UnicodeUtils.escapeWithSpaces(exc);
+									exceptionStr += UnicodeUtils.escapeWithSpaces(hs, exc);
 								} else {
-									exceptionStr += ", " + UnicodeUtils.escapeWithSpaces(exc);
+									exceptionStr += ", " + UnicodeUtils.escapeWithSpaces(hs, exc);
 								}
 							}
 							if (!exceptionStr.isEmpty())
@@ -309,24 +338,30 @@ public class Disassembler {
 					}
 					return ms;
 				}
-			});
+			};
+			futures[i] = multithreaded ? exec.submit(callable) : new FutureTask<>(callable);
 		}
 		StringContext ctx = new StringContext(futures.length);
 		for (Future<String> f : futures) {
+			if (f instanceof FutureTask)
+				((FutureTask) f).run();
 			ctx.next(f.get());
 		}
-		return ctx.finish();
+		String s = ctx.finish();
+		if (s.isEmpty())
+			return "\n";
+		return s;
 	}
 
-	private static String doFields(List<FieldNode> fields, Object nodeToFind, AtomicInteger lineFound) {
+	private static String doFields(List<FieldNode> fields, Object nodeToFind, AtomicInteger lineFound, HugeStrings hs) {
 		StringContext ctx = new StringContext(fields.size());
 		for (FieldNode fn : fields) {
 			String s = "";
 			if (fn.signature != null)
-				s += "\t// #Signature: " + UnicodeUtils.escapeWithSpaces(fn.signature) + "\n";
+				s += "\t// #Signature: " + UnicodeUtils.escapeWithSpaces(hs, fn.signature) + "\n";
 			if (fn.visibleAnnotations != null && !fn.visibleAnnotations.isEmpty()) {
 				for (AnnotationNode annotationNode : fn.visibleAnnotations) {
-					s += "\t@" + UnicodeUtils.escapeWithSpaces(annotationNode.desc);
+					s += "\t@" + UnicodeUtils.escapeWithSpaces(hs, annotationNode.desc);
 					if (annotationNode.values != null && !annotationNode.values.isEmpty()) {
 						s += " (";
 						boolean valBefore = true;
@@ -341,10 +376,10 @@ public class Disassembler {
 									boolean w8ing = false;
 									for (String rofl : arr) {
 										if (!w8ing) {
-											s += UnicodeUtils.escapeWithSpaces(rofl) + "/";
+											s += UnicodeUtils.escapeWithSpaces(hs, rofl) + "/";
 											w8ing = true;
 										} else {
-											s += UnicodeUtils.escapeWithSpaces(rofl) + "]";
+											s += UnicodeUtils.escapeWithSpaces(hs, rofl) + "]";
 										}
 									}
 									s += ", ";
@@ -357,14 +392,14 @@ public class Disassembler {
 											boolean w8ing = false;
 											for (String rofl : arr) {
 												if (!w8ing) {
-													s += UnicodeUtils.escapeWithSpaces(rofl) + "/";
+													s += UnicodeUtils.escapeWithSpaces(hs, rofl) + "/";
 													w8ing = true;
 												} else {
-													s += UnicodeUtils.escapeWithSpaces(rofl);
+													s += UnicodeUtils.escapeWithSpaces(hs, rofl);
 												}
 											}
 										} else {
-											s += "\"" + UnicodeUtils.escape(String.valueOf(obj)) + "\"";
+											s += "\"" + UnicodeUtils.escape(hs, String.valueOf(obj)) + "\"";
 										}
 										s += ", ";
 									}
@@ -387,9 +422,9 @@ public class Disassembler {
 				lineFound.set(s.split("\\n").length);
 			}
 			s += "\t" + ClassUtil.getAccessFlagsFull(fn.access).replace("varargs", "transient")
-					+ UnicodeUtils.escapeWithSpaces(fn.desc) + " " + UnicodeUtils.escapeWithSpaces(fn.name);
+					+ UnicodeUtils.escapeWithSpaces(hs, fn.desc) + " " + UnicodeUtils.escapeWithSpaces(hs, fn.name);
 			if (fn.value != null) {
-				s += " = " + ClassUtil.getDecompiledValue(fn.value, fn.desc, true);
+				s += " = " + ClassUtil.getDecompiledValue(fn.value, fn.desc, true, hs);
 			}
 			s += "\n";
 			ctx.next(s);
@@ -397,13 +432,22 @@ public class Disassembler {
 		return ctx.finish();
 	}
 
-	private static String[] disassembleMethod(String className, MethodNode mn) {
+	private static String[] disassembleMethod(String className, MethodNode mn, HugeStrings hs) {
 		HashMap<Label, Integer> labels = new HashMap<Label, Integer>();
 		String localVarTable;
 		String tryCatchTable;
-		for (AbstractInsnNode n : mn.instructions.toArray()) {
+
+		InsnList insnList = mn.instructions;
+		boolean deobfNumbers = Main.INSTANCE.mntmNumbers.isSelected();
+
+		ArrayList<Label> labelsReversed = deobfNumbers ? new ArrayList<>() : null;
+
+		for (AbstractInsnNode n = insnList.getFirst(); n != null; n = n.getNext()) {
 			if (n instanceof LabelNode) {
-				labels.put(((LabelNode) n).getLabel(), labels.size() + 1);
+				int id = labels.size() + 1;
+				if (deobfNumbers)
+					labelsReversed.add(((LabelNode) n).getLabel());
+				labels.put(((LabelNode) n).getLabel(), id);
 			}
 		}
 		if (mn.localVariables != null && !mn.localVariables.isEmpty()) {
@@ -411,10 +455,10 @@ public class Disassembler {
 			StringContext ctx = new StringContext(list.size() + 1);
 			ctx.next("\t// #LocalVars:\n");
 			for (LocalVariableNode lvn : list) {
-				ctx.next("\t// " + UnicodeUtils.escapeWithSpaces(lvn.name) + ": "
+				ctx.next("\t// " + UnicodeUtils.escapeWithSpaces(hs, lvn.name) + ": "
-						+ UnicodeUtils.escapeWithSpaces(lvn.desc) + " i:" + lvn.index + " s:"
+						+ UnicodeUtils.escapeWithSpaces(hs, 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(hs, lvn.signature) + "\n");
 			}
 			localVarTable = ctx.finish();
 		} else
@@ -424,123 +468,76 @@ public class Disassembler {
 			StringContext ctx = new StringContext(list.size() + 1);
 			ctx.next("\t// #TryCatch:\n");
 			for (TryCatchBlockNode tcbn : mn.tryCatchBlocks) {
-				ctx.next("\t// " + UnicodeUtils.escapeWithSpaces(tcbn.type) + " s:" + labels.get(tcbn.start.getLabel())
+				ctx.next("\t// " + UnicodeUtils.escapeWithSpaces(hs, tcbn.type) + " s:"
-						+ " e:" + labels.get(tcbn.end.getLabel()) + " h:" + labels.get(tcbn.handler.getLabel()) + "\n");
+						+ 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);
+		if (deobfNumbers) {
-		for (AbstractInsnNode n : insns) {
+			StackBasedCalculator calc = new StackBasedCalculator(insnList);
-			ctx.next(disassembleInstruction(n, labels));
+			calc.run();
+			insnList = calc.get();
+			int i = 0;
+			for (AbstractInsnNode n = insnList.getFirst(); n != null; n = n.getNext()) {
+				if (n instanceof LabelNode) {
+					((LabelNode) n).setLabel(labelsReversed.get(i++));
+				}
+			}
+		}
+
+		StringContext ctx = new StringContext(insnList.size());
+		for (AbstractInsnNode n = insnList.getFirst(); n != null; n = n.getNext()) {
+			ctx.next(disassembleInstruction(n, labels, hs));
 		}
 		return new String[] { ctx.finish(), localVarTable, tryCatchTable };
 	}
 
-	public static final HashMap<Class, InstructionInterface> iiMap = new HashMap<>();
+	public static String disassembleInstruction(AbstractInsnNode n, HashMap<Label, Integer> labels, HugeStrings hs) {
-
+		switch (n.getType()) {
-	static {
+		case INSN: {
-		iiMap.put(FieldInsnNode.class, (n, labels) -> {
+			return "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + "\n";
+		}
+		case INT_INSN: {
+			IntInsnNode node = (IntInsnNode) n;
+			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";
+			}
+		}
+		case VAR_INSN: {
+			VarInsnNode node = (VarInsnNode) n;
+			return "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + " " + node.var + "\n";
+		}
+		case TYPE_INSN: {
+			TypeInsnNode node = (TypeInsnNode) n;
+			return "\t\t" + OpcodesReverse.reverseOpcode(node.getOpcode()) + " "
+					+ UnicodeUtils.escapeWithSpaces(hs, node.desc) + "\n";
+		}
+		case FIELD_INSN: {
 			FieldInsnNode node = (FieldInsnNode) n;
 			return "\t\t" + OpcodesReverse.reverseOpcode(node.getOpcode()) + " "
-					+ UnicodeUtils.escapeWithSpaces(node.desc) + " " + UnicodeUtils.escapeWithSpaces(node.owner) + "/"
+					+ UnicodeUtils.escapeWithSpaces(hs, node.desc) + " " + UnicodeUtils.escapeWithSpaces(hs, node.owner)
-					+ UnicodeUtils.escapeWithSpaces(node.name).replace("/", "\\u002F") + "\n";
+					+ "/" + UnicodeUtils.escapeWithSpaces(hs, node.name).replace("/", "\\u002F") + "\n";
-		});
+		}
-		iiMap.put(LabelNode.class, (n, labels) -> {
+		case METHOD_INSN: {
-			LabelNode node = (LabelNode) n;
+			MethodInsnNode node = (MethodInsnNode) n;
-			return "\t\t// label " + labels.get(node.getLabel()) + "\n";
+			return "\t\t" + OpcodesReverse.reverseOpcode(node.getOpcode()) + " "
-		});
+					+ UnicodeUtils.escapeWithSpaces(hs, node.desc) + " " + UnicodeUtils.escapeWithSpaces(hs, node.owner)
-		iiMap.put(FrameNode.class, (n, labels) -> {
+					+ "/" + UnicodeUtils.escapeWithSpaces(hs, node.name).replace("/", "\\u002F") + "\n";
-			FrameNode node = (FrameNode) n;
+		}
-			String type = "";
+		case INVOKE_DYNAMIC_INSN: {
-			switch (node.type) {
-			case Opcodes.F_NEW:
-				type = "NEW";
-				break;
-			case Opcodes.F_FULL:
-				type = "FULL";
-				break;
-			case Opcodes.F_APPEND:
-				type = "APPEND";
-				break;
-			case Opcodes.F_CHOP:
-				type = "CHOP";
-				break;
-			case Opcodes.F_SAME:
-				type = "SAME";
-				break;
-			case Opcodes.F_SAME1:
-				type = "SAME1";
-				break;
-			}
-			String s = "\t\t// frame " + type + " l:";
-			ArrayList<String> arr = new ArrayList<>();
-			if (node.local != null) {
-				for (Object o : node.local) {
-					if (o == null) {
-						arr.add(null);
-					} else {
-						if (o instanceof String) {
-							arr.add("\"" + UnicodeUtils.escapeWithSpaces((String) o) + "\"");
-						} else if (o instanceof LabelNode) {
-							arr.add("(label) " + labels.get(((LabelNode) o).getLabel()));
-						} else if (o instanceof Integer) {
-							String frameType = ClassUtil.getFrameTypeByID(((Integer) o).intValue());
-							if (frameType != null)
-								arr.add(frameType);
-							else
-								arr.add("(" + o.getClass().getName().replace(".", "/") + ") " + o);
-						} else {
-							arr.add("(" + o.getClass().getName().replace(".", "/") + ") " + o);
-						}
-					}
-				}
-				s += arr.toString();
-			} else {
-				s += "null";
-			}
-			arr.clear();
-			s += " s:";
-			if (node.stack != null) {
-				for (Object o : node.stack) {
-					if (o == null) {
-						arr.add(null);
-					} else {
-						if (o instanceof String) {
-							arr.add("\"" + UnicodeUtils.escapeWithSpaces((String) o) + "\"");
-						} else if (o instanceof LabelNode) {
-							arr.add("(label) " + labels.get(((LabelNode) o).getLabel()));
-						} else if (o instanceof Integer) {
-							String frameType = ClassUtil.getFrameTypeByID(((Integer) o).intValue());
-							if (frameType != null)
-								arr.add(frameType);
-							else
-								arr.add("(" + o.getClass().getName().replace(".", "/") + ") " + o);
-						} else {
-							arr.add("(" + o.getClass().getName().replace(".", "/") + ") " + o);
-						}
-					}
-				}
-				s += arr.toString();
-			} else {
-				s += "null";
-			}
-			s += "\n";
-			return s;
-		});
-		iiMap.put(LineNumberNode.class, (n, labels) -> {
-			LineNumberNode node = (LineNumberNode) n;
-			return "\t\t// line " + node.line + " " + labels.get(node.start.getLabel()) + "\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: "
+					+ UnicodeUtils.escapeWithSpaces(hs, node.name).replace("/", "\\u002F") + "\n\t\t\tdesc: "
-					+ UnicodeUtils.escapeWithSpaces(node.desc) + "\n\t\t\tHandle: [\n\t\t\t\tname: "
+					+ UnicodeUtils.escapeWithSpaces(hs, node.desc) + "\n\t\t\tHandle: [\n\t\t\t\tname: "
-					+ UnicodeUtils.escapeWithSpaces(node.bsm.getName()) + "\n\t\t\t\towner: "
+					+ UnicodeUtils.escapeWithSpaces(hs, node.bsm.getName()) + "\n\t\t\t\towner: "
-					+ UnicodeUtils.escapeWithSpaces(node.bsm.getOwner()) + "\n\t\t\t\tdesc: "
+					+ UnicodeUtils.escapeWithSpaces(hs, node.bsm.getOwner()) + "\n\t\t\t\tdesc: "
-					+ UnicodeUtils.escapeWithSpaces(node.bsm.getDesc()) + "\n\t\t\t\tisInterface: "
+					+ UnicodeUtils.escapeWithSpaces(hs, node.bsm.getDesc()) + "\n\t\t\t\tisInterface: "
 					+ 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) {
@@ -552,40 +549,34 @@ public class Disassembler {
 					// 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, "");
+							+ ClassUtil.getDecompiledValue(buf, "", hs);
 					s += "\n\t\t\t\t]\n";
 				} 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: "
+							+ UnicodeUtils.escapeWithSpaces(hs, h.getName()).replace("/", "\\u002F")
-							+ UnicodeUtils.escapeWithSpaces(h.getOwner()) + "\n\t\t\t\t\tdesc: "
+							+ "\n\t\t\t\t\towner: " + UnicodeUtils.escapeWithSpaces(hs, h.getOwner())
-							+ UnicodeUtils.escapeWithSpaces(h.getDesc()) + "\n\t\t\t\t\tisInterface: " + h.isInterface()
+							+ "\n\t\t\t\t\tdesc: " + UnicodeUtils.escapeWithSpaces(hs, h.getDesc())
-							+ "\n\t\t\t\t\ttag: " + OpcodesReverse.reverseHandleOpcode(h.getTag());
+							+ "\n\t\t\t\t\tisInterface: " + h.isInterface() + "\n\t\t\t\t\ttag: "
+							+ OpcodesReverse.reverseHandleOpcode(h.getTag());
 					s += "\n\t\t\t\t]\n";
 				} else {
-					s += "\t\t\t\t" + ClassUtil.getDecompiledValue(l, "") + "\n";
+					s += "\t\t\t\t" + ClassUtil.getDecompiledValue(l, "", hs) + "\n";
 				}
 			}
 			s += "\t\t\t]\n\t\t]\n";
 			return s;
-		});
+		}
-		iiMap.put(MethodInsnNode.class, (n, labels) -> {
+		case JUMP_INSN: {
-			MethodInsnNode node = (MethodInsnNode) n;
+			JumpInsnNode node = (JumpInsnNode) n;
-			return "\t\t" + OpcodesReverse.reverseOpcode(node.getOpcode()) + " "
+			return "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + " " + labels.get(node.label.getLabel())
-					+ UnicodeUtils.escapeWithSpaces(node.desc) + " " + UnicodeUtils.escapeWithSpaces(node.owner) + "/"
+					+ "\n";
-					+ UnicodeUtils.escapeWithSpaces(node.name).replace("/", "\\u002F") + "\n";
+		}
-		});
+		case LABEL: {
-		iiMap.put(TypeInsnNode.class, (n, labels) -> {
+			LabelNode node = (LabelNode) n;
-			TypeInsnNode node = (TypeInsnNode) n;
+			return "\t\t// label " + labels.get(node.getLabel()) + "\n";
-			return "\t\t" + OpcodesReverse.reverseOpcode(node.getOpcode()) + " "
+		}
-					+ UnicodeUtils.escapeWithSpaces(node.desc) + "\n";
+		case LDC_INSN: {
-		});
-		iiMap.put(MultiANewArrayInsnNode.class, (n, labels) -> {
-			MultiANewArrayInsnNode node = (MultiANewArrayInsnNode) n;
-			return "\t\t" + OpcodesReverse.reverseOpcode(node.getOpcode()) + " "
-					+ UnicodeUtils.escapeWithSpaces(node.desc) + " " + node.dims + "\n";
-		});
-		iiMap.put(LdcInsnNode.class, (n, labels) -> {
 			LdcInsnNode node = (LdcInsnNode) n;
 			if (node.cst instanceof Type) {
 				Type type = (Type) node.cst;
@@ -595,37 +586,25 @@ public class Disassembler {
 				// 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, "");
+						+ valueEnd + "\n\t\t\tbuf: " + ClassUtil.getDecompiledValue(buf, "", hs);
 				s += "\n\t\t]\n";
 				return s;
 			} else {
-				return "\t\t" + OpcodesReverse.reverseOpcode(node.getOpcode()) + " "
+				String decomp = ClassUtil.getDecompiledValue(node.cst, "", hs);
-						+ ClassUtil.getDecompiledValue(node.cst, "") + "\n";
+				if (node.cst instanceof String) {
+					if (decomp.startsWith("\"#") && decomp.endsWith("\""))
+						decomp = decomp.substring(1, decomp.length() - 1);
+					else if (decomp.startsWith("\"\\u0023"))
+						decomp = "\"#" + decomp.substring(7);
+				}
+				return "\t\t" + OpcodesReverse.reverseOpcode(node.getOpcode()) + " " + decomp + "\n";
 			}
-		});
+		}
-		iiMap.put(VarInsnNode.class, (n, labels) -> {
+		case IINC_INSN: {
-			VarInsnNode node = (VarInsnNode) n;
+			IincInsnNode node = (IincInsnNode) n;
-			return "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + " " + node.var + "\n";
+			return "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + " " + node.var + " " + node.incr + "\n";
-		});
+		}
-		iiMap.put(InsnNode.class, (n, labels) -> {
+		case TABLESWITCH_INSN: {
-			InsnNode node = (InsnNode) n;
-			return "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + "\n";
-		});
-		iiMap.put(IntInsnNode.class, (n, labels) -> {
-			IntInsnNode node = (IntInsnNode) n;
-			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";
-			}
-		});
-		iiMap.put(JumpInsnNode.class, (n, labels) -> {
-			JumpInsnNode node = (JumpInsnNode) n;
-			return "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + " " + labels.get(node.label.getLabel())
-					+ "\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())
@@ -635,8 +614,8 @@ public class Disassembler {
 			}
 			s += "\t\t\t]\n\t\t]\n";
 			return s;
-		});
+		}
-		iiMap.put(LookupSwitchInsnNode.class, (n, labels) -> {
+		case LOOKUPSWITCH_INSN: {
 			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";
@@ -649,24 +628,70 @@ public class Disassembler {
 			}
 			s += "\t\t\t]\n\t\t]\n";
 			return s;
-		});
+		}
-		iiMap.put(IincInsnNode.class, (n, labels) -> {
+		case MULTIANEWARRAY_INSN: {
-			IincInsnNode node = (IincInsnNode) n;
+			MultiANewArrayInsnNode node = (MultiANewArrayInsnNode) n;
-			return "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + " " + node.var + " " + node.incr + "\n";
+			return "\t\t" + OpcodesReverse.reverseOpcode(node.getOpcode()) + " "
-		});
+					+ UnicodeUtils.escapeWithSpaces(hs, node.desc) + " " + node.dims + "\n";
-	}
+		}
-
+		case FRAME: {
-	static interface InstructionInterface {
+			FrameNode node = (FrameNode) n;
-		String apply(AbstractInsnNode n, HashMap<Label, Integer> labels);
+			String out = "";
-	}
+			switch (node.type) {
-
+			case Opcodes.F_SAME:
-	public static String disassembleInstruction(AbstractInsnNode n, HashMap<Label, Integer> labels) {
+				out = "SAME";
-		InstructionInterface ii = iiMap.get(n.getClass());
+				break;
-		if (ii != null)
+			case Opcodes.F_SAME1:
-			return ii.apply(n, labels);
+				out = "SAME1 " + getFrameArray(hs, node.stack, labels);
-		else
+				break;
+			case Opcodes.F_CHOP:
+				out = "CHOP " + Integer.toString(node.local.size());
+				break;
+			case Opcodes.F_APPEND:
+				out = "APPEND " + getFrameArray(hs, node.local, labels);
+				break;
+			case Opcodes.F_FULL:
+				out = "FULL " + getFrameArray(hs, node.local, labels) + " " + getFrameArray(hs, node.stack, labels);
+				break;
+			}
+			return "\t\t// frame " + out + "\n";
+		}
+		case LINE: {
+			LineNumberNode node = (LineNumberNode) n;
+			return "\t\t// line " + node.line + " " + labels.get(node.start.getLabel()) + "\n";
+		}
+		default: {
 			return "\t\tNOT HANDLED! " + OpcodesReverse.reverseOpcode(n.getOpcode()) + " "
 					+ n.getClass().getSimpleName() + "\n";
+		}
+		}
+	}
+
+	private static String getFrameArray(HugeStrings hs, List<Object> list, HashMap<Label, Integer> labels) {
+		ArrayList<String> arr = new ArrayList<>();
+		if (list != null) {
+			for (Object o : list) {
+				if (o == null) {
+					arr.add(null);
+				} else {
+					if (o instanceof String) {
+						arr.add("\"" + UnicodeUtils.escapeWithSpaces(hs, (String) o) + "\"");
+					} else if (o instanceof LabelNode) {
+						arr.add("(label) " + labels.get(((LabelNode) o).getLabel()));
+					} else if (o instanceof Integer) {
+						String frameType = ClassUtil.getFrameTypeByID(((Integer) o).intValue());
+						if (frameType != null)
+							arr.add(frameType);
+						else
+							arr.add("(" + o.getClass().getName().replace(".", "/") + ") " + o);
+					} else {
+						arr.add("(" + o.getClass().getName().replace(".", "/") + ") " + o);
+					}
+				}
+			}
+			return arr.toString();
+		}
+		return "null";
 	}
 
 }

src/me/ByteEdit/edit/HugeStrings.java

@@ -0,0 +1,53 @@
+package me.ByteEdit.edit;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import me.ByteEdit.utils.UnicodeUtils;
+
+public class HugeStrings {
+
+	public static int THRESHOLD = 1000;
+	private final HashMap<String, HugeData> map = new HashMap<>();
+
+	public String onString(String s) {
+		synchronized (map) {
+			HugeData i = map.get(s);
+			if (i == null)
+				map.put(s, i = new HugeData(map.size(), UnicodeUtils.escape(this, s, true)));
+			return "#" + Integer.toString(i.id);
+		}
+	}
+
+	public boolean isEmpty() {
+		return map.isEmpty();
+	}
+
+	public String makeStringsList() {
+		StringContext ctx = new StringContext(map.size());
+		List<HugeData> list = new ArrayList<>(map.values());
+		list.sort((o1, o2) -> Integer.compare(o1.id, o2.id));
+		for (HugeData hd : list) {
+			StringBuilder sb = new StringBuilder(20 + hd.escaped.length());
+			sb.append('#');
+			sb.append(Integer.toString(hd.id));
+			sb.append(": ");
+			sb.append(hd.escaped);
+			sb.append('\n');
+			ctx.next(sb.toString());
+		}
+		return ctx.finish();
+	}
+
+	private static class HugeData {
+		int id;
+		String escaped;
+
+		public HugeData(int id, String escaped) {
+			this.id = id;
+			this.escaped = escaped;
+		}
+	}
+
+}

src/me/ByteEdit/edit/HugeStringsRev.java

@@ -0,0 +1,20 @@
+package me.ByteEdit.edit;
+
+import java.util.HashMap;
+
+public class HugeStringsRev {
+
+	private final HashMap<Integer, String> map = new HashMap<>();
+
+	public void add(int i, String s) {
+		map.put(Integer.valueOf(i), s);
+	}
+
+	public String get(int i) {
+		String s = map.get(Integer.valueOf(i));
+		if (s == null)
+			s = "#" + Integer.toString(i);
+		return s;
+	}
+
+}

src/me/ByteEdit/edit/StackBasedCalculator.java

@@ -0,0 +1,689 @@
+package me.ByteEdit.edit;
+
+import java.util.EmptyStackException;
+import java.util.HashMap;
+import java.util.Stack;
+
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.InsnNode;
+import org.objectweb.asm.tree.IntInsnNode;
+import org.objectweb.asm.tree.LabelNode;
+import org.objectweb.asm.tree.LdcInsnNode;
+
+public class StackBasedCalculator implements Opcodes, Runnable {
+
+	private final InsnList insns;
+	private final Stack<Number> stack = new Stack<>();
+	private AbstractInsnNode start;
+	private int startIdx = -1;
+	private boolean isAtEnd = false;
+
+	public StackBasedCalculator(InsnList insns) {
+		this.insns = new InsnList();
+
+		HashMap<LabelNode, LabelNode> labelMap = new HashMap<>();
+		for (AbstractInsnNode node = insns.getFirst(); node != null; node = node.getNext()) {
+			if (node.getType() == AbstractInsnNode.LABEL) {
+				labelMap.put((LabelNode) node, new LabelNode());
+			}
+		}
+
+		for (AbstractInsnNode node = insns.getFirst(); node != null; node = node.getNext()) {
+			this.insns.add(node.clone(labelMap));
+		}
+	}
+
+	public InsnList get() {
+		return insns;
+	}
+
+	@Override
+	public void run() {
+		while (!isAtEnd) {
+			out: {
+				AbstractInsnNode[] arr = insns.toArray();
+				for (int i = startIdx == -1 ? 0 : startIdx; i < arr.length; i++) {
+					if (!handle(arr[i]))
+						break out;
+				}
+				isAtEnd = true;
+			}
+		}
+	}
+
+	private boolean handle(AbstractInsnNode node) {
+		try {
+			switch (node.getOpcode()) {
+			case ICONST_0:
+				stack.push(Integer.valueOf(0));
+				if (start == null)
+					start = node;
+				break;
+			case ICONST_1:
+				stack.push(Integer.valueOf(1));
+				if (start == null)
+					start = node;
+				break;
+			case ICONST_2:
+				stack.push(Integer.valueOf(2));
+				if (start == null)
+					start = node;
+				break;
+			case ICONST_3:
+				stack.push(Integer.valueOf(3));
+				if (start == null)
+					start = node;
+				break;
+			case ICONST_4:
+				stack.push(Integer.valueOf(4));
+				if (start == null)
+					start = node;
+				break;
+			case ICONST_5:
+				stack.push(Integer.valueOf(5));
+				if (start == null)
+					start = node;
+				break;
+			case ICONST_M1:
+				stack.push(Integer.valueOf(-1));
+				if (start == null)
+					start = node;
+				break;
+			case DCONST_0:
+				stack.push(Double.valueOf(0));
+				if (start == null)
+					start = node;
+				break;
+			case DCONST_1:
+				stack.push(Double.valueOf(1));
+				if (start == null)
+					start = node;
+				break;
+			case FCONST_0:
+				stack.push(Float.valueOf(0));
+				if (start == null)
+					start = node;
+				break;
+			case FCONST_1:
+				stack.push(Float.valueOf(1));
+				if (start == null)
+					start = node;
+				break;
+			case FCONST_2:
+				stack.push(Float.valueOf(2));
+				if (start == null)
+					start = node;
+				break;
+			case LCONST_0:
+				stack.push(Long.valueOf(0));
+				if (start == null)
+					start = node;
+				break;
+			case LCONST_1:
+				stack.push(Long.valueOf(1));
+				if (start == null)
+					start = node;
+				break;
+			case BIPUSH:
+			case SIPUSH:
+				stack.push(((IntInsnNode) node).operand);
+				if (start == null)
+					start = node;
+				break;
+			case D2F:
+				stack.push(((Double) stack.pop()).floatValue());
+				change(node);
+				return false;
+			case D2I:
+				stack.push(((Double) stack.pop()).intValue());
+				change(node);
+				return false;
+			case D2L:
+				stack.push(((Double) stack.pop()).longValue());
+				change(node);
+				return false;
+			case F2D:
+				stack.push(((Float) stack.pop()).doubleValue());
+				change(node);
+				return false;
+			case F2I:
+				stack.push(((Float) stack.pop()).intValue());
+				change(node);
+				return false;
+			case F2L:
+				stack.push(((Float) stack.pop()).longValue());
+				change(node);
+				return false;
+			case L2D:
+				stack.push(((Long) stack.pop()).doubleValue());
+				change(node);
+				return false;
+			case L2F:
+				stack.push(((Long) stack.pop()).floatValue());
+				change(node);
+				return false;
+			case L2I:
+				stack.push(((Long) stack.pop()).intValue());
+				change(node);
+				return false;
+			case I2B:
+				error(node);
+				return true;
+			case I2C:
+				error(node);
+				return true;
+			case I2D:
+				stack.push(((Integer) stack.pop()).doubleValue());
+				change(node);
+				return false;
+			case I2F:
+				stack.push(((Integer) stack.pop()).floatValue());
+				change(node);
+				return false;
+			case I2L:
+				stack.push(((Integer) stack.pop()).longValue());
+				change(node);
+				return false;
+			case I2S:
+				error(node);
+				return true;
+			case NOP:
+				break;
+			case LDC:
+				LdcInsnNode ldc = (LdcInsnNode) node;
+				if (ldc.cst instanceof Number) {
+					stack.push((Number) ldc.cst);
+					if (start == null)
+						start = node;
+				} else {
+					error(node);
+					return true;
+				}
+				break;
+			// long
+			case LADD: {
+				long top = ((Long) stack.pop()).longValue();
+				long bottom = ((Long) stack.pop()).longValue();
+				stack.push(bottom + top);
+				change(node);
+				return false;
+			}
+			case LSUB: {
+				long top = ((Long) stack.pop()).longValue();
+				long bottom = ((Long) stack.pop()).longValue();
+				stack.push(bottom - top);
+				change(node);
+				return false;
+			}
+			case LMUL: {
+				long top = ((Long) stack.pop()).longValue();
+				long bottom = ((Long) stack.pop()).longValue();
+				stack.push(bottom * top);
+				change(node);
+				return false;
+			}
+			case LDIV: {
+				long top = ((Long) stack.pop()).longValue();
+				long bottom = ((Long) stack.pop()).longValue();
+				stack.push(bottom / top);
+				change(node);
+				return false;
+			}
+			case LREM: {
+				long top = ((Long) stack.pop()).longValue();
+				long bottom = ((Long) stack.pop()).longValue();
+				stack.push(bottom % top);
+				change(node);
+				return false;
+			}
+			case LNEG: {
+				long top = ((Long) stack.pop()).longValue();
+				stack.push(-top);
+				change(node);
+				return false;
+			}
+			case LAND: {
+				long top = ((Long) stack.pop()).longValue();
+				long bottom = ((Long) stack.pop()).longValue();
+				stack.push(bottom & top);
+				change(node);
+				return false;
+			}
+			case LOR: {
+				long top = ((Long) stack.pop()).longValue();
+				long bottom = ((Long) stack.pop()).longValue();
+				stack.push(bottom | top);
+				change(node);
+				return false;
+			}
+			case LXOR: {
+				long top = ((Long) stack.pop()).longValue();
+				long bottom = ((Long) stack.pop()).longValue();
+				stack.push(bottom ^ top);
+				change(node);
+				return false;
+			}
+			case LSHR: {
+				int top = ((Integer) stack.pop()).intValue();
+				long bottom = ((Long) stack.pop()).longValue();
+				stack.push(bottom >> top);
+				change(node);
+				return false;
+			}
+			case LSHL: {
+				int top = ((Integer) stack.pop()).intValue();
+				long bottom = ((Long) stack.pop()).longValue();
+				stack.push(bottom << top);
+				change(node);
+				return false;
+			}
+			case LUSHR: {
+				int top = ((Integer) stack.pop()).intValue();
+				long bottom = ((Long) stack.pop()).longValue();
+				stack.push(bottom >>> top);
+				change(node);
+				return false;
+			}
+			// int
+			case IADD: {
+				int top = ((Integer) stack.pop()).intValue();
+				int bottom = ((Integer) stack.pop()).intValue();
+				stack.push(bottom + top);
+				change(node);
+				return false;
+			}
+			case ISUB: {
+				int top = ((Integer) stack.pop()).intValue();
+				int bottom = ((Integer) stack.pop()).intValue();
+				stack.push(bottom - top);
+				change(node);
+				return false;
+			}
+			case IMUL: {
+				int top = ((Integer) stack.pop()).intValue();
+				int bottom = ((Integer) stack.pop()).intValue();
+				stack.push(bottom * top);
+				change(node);
+				return false;
+			}
+			case IDIV: {
+				int top = ((Integer) stack.pop()).intValue();
+				int bottom = ((Integer) stack.pop()).intValue();
+				stack.push(bottom / top);
+				change(node);
+				return false;
+			}
+			case IREM: {
+				int top = ((Integer) stack.pop()).intValue();
+				int bottom = ((Integer) stack.pop()).intValue();
+				stack.push(bottom % top);
+				change(node);
+				return false;
+			}
+			case INEG: {
+				int top = ((Integer) stack.pop()).intValue();
+				stack.push(-top);
+				change(node);
+				return false;
+			}
+			case IAND: {
+				int top = ((Integer) stack.pop()).intValue();
+				int bottom = ((Integer) stack.pop()).intValue();
+				stack.push(bottom & top);
+				change(node);
+				return false;
+			}
+			case IOR: {
+				int top = ((Integer) stack.pop()).intValue();
+				int bottom = ((Integer) stack.pop()).intValue();
+				stack.push(bottom | top);
+				change(node);
+				return false;
+			}
+			case IXOR: {
+				int top = ((Integer) stack.pop()).intValue();
+				int bottom = ((Integer) stack.pop()).intValue();
+				stack.push(bottom ^ top);
+				change(node);
+				return false;
+			}
+			case ISHR: {
+				int top = ((Integer) stack.pop()).intValue();
+				int bottom = ((Integer) stack.pop()).intValue();
+				stack.push(bottom >> top);
+				change(node);
+				return false;
+			}
+			case ISHL: {
+				int top = ((Integer) stack.pop()).intValue();
+				int bottom = ((Integer) stack.pop()).intValue();
+				stack.push(bottom << top);
+				change(node);
+				return false;
+			}
+			case IUSHR: {
+				int top = ((Integer) stack.pop()).intValue();
+				int bottom = ((Integer) stack.pop()).intValue();
+				stack.push(bottom >>> top);
+				change(node);
+				return false;
+			}
+			// double
+			case DADD: {
+				double top = ((Double) stack.pop()).doubleValue();
+				double bottom = ((Double) stack.pop()).doubleValue();
+				stack.push(bottom + top);
+				change(node);
+				return false;
+			}
+			case DSUB: {
+				double top = ((Double) stack.pop()).doubleValue();
+				double bottom = ((Double) stack.pop()).doubleValue();
+				stack.push(bottom - top);
+				change(node);
+				return false;
+			}
+			case DMUL: {
+				double top = ((Double) stack.pop()).doubleValue();
+				double bottom = ((Double) stack.pop()).doubleValue();
+				stack.push(bottom * top);
+				change(node);
+				return false;
+			}
+			case DDIV: {
+				double top = ((Double) stack.pop()).doubleValue();
+				double bottom = ((Double) stack.pop()).doubleValue();
+				stack.push(bottom / top);
+				change(node);
+				return false;
+			}
+			case DREM: {
+				double top = ((Double) stack.pop()).doubleValue();
+				double bottom = ((Double) stack.pop()).doubleValue();
+				stack.push(bottom % top);
+				change(node);
+				return false;
+			}
+			case DNEG: {
+				double top = ((Double) stack.pop()).doubleValue();
+				stack.push(-top);
+				change(node);
+				return false;
+			}
+			// float
+			case FADD: {
+				float top = ((Float) stack.pop()).floatValue();
+				float bottom = ((Float) stack.pop()).floatValue();
+				stack.push(bottom + top);
+				change(node);
+				return false;
+			}
+			case FSUB: {
+				float top = ((Float) stack.pop()).floatValue();
+				float bottom = ((Float) stack.pop()).floatValue();
+				stack.push(bottom - top);
+				change(node);
+				return false;
+			}
+			case FMUL: {
+				float top = ((Float) stack.pop()).floatValue();
+				float bottom = ((Float) stack.pop()).floatValue();
+				stack.push(bottom * top);
+				change(node);
+				return false;
+			}
+			case FDIV: {
+				float top = ((Float) stack.pop()).floatValue();
+				float bottom = ((Float) stack.pop()).floatValue();
+				stack.push(bottom / top);
+				change(node);
+				return false;
+			}
+			case FREM: {
+				float top = ((Float) stack.pop()).floatValue();
+				float bottom = ((Float) stack.pop()).floatValue();
+				stack.push(bottom % top);
+				change(node);
+				return false;
+			}
+			case FNEG: {
+				float top = ((Float) stack.pop()).floatValue();
+				stack.push(-top);
+				change(node);
+				return false;
+			}
+			// dup
+			case DUP: {
+				Number num = stack.pop();
+				if (num instanceof Double || num instanceof Long) {
+					error(node);
+					return true;
+				}
+				stack.push(num);
+				stack.push(num);
+				change(node);
+				return false;
+			}
+			case DUP_X1: {
+				Number top = stack.pop();
+				Number bottom = stack.pop();
+				if (bottom instanceof Double || bottom instanceof Long || top instanceof Double
+						|| top instanceof Long) {
+					error(node);
+					return true;
+				}
+				stack.push(top);
+				stack.push(bottom);
+				stack.push(top);
+				change(node);
+				return false;
+			}
+			case DUP_X2: {
+				Number top = stack.pop();
+				Number bottom = stack.pop();
+				if (top instanceof Double || top instanceof Long) {
+					error(node);
+					return true;
+				}
+				Number bottom2 = null;
+				if (!(bottom instanceof Double || bottom instanceof Long)) {
+					bottom2 = stack.pop();
+					if (bottom instanceof Double || bottom instanceof Long) {
+						error(node);
+						return true;
+					}
+				}
+				stack.push(top);
+				if (bottom2 != null)
+					stack.push(bottom2);
+				stack.push(bottom);
+				stack.push(top);
+				change(node);
+				return false;
+			}
+			case DUP2: {
+				Number top = stack.pop();
+				Number bottom = null;
+				if (!(top instanceof Double || top instanceof Long)) {
+					bottom = stack.pop();
+					if (bottom instanceof Double || bottom instanceof Long) {
+						error(node);
+						return true;
+					}
+				}
+				if (bottom != null)
+					stack.push(bottom);
+				stack.push(top);
+				if (bottom != null)
+					stack.push(bottom);
+				stack.push(top);
+				change(node);
+				return false;
+			}
+			case DUP2_X1: {
+				Number top = stack.pop();
+				Number bottom = null;
+				if (!(top instanceof Double || top instanceof Long)) {
+					bottom = stack.pop();
+					if (bottom instanceof Double || bottom instanceof Long) {
+						error(node);
+						return true;
+					}
+				}
+				Number bottom2 = stack.pop();
+				if (bottom != null)
+					stack.push(bottom);
+				stack.push(top);
+				stack.push(bottom2);
+				if (bottom != null)
+					stack.push(bottom);
+				stack.push(top);
+				change(node);
+				return false;
+			}
+			case DUP2_X2: {
+				Number top = stack.pop();
+				Number bottom = null;
+				if (!(top instanceof Double || top instanceof Long)) {
+					bottom = stack.pop();
+					if (bottom instanceof Double || bottom instanceof Long) {
+						error(node);
+						return true;
+					}
+				}
+				Number top2 = stack.pop();
+				Number bottom2 = null;
+				if (!(top2 instanceof Double || top2 instanceof Long)) {
+					bottom2 = stack.pop();
+					if (bottom2 instanceof Double || bottom2 instanceof Long) {
+						error(node);
+						return true;
+					}
+				}
+				if (bottom != null)
+					stack.push(bottom);
+				stack.push(top);
+				if (bottom2 != null)
+					stack.push(bottom2);
+				stack.push(top2);
+				if (bottom != null)
+					stack.push(bottom);
+				stack.push(top);
+				change(node);
+				return false;
+			}
+			// stack
+			case POP:
+				stack.pop();
+				change(node);
+				return false;
+			case POP2:
+				stack.pop();
+				stack.pop();
+				change(node);
+				return false;
+			case SWAP: {
+				Number top = stack.pop();
+				Number bottom = stack.pop();
+				if (bottom instanceof Double || bottom instanceof Long || top instanceof Double
+						|| top instanceof Long) {
+					error(node);
+					return true;
+				}
+				stack.push(top);
+				stack.push(bottom);
+				change(node);
+				return false;
+			}
+			default:
+				error(node);
+				return true;
+			}
+		} catch (ClassCastException | EmptyStackException ex) {
+			error(node);
+			return true;
+		}
+		return true;
+	}
+
+	private void error(AbstractInsnNode node) {
+		change(node.getPrevious());
+		stack.clear();
+		start = null;
+	}
+
+	private void change(AbstractInsnNode node) {
+		if (start == null)
+			return;
+		int idx = insns.indexOf(start);
+		startIdx = idx;
+		int idx2 = insns.indexOf(node);
+		if (idx != idx2) {
+			for (int i = 0; i <= idx2 - idx; i++) {
+				insns.remove(insns.get(idx));
+			}
+			while (!stack.isEmpty()) {
+				addNode(idx, stack.pop());
+			}
+		}
+		stack.clear();
+		start = null;
+	}
+
+	private void addNode(int idx, Number n) {
+		if (n instanceof Double) {
+			double val = n.doubleValue();
+			if (val == 0.0)
+				insns.insertBefore(insns.get(idx), new InsnNode(DCONST_0));
+			else if (val == 1.0)
+				insns.insertBefore(insns.get(idx), new InsnNode(DCONST_1));
+			else
+				insns.insertBefore(insns.get(idx), new LdcInsnNode(val));
+		} else if (n instanceof Float) {
+			float val = n.floatValue();
+			if (val == 0.0f)
+				insns.insertBefore(insns.get(idx), new InsnNode(FCONST_0));
+			else if (val == 1.0f)
+				insns.insertBefore(insns.get(idx), new InsnNode(FCONST_1));
+			else if (val == 2.0f)
+				insns.insertBefore(insns.get(idx), new InsnNode(FCONST_2));
+			else
+				insns.insertBefore(insns.get(idx), new LdcInsnNode(val));
+		} else if (n instanceof Long) {
+			long val = n.longValue();
+			if (val == 0l)
+				insns.insertBefore(insns.get(idx), new InsnNode(LCONST_0));
+			else if (val == 1l)
+				insns.insertBefore(insns.get(idx), new InsnNode(LCONST_1));
+			else
+				insns.insertBefore(insns.get(idx), new LdcInsnNode(val));
+		} else if (n instanceof Integer) {
+			int val = n.intValue();
+			if (val == 0)
+				insns.insertBefore(insns.get(idx), new InsnNode(ICONST_0));
+			else if (val == 1)
+				insns.insertBefore(insns.get(idx), new InsnNode(ICONST_1));
+			else if (val == 2)
+				insns.insertBefore(insns.get(idx), new InsnNode(ICONST_2));
+			else if (val == 3)
+				insns.insertBefore(insns.get(idx), new InsnNode(ICONST_3));
+			else if (val == 4)
+				insns.insertBefore(insns.get(idx), new InsnNode(ICONST_4));
+			else if (val == 5)
+				insns.insertBefore(insns.get(idx), new InsnNode(ICONST_5));
+			else if (val == -1)
+				insns.insertBefore(insns.get(idx), new InsnNode(ICONST_M1));
+			else if (val == (byte) val)
+				insns.insertBefore(insns.get(idx), new IntInsnNode(BIPUSH, (byte) val));
+			else if (val == (short) val)
+				insns.insertBefore(insns.get(idx), new IntInsnNode(SIPUSH, (short) val));
+			else
+				insns.insertBefore(insns.get(idx), new LdcInsnNode(val));
+		} else {
+			throw new RuntimeException("Unexpected number: " + n);
+		}
+	}
+
+}

src/me/ByteEdit/edit/StringContext.java

@@ -16,8 +16,16 @@ public class StringContext {
 			arrs = new String[amt];
 	}
 
-	public void next(String s) {
+	public int next(String s) {
+		int i = idx;
 		len += (arrs[idx++] = s).length();
+		return i;
+	}
+
+	public void set(int i, String s) {
+		if (arrs[i] != null)
+			len -= arrs[i].length();
+		len += (arrs[i] = s).length();
 	}
 
 	public String finish() {

src/me/ByteEdit/main/Main.java

@@ -17,18 +17,20 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Collection;
 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;
@@ -38,12 +40,18 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import javax.swing.ButtonGroup;
+import javax.swing.JCheckBoxMenuItem;
 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.JRadioButtonMenuItem;
 import javax.swing.JScrollPane;
 import javax.swing.JSplitPane;
 import javax.swing.JTree;
@@ -70,7 +78,9 @@ import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
 import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser;
 import org.fife.ui.rsyntaxtextarea.folding.FoldParserManager;
+import org.fife.ui.rtextarea.RTextArea;
 import org.fife.ui.rtextarea.RTextScrollPane;
+import org.fife.ui.rtextarea.ToolTipSupplier;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.ClassNode;
@@ -79,7 +89,6 @@ import org.objectweb.asm.tree.MethodNode;
 
 import me.ByteEdit.boxes.CompilationBox;
 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;
@@ -88,6 +97,7 @@ import me.ByteEdit.boxes.UnicodeBox;
 import me.ByteEdit.edit.Assembler;
 import me.ByteEdit.edit.Disassembler;
 import me.ByteEdit.edit.Disassembler.DisassembleTuple;
+import me.ByteEdit.edit.HugeStrings;
 import me.ByteEdit.utils.ClassUtil;
 import me.ByteEdit.utils.OpcodesReverse;
 import me.ByteEdit.utils.UnicodeUtils;
@@ -105,7 +115,6 @@ public class Main extends JFrame {
 	public static GlobalSearchBox globalSearchBox;
 	public static SearchBox searchBox;
 	public static TypeOpenBox typeOpenBox;
-	public static OptionBox optionBox;
 	public static UnicodeBox unicodeBox;
 	public static RenameBox renameBox;
 	public static CompilationBox compilationBox;
@@ -114,7 +123,33 @@ public class Main extends JFrame {
 	public static RTextScrollPane scrollPane_ByteEdit;
 	public static File saveFolder;
 
-	public static HashSet<String> fakedFolders = new HashSet<>();
+	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;
+	private JMenu mnOptions;
+	private JCheckBoxMenuItem mntmComputeFrames;
+	private JCheckBoxMenuItem mntmComputeMax;
+	private JMenu mnStringLimit;
+	private JRadioButtonMenuItem rdbtnmntm0;
+	private JMenuItem rdbtnmntm100;
+	private JMenuItem rdbtnmntm1000;
+	private JMenuItem rdbtnmntm500;
+	private JMenuItem rdbtnmntm5000;
+	private JMenuItem rdbtnmntm10000;
+	public JCheckBoxMenuItem mntmMultithreaded;
+	private JMenu mnDeobfuscation;
+	public JCheckBoxMenuItem mntmNumbers;
 
 	public static final Object treeLock = new Object();
 
@@ -196,7 +231,17 @@ public class Main extends JFrame {
 				"// #Max: l:0 s:0\n\t// #TryCatch:\n\t// #LocalVars:\n\tpublic static method ()V {\n\t\treturn\n\t}",
 				null, "<html><b><u>method</u></b><br>Creates an example method</html>"));
 		provider.addCompletion(new ShorthandCompletion(provider, "frame", "frame FULL l:[] s:[]", null,
-				"<html><b><u>frame</u></b><br>Creates a stack map frame</html>"));
+				"<html><b><u>frame</u></b><br>Creates a stack map frame<br><br><b>Possible frames:</b><br><ul><li><code>SAME: same locals, empty stack</code></li><li><code>SAME1: same locals, stack has 1 entry</code></li><li><code>CHOP: same locals - k, empty stack</code></li><li><code>APPEND: same locals + k, empty stack</code></li><li><code>FULL: define locals, define stack</code></li></ul></html>"));
+		provider.addCompletion(new BasicCompletion(provider, "SAME", null,
+				"<html><b><u>Frames:</u></b><br><code>SAME</code><br><br><u>Locals:</u> same as previous<br><u>Stack:</u> empty</html>"));
+		provider.addCompletion(new BasicCompletion(provider, "SAME1", null,
+				"<html><b><u>Frames:</u></b><br><code>SAME1 [(type)]</code><br><br><u>Locals:</u> same as previous<br><u>Stack:</u> 1 entry</html>"));
+		provider.addCompletion(new BasicCompletion(provider, "CHOP", null,
+				"<html><b><u>Frames:</u></b><br><code>CHOP (int:k)</code><br><br><u>Locals:</u> removes the top <i>k</i> elements<br><u>Stack:</u> empty</html>"));
+		provider.addCompletion(new BasicCompletion(provider, "APPEND", null,
+				"<html><b><u>Frames:</u></b><br><code>APPEND [(type), (type), ...]</code><br><br><u>Locals:</u> adds the elements to the top<br><u>Stack:</u> empty</html>"));
+		provider.addCompletion(new BasicCompletion(provider, "FULL", null,
+				"<html><b><u>Frames:</u></b><br><code>FULL [(type), (type), ...] [(type), (type), ...]</code><br><i>first locals, then stack</i><br><br><u>Locals:</u> sets the elements<br><u>Stack:</u> sets the elements</html>"));
 		return provider;
 	}
 
@@ -209,7 +254,6 @@ public class Main extends JFrame {
 		globalSearchBox = new GlobalSearchBox();
 		searchBox = new SearchBox();
 		typeOpenBox = new TypeOpenBox();
-		optionBox = new OptionBox();
 		unicodeBox = new UnicodeBox();
 		renameBox = new RenameBox();
 		compilationBox = new CompilationBox();
@@ -217,7 +261,6 @@ public class Main extends JFrame {
 		ThemeManager.registerFrames(globalSearchBox);
 		ThemeManager.registerFrames(searchBox);
 		ThemeManager.registerFrames(typeOpenBox);
-		ThemeManager.registerFrames(optionBox);
 		ThemeManager.registerFrames(unicodeBox);
 		ThemeManager.registerFrames(renameBox);
 		ThemeManager.registerFrames(compilationBox);
@@ -227,6 +270,170 @@ public class Main extends JFrame {
 		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 {
+								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);
+													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);
+
+		mnOptions = new JMenu("Options");
+		menuBar.add(mnOptions);
+
+		mntmComputeFrames = new JCheckBoxMenuItem("Compute Frames");
+		mnOptions.add(mntmComputeFrames);
+
+		mntmComputeMax = new JCheckBoxMenuItem("Compute Max");
+		mnOptions.add(mntmComputeMax);
+
+		mntmMultithreaded = new JCheckBoxMenuItem("Multithreaded");
+		mntmMultithreaded.setSelected(true);
+		mnOptions.add(mntmMultithreaded);
+
+		mnStringLimit = new JMenu("Huge String Limit");
+		mnOptions.add(mnStringLimit);
+
+		rdbtnmntm0 = new JRadioButtonMenuItem("0");
+		rdbtnmntm0.addActionListener(e -> HugeStrings.THRESHOLD = 0);
+		mnStringLimit.add(rdbtnmntm0);
+
+		rdbtnmntm100 = new JRadioButtonMenuItem("100");
+		rdbtnmntm100.addActionListener(e -> HugeStrings.THRESHOLD = 100);
+		mnStringLimit.add(rdbtnmntm100);
+
+		rdbtnmntm500 = new JRadioButtonMenuItem("500");
+		rdbtnmntm500.addActionListener(e -> HugeStrings.THRESHOLD = 500);
+		mnStringLimit.add(rdbtnmntm500);
+
+		rdbtnmntm1000 = new JRadioButtonMenuItem("1000");
+		rdbtnmntm1000.addActionListener(e -> HugeStrings.THRESHOLD = 1000);
+		rdbtnmntm1000.setSelected(true);
+		mnStringLimit.add(rdbtnmntm1000);
+
+		rdbtnmntm5000 = new JRadioButtonMenuItem("5000");
+		rdbtnmntm5000.addActionListener(e -> HugeStrings.THRESHOLD = 5000);
+		mnStringLimit.add(rdbtnmntm5000);
+
+		rdbtnmntm10000 = new JRadioButtonMenuItem("10000");
+		rdbtnmntm10000.addActionListener(e -> HugeStrings.THRESHOLD = 10000);
+		mnStringLimit.add(rdbtnmntm10000);
+
+		ButtonGroup group = new ButtonGroup();
+		group.add(rdbtnmntm0);
+		group.add(rdbtnmntm100);
+		group.add(rdbtnmntm500);
+		group.add(rdbtnmntm1000);
+		group.add(rdbtnmntm5000);
+		group.add(rdbtnmntm10000);
+
+		mnDeobfuscation = new JMenu("Deobfuscation");
+		menuBar.add(mnDeobfuscation);
+
+		mntmNumbers = new JCheckBoxMenuItem("Numbers");
+		mnDeobfuscation.add(mntmNumbers);
+
 		contentPane = new JPanel();
 		contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
 		setContentPane(contentPane);
@@ -363,7 +570,6 @@ public class Main extends JFrame {
 															globalSearchBox.setVisible(false);
 															searchBox.setVisible(false);
 															typeOpenBox.setVisible(false);
-															optionBox.setVisible(false);
 															unicodeBox.setVisible(false);
 															renameBox.setVisible(false);
 															compilationBox.setVisible(false);
@@ -411,6 +617,84 @@ public class Main extends JFrame {
 		txtByteEditView = new RSyntaxTextArea();
 		ac.install(txtByteEditView);
 		txtByteEditView.setCodeFoldingEnabled(true);
+		// ToolTips for HugeStrings
+		txtByteEditView.setToolTipSupplier(new ToolTipSupplier() {
+
+			@Override
+			public String getToolTipText(RTextArea textArea, MouseEvent e) {
+				int idx = textArea.viewToModel(e.getPoint());
+				if (idx < 0)
+					return null;
+				int subIdx = Math.max(idx - 15, 0);
+				int subLen = Math.min(30, textArea.getDocument().getLength() - subIdx);
+				if (subLen <= 0)
+					return null;
+				try {
+					String cut = textArea.getText(subIdx, subLen);
+					int hashIdx = -1;
+					for (int off = idx - subIdx; off >= 0; off--) {
+						if (cut.charAt(off) == '#') {
+							hashIdx = off;
+							break;
+						}
+					}
+					if (hashIdx < 0) {
+						for (int off = idx - subIdx; off < cut.length(); off++) {
+							if (cut.charAt(off) == '#') {
+								hashIdx = off;
+								break;
+							}
+						}
+					}
+					if (hashIdx < 0)
+						return null;
+					if (hashIdx >= 5 && cut.substring(hashIdx - 5, hashIdx).equals("ldc \"")) // ldc "#..."
+						return null;
+					int numLen = 1;
+					for (int i = hashIdx + 1; i < cut.length(); i++) {
+						if (!(cut.charAt(i) - '0' >= 0 && cut.charAt(i) - '0' <= 9)) {
+							break;
+						}
+						numLen++;
+					}
+					if (numLen < 2 || hashIdx > idx - subIdx || idx - subIdx - numLen >= hashIdx)
+						return null;
+					String hashNum = cut.substring(hashIdx, hashIdx + numLen);
+
+					String txt = txtByteEditView.getText();
+					int len = 0;
+					for (String asm : txt.split("\\/\\/ #Annotations:\n")) {
+						len += 19; // "\\/\\/ #Annotations:\n".length()
+						if (asm.isEmpty())
+							continue;
+						if (idx >= len && idx < len + asm.length()) {
+							try (BufferedReader reader = new BufferedReader(new StringReader(asm))) {
+								String s;
+								while (!(s = reader.readLine()).startsWith("// #SourceFile: ")) {
+								}
+								while (!(s = reader.readLine()).equals("// #Fields")) {
+									if (s.startsWith("#")) {
+										String[] split = Assembler.SPACE.split(s, 2);
+										if (hashNum.equals(split[0].substring(0, split[0].length() - 1))) {
+											String toolTip = split[1];
+											if (toolTip.length() > 500)
+												toolTip = toolTip.substring(0, 500) + "...";
+											return toolTip;
+										}
+									}
+								}
+							} catch (IOException e1) {
+							}
+							break;
+						} else {
+							len += asm.length();
+						}
+					}
+				} catch (Exception e1) {
+				}
+				return null;
+			}
+		});
 		txtByteEditView.addKeyListener(new KeyAdapter() {
 
 			@Override
@@ -430,7 +714,8 @@ public class Main extends JFrame {
 							}
 						}
 						txtByteEditView.setText(dis);
-						txtByteEditView.setCaretPosition(prev);
+						if (dis.length() > prev)
+							txtByteEditView.setCaretPosition(prev);
 					} catch (Exception e2) {
 						e2.printStackTrace();
 					}
@@ -441,102 +726,47 @@ public class Main extends JFrame {
 		KeyStroke ctrlT = KeyStroke.getKeyStroke(KeyEvent.VK_T, KeyEvent.CTRL_DOWN_MASK);
 		KeyStroke ctrlS = KeyStroke.getKeyStroke(KeyEvent.VK_S, KeyEvent.CTRL_DOWN_MASK);
 		KeyStroke ctrlG = KeyStroke.getKeyStroke(KeyEvent.VK_G, KeyEvent.CTRL_DOWN_MASK);
-		KeyStroke ctrlO = KeyStroke.getKeyStroke(KeyEvent.VK_O, KeyEvent.CTRL_DOWN_MASK);
 		KeyStroke ctrlU = KeyStroke.getKeyStroke(KeyEvent.VK_U, KeyEvent.CTRL_DOWN_MASK);
 		KeyStroke ctrlR = KeyStroke.getKeyStroke(KeyEvent.VK_R, KeyEvent.CTRL_DOWN_MASK);
 		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() {
+		txtByteEditView.registerKeyboardAction(e -> themeBox.setVisible(true), ctrlB,
-
+				JComponent.WHEN_IN_FOCUSED_WINDOW);
-			@Override
+		txtByteEditView.registerKeyboardAction(e -> {
-			public void actionPerformed(ActionEvent e) {
+			globalSearchBox.setVisible(true);
-				themeBox.setVisible(true);
+			globalSearchBox.txtString.requestFocusInWindow();
-			}
+			globalSearchBox.txtString.select(0, globalSearchBox.txtString.getText().length());
-		}, ctrlB, JComponent.WHEN_IN_FOCUSED_WINDOW);
-		txtByteEditView.registerKeyboardAction(new ActionListener() {
-
-			@Override
-			public void actionPerformed(ActionEvent 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() {
+		txtByteEditView.registerKeyboardAction(e -> {
-
+			searchBox.setVisible(true);
-			@Override
+			searchBox.txtFind.requestFocusInWindow();
-			public void actionPerformed(ActionEvent e) {
+			searchBox.txtFind.select(0, searchBox.txtFind.getText().length());
-				searchBox.setVisible(true);
-				searchBox.txtFind.requestFocusInWindow();
-				searchBox.txtFind.select(0, searchBox.txtFind.getText().length());
-			}
 		}, ctrlF, JComponent.WHEN_IN_FOCUSED_WINDOW);
-		txtByteEditView.registerKeyboardAction(new ActionListener() {
+		txtByteEditView.registerKeyboardAction(e -> {
-
+			typeOpenBox.setVisible(true);
-			@Override
+			typeOpenBox.txtSearch.requestFocusInWindow();
-			public void actionPerformed(ActionEvent e) {
+			typeOpenBox.txtSearch.select(0, typeOpenBox.txtSearch.getText().length());
-				typeOpenBox.setVisible(true);
-				typeOpenBox.txtSearch.requestFocusInWindow();
-				typeOpenBox.txtSearch.select(0, typeOpenBox.txtSearch.getText().length());
-			}
 		}, ctrlT, JComponent.WHEN_IN_FOCUSED_WINDOW);
-		txtByteEditView.registerKeyboardAction(new ActionListener() {
+		txtByteEditView.registerKeyboardAction(e -> unicodeBox.setVisible(true), ctrlU,
-
+				JComponent.WHEN_IN_FOCUSED_WINDOW);
-			@Override
+		txtByteEditView.registerKeyboardAction(e -> compilationBox.setVisible(true), ctrlE,
-			public void actionPerformed(ActionEvent e) {
+				JComponent.WHEN_IN_FOCUSED_WINDOW);
-				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);
 		// specific
-		tree.registerKeyboardAction(new ActionListener() {
+		tree.registerKeyboardAction(e -> save(), ctrlS, JComponent.WHEN_FOCUSED);
-
+		txtByteEditView.registerKeyboardAction(e -> saveCurrentClassNode(), ctrlS, JComponent.WHEN_FOCUSED);
-			@Override
+		txtByteEditView.registerKeyboardAction(e -> {
-			public void actionPerformed(ActionEvent e) {
+			try {
-				save();
+				goToSelected();
-			}
+			} catch (BadLocationException e1) {
-		}, ctrlS, JComponent.WHEN_FOCUSED);
+				e1.printStackTrace();
-		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) {
-				try {
-					goToSelected();
-				} catch (BadLocationException e1) {
-					e1.printStackTrace();
-				}
 			}
 		}, ctrlG, JComponent.WHEN_FOCUSED);
-		txtByteEditView.registerKeyboardAction(new ActionListener() {
+		txtByteEditView.registerKeyboardAction(e -> {
-
+			try {
-			@Override
+				renameSelected();
-			public void actionPerformed(ActionEvent e) {
+			} catch (BadLocationException e1) {
-				try {
+				e1.printStackTrace();
-					renameSelected();
-				} catch (BadLocationException e1) {
-					e1.printStackTrace();
-				}
 			}
 		}, ctrlR, JComponent.WHEN_FOCUSED);
 		txtByteEditView.setEditable(true);
@@ -563,11 +793,11 @@ public class Main extends JFrame {
 		line = line.substring(2);
 		if (line.startsWith("invoke")) {
 			String[] split = line.split(" ");
-			String desc = UnicodeUtils.unescape(split[1]);
+			String desc = UnicodeUtils.unescape(null, split[1], true);
 			String target = split[2];
 			int index = target.lastIndexOf("/");
-			String className = UnicodeUtils.unescape(target.substring(0, index));
+			String className = UnicodeUtils.unescape(null, target.substring(0, index), true);
-			String methodName = UnicodeUtils.unescape(target.substring(index + 1));
+			String methodName = UnicodeUtils.unescape(null, target.substring(index + 1), true);
 			ClassNode classNode = classNodes.get(getFullName(className));
 			if (classNode == null) {
 				return;
@@ -586,7 +816,7 @@ public class Main extends JFrame {
 			}
 		} else if (line.startsWith("new ")) {
 			String[] split = line.split(" ");
-			String className = UnicodeUtils.unescape(split[1]);
+			String className = UnicodeUtils.unescape(null, split[1], true);
 			ClassNode classNode = classNodes.get(getFullName(className));
 			if (classNode == null) {
 				return;
@@ -595,11 +825,11 @@ public class Main extends JFrame {
 		} else if (line.startsWith("getstatic ") || line.startsWith("putstatic ") || line.startsWith("getfield ")
 				|| line.startsWith("putfield ")) {
 			String[] split = line.split(" ");
-			String desc = UnicodeUtils.unescape(split[1]);
+			String desc = UnicodeUtils.unescape(null, split[1], true);
 			String target = split[2];
 			int index = target.lastIndexOf("/");
-			String className = UnicodeUtils.unescape(target.substring(0, index));
+			String className = UnicodeUtils.unescape(null, target.substring(0, index), true);
-			String fieldName = UnicodeUtils.unescape(target.substring(index + 1));
+			String fieldName = UnicodeUtils.unescape(null, target.substring(index + 1), true);
 			ClassNode classNode = classNodes.get(getFullName(className));
 			if (classNode == null) {
 				return;
@@ -663,10 +893,12 @@ public class Main extends JFrame {
 			if (s.contains(" extends "))
 				s = s.substring(0, s.lastIndexOf(" extends "));
 			String[] split = s.split(" ");
-			String className = UnicodeUtils.unescape(split[split.length - 1]);
+			String className = UnicodeUtils.unescape(null, split[split.length - 1], true);
 			renameBox.className = className;
-			String name = UnicodeUtils.unescape(m.pattern() == renameableFieldPattern ? m.group(2) : m.group(1));
+			String name = UnicodeUtils.unescape(null, m.pattern() == renameableFieldPattern ? m.group(2) : m.group(1),
-			String desc = UnicodeUtils.unescape(m.pattern() == renameableFieldPattern ? m.group(1) : m.group(2));
+					true);
+			String desc = UnicodeUtils.unescape(null, m.pattern() == renameableFieldPattern ? m.group(1) : m.group(2),
+					true);
 			renameBox.name = name;
 			renameBox.desc = desc;
 			renameBox.txtName.setText(name);
@@ -707,8 +939,7 @@ public class Main extends JFrame {
 	}
 
 	public static int selectFileWithSearch(String s, Object nodeToFind) {
-		if (s != null && (s.endsWith(".class")
+		if (s != null && s.endsWith(".class")) {
-				|| (s.endsWith(".class/") && fakedFolders.contains(s.substring(0, s.length() - 7))))) {
 			currentNodeName = s;
 			int lineFound = -1;
 			ClassNode classNode = classNodes.get(s);
@@ -842,10 +1073,10 @@ public class Main extends JFrame {
 				output.closeEntry();
 			}
 			int computeFlags = 0;
-			if (optionBox.chckbxComputeFrames.isSelected()) {
+			if (mntmComputeFrames.isSelected()) {
 				computeFlags |= ClassWriter.COMPUTE_FRAMES;
 			}
-			if (optionBox.chckbxComputeMax.isSelected()) {
+			if (mntmComputeMax.isSelected()) {
 				computeFlags |= ClassWriter.COMPUTE_MAXS;
 			}
 			for (ClassNode node : classes) {
@@ -879,10 +1110,7 @@ public class Main extends JFrame {
 	}
 
 	public static String getFullName(String s) {
-		if (fakedFolders.contains(s))
+		return s + ".class";
-			return s + ".class/";
-		else
-			return s + ".class";
 	}
 
 	class ArchiveTreeModel extends DefaultTreeModel {
@@ -908,20 +1136,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);
 						}
@@ -960,7 +1188,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);
@@ -992,16 +1223,20 @@ public class Main extends JFrame {
 			tmp.addAll(0, folders);
 
 			for (String s : tmp) {
-				String[] elements = s.split("/");
+				String[] elements = SLASH.split(s, 50);
-				ByteEditTreeNode currentNode = (ByteEditTreeNode) getRoot();
+				if (elements.length >= 50) {
-				for (int i = 0; i < elements.length; i++) {
+					((ByteEditTreeNode) getRoot()).add(new ByteEditTreeNode(s, s));
-					String token = elements[i];
+				} else {
-					ByteEditTreeNode nextNode = findNode(currentNode, token);
+					ByteEditTreeNode currentNode = (ByteEditTreeNode) getRoot();
-					if (nextNode == null) {
+					for (int i = 0; i < elements.length; i++) {
-						nextNode = new ByteEditTreeNode(token, s);
+						String token = elements[i];
-						currentNode.add(nextNode);
+						ByteEditTreeNode nextNode = findNode(currentNode, token);
+						if (nextNode == null) {
+							nextNode = new ByteEditTreeNode(token, s);
+							currentNode.add(nextNode);
+						}
+						currentNode = nextNode;
 					}
-					currentNode = nextNode;
 				}
 			}
 		}
@@ -1016,6 +1251,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/utils/ClassUtil.java

@@ -6,6 +6,8 @@ import java.util.HashSet;
 
 import org.objectweb.asm.Type;
 
+import me.ByteEdit.edit.HugeStrings;
+
 public class ClassUtil {
 
 	public static final int ACC_PUBLIC = 0x0001;
@@ -525,28 +527,29 @@ public class ClassUtil {
 	public static final HashMap<Class, DecompilationInterface> diMap = new HashMap<>();
 
 	static {
-		diMap.put(String.class, (o, desc, escapeSpaces) -> "\""
+		diMap.put(String.class, (o, desc, escapeSpaces, hs) -> "\""
-				+ (escapeSpaces ? UnicodeUtils.escapeWithSpaces((String) o) : UnicodeUtils.escape((String) o)) + "\"");
+				+ (escapeSpaces ? UnicodeUtils.escapeWithSpaces(hs, (String) o) : UnicodeUtils.escape(hs, (String) o))
+				+ "\"");
 		diMap.put(Integer.class,
-				(o, desc, escape) -> desc.equals("Z") ? (((int) o) == 0 ? "false" : "true") : o.toString());
+				(o, desc, escape, hs) -> desc.equals("Z") ? (((int) o) == 0 ? "false" : "true") : o.toString());
-		diMap.put(Long.class, (o, desc, escape) -> o.toString() + "l");
+		diMap.put(Long.class, (o, desc, escape, hs) -> o.toString() + "l");
-		diMap.put(Float.class, (o, desc, escape) -> o.toString() + "f");
+		diMap.put(Float.class, (o, desc, escape, hs) -> o.toString() + "f");
 	}
 
 	static interface DecompilationInterface {
-		String apply(Object o, String desc, boolean escape);
+		String apply(Object o, String desc, boolean escape, HugeStrings hs);
 	}
 
-	public static String getDecompiledValue(Object o, String desc, boolean escapeSpaces) {
+	public static String getDecompiledValue(Object o, String desc, boolean escapeSpaces, HugeStrings hs) {
 		DecompilationInterface di = diMap.get(o.getClass());
 		if (di != null)
-			return di.apply(o, desc, escapeSpaces);
+			return di.apply(o, desc, escapeSpaces, hs);
 		else
 			return o.toString();
 	}
 
-	public static String getDecompiledValue(Object o, String desc) {
+	public static String getDecompiledValue(Object o, String desc, HugeStrings hs) {
-		return getDecompiledValue(o, desc, false);
+		return getDecompiledValue(o, desc, false, hs);
 	}
 
 	public static Object getCastedValue(String o, String className) {

src/me/ByteEdit/utils/UnicodeUtils.java

@@ -1,11 +1,26 @@
 package me.ByteEdit.utils;
 
+import me.ByteEdit.edit.HugeStrings;
+import me.ByteEdit.edit.HugeStringsRev;
+
 public class UnicodeUtils {
 
-	public static String unescape(String s) {
+	public static String unescape(HugeStringsRev hsr, String s) {
+		return unescape(hsr, s, false);
+	}
+
+	public static String unescape(HugeStringsRev hsr, String s, boolean force) {
 		if (s == null) {
 			return null;
 		}
+		if (!force && !s.isEmpty() && s.charAt(0) == '#' && s.length() < 12) {
+			try {
+				int id = Integer.parseInt(s.substring(1));
+				return hsr.get(id);
+			} catch (NumberFormatException ex) {
+				// Doesn't seem like a HugeString
+			}
+		}
 		StringBuilder sb = new StringBuilder();
 		char unicodeBuffer = 0;
 		int stage = 0;
@@ -78,10 +93,13 @@ public class UnicodeUtils {
 		return sb.toString();
 	}
 
-	public static String escapeWithSpaces(String s) {
+	public static String escapeWithSpaces(HugeStrings hs, String s) {
 		if (s == null) {
 			return null;
 		}
+		if (s.length() > HugeStrings.THRESHOLD) {
+			return hs.onString(s);
+		}
 		StringBuilder sb = new StringBuilder();
 		char[] arr = s.toCharArray();
 		int i = 0;
@@ -92,6 +110,9 @@ public class UnicodeUtils {
 			if (arr[0] == '/') {
 				sb.append("\\u002F");
 				i++;
+			} else if (arr[0] == '#') {
+				sb.append("\\u0023");
+				i++;
 			}
 			if (arr[len - 1] == '/') {
 				addSlash = true;
@@ -158,12 +179,26 @@ public class UnicodeUtils {
 		return sb.toString();
 	}
 
-	public static String escape(String s) {
+	public static String escape(HugeStrings hs, String s) {
+		return escape(hs, s, false);
+	}
+
+	public static String escape(HugeStrings hs, String s, boolean force) {
 		if (s == null) {
 			return null;
 		}
-		StringBuilder sb = new StringBuilder();
+		if (!force && s.length() > HugeStrings.THRESHOLD) {
-		for (char c : s.toCharArray()) {
+			return hs.onString(s);
+		}
+		char[] arr = s.toCharArray();
+		StringBuilder sb = new StringBuilder(arr.length);
+		int i = 0;
+		if (arr.length > 0 && arr[0] == '#') {
+			sb.append("\\u0023");
+			i++;
+		}
+		for (; i < arr.length; i++) {
+			char c = arr[i];
 			switch (c) {
 			case 'Ä':
 			case 'ä':

src/org/fife/ui/rsyntaxtextarea/TokenImpl.java

@@ -403,6 +403,9 @@ public class TokenImpl implements Token {
 		int last = getOffset();
 		FontMetrics fm = null;
 		while (token != null && token.isPaintable()) {
+			if (token.textCount > 10000) {
+				return getOffset() + (int) (x / 7);
+			}
 			fm = textArea.getFontMetricsForTokenType(token.getType());
 			char[] text = token.text;
 			int start = token.textOffset;
@@ -786,6 +789,13 @@ public class TokenImpl implements Token {
 		this.type = type;
 	}
 
+	public void reset() {
+		text = null;
+		offset = -1;
+		type = Token.NULL;
+		nextToken = null;
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */