updated to current version, minor fixes (#959)

caprover · Jul 5, 2023 · 32bca1d · 32bca1d
1 parent d4aa50c
commit 32bca1d
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/public/v4/apps/forge_minecraft.yml b/public/v4/apps/forge_minecraft.yml
@@ -14,6 +14,8 @@ services:
             MOTD: '$$cap_display_description'
             ONLINE_MODE: '$$cap_online_mode'
             RCON_PASSWORD: '$$cap_rcon_password'
+            CF_API_KEY: '$$cap_cf_api_key'
+            CF_PAGE_URL: '$$cap_cf_page_url'
         ports:
             - '$$cap_mc_port:25565'
         volumes:
@@ -39,28 +41,32 @@ caproverOneClickApp:
     variables:
         - id: $$cap_appname
           label: service name
-          defaultValue: mc
+          defaultValue: minecraft
         - id: $$java_version
           label: Java version
           description: 'Chose the Java version to run the server with. Look in the documentation for different versions: https://github.com/itzg/docker-minecraft-server#running-minecraft-server-on-different-java-version'
-          validRegex: /^(latest|java8|java8-jdk|java8-multiarch|java8-openj9|java8-graalvm-ce|java11|java11-jdk|java11-openj9|java17|java17-jdk|java17-openj9|java17-graalvm-ce|java17-alpine|java19)$/
-          defaultValue: java19
+          validRegex: /^(latest|java8|java8-jdk|java8-multiarch|java8-openj9|java8-graalvm-ce|java11|java11-jdk|java11-openj9|java17|java17-jdk|java17-openj9|java17-graalvm-ce|java17-alpine|java20)$/
+          defaultValue: java20
         - id: $$cap_minecraft_version
           label: Minecraft version
-          defaultValue: 1.19.3
+          defaultValue: 1.20.1
         - id: $$cap_forge_version
           label: forge server version
           description: 'Choose the version that works with your mc version , see: https://files.minecraftforge.net/'
-          defaultValue: 44.1.16
+          defaultValue: 47.0.46
         - id: $$server_type
           label: Server type
           description: 'Chose one of the server types from supported ones: https://github.com/itzg/docker-minecraft-server#server-types'
           validRegex: /^(MAGMA|FORGE|FABRIC|QUILT|BUKKIT|SPIGOT|PAPER|FOLIA|PUFFERFISH|PURPUR|MOHIST|CATSERVER|CANYON|SPONGEVANILLA|LIMBO|CRUCIBLE|MODRINTH|FTBA|AUTO_CURSEFORGE|CURSEFORGE)$/
           defaultValue: 'FORGE'
+        - id: $$cap_cf_api_key
+          label: CurseForge API Key. Necessary only when you use AUTO_CURSEFORGE server type.
+        - id: $$cap_cf_page_url
+          label: CurseForge page url. Necessary only when you use AUTO_CURSEFORGE server type.
         - id: $$cap_mc_port
           label: Service port
           description: 'Choose "25565" if you want to connect directly to the servers domain without any port specification.'
-          defaultValue: 25575
+          defaultValue: 25565
           validRegex: /.{1,}/
         - id: $$cap_web_username
           label: admin portal username
@@ -73,14 +79,14 @@ caproverOneClickApp:
           defaultValue: $$cap_gen_random_hex(8)
         - id: $$cap_max_ram
           label: Max RAM (GB)
-          defaultValue: 2
+          defaultValue: 8
           validRegex: /.{1,}/
         - id: $$cap_display_name
           label: server displayed name
           defaultValue: Minecraft server
         - id: $$cap_display_description
           label: server displayed description
-          defaultValue: Minecraft server powerd by docker
+          defaultValue: Minecraft server powered by docker
         - id: $$cap_online_mode
           label: online mode
           defaultValue: 'FALSE'