From c67206297ee1c9a085b383ec9c2770d976e45358 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 2 Dec 2019 13:32:10 +0000 Subject: [PATCH] Javadocs (#154) * Javadocs * Move to using IFabricJavadocProvider Co-authored-by: mentlerd * Checkstyle --- build.gradle | 2 +- .../java/net/fabricmc/loom/task/fernflower/FernFlowerTask.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 67604e7..c3aa4f0 100644 --- a/build.gradle +++ b/build.gradle @@ -50,7 +50,7 @@ dependencies { // decompilers 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 implementation ('org.cadixdev:mercury:0.1.0.fabric-SNAPSHOT') diff --git a/src/main/java/net/fabricmc/loom/task/fernflower/FernFlowerTask.java b/src/main/java/net/fabricmc/loom/task/fernflower/FernFlowerTask.java index 24c2514..fa7a2a4 100644 --- a/src/main/java/net/fabricmc/loom/task/fernflower/FernFlowerTask.java +++ b/src/main/java/net/fabricmc/loom/task/fernflower/FernFlowerTask.java @@ -64,6 +64,7 @@ public class FernFlowerTask extends AbstractDecompileTask implements ForkingJava Map options = new HashMap<>(); options.put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES, "1"); options.put(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING, "1"); + options.put(IFernflowerPreferences.REMOVE_SYNTHETIC, "1"); options.put(IFernflowerPreferences.LOG_LEVEL, "trace"); getLogging().captureStandardOutput(LogLevel.LIFECYCLE); @@ -78,6 +79,7 @@ public class FernFlowerTask extends AbstractDecompileTask implements ForkingJava } args.add("-t=" + getNumThreads()); + args.add("-m=" + getExtension().getMappingsProvider().tinyMappings.getAbsolutePath()); //TODO, Decompiler breaks on jemalloc, J9 module-info.class? getLibraries().forEach(f -> args.add("-e=" + f.getAbsolutePath()));