From 31b6e9e188fb2abbab040ee07f8a8c14cec2571d Mon Sep 17 00:00:00 2001
From: NebelNidas
Date: Sat, 6 Apr 2024 13:05:49 +0200
Subject: Add Vineflower decompiler (#541)

* Add Vineflower integration

* Fix some confusing names

* Rename method to reflect visitor pattern naming schemes

* Remove dead null check---
 enigma-swing/src/main/java/cuchaz/enigma/gui/config/Decompiler.java    | 1 +
 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 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'enigma-swing')

diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/Decompiler.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/Decompiler.java
index f9b5cbe..41ee254 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/Decompiler.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/Decompiler.java
@@ -4,6 +4,7 @@ import cuchaz.enigma.source.DecompilerService;
 import cuchaz.enigma.source.Decompilers;
 
 public enum Decompiler {
+	VINEFLOWER("Vineflower", Decompilers.VINEFLOWER),
 	CFR("CFR", Decompilers.CFR),
 	PROCYON("Procyon", Decompilers.PROCYON),
 	BYTECODE("Bytecode", Decompilers.BYTECODE);
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 32d6d76..ecd17f2 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
@@ -105,7 +105,7 @@ public final class UiConfig {
 	}
 
 	public static Decompiler getDecompiler() {
-		return ui.data().section("Decompiler").setIfAbsentEnum(Decompiler::valueOf, "Current", Decompiler.CFR);
+		return ui.data().section("Decompiler").setIfAbsentEnum(Decompiler::valueOf, "Current", Decompiler.VINEFLOWER);
 	}
 
 	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 0e8f7da..2f7cf19 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
@@ -78,7 +78,7 @@ public class Config {
 
 	public float scaleFactor = 1.0f;
 
-	public Decompiler decompiler = Decompiler.CFR;
+	public Decompiler decompiler = Decompiler.VINEFLOWER;
 
 	public Config() {
 		gson = new GsonBuilder().registerTypeAdapter(Integer.class, new IntSerializer()).registerTypeAdapter(Integer.class, new IntDeserializer()).registerTypeAdapter(Config.class, (InstanceCreator<Config>) type -> this).setPrettyPrinting().create();
-- 
cgit v1.2.3