Skip to content

Commit

Permalink
Use Vineflower instead of Fernflower (#39)
Browse files Browse the repository at this point in the history
  • Loading branch information
NebelNidas authored Mar 6, 2024
1 parent b62d84c commit b8dc2d2
Show file tree
Hide file tree
Showing 6 changed files with 151 additions and 328 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ dependencies {
implementation "org.ow2.asm:asm-util:${asm_version}"
implementation "com.github.javaparser:javaparser-core:${javaparser_version}"
implementation "net.fabricmc:cfr:${fabric_cfr_version}"
implementation "net.fabricmc:fabric-fernflower:${fabric_fernflower_version}"
implementation "org.vineflower:vineflower:${vineflower_version}"
implementation "org.bitbucket.mstrobel:procyon-compilertools:${procyon_version}"

// JavaFX for all platforms (needed for cross-platform fat jar)
Expand All @@ -89,8 +89,8 @@ extraJavaModuleInfo {
// CFR
automaticModule("net.fabricmc:cfr", "cfr")

// Fernflower
automaticModule("net.fabricmc:fabric-fernflower", "intellij.fernflower")
// Vineflower
automaticModule("org.vineflower:vineflower", "org.vineflower.vineflower")

// Procyon
automaticModule("org.bitbucket.mstrobel:procyon-compilertools", "procyon.compilertools")
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ version = 0.1.0
# Project Dependencies
asm_version = 9.6
fabric_cfr_version = 0.2.1
fabric_fernflower_version = 2.0.0
vineflower_version = 1.9.3
procyon_version = 0.6.0
mappingio_version = 0.5.0
javaparser_version = 3.25.6
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/matcher/srcprocess/BuiltinDecompiler.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

public enum BuiltinDecompiler {
CFR("CFR", Cfr::new),
FERNFLOWER("Fernflower", Fernflower::new),
VINEFLOWER("Vineflower", Vineflower::new),
PROCYON("Procyon", Procyon::new);

BuiltinDecompiler(String name, Supplier<? extends Decompiler> supplier) {
Expand Down
322 changes: 0 additions & 322 deletions src/main/java/matcher/srcprocess/Fernflower.java

This file was deleted.

Loading

0 comments on commit b8dc2d2

Please sign in to comment.