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/FieldEntry.java     | 87 ----------------------
 1 file changed, 87 deletions(-)
 delete mode 100644 src/main/java/cuchaz/enigma/mapping/FieldEntry.java

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

diff --git a/src/main/java/cuchaz/enigma/mapping/FieldEntry.java b/src/main/java/cuchaz/enigma/mapping/FieldEntry.java
deleted file mode 100644
index 0f1f506..0000000
--- a/src/main/java/cuchaz/enigma/mapping/FieldEntry.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * 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
- * <p>
- * Contributors:
- * Jeff Martin - initial API and implementation
- ******************************************************************************/
-
-package cuchaz.enigma.mapping;
-
-import cuchaz.enigma.utils.Utils;
-
-public class FieldEntry implements Entry {
-
-	private ClassEntry classEntry;
-	private String name;
-	private Type type;
-
-	// NOTE: this argument order is important for the MethodReader/MethodWriter
-	public FieldEntry(ClassEntry classEntry, String name, Type type) {
-		if (classEntry == null) {
-			throw new IllegalArgumentException("Class cannot be null!");
-		}
-		if (name == null) {
-			throw new IllegalArgumentException("Field name cannot be null!");
-		}
-		if (type == null) {
-			throw new IllegalArgumentException("Field type cannot be null!");
-		}
-
-		this.classEntry = classEntry;
-		this.name = name;
-		this.type = type;
-	}
-
-	public FieldEntry(FieldEntry other, ClassEntry newClassEntry) {
-		this.classEntry = newClassEntry;
-		this.name = other.name;
-		this.type = other.type;
-	}
-
-	@Override
-	public ClassEntry getClassEntry() {
-		return this.classEntry;
-	}
-
-	@Override
-	public String getName() {
-		return this.name;
-	}
-
-	@Override
-	public String getClassName() {
-		return this.classEntry.getName();
-	}
-
-	public Type getType() {
-		return this.type;
-	}
-
-	@Override
-	public FieldEntry cloneToNewClass(ClassEntry classEntry) {
-		return new FieldEntry(this, classEntry);
-	}
-
-	@Override
-	public int hashCode() {
-		return Utils.combineHashesOrdered(this.classEntry, this.name, this.type);
-	}
-
-	@Override
-	public boolean equals(Object other) {
-		return other instanceof FieldEntry && equals((FieldEntry) other);
-	}
-
-	public boolean equals(FieldEntry other) {
-		return this.classEntry.equals(other.classEntry) && this.name.equals(other.name) && this.type.equals(other.type);
-	}
-
-	@Override
-	public String toString() {
-		return this.classEntry.getName() + "." + this.name + ":" + this.type;
-	}
-}
-- 
cgit v1.2.3