Use image helper's hc5 file download approach

Dockerfile

@@ -48,7 +48,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=${MC_SERVER_RUNNER_VERSION} --var app=mc-server-runner --file {{.app}} \
   --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
-ARG MC_HELPER_VERSION=1.48.1
+ARG MC_HELPER_VERSION=1.47.1
 ARG MC_HELPER_BASE_URL=${GITHUB_BASEURL}/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
 # used for cache busting local copy of mc-image-helper
 ARG MC_HELPER_REV=1

docs/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11
+FROM python:3.9
 
 RUN pip install --upgrade pip
 

docs/configuration/server-properties.md

@@ -256,7 +256,7 @@ By default, the server listens for RCON on port 25575 within the container. It c
 
 ### Query
 
-Set the environment variable `ENABLE_QUERY` to "true" to enable the gamespy query protocol. Maps to the server property [enable-query](https://minecraft.wiki/w/Server.properties#enable-query). By default, the query port will be `25565` (UDP) but can be changed with the `QUERY_PORT` environment variable.
+Set the environment variable `QUERY_PORT` to "true" to enable the gamespy query protocol. Map to the server property [enable-query](https://minecraft.wiki/w/Server.properties#enable-query). By default, the query port will be `25565` (UDP) but can be changed with the `QUERY_PORT` environment variable.
 
 ### Level Seed
 

docs/mods-and-plugins/modrinth.md

@@ -42,25 +42,6 @@
     datapack:terralith
     ```
 
-## Version from Projects
-
-When the environment variable `VERSION_FROM_MODRINTH_PROJECTS` is set to "true" the Minecraft [`VERSION`](../versions/minecraft.md) will be automatically determined by looking at the most recent version of Minecraft that is supported by all the projects provided in `MODRINTH_PROJECTS`.
-
-!!! example
-
-    Given the environment variables
-    
-    ```yaml
-        MODRINTH_PROJECTS: |
-          viaversion
-          viabackwards
-          griefprevention
-          discordsrv
-        VERSION_FROM_MODRINTH_PROJECTS: true
-    ```
-    
-    Let's say all are supported on Minecraft up to 1.21.8 except griefprevention, which is only supported up to 1.21.7. In that case, `VERSION` will be automatically set to 1.21.7.
-
 ## Extra options
 
 `MODRINTH_DOWNLOAD_DEPENDENCIES`
@@ -71,4 +52,3 @@ When the environment variable `VERSION_FROM_MODRINTH_PROJECTS` is set to "true"
 
 `MODRINTH_LOADER`
 : When using a custom server, set this to specify which loader type will be requested during lookups
-

docs/requirements.txt

@@ -1,6 +1,6 @@
-mkdocs-material == 9.6.16
+mkdocs-material == 9.6.15
 mkdocs-autorefs == 1.4.2
-mkdocstrings[python] == 0.30.0
+mkdocstrings[python] == 0.29.1
 mkdocs-literate-nav == 0.6.2
 mdx-gh-links == 0.4
 mkdocs-click == 0.9.0

docs/types-and-platforms/server-types/fabric.md

@@ -41,27 +41,21 @@ A specific loader or launcher version other than the latest can be requested usi
       FABRIC_LOADER_VERSION: 0.13.1
     ```
 
-!!! note
+!!! note "Fabric API"
 
-    See the [Working with mods and plugins](../../mods-and-plugins/index.md) section to set up Fabric mods and configuration.
+    As [mentioned on the Fabric download page](https://fabricmc.net/use/installer/), most mods will require the Fabric API mod to be installed. That can be easily done by utilizing [the Modrinth downloads feature](../../mods-and-plugins/modrinth.md), such as adding this to the `environment` of a compose file service:
+    
+    ```yaml
+          TYPE: FABRIC
+          MODRINTH_PROJECTS: |
+            fabric-api
+    ```
 
-## Fabric API
+!!! note "Alternate launcher"
 
-As [mentioned on the Fabric download page](https://fabricmc.net/use/installer/), most mods will require the Fabric API mod to be installed. That can be easily done by utilizing [the Modrinth downloads feature](../../mods-and-plugins/modrinth.md), such as adding this to the `environment` of a compose file service:
+    If you wish to use an alternative launcher you can:  
 
-```yaml
-      TYPE: FABRIC
-      MODRINTH_PROJECTS: |
-        fabric-api
-```
+    - Provide the path to a custom launcher jar available to the container with `FABRIC_LAUNCHER`, relative to `/data` (such as `-e FABRIC_LAUNCHER=fabric-server-custom.jar`)
+    - Provide the URL to a custom launcher jar with `FABRIC_LAUNCHER_URL` (such as `-e FABRIC_LAUNCHER_URL=http://HOST/fabric-server-custom.jar`)
 
-## Alternate launcher
-
-If you wish to use an alternative launcher you can:  
-
-- Provide the path to a custom launcher jar available to the container with `FABRIC_LAUNCHER`, relative to `/data` (such as `-e FABRIC_LAUNCHER=fabric-server-custom.jar`)
-- Provide the URL to a custom launcher jar with `FABRIC_LAUNCHER_URL` (such as `-e FABRIC_LAUNCHER_URL=http://HOST/fabric-server-custom.jar`)
-
-## Force re-install
-
-If the Fabric launcher jar becomes corrupted you can temporarily set FABRIC_FORCE_REINSTALL to "true" to have it re-installed on next startup.
+See the [Working with mods and plugins](../../mods-and-plugins/index.md) section to set up Fabric mods and configuration.

docs/types-and-platforms/server-types/others.md

@@ -41,9 +41,7 @@ Configuration options with defaults:
 
 ## NanoLimbo
 
-A [NanoLimbo](https://github.com/BoomEaro/NanoLimbo) server can be run by setting `TYPE` to `NANOLIMBO`.
-
-Note: it is a fork of the original [NanoLimbo](https://github.com/Nan1t/NanoLimbo) made by Nan1t
+A [NanoLimbo](https://github.com/Nan1t/NanoLimbo) server can be run by setting `TYPE` to `NANOLIMBO`.
 
 An alternate Limbo server
 

examples/modrinth/version-from-modrinth-projects/compose.yml

@@ -1,15 +0,0 @@
-services:
-  mc:
-    image: itzg/minecraft-server
-    environment:
-      EULA: true
-      TYPE: paper
-      MODRINTH_PROJECTS: |
-        viaversion
-        viabackwards
-        griefprevention
-        discordsrv
-      VERSION_FROM_MODRINTH_PROJECTS: true
-      SETUP_ONLY: true
-    ports:
-      - "25565:25565"

files/cf-exclude-include.json

@@ -28,7 +28,6 @@
     "chunk-animator",
     "clickable-advancements",
     "compass-coords",
-    "config-menus-forge",
     "configured",
     "controllable",
     "controlling",
@@ -65,8 +64,6 @@
     "fancymenu",
     "farsight",
     "faster-ladder-climbing",
-    "fastquit",
-    "fastquit-forge",
     "flerovium",
     "foamfix-optimization-mod",
     "forgeskyboxes",
@@ -159,7 +156,6 @@
     "waila-harvestability",
     "wakes-reforged",
     "wawla",
-    "welcome-screen",
     "xaeroplus",
     "yungs-menu-tweaks",
     "zume"

files/modrinth-exclude-include.json

@@ -42,11 +42,9 @@
     "fallingleaves",
     "fancymenu",
     "fast-ip-ping",
-    "fastquit",
     "FauxCustomEntityData",
     "feytweaks",
     "figura",
-    "ForgeConfigScreens",
     "GeckoLibIrisCompat",
     "gpumemleakfix",
     "Highlighter",
@@ -84,7 +82,6 @@
     "sorted_enchantments",
     "visuality",
     "VR-Combat",
-    "welcomescreen",
     "YeetusExperimentus",
     "yungsmenutweaks",
     "Zoomify",

scripts/start-configuration

@@ -139,15 +139,6 @@ cd /data || exit 1
 export DECLARED_TYPE=${TYPE^^}
 export DECLARED_VERSION="$VERSION"
 
-if isTrue "${VERSION_FROM_MODRINTH_PROJECTS:-}" && [[ ${MODRINTH_PROJECTS:-} ]]; then
-  if ! VERSION=$(mc-image-helper version-from-modrinth-projects --projects "${MODRINTH_PROJECTS}"); then
-    logError "failed to resolve version from MODRINTH_PROJECTS: ${MODRINTH_PROJECTS}"
-    exit 1
-  fi
-  log "Resolved Minecraft version $VERSION from Modrinth projects"
-  export VERSION
-fi
-
 if isTrue "${ENABLE_AUTOPAUSE}"; then
   "${SCRIPTS:-/}start-autopause"
 fi

scripts/start-deployFabric

@@ -9,24 +9,15 @@ export TYPE=FABRIC
 : "${FABRIC_LAUNCHER:=}"
 : "${FABRIC_LAUNCHER_URL:=}"
 : "${FABRIC_LOADER_VERSION:=LATEST}"
-: "${FABRIC_FORCE_REINSTALL:=false}"
 
 resultsFile=/data/.install-fabric.env
 
 isDebugging && set -x
 
-commonArgs=(
-  --results-file="${resultsFile}"
-)
-if isTrue "${FABRIC_FORCE_REINSTALL}"; then
-  log "Forcing re-install of Fabric"
-  commonArgs+=(--force-reinstall)
-fi
-
 # Custom fabric jar
 if [[ $FABRIC_LAUNCHER ]]; then
   if !   mc-image-helper install-fabric-loader \
-    "${commonArgs[@]}" \
+    --results-file=${resultsFile} \
     --from-local-file="$FABRIC_LAUNCHER"; then
     logError "Failed to use provided Fabric launcher"
     exit 1
@@ -35,7 +26,7 @@ if [[ $FABRIC_LAUNCHER ]]; then
 # Custom fabric jar url
 elif [[ $FABRIC_LAUNCHER_URL ]]; then
   if !   mc-image-helper install-fabric-loader \
-    "${commonArgs[@]}" \
+    --results-file=${resultsFile} \
     --from-url="$FABRIC_LAUNCHER_URL"; then
     logError "Failed to installFabric launcher from $FABRIC_LAUNCHER_URL"
     exit 1
@@ -44,7 +35,7 @@ elif [[ $FABRIC_LAUNCHER_URL ]]; then
 # Official fabric launcher
 else
   if !   mc-image-helper install-fabric-loader \
-    "${commonArgs[@]}" \
+    --results-file=${resultsFile} \
     --minecraft-version="${VERSION}" \
     --installer-version="${FABRIC_LAUNCHER_VERSION}" \
     --loader-version="${FABRIC_LOADER_VERSION}"; then

scripts/start-deployNanoLimbo

@@ -7,7 +7,7 @@ isDebugging && set -x
 if ! SERVER=$(mc-image-helper github download-latest-asset \
   --output-directory=/data \
   --name-pattern="NanoLimbo-.+?(?<!-sources)\.jar" \
-  BoomEaro/NanoLimbo
+  Nan1t/NanoLimbo
   ); then
     logError "Failed to download NanoLimbo"
     exit 1

scripts/start-deployPufferfish

@@ -21,9 +21,7 @@ PUFFERFISH_BUILD_JSON=$(curl -X GET -s "https://ci.pufferfish.host/job/Pufferfis
 PUFFERFISH_BUILD_URL=$(jq -n "$PUFFERFISH_BUILD_JSON" | jq -jc '.url // empty' )
 # Example: "fileName": "pufferfish-paperclip-1.18.2-R0.1-SNAPSHOT-reobf.jar",
 PUFFERFISH_BUILD_FILENAME=$(jq -n "$PUFFERFISH_BUILD_JSON" | jq -jc '.artifacts[].fileName // empty' )
-# Example: "relativePath": "pufferfish-server/build/libs/pufferfish-paperclip-1.21.7-R0.1-SNAPSHOT-mojmap.jar",
-PUFFERFISH_BUILD_PATH=$(jq -n "$PUFFERFISH_BUILD_JSON" | jq -jc '.artifacts[].relativePath // empty' )
-PUFFERFISH_BUILD_DOWNLOAD_URL="${PUFFERFISH_BUILD_URL}artifact/${PUFFERFISH_BUILD_PATH}"
+PUFFERFISH_BUILD_DOWNLOAD_URL="${PUFFERFISH_BUILD_URL}artifact/build/libs/${PUFFERFISH_BUILD_FILENAME}"
 
 # Setting server to the Jar filename for export.
 export SERVER=$PUFFERFISH_BUILD_FILENAME

tests/setuponlytests/nanolimbo/docker-compose.yml

@@ -1,9 +0,0 @@
-services:
-  mc:
-    restart: "no"
-    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
-    environment:
-      EULA: "TRUE"
-      TYPE: NANOLIMBO
-    volumes:
-      - ./data:/data

tests/setuponlytests/nanolimbo/verify.sh

@@ -1 +0,0 @@
-mc-image-helper assert fileExists "/data/NanoLimbo-*.jar"