Merge pull request #115 from Diyagi/main

Add activateallcontent flag, revert #114 and some fixes

Author: arguser

Dockerfile

@@ -36,15 +36,14 @@ RUN set -x \
         jq \
         gettext-base \
         unzip \
-		libatomic1 \
-		libpulse0 \
-	    wget \
+        wget \
     && rm -rf /var/lib/apt/lists/*
 
 RUN case "${TARGETARCH}" in \
-    "arm64") apt-get update \
+    "arm64") dpkg --add-architecture amd64 \ 
+        && apt-get update \
         && apt-get install -y --no-install-recommends --no-install-suggests \
-            libmonosgen-2.0-1 \
+            libmonosgen-2.0-dev:amd64 \ 
             libdbus-1-3 \
             libxcursor1 \
             libxinerama1 \
@@ -108,6 +107,7 @@ ENV PUID=1000 \
     SERVER_IP="" \
     SERVER_PORT="" \
     PASSWORD="" \
+    ACTIVATE_ALL_CONTENT=false \
     ALLOW_ONLY_PLATFORM="" \
     DISCORD_WEBHOOK_URL="" \
     # Player Join

README.md

@@ -101,6 +101,8 @@ These are the arguments you can use to customize server behavior with default va
 | SERVER_IP | No Default | Only used if port is set. Sets the address that the server will bind to. Supports ipv4 and ipv6 addresses. If not set, default value 0.0.0.0 is used, which will accept connections from any internal ip. |
 | SERVER_PORT | No Default | Port used for direct connection mode. **Setting an value to this will cause the server behaviour to change!** [See Network Mode](#network-mode) |
 | PASSWORD | No Default | Password players should use when trying to join using direct connections. Maximum length password can be 28 characters. If omitted or invalid, a random password will be generated.|
+| ACTIVATE_CONTENT | "" | Comma separated list to turn on biomes for worlds created prior to v1.1. Valid values are `GiantCicadaBossDungeon`, `NatureBiomeCicadas`, `GuaranteedOases`, `BiomeStatues`, and `AbioticFactor`. Once enabled, they cannot be disabled! |
+| ACTIVATE_ALL_CONTENT | false | Same as `ACTIVATE_CONTENT` but activates all content bundles. |
 | ALLOW_ONLY_PLATFORM | No Default | Allow only players from given platform. If not set all platforms are allowed. Has no effect unless -port is also set enabling Direct Connections. Can be Steam (1), Epic (2), Microsoft (3), GOG (4). |
 | DISCORD_WEBHOOK_URL | "" | Webhook url (Edit channel > Integrations > Create Webhook). |
 | DISCORD_PLAYER_JOIN_ENABLED | true | Enable/Disable message on player join |
@@ -123,8 +125,6 @@ These are the arguments you can use to customize server behavior with default va
 | MODIO_API_KEY | "" | mod.io API key |
 | MODIO_API_URL | "" | mod.io API path |
 | MODS | "" | List of mods to install |
-| ACTIVATE_CONTENT | "" | Comma separated list to turn on biomes for worlds created prior to v1.1. Valid values are `GiantCicadaBossDungeon`, `NatureBiomeCicadas`, `GuaranteedOases`, and `AbioticFactor`. Once enabled, they cannot be disabled! |
-
 ## Mod Support
 
 The container supports automatically installing mods from [mod.io](https://mod.io/g/corekeeper).

docker-compose-example/.env

@@ -13,6 +13,7 @@ SERVER_IP=""
 # Port and Password are only needed if using direct connect mode
 #SERVER_PORT="27015"
 #PASSWORD=""
+ACTIVATE_ALL_CONTENT=false
 DISCORD_WEBHOOK_URL=""
 # Player Join
 DISCORD_PLAYER_JOIN_ENABLED=true

scripts/compile-parameters.sh

@@ -14,26 +14,39 @@ add_param() {
     fi
 }
 
+# Function to add flags to parameter array
+# usage: add_flag <name> <$env_value>
+add_flag() {
+    local flag_name="$1"
+    local flag_value="$2"
+
+    if [ "${flag_value,,}" = "true" ]; then
+        params+=("$flag_name")
+    fi
+}
+
 # Makes log file avaliable for other uses.
 logfile="${STEAMAPPDIR}/logs/$(date '+%Y-%m-%d_%H-%M-%S').log"
 params=(
     "-batchmode"
     "-logfile" "$logfile"
 )
 
-add_param "-world"      "${WORLD_INDEX}"
-add_param "-worldname"  "${WORLD_NAME}"
-add_param "-worldseed"  "${WORLD_SEED}"
-add_param "-worldmode"  "${WORLD_MODE}"
-add_param "-hashedworldseed"  "${HASHED_WORLD_SEED}"
-add_param "-gameid"     "${GAME_ID}"
-add_param "-datapath"   "${DATA_PATH:-${STEAMAPPDATADIR}}"
-add_param "-maxplayers" "${MAX_PLAYERS}"
-add_param "-season"     "${SEASON}"
-add_param "-ip"         "${SERVER_IP}"
-add_param "-port"       "${SERVER_PORT}"
-add_param "-activatecontent" "${ACTIVATE_CONTENT}"
-add_param "-password"   "${PASSWORD}"
-add_param "-allowonlyplatform" "${ALLOW_ONLY_PLATFORM}"
+add_param "-world"              "${WORLD_INDEX}"
+add_param "-worldname"          "${WORLD_NAME}"
+add_param "-worldseed"          "${WORLD_SEED}"
+add_param "-worldmode"          "${WORLD_MODE}"
+add_param "-hashedworldseed"    "${HASHED_WORLD_SEED}"
+add_param "-gameid"             "${GAME_ID}"
+add_param "-datapath"           "${DATA_PATH:-${STEAMAPPDATADIR}}"
+add_param "-maxplayers"         "${MAX_PLAYERS}"
+add_param "-season"             "${SEASON}"
+add_param "-ip"                 "${SERVER_IP}"
+add_param "-port"               "${SERVER_PORT}"
+add_param "-activatecontent"    "${ACTIVATE_CONTENT}"
+add_param "-password"           "${PASSWORD}"
+add_param "-allowonlyplatform"  "${ALLOW_ONLY_PLATFORM}"
+
+add_flag "-activateallcontent"  "${ACTIVATE_ALL_CONTENT}"
 
 echo "${params[@]}"

scripts/helper-functions.sh

@@ -52,9 +52,9 @@ SendDiscordMessage() {
     # shellcheck disable=SC2059
     "${SCRIPTSDIR}"/discord.sh "$title" "$(printf "$message")" "$color" &
     waitpid=$!
-  fi
 
-  if [[ "${wait,,}" == true ]]; then
-    wait "$waitpid"
+    if [[ "${wait,,}" == true ]]; then
+      wait "$waitpid"
+    fi
   fi
 }

scripts/launch.sh

@@ -6,13 +6,14 @@ cd "${STEAMAPPDIR}" || exit
 
 ### Function for gracefully shutdown
 function kill_corekeeperserver {
-    if [[ -n "$ckpid" ]]; then
-        kill $ckpid
-        wait $ckpid
+    if [[ -n "$ckpid" ]] && kill -0 "$ckpid" 2>/dev/null; then
+        kill "$ckpid"
+        wait "$ckpid"
     fi
-    if [[ -n "$xvfbpid" ]]; then
-        kill $xvfbpid
-        wait $xvfbpid
+
+    if [[ -n "$xvfbpid" ]] && kill -0 "$xvfbpid" 2>/dev/null; then
+        kill "$xvfbpid"
+        wait "$xvfbpid"
     fi
 
     # Sends stop message
@@ -45,7 +46,7 @@ architecture=$(dpkg --print-architecture)
 
 # Start Core Keeper Server
 if [ "$architecture" == "arm64" ]; then
-    DISPLAY=:99 LD_LIBRARY_PATH="${STEAMCMDDIR}/linux64:${BOX64_LD_LIBRARY_PATH}:${LD_LIBRARY_PATH}" /usr/local/bin/box64 ./CoreKeeperServer "${params[@]}" &
+    DISPLAY=:99 LD_LIBRARY_PATH="${STEAMCMDDIR}/linux64:/usr/lib:${LD_LIBRARY_PATH#:}" /usr/local/bin/box64 ./CoreKeeperServer "${params[@]}" &
 else
     DISPLAY=:99 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${STEAMCMDDIR}/linux64/" ./CoreKeeperServer "${params[@]}" &
 fi