Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependencies #42

Merged
merged 4 commits into from
Mar 6, 2024
Merged

Update dependencies #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
48e5246
Update dependencies
NebelNidas Nov 13, 2023
1cfe110
Add missing semicolon
NebelNidas Nov 13, 2023
12c738e
Update to Mapping-IO 0.5
NebelNidas Nov 16, 2023
e584bb1
Update dependencies, again
NebelNidas Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,6 @@ 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")

Expand Down
16 changes: 8 additions & 8 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
asm_version = 9.6
fabric_cfr_version = 0.2.1
fabric_fernflower_version = 2.0.0
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
14 changes: 5 additions & 9 deletions src/main/java/matcher/gui/menu/FileMenu.java
View file
Open in desktop
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