From 3f2e986aed794e4ec478ad28ecb3fb9dcec91068 Mon Sep 17 00:00:00 2001 From: Dmitry Isaenko Date: Wed, 25 Aug 2021 07:03:17 +0300 Subject: [PATCH] Validated using newest GoldLeaf v0.9 and works fine. Updated text, application preferences record, fxml, readme. --- README.md | 2 +- src/main/java/nsusbloader/AppPreferences.java | 10 ++++------ .../Controllers/SettingsBlockGoldleafController.java | 2 +- src/main/java/nsusbloader/com/usb/GoldLeaf_08.java | 2 +- .../java/nsusbloader/com/usb/UsbCommunications.java | 2 +- src/main/resources/SettingsBlockGoldleaf.fxml | 8 +++----- 6 files changed, 11 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index a1560b0..6935324 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ JDK 11 for MacOS and Linux | v0.6 | none | | v0.6.1 | v0.6 | | v0.7 - 0.7.3 | v0.7+ | -| v0.8 | v1.0+ | +| v0.8 - 0.9 | v1.0+ | where '+' means 'any next NS-USBloader version'. diff --git a/src/main/java/nsusbloader/AppPreferences.java b/src/main/java/nsusbloader/AppPreferences.java index 52a60fc..18afe80 100644 --- a/src/main/java/nsusbloader/AppPreferences.java +++ b/src/main/java/nsusbloader/AppPreferences.java @@ -27,7 +27,7 @@ public class AppPreferences { private final Preferences preferences; private final Locale locale; - public static final String[] goldleafSupportedVersions = {"v0.5", "v0.7.x", "v0.8"}; + public static final String[] goldleafSupportedVersions = {"v0.5", "v0.7.x", "v0.8-0.9"}; private AppPreferences(){ this.preferences = Preferences.userRoot().node("NS-USBloader"); @@ -113,12 +113,10 @@ public class AppPreferences { public boolean getNspFileFilterGL(){return preferences.getBoolean("GL_NSP_FILTER", false); } public void setNspFileFilterGL(boolean prop){preferences.putBoolean("GL_NSP_FILTER", prop);} - public String getGlVersion(){ - int recentGlVersionIndex = goldleafSupportedVersions.length - 1; - String recentGlVersion = goldleafSupportedVersions[recentGlVersionIndex]; - return preferences.get("gl_version", recentGlVersion); + public int getGlVersion(){ + return preferences.getInt("gl_ver", goldleafSupportedVersions.length - 1); } - public void setGlVersion(String version){ preferences.put("gl_version", version);} + public void setGlVersion(int version){ preferences.putInt("gl_ver", version);} public double getSceneWidth(){ return preferences.getDouble("WIND_WIDTH", 850.0); } public void setSceneWidth(double value){ preferences.putDouble("WIND_WIDTH", value); } diff --git a/src/main/java/nsusbloader/Controllers/SettingsBlockGoldleafController.java b/src/main/java/nsusbloader/Controllers/SettingsBlockGoldleafController.java index b5ba33d..8be5568 100644 --- a/src/main/java/nsusbloader/Controllers/SettingsBlockGoldleafController.java +++ b/src/main/java/nsusbloader/Controllers/SettingsBlockGoldleafController.java @@ -53,6 +53,6 @@ public class SettingsBlockGoldleafController implements Initializable { final AppPreferences preferences = AppPreferences.getInstance(); preferences.setNspFileFilterGL(getNSPFileFilterForGL()); - preferences.setGlVersion(getGlVer()); + preferences.setGlVersion(glVersionChoiceBox.getSelectionModel().getSelectedIndex()); } } diff --git a/src/main/java/nsusbloader/com/usb/GoldLeaf_08.java b/src/main/java/nsusbloader/com/usb/GoldLeaf_08.java index 0a15656..f8bf657 100644 --- a/src/main/java/nsusbloader/com/usb/GoldLeaf_08.java +++ b/src/main/java/nsusbloader/com/usb/GoldLeaf_08.java @@ -103,7 +103,7 @@ class GoldLeaf_08 extends TransferModule { this.nspFilterForGl = nspFilter; - print("============= GoldLeaf v0.8 =============\n\t" + + print("=========== GoldLeaf v0.8-0.9 ===========\n\t" + "VIRT:/ equals files added into the application\n\t" + "HOME:/ equals " +System.getProperty("user.home"), EMsgType.INFO); diff --git a/src/main/java/nsusbloader/com/usb/UsbCommunications.java b/src/main/java/nsusbloader/com/usb/UsbCommunications.java index 3601848..595ede2 100644 --- a/src/main/java/nsusbloader/com/usb/UsbCommunications.java +++ b/src/main/java/nsusbloader/com/usb/UsbCommunications.java @@ -66,7 +66,7 @@ public class UsbCommunications extends CancellableRunnable { case "TinFoil": module = new TinFoil(handler, nspMap, this, logPrinter); break; - case "GoldLeafv0.8": + case "GoldLeafv0.8-0.9": module = new GoldLeaf_08(handler, nspMap, this, logPrinter, nspFilterForGl); break; case "GoldLeafv0.7.x": diff --git a/src/main/resources/SettingsBlockGoldleaf.fxml b/src/main/resources/SettingsBlockGoldleaf.fxml index 9c84293..f30cc9e 100644 --- a/src/main/resources/SettingsBlockGoldleaf.fxml +++ b/src/main/resources/SettingsBlockGoldleaf.fxml @@ -7,9 +7,7 @@ - - + - \ No newline at end of file +