Merge upstream

NebelNidas · Mar 9, 2024 · 960eb9b · 960eb9b
2 parents f42e25f + b8dc2d2
commit 960eb9b
Show file tree

Hide file tree

Showing 10 changed files with 279 additions and 778 deletions.
diff --git a/build.gradle b/build.gradle
@@ -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)
@@ -86,14 +86,11 @@ dependencies {
 extraJavaModuleInfo {
 	failOnMissingModuleInfo.set(false) // because of transitive dependencies
 
-	// Mapping-IO
-	automaticModule("net.fabricmc:mapping-io", "net.fabricmc.mappingio")
-
 	// 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")

diff --git a/gradle.properties b/gradle.properties
@@ -2,19 +2,19 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Gradle Plugins
-javafx_plugin_version = 0.0.13
+javafx_plugin_version = 0.1.0
 shadow_version = 7.1.2
-extra_java_module_info_version = 1.3
+extra_java_module_info_version = 1.6
 
 # Poject Properties
 version = 0.1.0
 
 # Project Dependencies
-asm_version = 9.4
-fabric_cfr_version = 0.2.0
-fabric_fernflower_version = 2.0.0
+asm_version = 9.6
+fabric_cfr_version = 0.2.1
+vineflower_version = 1.9.3
 procyon_version = 0.6.0
-mappingio_version = 0.3.0
-javaparser_version = 3.24.2
-javafx_version = 17.0.2
-checkstyle_version = 10.3.4
+mappingio_version = 0.5.0
+javaparser_version = 3.25.6
+javafx_version = 21.0.1
+checkstyle_version = 10.12.5
diff --git a/src/main/java/matcher/gui/menu/FileMenu.java b/src/main/java/matcher/gui/menu/FileMenu.java
@@ -63,21 +63,17 @@ private void init() {
 		getItems().add(menuItem);
 		menuItem.setOnAction(event -> loadMappings(null));
 
-		menuItem = new MenuItem("Load mappings (Enigma)");
+		menuItem = new MenuItem("Load mappings (Enigma dir)");
 		getItems().add(menuItem);
-		menuItem.setOnAction(event -> loadMappings(MappingFormat.ENIGMA));
-
-		menuItem = new MenuItem("Load mappings (MCP dir)");
-		getItems().add(menuItem);
-		menuItem.setOnAction(event -> loadMappings(MappingFormat.MCP));
+		menuItem.setOnAction(event -> loadMappings(MappingFormat.ENIGMA_DIR));
 
 		menuItem = new MenuItem("Save mappings");
 		getItems().add(menuItem);
 		menuItem.setOnAction(event -> saveMappings(null));
 
-		menuItem = new MenuItem("Save mappings (Enigma)");
+		menuItem = new MenuItem("Save mappings (Enigma dir)");
 		getItems().add(menuItem);
-		menuItem.setOnAction(event -> saveMappings(MappingFormat.ENIGMA));
+		menuItem.setOnAction(event -> saveMappings(MappingFormat.ENIGMA_DIR));
 
 		menuItem = new MenuItem("Clear mappings");
 		getItems().add(menuItem);
@@ -315,7 +311,7 @@ private static boolean isDirEmpty(Path dir) {
 	}
 
 	private static MappingFormat getFormat(Path file) {
-		if (Files.isDirectory(file)) return MappingFormat.ENIGMA;
+		if (Files.isDirectory(file)) return MappingFormat.ENIGMA_DIR;
 
 		String name = file.getFileName().toString().toLowerCase(Locale.ENGLISH);