* Javadocs

* Move to using IFabricJavadocProvider
Co-authored-by: mentlerd <mentlerd@gmail.com>

* Checkstyle
dev/0.11
modmuss50 2019-12-02 13:32:10 +00:00 committed by GitHub
parent 2f775b1c97
commit c67206297e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions

View File

@ -50,7 +50,7 @@ dependencies {
// decompilers // decompilers
implementation ('net.fabricmc:procyon-fabric-compilertools:0.5.35.+') implementation ('net.fabricmc:procyon-fabric-compilertools:0.5.35.+')
implementation ('org.jetbrains:intellij-fernflower:1.0.0.9') implementation ('org.jetbrains:intellij-fernflower:1.1.0.11')
// source code remapping // source code remapping
implementation ('org.cadixdev:mercury:0.1.0.fabric-SNAPSHOT') implementation ('org.cadixdev:mercury:0.1.0.fabric-SNAPSHOT')

View File

@ -64,6 +64,7 @@ public class FernFlowerTask extends AbstractDecompileTask implements ForkingJava
Map<String, Object> options = new HashMap<>(); Map<String, Object> options = new HashMap<>();
options.put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES, "1"); options.put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES, "1");
options.put(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING, "1"); options.put(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING, "1");
options.put(IFernflowerPreferences.REMOVE_SYNTHETIC, "1");
options.put(IFernflowerPreferences.LOG_LEVEL, "trace"); options.put(IFernflowerPreferences.LOG_LEVEL, "trace");
getLogging().captureStandardOutput(LogLevel.LIFECYCLE); getLogging().captureStandardOutput(LogLevel.LIFECYCLE);
@ -78,6 +79,7 @@ public class FernFlowerTask extends AbstractDecompileTask implements ForkingJava
} }
args.add("-t=" + getNumThreads()); args.add("-t=" + getNumThreads());
args.add("-m=" + getExtension().getMappingsProvider().tinyMappings.getAbsolutePath());
//TODO, Decompiler breaks on jemalloc, J9 module-info.class? //TODO, Decompiler breaks on jemalloc, J9 module-info.class?
getLibraries().forEach(f -> args.add("-e=" + f.getAbsolutePath())); getLibraries().forEach(f -> args.add("-e=" + f.getAbsolutePath()));