From a88175ffc95792b88a8724f66db6dda2b8cc32ee Mon Sep 17 00:00:00 2001
From: gegy1000
Date: Tue, 17 Jul 2018 19:14:08 +0200
Subject: ASM Based Class Translator (#1)

* Initial port to ASM

* Package updates

* Annotation + inner class translation

* Fix inner class mapping

* More bytecode translation

* Signature refactoring

* Fix highlighting of mapped names

* Fix parameter name offset

* Fix anonymous class generation

* Fix issues with inner class signature transformation

* Fix bridged method detection

* Fix compile issues

* Resolve all failed tests

* Apply deobfuscated name to transformed classes

* Fix class signatures not being translated

* Fix frame array type translation

* Fix frame array type translation

* Fix array translation in method calls

* Fix method reference and bridge detection

* Fix handling of null deobf mappings

* Parameter translation in interfaces

* Fix enum parameter index offset

* Fix parsed local variable indexing

* Fix stackoverflow on rebuilding method names

* Ignore invalid decompiled variable indices

* basic source jar

* Output directly to file on source export

* Make decompile parallel

* fix incorrect super calls

* Use previous save state to delete old mapping files

* Fix old mappings not properly being removed

* Fix old mappings not properly being removed

* make isMethodProvider public

(cherry picked from commit ebad6a9)

* speed up Deobfuscator's getSources by using a single TranslatingTypeloader and caching the ClassLoaderTypeloader

* ignore .idea project folders

* move SynchronizedTypeLoader to a non-inner

* fix signature remap of inners for now

* index & resolve method/field references for usages view

* Allow reader/writer subclasses to provide the underlying file operations

* fix giving obf classes a name not removing them from the panel

* buffer the ParsedJar class entry inputstream, allow use with a jarinputstream

* make CachingClasspathTypeLoader public

* make CachingClasspathTypeLoader public

* support enum switches with obfuscated SwitchMaps
---
 .../java/cuchaz/enigma/mapping/FieldMapping.java   | 38 +++++++++-------------
 1 file changed, 16 insertions(+), 22 deletions(-)

(limited to 'src/main/java/cuchaz/enigma/mapping/FieldMapping.java')

diff --git a/src/main/java/cuchaz/enigma/mapping/FieldMapping.java b/src/main/java/cuchaz/enigma/mapping/FieldMapping.java
index cd761b4..8fbe095 100644
--- a/src/main/java/cuchaz/enigma/mapping/FieldMapping.java
+++ b/src/main/java/cuchaz/enigma/mapping/FieldMapping.java
@@ -11,32 +11,27 @@
 
 package cuchaz.enigma.mapping;
 
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.FieldEntry;
 import cuchaz.enigma.throwables.IllegalNameException;
 
 public class FieldMapping implements Comparable<FieldMapping>, MemberMapping<FieldEntry> {
 
 	private String obfName;
 	private String deobfName;
-	private Type obfType;
+	private TypeDescriptor obfDesc;
 	private Mappings.EntryModifier modifier;
 
-	public FieldMapping(String obfName, Type obfType, String deobfName, Mappings.EntryModifier modifier) {
+	public FieldMapping(String obfName, TypeDescriptor obfDesc, String deobfName, Mappings.EntryModifier modifier) {
 		this.obfName = obfName;
 		this.deobfName = NameValidator.validateFieldName(deobfName);
-		this.obfType = obfType;
+		this.obfDesc = obfDesc;
 		this.modifier = modifier;
 	}
 
-	public FieldMapping(FieldMapping other, ClassNameReplacer obfClassNameReplacer) {
-		this.obfName = other.obfName;
-		this.deobfName = other.deobfName;
-		this.modifier = other.modifier;
-		this.obfType = new Type(other.obfType, obfClassNameReplacer);
-	}
-
 	@Override
 	public FieldEntry getObfEntry(ClassEntry classEntry) {
-		return new FieldEntry(classEntry, this.obfName, this.obfType);
+		return new FieldEntry(classEntry, this.obfName, this.obfDesc);
 	}
 
 	@Override
@@ -65,12 +60,12 @@ public class FieldMapping implements Comparable<FieldMapping>, MemberMapping<Fie
 		this.deobfName = NameValidator.validateFieldName(val);
 	}
 
-	public Type getObfType() {
-		return this.obfType;
+	public TypeDescriptor getObfDesc() {
+		return this.obfDesc;
 	}
 
-	public void setObfType(Type val) {
-		this.obfType = val;
+	public void setObfDesc(TypeDescriptor val) {
+		this.obfDesc = val;
 	}
 
 	public Mappings.EntryModifier getModifier() {
@@ -83,21 +78,20 @@ public class FieldMapping implements Comparable<FieldMapping>, MemberMapping<Fie
 
 	@Override
 	public int compareTo(FieldMapping other) {
-		return (this.obfName + this.obfType).compareTo(other.obfName + other.obfType);
+		return (this.obfName + this.obfDesc).compareTo(other.obfName + other.obfDesc);
 	}
 
 	public boolean renameObfClass(final String oldObfClassName, final String newObfClassName) {
-		// rename obf classes in the type
-		Type newType = new Type(this.obfType, className ->
-		{
+		// rename obf classes in the desc
+		TypeDescriptor newDesc = this.obfDesc.remap(className -> {
 			if (className.equals(oldObfClassName)) {
 				return newObfClassName;
 			}
-			return null;
+			return className;
 		});
 
-		if (!newType.equals(this.obfType)) {
-			this.obfType = newType;
+		if (!newDesc.equals(this.obfDesc)) {
+			this.obfDesc = newDesc;
 			return true;
 		}
 		return false;
-- 
cgit v1.2.3