Skip to content

Commit ee3c94a

Browse files
committed
Fix Fernflower nested classes
1 parent eb4c729 commit ee3c94a

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/main/java/the/bytecode/club/jda/decompilers/FernflowerDecompiler.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ public String decompileClassNode(String containerName, final ClassNode cn) {
7373
result.set(null);
7474

7575
BaseDecompiler baseDecompiler = new BaseDecompiler((externalPath, internalPath) -> {
76-
// System.out.println("boi " + externalPath + " " + internalPath);
7776
ClassNode requestedCn = JDA.getClassNode(containerName, JDA.extractProxyClassName(externalPath));
7877
if (requestedCn == null) {
7978
System.err.println("Couldn't load " + externalPath);
@@ -95,8 +94,9 @@ public void copyFile(String s, String s1, String s2) {
9594
}
9695

9796
@Override
98-
public void saveClassFile(String s, String s1, String s2, String decompilation, int[] ints) {
99-
result.set(decompilation);
97+
public void saveClassFile(String filename, String className, String entryName, String decompilation, int[] ints) {
98+
if (className.equals(cn.name))
99+
result.set(decompilation);
100100
}
101101

102102
@Override
@@ -160,7 +160,10 @@ public void decompileToZip(String zipName) {
160160
private Map<String, Object> generateFernflowerArgs() {
161161
Map<String, Object> options = new HashMap<>();
162162
for (SettingsEntry setting : settings.getEntries()) {
163-
options.put(setting.key, setting.getString());
163+
Object value = setting.get();
164+
if (value instanceof Boolean)
165+
value = (Boolean) value? "1" : "0";
166+
options.put(setting.key, value);
164167
}
165168
return options;
166169
}

0 commit comments

Comments
 (0)