Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: hyperdefined/CustomLauncherRewrite
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.9.2
Choose a base ref
...
head repository: hyperdefined/CustomLauncherRewrite
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Jun 26, 2024

  1. Copy the full SHA
    46fdbdb View commit details
  2. Copy the full SHA
    a699ec3 View commit details
  3. make the uninstaller better

    - fix #101
    - fix the prompt not appearing
    hyperdefined committed Jun 26, 2024
    Copy the full SHA
    040df94 View commit details

Commits on Jun 27, 2024

  1. Copy the full SHA
    84d98cc View commit details
  2. Copy the full SHA
    486620c View commit details
  3. Copy the full SHA
    436db1f View commit details

Commits on Jul 18, 2024

  1. Bump org.apache.commons:commons-lang3 from 3.14.0 to 3.15.0

    Bumps org.apache.commons:commons-lang3 from 3.14.0 to 3.15.0.
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.commons:commons-lang3
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Jul 18, 2024
    Copy the full SHA
    085591f View commit details

Commits on Jul 25, 2024

  1. Merge pull request #103 from hyperdefined/dependabot/maven/org.apache…

    ….commons-commons-lang3-3.15.0
    
    Bump org.apache.commons:commons-lang3 from 3.14.0 to 3.15.0
    hyperdefined authored Jul 25, 2024
    Copy the full SHA
    c903c08 View commit details

Commits on Aug 20, 2024

  1. Bump org.apache.commons:commons-compress from 1.26.2 to 1.27.1

    Bumps org.apache.commons:commons-compress from 1.26.2 to 1.27.1.
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.commons:commons-compress
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Aug 20, 2024
    Copy the full SHA
    dff2ee2 View commit details

Commits on Aug 30, 2024

  1. Bump org.apache.commons:commons-lang3 from 3.15.0 to 3.17.0

    Bumps org.apache.commons:commons-lang3 from 3.15.0 to 3.17.0.
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.commons:commons-lang3
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Aug 30, 2024
    Copy the full SHA
    19865ab View commit details

Commits on Sep 9, 2024

  1. Bump org.apache.logging.log4j:log4j-core from 2.23.1 to 2.24.0

    Bumps org.apache.logging.log4j:log4j-core from 2.23.1 to 2.24.0.
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.logging.log4j:log4j-core
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Sep 9, 2024
    Copy the full SHA
    61b29ac View commit details

Commits on Sep 17, 2024

  1. Merge pull request #108 from hyperdefined/dependabot/maven/org.apache…

    ….logging.log4j-log4j-core-2.24.0
    
    Bump org.apache.logging.log4j:log4j-core from 2.23.1 to 2.24.0
    hyperdefined authored Sep 17, 2024
    Copy the full SHA
    8c8c282 View commit details
  2. Merge pull request #106 from hyperdefined/dependabot/maven/org.apache…

    ….commons-commons-compress-1.27.1
    
    Bump org.apache.commons:commons-compress from 1.26.2 to 1.27.1
    hyperdefined authored Sep 17, 2024
    Copy the full SHA
    5a67ebe View commit details
  3. Merge pull request #107 from hyperdefined/dependabot/maven/org.apache…

    ….commons-commons-lang3-3.17.0
    
    Bump org.apache.commons:commons-lang3 from 3.15.0 to 3.17.0
    hyperdefined authored Sep 17, 2024
    Copy the full SHA
    ee60c8a View commit details

Commits on Sep 19, 2024

  1. Bump commons-io:commons-io from 2.16.1 to 2.17.0

    Bumps commons-io:commons-io from 2.16.1 to 2.17.0.
    
    ---
    updated-dependencies:
    - dependency-name: commons-io:commons-io
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Sep 19, 2024
    Copy the full SHA
    a642220 View commit details

Commits on Sep 20, 2024

  1. Bump org.apache.httpcomponents.client5:httpclient5 from 5.3.1 to 5.4

    Bumps [org.apache.httpcomponents.client5:httpclient5](https://github.com/apache/httpcomponents-client) from 5.3.1 to 5.4.
    - [Changelog](https://github.com/apache/httpcomponents-client/blob/master/RELEASE_NOTES.txt)
    - [Commits](apache/httpcomponents-client@rel/v5.3.1...rel/v5.4)
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.httpcomponents.client5:httpclient5
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Sep 20, 2024
    Copy the full SHA
    df66fa2 View commit details

Commits on Sep 30, 2024

  1. Bump org.apache.logging.log4j:log4j-core from 2.24.0 to 2.24.1

    Bumps org.apache.logging.log4j:log4j-core from 2.24.0 to 2.24.1.
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.logging.log4j:log4j-core
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Sep 30, 2024
    Copy the full SHA
    765241d View commit details

Commits on Oct 7, 2024

  1. Bump com.akathist.maven.plugins.launch4j:launch4j-maven-plugin

    Bumps [com.akathist.maven.plugins.launch4j:launch4j-maven-plugin](https://github.com/orphan-oss/launch4j-maven-plugin) from 2.5.1 to 2.5.2.
    - [Release notes](https://github.com/orphan-oss/launch4j-maven-plugin/releases)
    - [Commits](orphan-oss/launch4j-maven-plugin@launch4j-maven-plugin-2.5.1...launch4j-maven-plugin-2.5.2)
    
    ---
    updated-dependencies:
    - dependency-name: com.akathist.maven.plugins.launch4j:launch4j-maven-plugin
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Oct 7, 2024
    Copy the full SHA
    cbbd020 View commit details

Commits on Oct 14, 2024

  1. Bump org.jetbrains:annotations from 24.1.0 to 26.0.1

    Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.1.0 to 26.0.1.
    - [Release notes](https://github.com/JetBrains/java-annotations/releases)
    - [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
    - [Commits](JetBrains/java-annotations@24.1.0...26.0.1)
    
    ---
    updated-dependencies:
    - dependency-name: org.jetbrains:annotations
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Oct 14, 2024
    Copy the full SHA
    741d893 View commit details

Commits on Oct 21, 2024

  1. Copy the full SHA
    aa17c4d View commit details
  2. Merge pull request #109 from hyperdefined/dependabot/maven/commons-io…

    …-commons-io-2.17.0
    
    Bump commons-io:commons-io from 2.16.1 to 2.17.0
    hyperdefined authored Oct 21, 2024
    Copy the full SHA
    a81d566 View commit details
  3. Merge pull request #110 from hyperdefined/dependabot/maven/org.apache…

    ….httpcomponents.client5-httpclient5-5.4
    
    Bump org.apache.httpcomponents.client5:httpclient5 from 5.3.1 to 5.4
    hyperdefined authored Oct 21, 2024
    Copy the full SHA
    04bd11d View commit details
  4. Merge pull request #112 from hyperdefined/dependabot/maven/org.apache…

    ….logging.log4j-log4j-core-2.24.1
    
    Bump org.apache.logging.log4j:log4j-core from 2.24.0 to 2.24.1
    hyperdefined authored Oct 21, 2024
    Copy the full SHA
    a92c4f3 View commit details
  5. Merge pull request #113 from hyperdefined/dependabot/maven/com.akathi…

    …st.maven.plugins.launch4j-launch4j-maven-plugin-2.5.2
    
    Bump com.akathist.maven.plugins.launch4j:launch4j-maven-plugin from 2.5.1 to 2.5.2
    hyperdefined authored Oct 21, 2024
    Copy the full SHA
    d205a68 View commit details
  6. Merge pull request #115 from hyperdefined/dependabot/maven/org.jetbra…

    …ins-annotations-26.0.1
    
    Bump org.jetbrains:annotations from 24.1.0 to 26.0.1
    hyperdefined authored Oct 21, 2024
    Copy the full SHA
    101c9d2 View commit details
  7. update to java 21

    hyperdefined committed Oct 21, 2024
    Copy the full SHA
    d60e887 View commit details

Commits on Oct 29, 2024

  1. Bump org.apache.httpcomponents.client5:httpclient5 from 5.4 to 5.4.1

    Bumps [org.apache.httpcomponents.client5:httpclient5](https://github.com/apache/httpcomponents-client) from 5.4 to 5.4.1.
    - [Changelog](https://github.com/apache/httpcomponents-client/blob/rel/v5.4.1/RELEASE_NOTES.txt)
    - [Commits](apache/httpcomponents-client@rel/v5.4...rel/v5.4.1)
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.httpcomponents.client5:httpclient5
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Oct 29, 2024
    Copy the full SHA
    0c375b2 View commit details

Commits on Nov 20, 2024

  1. Bump commons-io:commons-io from 2.17.0 to 2.18.0

    Bumps commons-io:commons-io from 2.17.0 to 2.18.0.
    
    ---
    updated-dependencies:
    - dependency-name: commons-io:commons-io
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Nov 20, 2024
    Copy the full SHA
    11e065f View commit details

Commits on Nov 22, 2024

  1. Bump org.apache.logging.log4j:log4j-core from 2.24.1 to 2.24.2

    Bumps org.apache.logging.log4j:log4j-core from 2.24.1 to 2.24.2.
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.logging.log4j:log4j-core
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Nov 22, 2024
    Copy the full SHA
    032e602 View commit details

Commits on Dec 5, 2024

  1. Merge pull request #119 from hyperdefined/dependabot/maven/org.apache…

    ….logging.log4j-log4j-core-2.24.2
    
    Bump org.apache.logging.log4j:log4j-core from 2.24.1 to 2.24.2
    hyperdefined authored Dec 5, 2024
    Copy the full SHA
    c67e243 View commit details
  2. Merge pull request #118 from hyperdefined/dependabot/maven/commons-io…

    …-commons-io-2.18.0
    
    Bump commons-io:commons-io from 2.17.0 to 2.18.0
    hyperdefined authored Dec 5, 2024
    Copy the full SHA
    fba1604 View commit details
  3. Merge pull request #117 from hyperdefined/dependabot/maven/org.apache…

    ….httpcomponents.client5-httpclient5-5.4.1
    
    Bump org.apache.httpcomponents.client5:httpclient5 from 5.4 to 5.4.1
    hyperdefined authored Dec 5, 2024
    Copy the full SHA
    ca577c1 View commit details

Commits on Dec 16, 2024

  1. Bump org.apache.logging.log4j:log4j-core from 2.24.2 to 2.24.3

    Bumps org.apache.logging.log4j:log4j-core from 2.24.2 to 2.24.3.
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.logging.log4j:log4j-core
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Dec 16, 2024
    Copy the full SHA
    fb0ae60 View commit details
  2. Merge pull request #120 from hyperdefined/dependabot/maven/org.apache…

    ….logging.log4j-log4j-core-2.24.3
    
    Bump org.apache.logging.log4j:log4j-core from 2.24.2 to 2.24.3
    hyperdefined authored Dec 16, 2024
    Copy the full SHA
    29ce380 View commit details

Commits on Jan 8, 2025

  1. Bump org.json:json from 20240303 to 20250107

    Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20240303 to 20250107.
    - [Release notes](https://github.com/douglascrockford/JSON-java/releases)
    - [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
    - [Commits](https://github.com/douglascrockford/JSON-java/commits)
    
    ---
    updated-dependencies:
    - dependency-name: org.json:json
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Jan 8, 2025
    Copy the full SHA
    38183aa View commit details

Commits on Jan 23, 2025

  1. Bump org.jetbrains:annotations from 26.0.1 to 26.0.2

    Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 26.0.1 to 26.0.2.
    - [Release notes](https://github.com/JetBrains/java-annotations/releases)
    - [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
    - [Commits](JetBrains/java-annotations@26.0.1...26.0.2)
    
    ---
    updated-dependencies:
    - dependency-name: org.jetbrains:annotations
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Jan 23, 2025
    Copy the full SHA
    7949cd4 View commit details

Commits on Jan 30, 2025

  1. Bump com.akathist.maven.plugins.launch4j:launch4j-maven-plugin

    Bumps [com.akathist.maven.plugins.launch4j:launch4j-maven-plugin](https://github.com/orphan-oss/launch4j-maven-plugin) from 2.5.2 to 2.5.3.
    - [Release notes](https://github.com/orphan-oss/launch4j-maven-plugin/releases)
    - [Commits](orphan-oss/launch4j-maven-plugin@launch4j-maven-plugin-2.5.2...launch4j-maven-plugin-2.5.3)
    
    ---
    updated-dependencies:
    - dependency-name: com.akathist.maven.plugins.launch4j:launch4j-maven-plugin
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Jan 30, 2025
    Copy the full SHA
    78bf0d4 View commit details

Commits on Feb 11, 2025

  1. Update FirstLaunch.java

    hyperdefined committed Feb 11, 2025
    Copy the full SHA
    8e97c32 View commit details
  2. Update PopUpWindow.java

    hyperdefined committed Feb 11, 2025
    Copy the full SHA
    d2bc37f View commit details

Commits on Feb 19, 2025

  1. Bump org.apache.maven.plugins:maven-clean-plugin from 3.4.0 to 3.4.1

    Bumps [org.apache.maven.plugins:maven-clean-plugin](https://github.com/apache/maven-clean-plugin) from 3.4.0 to 3.4.1.
    - [Release notes](https://github.com/apache/maven-clean-plugin/releases)
    - [Commits](apache/maven-clean-plugin@maven-clean-plugin-3.4.0...maven-clean-plugin-3.4.1)
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.maven.plugins:maven-clean-plugin
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Feb 19, 2025
    Copy the full SHA
    f11e483 View commit details

Commits on Feb 21, 2025

  1. Bump org.apache.maven.plugins:maven-compiler-plugin

    Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.13.0 to 3.14.0.
    - [Release notes](https://github.com/apache/maven-compiler-plugin/releases)
    - [Commits](apache/maven-compiler-plugin@maven-compiler-plugin-3.13.0...maven-compiler-plugin-3.14.0)
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.maven.plugins:maven-compiler-plugin
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Feb 21, 2025
    Copy the full SHA
    7306f70 View commit details

Commits on Mar 27, 2025

  1. Bump org.apache.httpcomponents.client5:httpclient5 from 5.4.1 to 5.4.3

    Bumps [org.apache.httpcomponents.client5:httpclient5](https://github.com/apache/httpcomponents-client) from 5.4.1 to 5.4.3.
    - [Changelog](https://github.com/apache/httpcomponents-client/blob/rel/v5.4.3/RELEASE_NOTES.txt)
    - [Commits](apache/httpcomponents-client@rel/v5.4.1...rel/v5.4.3)
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.httpcomponents.client5:httpclient5
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Mar 27, 2025
    Copy the full SHA
    a1a25c8 View commit details

Commits on Mar 28, 2025

  1. Merge pull request #128 from hyperdefined/dependabot/maven/org.apache…

    ….httpcomponents.client5-httpclient5-5.4.3
    
    Bump org.apache.httpcomponents.client5:httpclient5 from 5.4.1 to 5.4.3
    hyperdefined authored Mar 28, 2025
    Copy the full SHA
    9ab8b9e View commit details
  2. Merge pull request #127 from hyperdefined/dependabot/maven/org.apache…

    ….maven.plugins-maven-compiler-plugin-3.14.0
    
    Bump org.apache.maven.plugins:maven-compiler-plugin from 3.13.0 to 3.14.0
    hyperdefined authored Mar 28, 2025
    Copy the full SHA
    6c6ec7a View commit details
  3. Merge pull request #126 from hyperdefined/dependabot/maven/org.apache…

    ….maven.plugins-maven-clean-plugin-3.4.1
    
    Bump org.apache.maven.plugins:maven-clean-plugin from 3.4.0 to 3.4.1
    hyperdefined authored Mar 28, 2025
    Copy the full SHA
    cf8d334 View commit details
  4. Merge pull request #124 from hyperdefined/dependabot/maven/com.akathi…

    …st.maven.plugins.launch4j-launch4j-maven-plugin-2.5.3
    
    Bump com.akathist.maven.plugins.launch4j:launch4j-maven-plugin from 2.5.2 to 2.5.3
    hyperdefined authored Mar 28, 2025
    Copy the full SHA
    de18f6e View commit details
  5. Merge pull request #123 from hyperdefined/dependabot/maven/org.jetbra…

    …ins-annotations-26.0.2
    
    Bump org.jetbrains:annotations from 26.0.1 to 26.0.2
    hyperdefined authored Mar 28, 2025
    Copy the full SHA
    e6defc0 View commit details
  6. Merge pull request #122 from hyperdefined/dependabot/maven/org.json-j…

    …son-20250107
    
    Bump org.json:json from 20240303 to 20250107
    hyperdefined authored Mar 28, 2025
    Copy the full SHA
    e289926 View commit details

Commits on Apr 14, 2025

  1. Bump commons-io:commons-io from 2.18.0 to 2.19.0

    Bumps commons-io:commons-io from 2.18.0 to 2.19.0.
    
    ---
    updated-dependencies:
    - dependency-name: commons-io:commons-io
      dependency-version: 2.19.0
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Apr 14, 2025
    Copy the full SHA
    c64f481 View commit details

Commits on Apr 16, 2025

  1. Merge pull request #129 from hyperdefined/dependabot/maven/commons-io…

    …-commons-io-2.19.0
    
    Bump commons-io:commons-io from 2.18.0 to 2.19.0
    hyperdefined authored Apr 16, 2025
    Copy the full SHA
    b93a750 View commit details
Showing with 825 additions and 341 deletions.
  1. +1 −1 README.md
  2. +1 −1 linux/customlauncherrewrite.desktop
  3. +12 −8 linux/installer.sh
  4. +13 −1 linux/run.sh
  5. +35 −11 linux/uninstaller.sh
  6. +12 −27 pom.xml
  7. +7 −7 src/main/java/lol/hyper/customlauncher/ConfigHandler.java
  8. +38 −11 src/main/java/lol/hyper/customlauncher/CustomLauncherRewrite.java
  9. +6 −3 src/main/java/lol/hyper/customlauncher/FirstLaunch.java
  10. +4 −4 src/main/java/lol/hyper/customlauncher/accounts/Accounts.java
  11. +10 −2 src/main/java/lol/hyper/customlauncher/districts/DistrictTrackerPanel.java
  12. +1 −1 src/main/java/lol/hyper/customlauncher/fieldoffices/FieldOffice.java
  13. +23 −5 src/main/java/lol/hyper/customlauncher/fieldoffices/FieldOfficeTrackerPanel.java
  14. +41 −1 src/main/java/lol/hyper/customlauncher/invasions/Invasion.java
  15. +132 −45 src/main/java/lol/hyper/customlauncher/invasions/InvasionTrackerPanel.java
  16. +14 −7 src/main/java/lol/hyper/customlauncher/login/LaunchGame.java
  17. +40 −46 src/main/java/lol/hyper/customlauncher/login/LoginHandler.java
  18. +5 −2 src/main/java/lol/hyper/customlauncher/login/windows/TwoFactorAuth.java
  19. +2 −2 src/main/java/lol/hyper/customlauncher/releasenotes/ReleaseNotesTracker.java
  20. +5 −2 src/main/java/lol/hyper/customlauncher/releasenotes/ReleaseNotesWindow.java
  21. +11 −7 src/main/java/lol/hyper/customlauncher/tools/ExceptionWindow.java
  22. +76 −41 src/main/java/lol/hyper/customlauncher/tools/JSONUtils.java
  23. +17 −8 src/main/java/lol/hyper/customlauncher/tools/OSDetection.java
  24. +7 −2 src/main/java/lol/hyper/customlauncher/tools/PopUpWindow.java
  25. +182 −0 src/main/java/lol/hyper/customlauncher/toondata/ToonDataPanel.java
  26. +73 −54 src/main/java/lol/hyper/customlauncher/ttrupdater/TTRUpdater.java
  27. +14 −14 src/main/java/lol/hyper/customlauncher/updater/UpdateChecker.java
  28. +3 −3 src/main/java/lol/hyper/customlauncher/windows/AboutPanel.java
  29. +5 −2 src/main/java/lol/hyper/customlauncher/windows/AccountManagerWindow.java
  30. +3 −3 src/main/java/lol/hyper/customlauncher/windows/DeleteAccountWindow.java
  31. +25 −13 src/main/java/lol/hyper/customlauncher/windows/MainWindow.java
  32. +4 −4 src/main/java/lol/hyper/customlauncher/windows/NewAccountWindow.java
  33. +2 −2 src/main/java/lol/hyper/customlauncher/windows/SecretPrompt.java
  34. +1 −1 src/main/resources/log4j2config.xml
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
![GitHub release (latest by date)](https://img.shields.io/github/v/release/hyperdefined/CustomLauncherRewrite) [![Downloads](https://img.shields.io/github/downloads/hyperdefined/CustomLauncherRewrite/total?logo=github)](https://github.com/hyperdefined/CustomLauncherRewrite/releases) [![badge](https://img.shields.io/badge/made%20with-love%20&%20fluff-red)](https://www.gnu.org/licenses/gpl-3.0) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![wakatime](https://wakatime.com/badge/user/992a7647-176a-477c-8086-e1abfba87ff4/project/c164aaf8-23ad-4bbc-9807-44eb3db04263.svg)](https://wakatime.com/badge/user/992a7647-176a-477c-8086-e1abfba87ff4/project/c164aaf8-23ad-4bbc-9807-44eb3db04263)
</div>

CustomLauncherRewrite is an all purpose launcher for Toontown Rewritten. This launcher is based on my old one, [Multitoon Helper](https://github.com/hyperdefined/multitoon-helper). This one is built from the ground up and includes many features!
CustomLauncherRewrite is an all-purpose launcher for Toontown Rewritten. This launcher is based on my old one, [Multitoon Helper](https://github.com/hyperdefined/multitoon-helper). This one is built from the ground up and includes many features!

## Features
### Account Saving
2 changes: 1 addition & 1 deletion linux/customlauncherrewrite.desktop
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
Type=Application
Name=CustomLauncherRewrite
Comment=An all purpose custom TTR launcher.
Path=/opt/CustomLauncherRewrite
Path={INSTALL_DIR}
Icon=customlauncherrewrite-icon.png
Exec=bash run.sh
Terminal=false
20 changes: 12 additions & 8 deletions linux/installer.sh
Original file line number Diff line number Diff line change
@@ -19,24 +19,28 @@
# taken from https://gist.github.com/steinwaywhw/a4cd19cda655b8249d908261a62687f8
DOWNLOADURL=$(curl -s https://api.github.com/repos/hyperdefined/CustomLauncherRewrite/releases/latest | grep "browser_download_url" | grep "tar.gz" | cut -d '"' -f 4)
OUTPUTFILE=${DOWNLOADURL##*/}
INSTALLDIR=/opt/CustomLauncherRewrite #In case support for a custom install directory is added

echo "Downloading latest version from ""$DOWNLOADURL"""

wget -q -P /tmp/ "$DOWNLOADURL"

echo "CustomLauncherRewrite will install itself to /opt/CustomLauncherRewrite by default. If you want to specify a different directory, enter one below."
echo "If you want to leave it default, just press enter."
read -r -p "Enter the installation directory (will create folder): " USER_INSTALLDIR < /dev/tty
INSTALLDIR=${USER_INSTALLDIR:-/opt/CustomLauncherRewrite}
echo "Creating $INSTALLDIR...".
sudo mkdir -p $INSTALLDIR
sudo mkdir -p "$INSTALLDIR"
echo "$INSTALLDIR" > ~/.customlauncherrewrite-location

echo "Extracting ""$OUTPUTFILE""..."
sudo tar -xf /tmp/"$OUTPUTFILE" -C $INSTALLDIR
sudo tar -xf /tmp/"$OUTPUTFILE" -C "$INSTALLDIR"

echo "Downloading desktop entry..."
# Create the icons directory just in case it doesn't exist
# Save the icon for the launcher
mkdir -p ~/.local/share/icons/
wget -q -O ~/.local/share/icons/customlauncherrewrite-icon.png https://raw.githubusercontent.com/hyperdefined/CustomLauncherRewrite/master/src/main/resources/icon.png
sudo wget -q -P /usr/share/applications https://raw.githubusercontent.com/hyperdefined/CustomLauncherRewrite/master/linux/customlauncherrewrite.desktop
sudo sed -i "s|{INSTALL_DIR}|$INSTALLDIR|g" /usr/share/applications/customlauncherrewrite.desktop

# Find the user's desktop
if command -v xdg-user-dir >/dev/null 2>&1; then
@@ -48,15 +52,15 @@ fi

# Symlink on desktop (e.g. desktop shortcut)
ln -s /usr/share/applications/customlauncherrewrite.desktop "$DESKTOP_DIR/customlauncherrewrite.desktop"
sudo chmod +x "$DESKTOP_DIR/customlauncherrewrite.desktop"
sudo chown "$USER":"$USER" "$DESKTOP_DIR/customlauncherrewrite.desktop"
chmod +x "$DESKTOP_DIR/customlauncherrewrite.desktop"

# Make sure the user owns the folder to run
echo "Setting correct perms to install location..."
sudo chown -R "$USER":"$USER" $INSTALLDIR
sudo chmod -R 755 $INSTALLDIR
sudo chown -R "$USER":"$USER" "$INSTALLDIR"
sudo chmod -R 755 "$INSTALLDIR"

# Delete any temp files
rm -rf /tmp/CustomLauncherRewrite*

echo "CustomLauncherRewrite has been installed!"
echo "CustomLauncherRewrite has been installed!"
14 changes: 13 additions & 1 deletion linux/run.sh
Original file line number Diff line number Diff line change
@@ -19,7 +19,19 @@
# Check if Java is installed and the version is at least 17
if (( $(java -version 2>&1 | grep -Po '(?<=")[0-9]{2}') >= 17 )); then
latest=$(find . -name "CustomLauncherRewrite-*.jar" -type f -printf "%T@ %p\n" | sort -nr | head -n1 | cut -d' ' -f2-)
java -jar "$latest"
java -jar "$latest" &
pid=$!

# This is only needed as I've see the jar run in the background and not get closed
cleanup() {
if kill -0 $pid 2>/dev/null; then
echo "Killing CustomLauncherRewrite for cleanup, process $pid"
kill $pid
fi
}

trap cleanup EXIT
wait $pid
else
if command -v notify-send &> /dev/null; then
notify-send -i stop "CustomLauncherRewrite" "Please update Java JRE to version 17 or higher!"
46 changes: 35 additions & 11 deletions linux/uninstaller.sh
Original file line number Diff line number Diff line change
@@ -16,27 +16,51 @@
# along with CustomLauncherRewrite. If not, see <https://www.gnu.org/licenses/>.
#

read -r -p "Before we uninstall, would you like to keep your TTR files? These include screenshots and resource packs. Enter 'Y' to keep them, 'N' to wipe them.: " input
read -r -p "Before we uninstall, would you like to keep your TTR files? These include screenshots and resource packs. Enter 'Y' to keep them, 'N' to wipe them.: " input < /dev/tty

# Convert to uppercase
input=$(echo "$input" | tr -d '[:space:]' | tr '[:lower:]' '[:upper:]')

if [ "$input" != "Y" ]; then
keep_ttr_files=false
else
keep_ttr_files=true
fi

# Read the install location
INSTALL_DIR=$(head -n1 ~/.customlauncherrewrite-location)

# Make sure the location is valid
if [ -z "$INSTALL_DIR" ]; then
echo "Installation location cannot be determined! Using default..."
INSTALL_DIR="/opt/CustomLauncherRewrite"
fi

# Delete all files in the root of the install location
sudo find "$INSTALL_DIR" -maxdepth 1 -type f -delete

if $keep_ttr_files; then
echo "Removing /opt/CustomLauncherRewrite but keeping TTR files..."
# remove everything but ttr-files folder
sudo find /opt/CustomLauncherRewrite/* -type d -not -name 'ttr-files' -exec rm -rf {} +
sudo rm /opt/CustomLauncherRewrite/CustomLauncherRewrite*
sudo rm /opt/CustomLauncherRewrite/run.sh
else
echo "Removing /opt/CustomLauncherRewrite..."
sudo rm -r /opt/CustomLauncherRewrite
echo "Removing $INSTALL_DIR but keeping TTR files..."
# Remove all folders but ttr-files folder
sudo find "$INSTALL_DIR" -mindepth 1 -maxdepth 1 -type d -not -name "ttr-files" -exec rm -rf {} +
else
# Remove the entire directory
echo "Removing $INSTALL_DIR..."
sudo rm -r "$INSTALL_DIR"
fi

# Find the user's desktop
if command -v xdg-user-dir >/dev/null 2>&1; then
DESKTOP_DIR=$(xdg-user-dir DESKTOP)
else
# If xdg-user-dir is not installed, just try to guess it
DESKTOP_DIR=~/Desktop
fi

echo "Removing the desktop entry..."
sudo rm ~/Desktop/customlauncherrewrite.desktop
sudo rm "$DESKTOP_DIR/customlauncherrewrite.desktop"
rm ~/.local/share/icons/customlauncherrewrite-icon.png
sudo rm /usr/share/applications/customlauncherrewrite.desktop
rm ~/.customlauncherrewrite-location

echo "CustomLauncherRewrite has been uninstalled!"
echo "CustomLauncherRewrite has been uninstalled!"
39 changes: 12 additions & 27 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -23,19 +23,19 @@

<groupId>lol.hyper</groupId>
<artifactId>CustomLauncherRewrite</artifactId>
<version>1.9.2</version>
<version>1.9.3</version>
<packaging>jar</packaging>

<properties>
<java.version>17</java.version>
<java.version>21</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<build>
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.4.0</version>
<version>3.5.0</version>
<executions>
<execution>
<id>auto-clean</id>
@@ -49,7 +49,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<version>3.14.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
@@ -81,7 +81,7 @@
<plugin>
<groupId>com.akathist.maven.plugins.launch4j</groupId>
<artifactId>launch4j-maven-plugin</artifactId>
<version>2.5.1</version>
<version>2.6.0</version>
<executions>
<execution>
<id>l4j-clui</id>
@@ -93,7 +93,7 @@
<headerType>gui</headerType>
<jar>${project.build.directory}/CustomLauncherRewrite-${project.version}.jar</jar>
<outfile>${project.build.directory}/CustomLauncherRewrite-${project.version}.exe</outfile>
<downloadUrl>https://adoptium.net/releases.html?variant=openjdk17&amp;jvmVariant=hotspot
<downloadUrl>https://adoptium.net/releases.html?variant=openjdk21&amp;jvmVariant=hotspot
</downloadUrl>
<icon>src/main/resources/icon.ico</icon>
<classPath>
@@ -150,42 +150,27 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20240303</version>
<version>20250517</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.16.1</version>
<version>2.20.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.26.2</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>5.3.1</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
<version>1.27.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.23.1</version>
<version>2.25.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.14.0</version>
<version>3.18.0</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
@@ -205,7 +190,7 @@
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>24.1.0</version>
<version>26.0.2</version>
</dependency>
</dependencies>

14 changes: 7 additions & 7 deletions src/main/java/lol/hyper/customlauncher/ConfigHandler.java
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ public class ConfigHandler {
/**
* The config version, used for detecting and changes.
*/
public final int CONFIG_VERSION = 1;
private final int CONFIG_VERSION = 1;
/**
* The config's content.
*/
@@ -151,7 +151,7 @@ public void loadConfig(boolean log) {
JSONUtils.writeFile(configJSON, CONFIG_FILE);
}
if (configJSON.getInt("version") != CONFIG_VERSION) {
logger.warn("Config version is not correct! Somethings will not work correctly. Version should be " + CONFIG_VERSION + " but read " + configJSON.getInt("version"));
logger.warn("Config version is not correct! Somethings will not work correctly. Version should be " + CONFIG_VERSION + " but read {}", configJSON.getInt("version"));
}
}
setDefaults();
@@ -163,7 +163,7 @@ public void loadConfig(boolean log) {
if (!(installPath.exists())) {
try {
Files.createDirectory(installPath.toPath());
logger.info("Creating TTR install folder at " + installPath);
logger.info("Creating TTR install folder at {}", installPath);
new FirstLaunch();
} catch (IOException exception) {
logger.error("Cannot create TTR folder!", exception);
@@ -172,10 +172,10 @@ public void loadConfig(boolean log) {
}

if (log) {
logger.info("Config version: " + configJSON.getInt("version"));
logger.info("showInvasionNotifications: " + invasionNotifications);
logger.info("showFieldOfficeNotifications: " + fieldOfficeNotifications);
logger.info("ttrInstallLocation: " + installPath.getAbsolutePath());
logger.info("Config version: {}", configJSON.getInt("version"));
logger.info("showInvasionNotifications: {}", invasionNotifications);
logger.info("showFieldOfficeNotifications: {}", fieldOfficeNotifications);
logger.info("ttrInstallLocation: {}", installPath.getAbsolutePath());
}
}
}
Loading