diff options
| author | 2018-07-17 19:14:08 +0200 | |
|---|---|---|
| committer | 2018-07-17 19:14:08 +0200 | |
| commit | a88175ffc95792b88a8724f66db6dda2b8cc32ee (patch) | |
| tree | 65895bbc6cf1766f4ca01e1257619ab1993e71dc /src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java | |
| parent | Merge pull request #3 from thiakil/src-jar (diff) | |
| download | enigma-fork-a88175ffc95792b88a8724f66db6dda2b8cc32ee.tar.gz enigma-fork-a88175ffc95792b88a8724f66db6dda2b8cc32ee.tar.xz enigma-fork-a88175ffc95792b88a8724f66db6dda2b8cc32ee.zip | |
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
Diffstat (limited to 'src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java')
| -rw-r--r-- | src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java b/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java index befc92a..69d5684 100644 --- a/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java +++ b/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java | |||
| @@ -2,6 +2,7 @@ package cuchaz.enigma.mapping; | |||
| 2 | 2 | ||
| 3 | import com.google.common.base.Charsets; | 3 | import com.google.common.base.Charsets; |
| 4 | import com.google.common.collect.Maps; | 4 | import com.google.common.collect.Maps; |
| 5 | import cuchaz.enigma.mapping.entry.ClassEntry; | ||
| 5 | import cuchaz.enigma.throwables.MappingConflict; | 6 | import cuchaz.enigma.throwables.MappingConflict; |
| 6 | import cuchaz.enigma.throwables.MappingParseException; | 7 | import cuchaz.enigma.throwables.MappingParseException; |
| 7 | 8 | ||
| @@ -20,11 +21,11 @@ public class MappingsTinyReader { | |||
| 20 | } | 21 | } |
| 21 | 22 | ||
| 22 | public FieldMapping readField(String[] parts) { | 23 | public FieldMapping readField(String[] parts) { |
| 23 | return new FieldMapping(parts[3], new Type(parts[2]), parts[4], Mappings.EntryModifier.UNCHANGED); | 24 | return new FieldMapping(parts[3], new TypeDescriptor(parts[2]), parts[4], Mappings.EntryModifier.UNCHANGED); |
| 24 | } | 25 | } |
| 25 | 26 | ||
| 26 | public MethodMapping readMethod(String[] parts) { | 27 | public MethodMapping readMethod(String[] parts) { |
| 27 | return new MethodMapping(parts[3], new Signature(parts[2]), parts[4]); | 28 | return new MethodMapping(parts[3], new MethodDescriptor(parts[2]), parts[4]); |
| 28 | } | 29 | } |
| 29 | 30 | ||
| 30 | public Mappings read(File file) throws IOException, MappingParseException { | 31 | public Mappings read(File file) throws IOException, MappingParseException { |
| @@ -72,7 +73,7 @@ public class MappingsTinyReader { | |||
| 72 | break; | 73 | break; |
| 73 | case "MTH-ARG": | 74 | case "MTH-ARG": |
| 74 | classMapping = classMappingMap.computeIfAbsent(parts[1], k -> new ClassMapping(parts[1])); | 75 | classMapping = classMappingMap.computeIfAbsent(parts[1], k -> new ClassMapping(parts[1])); |
| 75 | classMapping.setArgumentName(parts[3], new Signature(parts[2]), Integer.parseInt(parts[4]), parts[5]); | 76 | classMapping.setArgumentName(parts[3], new MethodDescriptor(parts[2]), Integer.parseInt(parts[4]), parts[5]); |
| 76 | break; | 77 | break; |
| 77 | default: | 78 | default: |
| 78 | throw new MappingParseException(file, lineNumber, "Unknown token '" + token + "' !"); | 79 | throw new MappingParseException(file, lineNumber, "Unknown token '" + token + "' !"); |