From 00fcd0550fcdda621c2e4662f6ddd55ce673b931 Mon Sep 17 00:00:00 2001 From: Gegy Date: Thu, 24 Jan 2019 14:48:32 +0200 Subject: [WIP] Mapping rework (#91) * Move packages * Mapping & entry refactor: first pass * Fix deobf -> obf tree remapping * Resolve various issues * Give all entries the potential for parents and treat inner classes as children * Deobf UI tree elements * Tests pass * Sort mapping output * Fix delta tracking * Index separation and first pass for #97 * Keep track of remapped jar index * Fix child entries not being remapped * Drop non-root entries * Track dropped mappings * Fix enigma mapping ordering * EntryTreeNode interface * Small tweaks * Naive full index remap on rename * Entries can resolve to more than one root entry * Support alternative resolution strategies * Bridge method resolution * Tests pass * Fix mappings being used where there are none * Fix methods with different descriptors being considered unique. closes #89 --- .../enigma/translation/SignatureUpdater.java | 92 ++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 src/main/java/cuchaz/enigma/translation/SignatureUpdater.java (limited to 'src/main/java/cuchaz/enigma/translation/SignatureUpdater.java') diff --git a/src/main/java/cuchaz/enigma/translation/SignatureUpdater.java b/src/main/java/cuchaz/enigma/translation/SignatureUpdater.java new file mode 100644 index 0000000..3783053 --- /dev/null +++ b/src/main/java/cuchaz/enigma/translation/SignatureUpdater.java @@ -0,0 +1,92 @@ +/******************************************************************************* + * Copyright (c) 2015 Jeff Martin. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser General Public + * License v3.0 which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl.html + *
+ * Contributors:
+ * Jeff Martin - initial API and implementation
+ ******************************************************************************/
+
+package cuchaz.enigma.translation;
+
+import com.google.common.collect.Lists;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.List;
+
+public class SignatureUpdater {
+
+ public static String update(String signature, ClassNameUpdater updater) {
+ try {
+ StringBuilder buf = new StringBuilder();
+
+ // read the signature character-by-character
+ StringReader reader = new StringReader(signature);
+ int i;
+ while ((i = reader.read()) != -1) {
+ char c = (char) i;
+
+ // does this character start a class name?
+ if (c == 'L') {
+ // update the class name and add it to the buffer
+ buf.append('L');
+ String className = readClass(reader);
+ if (className == null) {
+ throw new IllegalArgumentException("Malformed signature: " + signature);
+ }
+ buf.append(updater.update(className));
+ buf.append(';');
+ } else {
+ // copy the character into the buffer
+ buf.append(c);
+ }
+ }
+
+ return buf.toString();
+ } catch (IOException ex) {
+ // I'm pretty sure a StringReader will never throw one of these
+ throw new Error(ex);
+ }
+ }
+
+ private static String readClass(StringReader reader) throws IOException {
+ // read all the characters in the buffer until we hit a ';'
+ // remember to treat generics correctly
+ StringBuilder buf = new StringBuilder();
+ int depth = 0;
+ int i;
+ while ((i = reader.read()) != -1) {
+ char c = (char) i;
+
+ if (c == '<') {
+ depth++;
+ } else if (c == '>') {
+ depth--;
+ } else if (depth == 0) {
+ if (c == ';') {
+ return buf.toString();
+ } else {
+ buf.append(c);
+ }
+ }
+ }
+
+ return null;
+ }
+
+ public static List