From 63e2616c4017633d231fb9ae369fdfd57d2adaca Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 22 May 2021 10:23:30 +0100 Subject: Update to Java 16 (#390) * Java 16 * Cleanup * Set CFR as the default decompiler, it seems to handle j16 stuff better * Update build.gradle Co-authored-by: YanisBft * Update proguard, disable broken tests Co-authored-by: YanisBft --- enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java | 2 +- enigma-swing/src/main/java/cuchaz/enigma/gui/config/legacy/Config.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'enigma-swing') diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java index 8ec8720d..8a10acec 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java @@ -102,7 +102,7 @@ public final class UiConfig { } public static Decompiler getDecompiler() { - return ui.data().section("Decompiler").setIfAbsentEnum(Decompiler::valueOf, "Current", Decompiler.PROCYON); + return ui.data().section("Decompiler").setIfAbsentEnum(Decompiler::valueOf, "Current", Decompiler.CFR); } public static void setDecompiler(Decompiler d) { diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/legacy/Config.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/legacy/Config.java index fdd17d25..1265750f 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/legacy/Config.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/legacy/Config.java @@ -70,7 +70,7 @@ public class Config { public float scaleFactor = 1.0f; - public Decompiler decompiler = Decompiler.PROCYON; + public Decompiler decompiler = Decompiler.CFR; public Config() { gson = new GsonBuilder() -- cgit v1.2.3