From daf4768187212debf8c7298519e82cfacb39dc8e Mon Sep 17 00:00:00 2001 From: Griefed Date: Fri, 20 Sep 2024 21:11:58 +0200 Subject: [PATCH 01/19] ci: Switch dependabot branch to develop --- .github/dependabot.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e06ad4553..02489077c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -14,7 +14,7 @@ updates: labels: - "dependencies" - "github-actions" - target-branch: "dependabot" + target-branch: "develop" pull-request-branch-name: separator: "-" @@ -30,7 +30,7 @@ updates: labels: - "dependencies" - "gradle" - target-branch: "dependabot" + target-branch: "develop" pull-request-branch-name: separator: "-" @@ -43,7 +43,7 @@ updates: labels: - "dependencies" - "gradle" - target-branch: "dependabot" + target-branch: "develop" pull-request-branch-name: separator: "-" @@ -56,7 +56,7 @@ updates: labels: - "dependencies" - "gradle" - target-branch: "dependabot" + target-branch: "develop" pull-request-branch-name: separator: "-" @@ -72,7 +72,7 @@ updates: labels: - "dependencies" - "npm" - target-branch: "dependabot" + target-branch: "develop" pull-request-branch-name: separator: "-" @@ -88,6 +88,6 @@ updates: labels: - "dependencies" - "docker" - target-branch: "dependabot" + target-branch: "develop" pull-request-branch-name: separator: "-" From ed31ca89058ef4940e0b30bd784cbf1e4d1a8a7f Mon Sep 17 00:00:00 2001 From: Griefed Date: Sat, 21 Sep 2024 12:38:36 +0200 Subject: [PATCH 02/19] First steps towards cli rework --- .runConfigurations/Run App.run.xml | 2 +- .../api/utilities/common/SystemUtilities.kt | 7 + .../resources/serverpackcreator.properties | 7 +- serverpackcreator-app/build.gradle.kts | 3 + .../app/ServerPackCreator.kt | 147 +-- .../app/cli/ConfigurationEditor.kt | 2 - .../app/cli/InteractiveCommandLine.kt | 146 +++ .../app/cli/commands/Command.kt | 5 + .../app/cli/commands/ConfigGenCommand.kt | 65 ++ .../app/cli/commands/HelpCommand.kt | 51 + .../app/cli/commands/HomeDirCommand.kt | 46 + .../app/cli/commands/LanguageCommand.kt | 38 + .../app/cli/commands/RunHeadlessCommand.kt | 68 ++ .../RunHeadlessCustomConfigCommand.kt | 86 ++ .../app/cli/commands/SetupCommand.kt | 22 + .../app/cli/commands/UpdateCommand.kt | 205 ++++ .../app/gui/window/UpdateDialogs.kt | 5 +- .../app/updater/UpdateChecker.kt | 9 +- .../griefed/resources/gui/LICENSE-AGREEMENT | 395 ++++---- spc.install4j | 882 +++++++++++++++++- 20 files changed, 1806 insertions(+), 385 deletions(-) create mode 100644 serverpackcreator-app/src/main/kotlin/de/griefed/serverpackcreator/app/cli/InteractiveCommandLine.kt create mode 100644 serverpackcreator-app/src/main/kotlin/de/griefed/serverpackcreator/app/cli/commands/Command.kt create mode 100644 serverpackcreator-app/src/main/kotlin/de/griefed/serverpackcreator/app/cli/commands/ConfigGenCommand.kt create mode 100644 serverpackcreator-app/src/main/kotlin/de/griefed/serverpackcreator/app/cli/commands/HelpCommand.kt create mode 100644 serverpackcreator-app/src/main/kotlin/de/griefed/serverpackcreator/app/cli/commands/HomeDirCommand.kt create mode 100644 serverpackcreator-app/src/main/kotlin/de/griefed/serverpackcreator/app/cli/commands/LanguageCommand.kt create mode 100644 serverpackcreator-app/src/main/kotlin/de/griefed/serverpackcreator/app/cli/commands/RunHeadlessCommand.kt create mode 100644 serverpackcreator-app/src/main/kotlin/de/griefed/serverpackcreator/app/cli/commands/RunHeadlessCustomConfigCommand.kt create mode 100644 serverpackcreator-app/src/main/kotlin/de/griefed/serverpackcreator/app/cli/commands/SetupCommand.kt create mode 100644 serverpackcreator-app/src/main/kotlin/de/griefed/serverpackcreator/app/cli/commands/UpdateCommand.kt diff --git a/.runConfigurations/Run App.run.xml b/.runConfigurations/Run App.run.xml index 7487e4db9..cca44e66d 100644 --- a/.runConfigurations/Run App.run.xml +++ b/.runConfigurations/Run App.run.xml @@ -2,7 +2,7 @@