From f65459a89bb1d9c4733594a767e9ee15b7a7c48a Mon Sep 17 00:00:00 2001
From: H <37481947+H-QueerCoded@users.noreply.github.com>
Date: Sun, 28 Jan 2024 00:48:42 +1300
Subject: [PATCH] feat(minecraft-java) add wider packwiz support (#17523)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**

Updated minecraft-java's questions.yaml to allow downloading packwiz
packs when modloaders other than Fabric are chosen. The developer of the
docker image has
[stated](https://github.com/itzg/docker-minecraft-server/issues/1238#issuecomment-1003560897)
that packwiz support is not limited to Fabric. Mod loaders supported by
packwiz itself are listed
[here](https://packwiz.infra.link/reference/commands/packwiz/init/#options).

**⚙️ Type of change**

- [x] ⚙️ Feature/App addition
- [ ] 🪛 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?**

I don't have the capability to test this at this time.

**📃 Notes:**

I haven't worked on TrueNAS apps/questions.yaml before but based on my
understanding from reading the docs this should be correct. If there is
a way to combine all the added lines using a compound show-if statement
(ie show-if type is forge or fabric or quilt or neoforge) I couldn't
find documentation on it.

**✔️ Checklist:**

- [x] ⚖️ My code follows the style guidelines of this project
- [ ] 👀 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
- [ ] ⚠️ My changes generate no new warnings
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [ ] ⬆️ I increased versions for any altered app according to semantic
versioning

---------

Signed-off-by: H <37481947+H-QueerCoded@users.noreply.github.com>
---
 charts/stable/minecraft-java/Chart.yaml     |  2 +-
 charts/stable/minecraft-java/questions.yaml | 12 ++++++------
 charts/stable/minecraft-java/values.yaml    |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/charts/stable/minecraft-java/Chart.yaml b/charts/stable/minecraft-java/Chart.yaml
index b0caf1c35eb..73f19058ec6 100644
--- a/charts/stable/minecraft-java/Chart.yaml
+++ b/charts/stable/minecraft-java/Chart.yaml
@@ -35,4 +35,4 @@ sources:
   - https://hub.docker.com/r/itzg/minecraft-server
   - https://hub.docker.com/r/itzg/mc-backup
 type: application
-version: 7.1.11
+version: 7.1.12
diff --git a/charts/stable/minecraft-java/questions.yaml b/charts/stable/minecraft-java/questions.yaml
index 5f43287ab84..c9da2815ab9 100644
--- a/charts/stable/minecraft-java/questions.yaml
+++ b/charts/stable/minecraft-java/questions.yaml
@@ -126,6 +126,12 @@ questions:
                                               description: Pufferfish
                                             - value: CUSTOM
                                               description: Custom
+                                      - variable: PACKWIZ_URL
+                                        label: Packwiz URL
+                                        schema:
+                                          type: string
+                                          default: ""
+                                          show_if: [[TYPE, "!=", "VANILLA"]]
                                       - variable: CUSTOM_SERVER
                                         label: Custom Server
                                         description: URL or a container path to an existing JAR file, will ONLY download once.
@@ -208,12 +214,6 @@ questions:
                                           type: string
                                           default: ""
                                           show_if: [[TYPE, "=", "FABRIC"]]
-                                      - variable: PACKWIZ_URL
-                                        label: Packwiz URL
-                                        schema:
-                                          type: string
-                                          default: ""
-                                          show_if: [[TYPE, "=", "FABRIC"]]
                                       - variable: SPIGOT_DOWNLOAD_URL
                                         label: Spigot Download URL
                                         schema:
diff --git a/charts/stable/minecraft-java/values.yaml b/charts/stable/minecraft-java/values.yaml
index 7f0fc841e1a..41200acd04a 100644
--- a/charts/stable/minecraft-java/values.yaml
+++ b/charts/stable/minecraft-java/values.yaml
@@ -158,6 +158,7 @@ workload:
             ONLINE_MODE: true
             MEMORY: 2048M
             RCON_PASSWORD: "secretrconpass"
+            # PACKWIZ_URL: ""
             # CUSTOM_SERVER: ""
             # QUILT_LOADER_VERSION: ""
             # QUILT_LAUNCHER: ""
@@ -174,7 +175,6 @@ workload:
             # BUKKIT_DOWNLOAD_URL: ""
             # PAPERBUILD: ""
             # PAPER_DOWNLOAD_URL: ""
-            # PACKWIZ_URL: ""
             # AIRPLANE_BUILD: "lastSuccessfulBuild"
             # MAGMA_CHANNEL: "stable"
             # MOHIST_BUILD: ""