hibiscus-client/fabric-loom
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update to use threaded fernflower

Browse source
This commit is contained in:
modmuss50 2020-04-24 13:36:50 +01:00
parent 26755cb82c
commit 3ce6fcd9a4
4 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

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

2
src/main/java/net/fabricmc/loom/task/fernflower/FernFlowerTask.java
View file

@ -66,6 +66,7 @@ public class FernFlowerTask extends AbstractDecompileTask implements ForkingJava
options.put(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING, "1");
options.put(IFernflowerPreferences.REMOVE_SYNTHETIC, "1");
options.put(IFernflowerPreferences.LOG_LEVEL, "trace");
options.put(IFernflowerPreferences.THREADS, getNumThreads());
getLogging().captureStandardOutput(LogLevel.LIFECYCLE);
List<String> args = new ArrayList<>();
@ -78,7 +79,6 @@ public class FernFlowerTask extends AbstractDecompileTask implements ForkingJava
args.add("-l=" + getLineMapFile().getAbsolutePath());
}
args.add("-t=" + getNumThreads());
args.add("-m=" + getExtension().getMappingsProvider().tinyMappings.getAbsolutePath());
//TODO, Decompiler breaks on jemalloc, J9 module-info.class?

3
src/main/java/net/fabricmc/loom/task/fernflower/ForkedFFExecutor.java
View file

@ -53,7 +53,6 @@ public class ForkedFFExecutor {
File lineMap = null;
File mappings = null;
List<File> libraries = new ArrayList<>();
int numThreads = 0;
boolean isOption = true;
@ -91,8 +90,6 @@ public class ForkedFFExecutor {
}
mappings = new File(arg.substring(3));
} else if (arg.startsWith("-t=")) {
numThreads = Integer.parseInt(arg.substring(3));
} else {
if (input != null) {
throw new RuntimeException("Unable to set more than one input.");

6
src/main/java/net/fabricmc/loom/task/fernflower/ThreadIDFFLogger.java
View file

@ -92,15 +92,11 @@ public class ThreadIDFFLogger extends IFernflowerLogger {
@Override
public void startMethod(String methodName) {
String className = workingClass.get().peek();
line.get().push("Decompiling " + className + "." + methodName.substring(0, methodName.indexOf(" ")));
print();
//No need to print out methods
}
@Override
public void endMethod() {
line.get().pop();
print();
}
@Override