diff --git a/src/main/java/xyz/jeddunk/autocreamapi/Controller.java b/src/main/java/xyz/jeddunk/autocreamapi/Controller.java index bfd8933..5f64732 100644 --- a/src/main/java/xyz/jeddunk/autocreamapi/Controller.java +++ b/src/main/java/xyz/jeddunk/autocreamapi/Controller.java @@ -96,6 +96,8 @@ public class Controller implements Initializable { @FXML public CheckBox unlock_all_checkbox; @FXML + public CheckBox use_steamdb_dlc; + @FXML public Button reset_button; @FXML public Button save_button; @@ -113,6 +115,7 @@ public class Controller implements Initializable { @FXML @Override public void initialize(URL location, ResourceBundle resources) { + use_steamdb_dlc.setSelected(true); appId_textfield.textProperty().addListener(appIdChangesGameName()); game_name_textfield.setOnKeyReleased(event -> { KeyCode code = event.getCode(); @@ -338,7 +341,8 @@ public class Controller implements Initializable { return new Task() { @Override protected Void call() { - Map collect = cache.getDlcMap(appId_textfield.getText()); + Map collect = + cache.getDlcMap(appId_textfield.getText(), use_steamdb_dlc.isSelected()); StringBuilder sb = new StringBuilder(); collect.forEach((k, v) -> sb.append(k).append("=").append(v).append("\n")); dlc_textarea.setText(sb.toString()); diff --git a/src/main/java/xyz/jeddunk/autocreamapi/Main.java b/src/main/java/xyz/jeddunk/autocreamapi/Main.java index 16130bc..207708a 100644 --- a/src/main/java/xyz/jeddunk/autocreamapi/Main.java +++ b/src/main/java/xyz/jeddunk/autocreamapi/Main.java @@ -24,7 +24,7 @@ import javafx.stage.Stage; public class Main extends Application { private static final int MIN_WIDTH = 905; - private static final int MIN_HEIGHT = 400; + private static final int MIN_HEIGHT = 450; private static final int PREF_WIDTH = 1200; private static final int PREF_HEIGHT = 600; diff --git a/src/main/java/xyz/jeddunk/autocreamapi/util/SteamAppsListCache.java b/src/main/java/xyz/jeddunk/autocreamapi/util/SteamAppsListCache.java index 426d8b2..d9ed9a7 100644 --- a/src/main/java/xyz/jeddunk/autocreamapi/util/SteamAppsListCache.java +++ b/src/main/java/xyz/jeddunk/autocreamapi/util/SteamAppsListCache.java @@ -125,27 +125,27 @@ public class SteamAppsListCache { } private void saveListToFile() throws IOException { - System.out.println("Trying to save SteamAppList to file (" + cacheFile.getAbsolutePath() + ")..."); + System.out.println("Trying to save SteamAppList to file \"" + cacheFile.getAbsolutePath() + "\"..."); Gson gson = new Gson(); String jsonString = gson.toJson(list); BufferedWriter fOut = new BufferedWriter(new FileWriter(cacheFile)); fOut.write(jsonString); fOut.close(); - System.out.println("Successfully saved SteamAppList to file (" + cacheFile.getAbsolutePath() + ")..."); + System.out.println("Successfully saved SteamAppList to file \"" + cacheFile.getAbsolutePath() + "\"..."); } private void getListFromFile() throws FileNotFoundException, JsonSyntaxException { - System.out.println("Trying to get SteamAppList from file (" + cacheFile.getAbsolutePath() + ")..."); + System.out.println("Trying to get SteamAppList from file \"" + cacheFile.getAbsolutePath() + "\"..."); BufferedReader fIn = new BufferedReader(new FileReader(cacheFile)); String json = fIn.lines().collect(Collectors.joining()); final Type type = new TypeToken() { }.getType(); Gson gson = new Gson(); list = gson.fromJson(json, type); - System.out.println("Successfully got SteamAppList from file (" + cacheFile.getAbsolutePath() + ")..."); + System.out.println("Successfully got SteamAppList from file \"" + cacheFile.getAbsolutePath() + "\"..."); } - public Map getDlcMap(String appId) { + public Map getDlcMap(String appId, boolean use_steamdb) { Map steamStoreDLCs = new HashMap<>(); Map steamDbDLCs = new HashMap<>(); //StringBuilder sb = new StringBuilder(); @@ -176,32 +176,34 @@ public class SteamAppsListCache { } // SteamDB - try { - Document steamDbDoc = Jsoup - .connect("https://steamdb.info/app/" + appId + "/dlc/") - .userAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:76.0) Gecko/20100101 Firefox/76.0") - .get(); - Element steamDbDlcSection = steamDbDoc.getElementById("dlc"); - Elements steamDbDLCElements = steamDbDlcSection.getElementsByClass("app"); - for (Element dlc : steamDbDLCElements) { - String dlc_id = dlc.attr("data-appid"); - String dlc_name = "Unknown DLC " + dlc_id; - Elements td = dlc.getElementsByTag("td"); - if (!td.isEmpty()) { - dlc_name = td.get(1).text().replace("\n", "").trim(); + if (use_steamdb) { + try { + Document steamDbDoc = Jsoup + .connect("https://steamdb.info/app/" + appId + "/dlc/") + .userAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Firefox/78.0") + .get(); + Element steamDbDlcSection = steamDbDoc.getElementById("dlc"); + Elements steamDbDLCElements = steamDbDlcSection.getElementsByClass("app"); + for (Element dlc : steamDbDLCElements) { + String dlc_id = dlc.attr("data-appid"); + String dlc_name = "Unknown DLC " + dlc_id; + Elements td = dlc.getElementsByTag("td"); + if (!td.isEmpty()) { + dlc_name = td.get(1).text().replace("\n", "").trim(); + } + steamDbDLCs.put(Integer.parseInt(dlc_id), dlc_name); } - steamDbDLCs.put(Integer.parseInt(dlc_id), dlc_name); + } catch (HttpStatusException e) { + if (e.getStatusCode() == 404) { + System.err.println("App ID empty or not found! (HTTP Status Code: 404)"); + } else { + System.err.printf("Error occurred while trying to get list of DLCs " + + "(HTTP Status Code: %d)%n", e.getStatusCode()); + } + System.err.println(e.getUrl()); + } catch (NullPointerException | IOException e) { + // ignore } - } catch (HttpStatusException e) { - if (e.getStatusCode() == 404) { - System.err.println("App ID empty or not found! (HTTP Status Code: 404)"); - } else { - System.err.printf("Error occurred while trying to get list of DLCs " + - "(HTTP Status Code: %d)%n", e.getStatusCode()); - } - System.err.println(e.getUrl()); - } catch (NullPointerException | IOException e) { - // ignore } Map allDLCs = new HashMap<>(steamStoreDLCs); diff --git a/src/main/resources/fonts/roboto-condensed/LICENSE.txt b/src/main/resources/fonts/roboto-condensed/LICENSE.txt new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/src/main/resources/fonts/roboto-condensed/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/src/main/resources/fonts/roboto-condensed/RobotoCondensed-Bold.ttf b/src/main/resources/fonts/roboto-condensed/RobotoCondensed-Bold.ttf new file mode 100644 index 0000000..7fe3128 Binary files /dev/null and b/src/main/resources/fonts/roboto-condensed/RobotoCondensed-Bold.ttf differ diff --git a/src/main/resources/fonts/roboto-condensed/RobotoCondensed-BoldItalic.ttf b/src/main/resources/fonts/roboto-condensed/RobotoCondensed-BoldItalic.ttf new file mode 100644 index 0000000..52ef6f3 Binary files /dev/null and b/src/main/resources/fonts/roboto-condensed/RobotoCondensed-BoldItalic.ttf differ diff --git a/src/main/resources/fonts/roboto-condensed/RobotoCondensed-Italic.ttf b/src/main/resources/fonts/roboto-condensed/RobotoCondensed-Italic.ttf new file mode 100644 index 0000000..12216d6 Binary files /dev/null and b/src/main/resources/fonts/roboto-condensed/RobotoCondensed-Italic.ttf differ diff --git a/src/main/resources/fonts/roboto-condensed/RobotoCondensed-Light.ttf b/src/main/resources/fonts/roboto-condensed/RobotoCondensed-Light.ttf new file mode 100644 index 0000000..43dd8f4 Binary files /dev/null and b/src/main/resources/fonts/roboto-condensed/RobotoCondensed-Light.ttf differ diff --git a/src/main/resources/fonts/roboto-condensed/RobotoCondensed-LightItalic.ttf b/src/main/resources/fonts/roboto-condensed/RobotoCondensed-LightItalic.ttf new file mode 100644 index 0000000..99d491b Binary files /dev/null and b/src/main/resources/fonts/roboto-condensed/RobotoCondensed-LightItalic.ttf differ diff --git a/src/main/resources/fonts/roboto-condensed/RobotoCondensed-Regular.ttf b/src/main/resources/fonts/roboto-condensed/RobotoCondensed-Regular.ttf new file mode 100644 index 0000000..62dd61e Binary files /dev/null and b/src/main/resources/fonts/roboto-condensed/RobotoCondensed-Regular.ttf differ diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-Bold.ttf b/src/main/resources/fonts/roboto-mono/RobotoMono-Bold.ttf new file mode 100644 index 0000000..900fce6 Binary files /dev/null and b/src/main/resources/fonts/roboto-mono/RobotoMono-Bold.ttf differ diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-BoldItalic.ttf b/src/main/resources/fonts/roboto-mono/RobotoMono-BoldItalic.ttf new file mode 100644 index 0000000..4bfe29a Binary files /dev/null and b/src/main/resources/fonts/roboto-mono/RobotoMono-BoldItalic.ttf differ diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-ExtraLight.ttf b/src/main/resources/fonts/roboto-mono/RobotoMono-ExtraLight.ttf new file mode 100644 index 0000000..d535884 Binary files /dev/null and b/src/main/resources/fonts/roboto-mono/RobotoMono-ExtraLight.ttf differ diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-ExtraLightItalic.ttf b/src/main/resources/fonts/roboto-mono/RobotoMono-ExtraLightItalic.ttf new file mode 100644 index 0000000..b28960a Binary files /dev/null and b/src/main/resources/fonts/roboto-mono/RobotoMono-ExtraLightItalic.ttf differ diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-Italic.ttf b/src/main/resources/fonts/roboto-mono/RobotoMono-Italic.ttf new file mode 100644 index 0000000..4ee4dc4 Binary files /dev/null and b/src/main/resources/fonts/roboto-mono/RobotoMono-Italic.ttf differ diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-Light.ttf b/src/main/resources/fonts/roboto-mono/RobotoMono-Light.ttf new file mode 100644 index 0000000..276af4c Binary files /dev/null and b/src/main/resources/fonts/roboto-mono/RobotoMono-Light.ttf differ diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-LightItalic.ttf b/src/main/resources/fonts/roboto-mono/RobotoMono-LightItalic.ttf new file mode 100644 index 0000000..a2801c2 Binary files /dev/null and b/src/main/resources/fonts/roboto-mono/RobotoMono-LightItalic.ttf differ diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-Medium.ttf b/src/main/resources/fonts/roboto-mono/RobotoMono-Medium.ttf new file mode 100644 index 0000000..8461be7 Binary files /dev/null and b/src/main/resources/fonts/roboto-mono/RobotoMono-Medium.ttf differ diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-MediumItalic.ttf b/src/main/resources/fonts/roboto-mono/RobotoMono-MediumItalic.ttf new file mode 100644 index 0000000..a3bfaa1 Binary files /dev/null and b/src/main/resources/fonts/roboto-mono/RobotoMono-MediumItalic.ttf differ diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-Regular.ttf b/src/main/resources/fonts/roboto-mono/RobotoMono-Regular.ttf new file mode 100644 index 0000000..7c4ce36 Binary files /dev/null and b/src/main/resources/fonts/roboto-mono/RobotoMono-Regular.ttf differ diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-SemiBold.ttf b/src/main/resources/fonts/roboto-mono/RobotoMono-SemiBold.ttf new file mode 100644 index 0000000..15ee6c6 Binary files /dev/null and b/src/main/resources/fonts/roboto-mono/RobotoMono-SemiBold.ttf differ diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-SemiBoldItalic.ttf b/src/main/resources/fonts/roboto-mono/RobotoMono-SemiBoldItalic.ttf new file mode 100644 index 0000000..8e21497 Binary files /dev/null and b/src/main/resources/fonts/roboto-mono/RobotoMono-SemiBoldItalic.ttf differ diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-Thin.ttf b/src/main/resources/fonts/roboto-mono/RobotoMono-Thin.ttf new file mode 100644 index 0000000..ee8a3fd Binary files /dev/null and b/src/main/resources/fonts/roboto-mono/RobotoMono-Thin.ttf differ diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-ThinItalic.ttf b/src/main/resources/fonts/roboto-mono/RobotoMono-ThinItalic.ttf new file mode 100644 index 0000000..40b01e4 Binary files /dev/null and b/src/main/resources/fonts/roboto-mono/RobotoMono-ThinItalic.ttf differ diff --git a/src/main/resources/mainWindow.fxml b/src/main/resources/mainWindow.fxml index 2a0bd35..44f9a74 100644 --- a/src/main/resources/mainWindow.fxml +++ b/src/main/resources/mainWindow.fxml @@ -6,8 +6,10 @@ + + @@ -29,123 +31,114 @@ ~ . --> - - +
- + - - - + + + - - - - - - - - + + + + + + + - + - - + + + + + + + + + + + + + + + + + - + - - + + - + - - - - - - - - - + + + + + + + - + - +
- - + - + - - + + - + - - + - \ No newline at end of file + diff --git a/src/main/resources/stylesheet.css b/src/main/resources/stylesheet.css index 5c463fd..c08505d 100644 --- a/src/main/resources/stylesheet.css +++ b/src/main/resources/stylesheet.css @@ -13,6 +13,46 @@ * . */ + +@font-face { + font-family: 'Roboto Condensed', sans-serif; + src: url("fonts/roboto-condensed/RobotoCondensed-Regular.ttf"); +} + +@font-face { + font-family: 'Roboto Condensed', sans-serif; + font-weight: bold; + src: url("fonts/roboto-condensed/RobotoCondensed-Bold.ttf"); +} + +@font-face { + font-family: 'Roboto Condensed', sans-serif; + font-weight: italic; + src: url("fonts/roboto-condensed/RobotoCondensed-Italic.ttf"); +} + +@font-face { + font-family: 'Roboto Mono', monospace; + src: url("fonts/roboto-mono/RobotoMono-Regular.ttf"); +} + +@font-face { + font-family: 'Roboto Mono', monospace; + font-weight: bold; + src: url("fonts/roboto-mono/RobotoMono-Bold.ttf"); +} + +@font-face { + font-family: 'Roboto Mono', monospace; + font-weight: italic; + src: url("fonts/roboto-mono/RobotoMono-Italic.ttf"); +} + +* { + -fx-font-family: 'Roboto Condensed', sans-serif; + -fx-font-size: 14px; +} + JFXButton { -fx-background-color: #ddd; } @@ -20,4 +60,12 @@ JFXButton { #state_label { -fx-background-color: #ddd; -fx-border-color: #aaa; +} + +#dlc_textarea { + -fx-font-family: 'Roboto Mono', sans-serif; +} + +.dlcSettings > .title { + -fx-background-color: #ddd; } \ No newline at end of file