From ab46b1f642bfe45fce999369709ba0e5b914aa34 Mon Sep 17 00:00:00 2001 From: Lucas Magno Zimmer Date: Thu, 1 Jun 2023 18:07:16 -0300 Subject: [PATCH] chore(minecraft-java): Add AUTO_CURSEFORGE options (#8147) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes #8146 **⚙️ Type of change** - [X] ⚙️ Feature/App addition - [X] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [X] ⚖️ My code follows the style guidelines of this project - [X] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [X] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [X] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🪞 I have opened a PR on [truecharts/containers](https://github.com/truecharts/containers) adding the container to TrueCharts mirror repo. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --------- Signed-off-by: Deconto Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Signed-off-by: Kjeld Schouten Co-authored-by: GuilhermeDeconto Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Co-authored-by: Kjeld Schouten --- charts/stable/minecraft-java/Chart.yaml | 2 +- charts/stable/minecraft-java/questions.yaml | 80 +++++++++++++++++++++ charts/stable/minecraft-java/values.yaml | 13 +++- 3 files changed, 92 insertions(+), 3 deletions(-) diff --git a/charts/stable/minecraft-java/Chart.yaml b/charts/stable/minecraft-java/Chart.yaml index b0b6a76d56d..ecf29620213 100644 --- a/charts/stable/minecraft-java/Chart.yaml +++ b/charts/stable/minecraft-java/Chart.yaml @@ -21,7 +21,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/minecraft-java - https://github.com/itzg/docker-minecraft-server type: application -version: 4.0.24 +version: 4.1.0 annotations: truecharts.org/catagories: | - games diff --git a/charts/stable/minecraft-java/questions.yaml b/charts/stable/minecraft-java/questions.yaml index 8374b10145e..7a92c050b09 100644 --- a/charts/stable/minecraft-java/questions.yaml +++ b/charts/stable/minecraft-java/questions.yaml @@ -114,6 +114,8 @@ questions: description: FTBA - value: CURSEFORGE description: Curseforge + - value: AUTO_CURSEFORGE + description: Auto CurseForge - value: QUILT description: Quilt - value: PUFFERFISH @@ -322,6 +324,84 @@ questions: type: boolean default: false show_if: [[TYPE, "=", "CURSEFORGE"]] + - variable: CF_API_KEY + label: CF API Key + schema: + type: string + default: "" + show_if: [[TYPE, "=", "AUTO_CURSEFORGE"]] + - variable: CF_PAGE_URL + label: CF modpack page URL + schema: + type: string + default: "" + show_if: [[TYPE, "=", "AUTO_CURSEFORGE"]] + - variable: CF_SLUG + label: CF modpack slug + schema: + type: string + default: "" + show_if: [[TYPE, "=", "AUTO_CURSEFORGE"]] + - variable: modpack_exclusions + label: Configure modpack exclusions + schema: + type: boolean + default: false + show_if: [[TYPE, "=", "AUTO_CURSEFORGE"]] + show_subquestions_if: true + subquestions: + - variable: CF_EXCLUDE_INCLUDE_FILE + label: JSON file path + schema: + type: string + - variable: CF_EXCLUDE_MODS + label: List of project slugs or IDs to exclude + description: "Comma or space delimited list" + schema: + type: string + default: "" + - variable: CF_FORCE_INCLUDE_MODS + label: List of project slugs or IDs to force include + description: "Comma or space delimited list" + schema: + type: string + default: "" + - variable: CF_FORCE_SYNCHRONIZE + label: Check to ensure the exclude/includes are re-evaluated + schema: + type: boolean + default: false + - variable: advanced_auto_curseforge + label: Advanced Auto CurseForge configurations + schema: + type: boolean + default: false + show_if: [[TYPE, "=", "AUTO_CURSEFORGE"]] + show_subquestions_if: true + subquestions: + - variable: CF_OVERRIDES_SKIP_EXISTING + label: Skip files in the overrides that already exist in the data directory + schema: + type: boolean + default: false + - variable: CF_PARALLEL_DOWNLOADS + label: How many parallel mod downloads to perform + schema: + type: int + default: 4 + - variable: CF_SET_LEVEL_FROM + label: Saves directory + description: "Some modpacks come with world/save data via a worlds file and/or the overrides provided with the modpack. Either approach can be selected to set the LEVEL to the resulting saves directory." + schema: + type: string + default: "" + enum: + - value: "" + description: Default + - value: WORLD_FILE + description: World File + - value: OVERRIDES + description: Overrides - variable: DIFFICULTY label: Difficulty schema: diff --git a/charts/stable/minecraft-java/values.yaml b/charts/stable/minecraft-java/values.yaml index 777eee99a52..ccacbddf821 100644 --- a/charts/stable/minecraft-java/values.yaml +++ b/charts/stable/minecraft-java/values.yaml @@ -126,6 +126,7 @@ workload: LEVEL: world ONLINE_MODE: true MEMORY: 2048M + RCON_PASSWORD: "secretrconpass" # CUSTOM_SERVER: "" # QUILT_LOADER_VERSION: "" # QUILT_LAUNCHER: "" @@ -170,5 +171,13 @@ workload: # USE_SIMD_FLAGS: false # JVM_OPTS: "" # JVM_XX_OPTS: "" - - RCON_PASSWORD: "secretrconpass" + # CF_API_KEY + # CF_PAGE_URL + # CF_SLUG + # CF_EXCLUDE_INCLUDE_FILE + # CF_EXCLUDE_MODS + # CF_FORCE_INCLUDE_MODS + # CF_FORCE_SYNCHRONIZE + # CF_OVERRIDES_SKIP_EXISTING + # CF_PARALLEL_DOWNLOADS + # CF_SET_LEVEL_FROM