diff --git a/lib/cfr_0_146.jar b/lib/cfr_0_146.jar deleted file mode 100644 index 6e251c0..0000000 Binary files a/lib/cfr_0_146.jar and /dev/null differ diff --git a/pom.xml b/pom.xml index b26383f..1b6c6b4 100644 --- a/pom.xml +++ b/pom.xml @@ -68,22 +68,6 @@ install-file - - install-cfr - clean - - ${basedir}/lib/cfr_0_146.jar - default - org.benf - cfr - 1.4.6 - jar - true - - - install-file - - install-attach clean @@ -230,7 +214,7 @@ org.benf cfr - 0.146 + 0.150 com.sun diff --git a/src/main/java/me/grax/jbytemod/decompiler/CFRDecompiler.java b/src/main/java/me/grax/jbytemod/decompiler/CFRDecompiler.java index 0429610..6750e26 100644 --- a/src/main/java/me/grax/jbytemod/decompiler/CFRDecompiler.java +++ b/src/main/java/me/grax/jbytemod/decompiler/CFRDecompiler.java @@ -11,6 +11,7 @@ import org.benf.cfr.reader.entities.constantpool.ConstantPool; import org.benf.cfr.reader.state.ClassFileSourceImpl; import org.benf.cfr.reader.state.DCCommonState; +import org.benf.cfr.reader.util.AnalysisType; import org.benf.cfr.reader.util.bytestream.BaseByteData; import org.benf.cfr.reader.util.getopt.OptionsImpl; import org.benf.cfr.reader.util.output.ToStringDumper; @@ -106,7 +107,6 @@ public String decompile(byte[] b, MethodNode mn) { } ClassFileSource2 cfs = new ClassFileSource2() { - @Override public JarContent addJarContent(String s) { return null; } @@ -133,6 +133,12 @@ public Pair getClassFileContent(String path) throws IOException public Collection addJar(String arg0) { throw new RuntimeException(); } + + @Override + public JarContent addJarContent(String jarPath, AnalysisType analysisType) { + // TODO Auto-generated method stub + return null; + } }; PluginRunner runner = new PluginRunner(ops, cfs); if (mn != null) { diff --git a/src/main/java/me/grax/jbytemod/decompiler/Decompilers.java b/src/main/java/me/grax/jbytemod/decompiler/Decompilers.java index 3899fd1..fd2cee0 100644 --- a/src/main/java/me/grax/jbytemod/decompiler/Decompilers.java +++ b/src/main/java/me/grax/jbytemod/decompiler/Decompilers.java @@ -1,7 +1,7 @@ package me.grax.jbytemod.decompiler; public enum Decompilers { - CFR("CFR", "1.46"), PROCYON("Procyon", "0.5.36"), FERNFLOWER("Fernflower", ""), KRAKATAU("Krakatau", "502"); + CFR("CFR", "1.50"), PROCYON("Procyon", "0.5.36"), FERNFLOWER("Fernflower", ""), KRAKATAU("Krakatau", "502"); private String version; private String name;