neoforge: handle new version ordering (#3703)

.github/workflows/build-multiarch.yml

@@ -186,14 +186,14 @@ jobs:
           tests/test.sh
 
       - name: Login to DockerHub
-        uses: docker/login-action@v3.5.0
+        uses: docker/login-action@v3.6.0
         if: env.HAS_IMAGE_REPO_ACCESS
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Login to GHCR
-        uses: docker/login-action@v3.5.0
+        uses: docker/login-action@v3.6.0
         if: env.HAS_IMAGE_REPO_ACCESS
         with:
           registry: ghcr.io

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.49.0
+ARG MC_HELPER_VERSION=1.49.2
 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
@@ -74,7 +74,8 @@ exec /image/scripts/start
 EOF
 
 COPY --chmod=755 scripts/auto/* /image/scripts/auto/
-COPY --chmod=755 files/shims/ /usr/local/bin/
+COPY --chmod=755 scripts/shims/* /image/scripts/shims/
+RUN ln -s /image/scripts/shims/* /usr/local/bin/
 COPY --chmod=755 files/* /image/
 
 RUN curl -fsSL -o /image/Log4jPatcher.jar https://github.com/CreeperHost/Log4jPatcher/releases/download/v1.0.1/Log4jPatcher-1.0.1.jar

docs/mods-and-plugins/index.md

@@ -133,6 +133,14 @@ The newline delimiting allows for compose file usage like:
         https://download.geysermc.org/v2/projects/floodgate/versions/latest/builds/latest/downloads/spigot
 ```
 
+!!! note "Auto-removal"
+
+    Entries that are removed from the `MODS` or `PLUGINS` list will be automatically removed from the `mods` or `plugins` directory. This is useful for removing mods/plugins that are no longer needed. An empty `MODS` or `PLUGINS` list will remove all mods/plugins.
+
+!!! note "Disable processing"
+
+    To temporarily disable processing of the `MODS` or `PLUGINS` list, then comment out the `MODS` or `PLUGINS` environment variable.
+
 ## Mod/Plugin URL Listing File 
 
 As an alternative to `MODS`/`PLUGINS`, the variable `MODS_FILE` or `PLUGINS_FILE` can be set with the container path or URL of a text file listing a mod/plugin URLs on each line. For example, the following

docs/mods-and-plugins/modrinth.md

@@ -2,28 +2,46 @@
 
 [Modrinth](https://modrinth.com/) is an open source modding platform with a clean, easy to use website for finding [Fabric, Forge, etc mods](https://modrinth.com/mods) and [Paper, etc plugins](https://modrinth.com/plugins), and [datapacks](https://modrinth.com/datapacks). At startup, the container will automatically locate and download the newest versions of mod/plugin files that correspond to the `TYPE` and `VERSION` in use. Older file versions downloaded previously will automatically be cleaned up.
 
-- **MODRINTH_PROJECTS** : comma or newline separated list of project slugs (short name) or IDs. The project ID is located in the "Technical information" section. The project slug is the part of the URL that follows `/mod/`, `/plugin/`, or `/datapack/`. For example:
-  ```
+## Usage
+
+To use this feature, set the environment variable `MODRINTH_PROJECTS` to a comma or newline separated list of project slugs (short name) or IDs.  
+
+!!! tip "Project ID"
+
+    The project ID can be copied to the clipboard from the project page menu:
+
+    ![Modrinth copy project ID](../img/modrinth-copy-project-id.png)
+
+!!! tip "Project Slug"
+
+    The project slug is the part of the URL that follows `/mod/`, `/plugin/`, or `/datapack/`. For example:
+    
+    ```
     https://modrinth.com/mod/fabric-api
                              ----------
                               |
                               +-- project slug
-  ```
-  Also, a specific version (or release type) can be declared adding a colon and then the version id, version number/name, or release type after the project slug. The version ID or number can be found in the 'Metadata' section. Valid release types are `release`, `beta`, `alpha`.
-  
-  To select a datapack from a Modrinth project, prefix the entry with "datapack:". When running a vanilla server, this is optional since only datapacks will be available for vanilla servers to select.
-  
-  You can also reference a file containing project entries by prefixing the **container path** path with `@`.
-        
-  | Description                     | Example projects entry                                |
-  |---------------------------------|-------------------------------------------------------|
-  | Select latest version           | `fabric-api`                                          |
-  | Select specific version         | `fabric-api:bQZpGIz0`<br/>`fabric-api:0.119.2+1.21.4` |
-  | Select latest beta version      | `fabric-api:beta`                                     |
-  | Latest version using project ID | `P7dR8mSH`                                            |
-  | Latest version of datapack      | `datapack:terralith`                                  |
-  | Specific version of datapack    | `datapack:terralith:2.5.5`                            |
-  | Projects Listing File           | `@/path/to/modrinth-mods.txt`                         |
+    ```
+
+Also, a specific version (or release type) can be declared by adding a colon and then the version id, version number/name, or release type after the project slug. The version ID or number can be found in the 'Metadata' section. Valid release types are `release`, `beta`, `alpha`.
+
+To select a datapack from a Modrinth project, prefix the entry with "datapack:". When running a vanilla server, this is optional since only datapacks will be available for vanilla servers to select.
+
+You can also reference a file containing project entries by prefixing the **container path** path with `@`.
+
+### Examples
+            
+| Description                     | Example projects entry                                |
+|---------------------------------|-------------------------------------------------------|
+| Select latest version           | `fabric-api`                                          |
+| Select specific version         | `fabric-api:bQZpGIz0`<br/>`fabric-api:0.119.2+1.21.4` |
+| Select latest beta version      | `fabric-api:beta`                                     |
+| Latest version using project ID | `P7dR8mSH`                                            |
+| Latest version of datapack      | `datapack:terralith`                                  |
+| Specific version of datapack    | `datapack:terralith:2.5.5`                            |
+| Projects Listing File           | `@/path/to/modrinth-mods.txt`                         |
+
+### Notes
 
 !!! info "More about listing files"
 
@@ -42,6 +60,14 @@
     datapack:terralith
     ```
 
+!!! note "Auto-removal"
+
+    Entries that are removed from the `MODRINTH_PROJECTS` list will be automatically removed from the `mods` or `plugins` directory. This is useful for removing mods/plugins that are no longer needed. An empty `MODRINTH_PROJECTS` list will remove all mods/plugins.
+
+!!! note "Disable processing"
+
+    To temporarily disable processing of the `MODRINTH_PROJECTS` list, then comment out the `MODRINTH_PROJECTS` environment variable.
+
 ## 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`.

docs/requirements.txt

@@ -1,4 +1,4 @@
-mkdocs-material == 9.6.20
+mkdocs-material == 9.6.21
 mkdocs-autorefs == 1.4.3
 mkdocstrings[python] == 0.30.1
 mkdocs-literate-nav == 0.6.2

files/cf-exclude-include.json

@@ -1,197 +1,204 @@
-{
-  "globalExcludes": [
-    "advancement-plaques",
-    "ambience-music-mod",
-    "ambientsounds",
-    "appleskin",
-    "armor-chroma",
-    "armor-toughness-bar",
-    "audio-extension-for-fancymenu-forge",
-    "auudio-forge",
-    "beehivetooltips",
-    "better-advancements",
-    "better-foliage",
-    "better-modlist-neoforge",
-    "better-placement",
-    "better-sprinting",
-    "better-third-person",
-    "better-tips-nbt-tag",
-    "betterf3",
-    "betterfps",
-    "bettergrassify",
-    "biomeinfo",
-    "block-drops-jei-addon",
-    "blur-forge",
-    "cartography",
-    "chattoggle",
-    "cherished-worlds",
-    "chunk-animator",
-    "clickable-advancements",
-    "compass-coords",
-    "config-menus-forge",
-    "configured",
-    "controllable",
-    "controlling",
-    "craftpresence",
-    "ctm",
-    "custom-main-menu",
-    "dark-mode-everywhere",
-    "defensive-measures",
-    "ding",
-    "distraction-free-recipes",
-    "drippy-loading-screen",
-    "dynamic-surroundings",
-    "dynamic-view",
-    "dynamiclights-reforged",
-    "easiervillagertrading",
-    "effective-forge",
-    "embeddium",
-    "embeddium-extension",
-    "embeddium-extras",
-    "enchantment-descriptions",
-    "enhanced-boss-bars",
-    "enhancedvisuals",
-    "entity-collision-fps-fix",
-    "entity-model-features",
-    "entity-texture-features-fabric",
-    "entityculling",
-    "equipment-compare",
-    "essential-mod",
-    "euphoria-patches",
-    "extreme-sound-muffler",
-    "ezzoom",
-    "fading-night-vision",
-    "falling-leaves-forge",
-    "fancymenu",
-    "farsight",
-    "faster-ladder-climbing",
-    "fastquit",
-    "fastquit-forge",
-    "flerovium",
-    "foamfix-optimization-mod",
-    "forgeskyboxes",
-    "fps-reducer",
-    "free-cam",
-    "ftb-backups-2",
-    "fullscreen-windowed-borderless-for-minecraft",
-    "hwyla",
-    "iceberg",
-    "ignitioncoil",
-    "illager-raid-music",
-    "inmisaddon",
-    "iris-flywheel-compat",
-    "irisshaders",
-    "item-borders",
-    "item-highlighter",
-    "item-obliterator",
-    "itemphysic-lite",
-    "itemzoom",
-    "just-enough-harvestcraft",
-    "just-enough-mekanism-multiblocks",
-    "just-enough-resources-jer",
-    "just-zoom",
-    "legendary-tooltips",
-    "lighty",
-    "loot-capacitor-tooltips",
-    "loot-journal",
-    "lootbeams",
-    "magnesium-extras",
-    "make-bubbles-pop",
-    "menumobs",
-    "minecraft-rich-presence",
-    "model-gap-fix",
-    "more-overlays",
-    "mouse-tweaks",
-    "neat",
-    "nekos-enchanted-books",
-    "no-nv-flash",
-    "no-recipe-book",
-    "not-enough-animations",
-    "oculus",
-    "ok-zoomer",
-    "oldjavawarning",
-    "overloaded-armor-bar",
-    "packmenu",
-    "packmodemenu",
-    "particle-effects",
-    "particle-effects-reforged",
-    "particle-rain",
-    "particular",
-    "particular-reforged",
-    "reauth",
-    "rebind-narrator",
-    "reblured",
-    "reeses-sodium-options",
-    "reforgium",
-    "resource-reloader",
-    "rubidium",
-    "rubidium-extra",
-    "ryoamiclights",
-    "schematica",
-    "seamless-loading-screen",
-    "seamless-loading-screen-forge",
-    "searchables",
-    "seasonhud",
-    "shulkerboxviewer",
-    "skin-layers-3d",
-    "smart-hud",
-    "smithing-template-viewer",
-    "smooth-font",
-    "smoothwater",
-    "sodium",
-    "sodium-extra",
-    "sodium-options-api",
-    "sodium-rubidium-occlusion-culling-fix",
-    "sound",
-    "sound-filters",
-    "sound-physics-remastered",
-    "sound-reloader",
-    "stellar-sky",
-    "swingthroughgrass",
-    "textrues-embeddium-options",
-    "textrues-rubidium-options",
-    "thaumic-jei",
-    "tips",
-    "toast-control",
-    "torohealth-damage-indicators",
-    "true-darkness",
-    "ungrab-mouse-mod",
-    "vanillafix",
-    "visuality",
-    "waila-harvestability",
-    "waila-stages",
-    "wakes-reforged",
-    "wawla",
-    "welcome-screen",
-    "xaeroplus",
-    "yungs-menu-tweaks",
-    "zume"
-  ],
-  "modpacks": {
-    "all-of-fabric-6": {
-      "forceIncludes": ["revelationary"]
-    },
-    "beyond-depth": {
-      "forceIncludes": ["particular-reforged"]
-    },
-    "create-arcane-engineering": {
-      "forceIncludes": ["just-enough-resources-jer"]
-    },
-    "skyfactory-5": {
-      "forceIncludes": [
-        "colored-torches",
-        "dye-mob-dye",
-        "openstairs"
-      ]
-    },
-    "valhelsia-5": {
-      "excludes": ["modernfix"]
-    },
-    "mc-eternal-2": {
-      "forceIncludes": [
-        "particular-reforged",
-        "mob-player-animator"
-      ]
-    }
-  }
-}
+{
+  "globalExcludes": [
+    "advancement-plaques",
+    "ambience-music-mod",
+    "ambientsounds",
+    "appleskin",
+    "armor-chroma",
+    "armor-toughness-bar",
+    "audio-extension-for-fancymenu-forge",
+    "auudio-forge",
+    "beehivetooltips",
+    "better-advancements",
+    "better-foliage",
+    "better-modlist-neoforge",
+    "better-placement",
+    "better-sprinting",
+    "better-third-person",
+    "better-tips-nbt-tag",
+    "betterf3",
+    "betterfps",
+    "bettergrassify",
+    "biomeinfo",
+    "block-drops-jei-addon",
+    "blur-forge",
+    "cartography",
+    "chattoggle",
+    "cherished-worlds",
+    "chunk-animator",
+    "clickable-advancements",
+    "colorwheel",
+    "colorwheel-patcher",
+    "compass-coords",
+    "config-menus-forge",
+    "configured",
+    "controllable",
+    "controlling",
+    "craftpresence",
+    "ctm",
+    "custom-main-menu",
+    "dark-mode-everywhere",
+    "defensive-measures",
+    "ding",
+    "distraction-free-recipes",
+    "drippy-loading-screen",
+    "dynamic-surroundings",
+    "dynamic-view",
+    "dynamiclights-reforged",
+    "easiervillagertrading",
+    "effective-forge",
+    "embeddium",
+    "embeddium-extension",
+    "embeddium-extras",
+    "enchantment-descriptions",
+    "enhanced-boss-bars",
+    "enhancedvisuals",
+    "entity-collision-fps-fix",
+    "entity-model-features",
+    "entity-texture-features-fabric",
+    "entityculling",
+    "equipment-compare",
+    "essential-mod",
+    "euphoria-patches",
+    "extreme-sound-muffler",
+    "ezzoom",
+    "fading-night-vision",
+    "falling-leaves-forge",
+    "fancymenu",
+    "farsight",
+    "faster-ladder-climbing",
+    "fastquit",
+    "fastquit-forge",
+    "flerovium",
+    "foamfix-optimization-mod",
+    "forgeskyboxes",
+    "fps-reducer",
+    "free-cam",
+    "ftb-backups-2",
+    "fullscreen-windowed-borderless-for-minecraft",
+    "hwyla",
+    "iceberg",
+    "ignitioncoil",
+    "illager-raid-music",
+    "inmisaddon",
+    "iris-flywheel-compat",
+    "irisshaders",
+    "item-borders",
+    "item-highlighter",
+    "item-obliterator",
+    "itemphysic-lite",
+    "itemzoom",
+    "just-enough-harvestcraft",
+    "just-enough-mekanism-multiblocks",
+    "just-enough-resources-jer",
+    "just-zoom",
+    "legendary-tooltips",
+    "lighty",
+    "loot-capacitor-tooltips",
+    "loot-journal",
+    "lootbeams",
+    "magnesium-extras",
+    "make-bubbles-pop",
+    "menumobs",
+    "minecraft-rich-presence",
+    "model-gap-fix",
+    "more-overlays",
+    "mouse-tweaks",
+    "neat",
+    "nekos-enchanted-books",
+    "no-nv-flash",
+    "no-recipe-book",
+    "not-enough-animations",
+    "oculus",
+    "ok-zoomer",
+    "oldjavawarning",
+    "overloaded-armor-bar",
+    "packmenu",
+    "packmodemenu",
+    "particle-effects",
+    "particle-effects-reforged",
+    "particle-rain",
+    "particular",
+    "particular-reforged",
+    "reauth",
+    "rebind-narrator",
+    "reblured",
+    "reeses-sodium-options",
+    "reforgium",
+    "resource-reloader",
+    "rubidium",
+    "rubidium-extra",
+    "ryoamiclights",
+    "schematica",
+    "seamless-loading-screen",
+    "seamless-loading-screen-forge",
+    "searchables",
+    "seasonhud",
+    "shulkerboxviewer",
+    "skin-layers-3d",
+    "smart-hud",
+    "smithing-template-viewer",
+    "smooth-font",
+    "smoothwater",
+    "sodium",
+    "sodium-extra",
+    "sodium-options-api",
+    "sodium-rubidium-occlusion-culling-fix",
+    "sound",
+    "sound-filters",
+    "sound-physics-remastered",
+    "sound-reloader",
+    "stellar-sky",
+    "swingthroughgrass",
+    "textrues-embeddium-options",
+    "textrues-rubidium-options",
+    "thaumic-jei",
+    "tips",
+    "toast-control",
+    "torohealth-damage-indicators",
+    "true-darkness",
+    "ungrab-mouse-mod",
+    "vanillafix",
+    "visuality",
+    "waila-harvestability",
+    "waila-stages",
+    "wakes-reforged",
+    "wawla",
+    "welcome-screen",
+    "xaeroplus",
+    "yungs-menu-tweaks",
+    "zume"
+  ],
+  "modpacks": {
+    "all-of-fabric-6": {
+      "forceIncludes": ["revelationary"]
+    },
+    "beyond-depth": {
+      "forceIncludes": ["particular-reforged"]
+    },
+    "create-arcane-engineering": {
+      "forceIncludes": ["just-enough-resources-jer"]
+    },
+    "mc-eternal-2": {
+      "forceIncludes": [
+        "particular-reforged",
+        "mob-player-animator"
+      ]
+    },
+    "reclamation-reclaim-the-world": {
+      "forceIncludes": [
+        "more-overlays-updated"
+      ]
+    },
+    "skyfactory-5": {
+      "forceIncludes": [
+        "colored-torches",
+        "dye-mob-dye",
+        "openstairs"
+      ]
+    },
+    "valhelsia-5": {
+      "excludes": ["modernfix"]
+    }
+  }
+}

files/modrinth-exclude-include.json

@@ -26,6 +26,7 @@
     "clickadv",
     "cobblemon-ui-tweaks",
     "compass-coords",
+    "colorwheel",
     "connectedness",
     "connector",
     "continuity",

scripts/start-rconcmds

@@ -25,4 +25,4 @@ isDebugging && set -x
 isNumericElseSetToDefault RCON_CMDS_PERIOD 10
 checkIfNotZeroElseSetToDefault RCON_CMDS_PERIOD 10
 
-/usr/local/bin/rcon-cmds-daemon.sh &
+"$(dirname "$0")/auto/rcon-cmds-daemon.sh" &

scripts/start-setupModpack

@@ -3,10 +3,8 @@
 set -e -o pipefail
 
 : "${REMOVE_OLD_MODS:=false}"
-: "${MODS:=}"
 : "${MODS_OUT_DIR:=/data/mods}"
 : "${MODS_FILE:=}"
-: "${PLUGINS:=}"
 : "${PLUGINS_OUT_DIR:=/data/plugins}"
 : "${PLUGINS_FILE:=}"
 : "${REMOVE_OLD_MODS_DEPTH:=1} "
@@ -94,7 +92,7 @@ fi
 
 function handleListings() {
   if usesMods && usesPlugins; then
-      if [[ "$MODS" ]]; then
+      if [[ -v MODS ]]; then
 
         ensureRemoveAllModsOff "MODS is set"
 
@@ -105,7 +103,7 @@ function handleListings() {
           --to="$MODS_OUT_DIR" \
           "$MODS"
       fi
-      if [[ "$PLUGINS" ]]; then
+      if [[ -v PLUGINS ]]; then
         ensureRemoveAllModsOff "PLUGINS is set"
         mkdir -p "$PLUGINS_OUT_DIR"
         mc-image-helper mcopy \
@@ -140,14 +138,14 @@ function handleListings() {
       outDir="$PLUGINS_OUT_DIR"
     fi
 
-    if [[ "$MODS" || "$PLUGINS" ]]; then
+    if [[ -v MODS || -v PLUGINS ]]; then
       ensureRemoveAllModsOff "MODS or PLUGINS is set"
       mkdir -p "$outDir"
       mc-image-helper mcopy \
         --glob=*.jar \
         --scope=var-list \
         --to="$outDir" \
-        "$MODS" "$PLUGINS"
+        "${MODS:-}" "${PLUGINS:-}"
     fi
 
     if [[ "$MODS_FILE" || "$PLUGINS_FILE" ]]; then