From 58f755876a728a11caddaa2447d5d9cd9637007f Mon Sep 17 00:00:00 2001 From: tildejustin Date: Thu, 2 Mar 2023 21:33:33 -0500 Subject: [PATCH 1/4] added saving instance folder --- .../java/com/pistacium/modcheck/ModCheck.java | 3 ++ .../com/pistacium/modcheck/ModCheckFrame.java | 5 ++- .../com/pistacium/modcheck/util/Config.java | 15 ++++++++ .../modcheck/util/ModCheckUtils.java | 34 +++++++++++++++++-- 4 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/pistacium/modcheck/util/Config.java diff --git a/src/main/java/com/pistacium/modcheck/ModCheck.java b/src/main/java/com/pistacium/modcheck/ModCheck.java index 26ac899..260b7b5 100644 --- a/src/main/java/com/pistacium/modcheck/ModCheck.java +++ b/src/main/java/com/pistacium/modcheck/ModCheck.java @@ -4,6 +4,7 @@ import com.google.gson.JsonParser; import com.pistacium.modcheck.mod.ModData; import com.pistacium.modcheck.mod.version.ModVersion; +import com.pistacium.modcheck.util.Config; import com.pistacium.modcheck.util.ModCheckStatus; import com.pistacium.modcheck.util.ModCheckUtils; @@ -32,6 +33,8 @@ public static void setStatus(ModCheckStatus status) { public static final ArrayList AVAILABLE_MODS = new ArrayList<>(); + public static Config config; + public static void main(String[] args) { THREAD_EXECUTOR.submit(() -> { diff --git a/src/main/java/com/pistacium/modcheck/ModCheckFrame.java b/src/main/java/com/pistacium/modcheck/ModCheckFrame.java index 21f7faa..52d824c 100644 --- a/src/main/java/com/pistacium/modcheck/ModCheckFrame.java +++ b/src/main/java/com/pistacium/modcheck/ModCheckFrame.java @@ -5,6 +5,7 @@ import com.pistacium.modcheck.mod.ModData; import com.pistacium.modcheck.mod.resource.ModResource; import com.pistacium.modcheck.mod.version.ModVersion; +import com.pistacium.modcheck.util.Config; import com.pistacium.modcheck.util.ModCheckStatus; import com.pistacium.modcheck.util.ModCheckUtils; import com.pistacium.modcheck.util.SwingUtils; @@ -81,7 +82,8 @@ private void initHeaderLayout() { JButton selectPathButton = new JButton("Select Instance Paths"); selectPathButton.addActionListener(e -> { - JFileChooser pathSelector = new JFileChooser(); + Config instanceDir = ModCheckUtils.readConfig(); + JFileChooser pathSelector = instanceDir == null ? new JFileChooser() : new JFileChooser(instanceDir.getDir()); pathSelector.setMultiSelectionEnabled(true); pathSelector.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); pathSelector.setDialogType(JFileChooser.CUSTOM_DIALOG); @@ -111,6 +113,7 @@ public Object getItem() { } selectedDirLabel.setText("Selected Instances :
" + stringBuilder.substring(0, stringBuilder.length() - (stringBuilder.length() != 0 ? 2 : 0)) + ""); } + ModCheckUtils.writeConfig(files[0].getParentFile()); }); instanceSelectPanel.add(selectPathButton); diff --git a/src/main/java/com/pistacium/modcheck/util/Config.java b/src/main/java/com/pistacium/modcheck/util/Config.java new file mode 100644 index 0000000..4b72ec5 --- /dev/null +++ b/src/main/java/com/pistacium/modcheck/util/Config.java @@ -0,0 +1,15 @@ +package com.pistacium.modcheck.util; + +import java.io.File; + +public class Config { + final String filepath; + + public Config(String filepath) { + this.filepath = filepath; + } + + public File getDir() { + return new File(filepath); + } +} diff --git a/src/main/java/com/pistacium/modcheck/util/ModCheckUtils.java b/src/main/java/com/pistacium/modcheck/util/ModCheckUtils.java index a4ac66c..9adc2dd 100644 --- a/src/main/java/com/pistacium/modcheck/util/ModCheckUtils.java +++ b/src/main/java/com/pistacium/modcheck/util/ModCheckUtils.java @@ -1,7 +1,7 @@ package com.pistacium.modcheck.util; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; +import com.google.gson.*; +import com.pistacium.modcheck.ModCheck; import java.io.*; import java.net.HttpURLConnection; @@ -75,4 +75,34 @@ public static String getAPIUrl(String url, String type) { return url; } + + public static Config readConfig() { + Gson gson = new Gson(); + File file = new File("modcheck.json"); + if (!file.exists()) { + return null; + } + BufferedReader br = null; + try { + br = new BufferedReader(new FileReader(file)); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + assert br != null; + return gson.fromJson(br, Config.class); + } + + public static void writeConfig(File dir) { + File file = new File("modcheck.json"); + Config config = new Config(dir.getPath()); + try (Writer writer = new FileWriter(file)) { + Gson gson = new GsonBuilder() + .setPrettyPrinting() + .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES) + .create(); + gson.toJson(config, writer); + } catch (IOException e) { + throw new RuntimeException(e); + } + } } From b0c7c60f1dc32458516679a9fa9e26eeac6a7abc Mon Sep 17 00:00:00 2001 From: tildejustin Date: Thu, 2 Mar 2023 21:44:27 -0500 Subject: [PATCH 2/4] ... --- README.md | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index 1e48974..0000000 --- a/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# ModCheck -![ModCheck](https://cdn.7tv.app/emote/60eefb20119bd109472f7f4b/4x) - -Minecraft SpeedRun Mods Auto Installer/Updater - -original idea by [pistacium](https://github.com/pistacium/ModCheck) - -![image](https://user-images.githubusercontent.com/25276450/172102912-455735a5-558f-4330-84c6-fad5bf9aa92b.png) From 20a5e2eebcd905184ed4a14263e35330b54cf784 Mon Sep 17 00:00:00 2001 From: tildejustin Date: Sun, 9 Apr 2023 21:20:29 -0400 Subject: [PATCH 3/4] Revert "..." This reverts commit b0c7c60f1dc32458516679a9fa9e26eeac6a7abc. --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..1e48974 --- /dev/null +++ b/README.md @@ -0,0 +1,8 @@ +# ModCheck +![ModCheck](https://cdn.7tv.app/emote/60eefb20119bd109472f7f4b/4x) + +Minecraft SpeedRun Mods Auto Installer/Updater + +original idea by [pistacium](https://github.com/pistacium/ModCheck) + +![image](https://user-images.githubusercontent.com/25276450/172102912-455735a5-558f-4330-84c6-fad5bf9aa92b.png) From e9a727f175bbf83b498def58f73635cf59f193de Mon Sep 17 00:00:00 2001 From: tildejustin Date: Sun, 9 Apr 2023 21:35:29 -0400 Subject: [PATCH 4/4] version bump --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c9bba55..9cd0703 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group 'com.redlimerl' -version '0.5.3' +version '0.5.4' repositories { mavenCentral() }