Skip to content

Commit

Permalink
Merge upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
NebelNidas committed Mar 7, 2024
2 parents 5fed4fc + b8dc2d2 commit 24c0695
Show file tree
Hide file tree
Showing 10 changed files with 282 additions and 782 deletions.
9 changes: 3 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,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}"
runtimeOnly "org.tinylog:tinylog-impl:${tinylog_version}"
runtimeOnly "org.tinylog:slf4j-tinylog:${tinylog_version}"
Expand All @@ -89,14 +89,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")
Expand Down
22 changes: 11 additions & 11 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
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
slf4j_version = 2.0.9
tinylog_version = 2.6.2
mappingio_version = 0.5.0
javaparser_version = 3.25.6
javafx_version = 21.0.1
checkstyle_version = 10.12.5
slf4j_version = 2.0.12
tinylog_version = 2.7.0
14 changes: 5 additions & 9 deletions src/main/java/matcher/gui/menu/FileMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -65,21 +65,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);
Expand Down Expand Up @@ -361,7 +357,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);

Expand Down
Loading

0 comments on commit 24c0695

Please sign in to comment.