Loader version option

Dockerfile

@@ -29,8 +29,7 @@ RUN userdel -r ubuntu && \
 RUN su -c "curl -sL https://github.com/Jabba-Team/jabba/raw/main/install.sh | bash && . ~/.jabba/jabba.sh" minecraft
 
 COPY ./scripts/init /
-COPY ./scripts/mc /usr/local/bin 
+RUN chmod +x /init
-RUN chmod +x /init && chmod +x /usr/local/bin/mc
 
 USER minecraft
 

compose.yaml

@@ -5,12 +5,19 @@ services:
     stdin_open: true
     tty: true
     environment:
-      - MC_LOADER=paper
+      - MC_VERSION=1.20.1
-      - MC_VERSION=1.21.4
+
+      - MC_LOADER=fabric # paper, fabric or forge
+      - MC_LOADER_VERSION=0.16.14 # build number or blank for latest
+
       - JAVA_VERSION=temurin@21
       - JAR=server.jar
-      - MEMORY=2G
+
+      - MEMORY=4G
       - ADD_ARGS=
+
+      - PUID=1000
+      - PGID=1000
     build:
       dockerfile: Dockerfile
       context: .
@@ -21,5 +28,5 @@ services:
     deploy:
       resources:
         limits:
-          memory: 2G
+          memory: 4G
     restart: unless-stopped

scripts/init

@@ -1,29 +1,179 @@
 #!/bin/env bash
 
-JAVA_VERSION=${JAVA_VERSION:-"temurin@21"}
+MC_VERSION=${MC_VERSION}
-PATH=${JAVA_HOME}/bin:$PATH
+
-JAVA_HOME=/data/java/${JAVA_VERSION}
+MC_LOADER=${MC_LOADER=}
-JAR=server.jar
+MC_LOADER_VERSION=${MC_LOADER_VERSION}
+
+JAVA_VERSION=${JAVA_VERSION:-"temurin@21"}
+JAVA_HOME=/data/java/${JAVA_VERSION}
+JAR=${JAR:-"server.jar"}
 
-ADD_ARGS=${ADD_ARGS:-""}
 MEM=${MEMORY:-2G}
+ADD_ARGS=${ADD_ARGS:-""}
 
 PUID="${PUID:-1000}"
 PGID="${PGID:-1000}"
 
+PATH=${JAVA_HOME}/bin:$PATH
+
+# Set Permissions for data folder
 setperms() {
-  echo "Setting permissions to UID:${PUID} and GID:${PGID}"
+  echo -e "|_______________________________________________________|"
+  echo -e "|##--------------- Setting Permissions ---------------##|"
+  echo -e "|#| Setting permissions to UID:${PUID} and GID:${PGID}"
   sudo usermod -u ${PUID} minecraft >/dev/null 2>&1
   sudo groupmod -g ${PGID} minecraft >/dev/null 2>&1
   sudo chown -R ${PUID}:${PGID} /data >/dev/null 2>&1
+  echo -e "|#|---------------------------------------------------|#|"
   sleep 2
-  echo "DONE"
+  echo -e "|#|                     DONE"
+  echo -e "|##---------------------------------------------------##|"
   sleep 2
 }
 
+# Crash function
+crash() {
+  sleep 5
+  echo "Exit Complete"
+  exit 1
+}
+
+# Set Eula
+setEula() {
+  cat <<EOF > eula.txt
+#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://aka.ms/MinecraftEULA).
+eula=true
+EOF
+}
+
+# Check for Java, and install if neccesary
+javaCheck() {
+  JAVA_HOME=/data/java/${JAVA_VERSION}
+  if [[ -f "$HOME/.jabba/jabba.sh" ]]; then
+    source $HOME/.jabba/jabba.sh
+  else
+    echo "Something went wrong with locating jabba(the java installer)"
+    exit 0
+  fi
+
+  if [[ ! -n "${JAVA_VERSION}" ]]; then
+    echo "NO JAVA_VERSION ENVIRONMENT VARIABLE SET SET IT"
+    crash
+  fi
+
+  if [[ ! -f "/data/java/${JAVA_VERSION}/bin/java" ]]; then
+    rm -rf /data/java/${JAVA_VERSION}
+    jabba install ${JAVA_VERSION} -o /data/java/${JAVA_VERSION}
+  fi
+  PATH=${JAVA_HOME}/bin:$PATH
+  JAVA="java"
+}
+
+# Paper Server
+getPaper() {
+  SERVER_TYPE="Paper Minecraft"
+  if [[ ! -f server.jar ]]; then
+    LATEST_BUILD=$(curl -s https://api.papermc.io/v2/projects/${MC_LOADER}/versions/${MC_VERSION}/builds |
+      jq -r '.builds | map(select(.channel == "default") | .build) | .[-1]')
+
+    if [ "$LATEST_BUILD" != "null" ]; then
+      JAR_NAME=${MC_LOADER}-${MC_VERSION}-${LATEST_BUILD}.jar
+      PAPERMC_URL="https://api.papermc.io/v2/projects/${MC_LOADER}/versions/${MC_VERSION}/builds/${LATEST_BUILD}/downloads/${JAR_NAME}"
+
+      # Download the latest Paper version
+      curl -o server.jar $PAPERMC_URL
+      echo "Download completed"
+      echo "Minecraft Version: ${MC_VERSION}"
+      echo "Paper Version: ${LATEST_BUILD}"
+    else
+      echo "No stable build for version $MC_VERSION found :("
+    fi
+  fi
+}
+
+# Fabric Server
+getFabric() {
+  SERVER_TYPE="Fabric Minecraft"
+  LATEST_BUILD=$(curl -s https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION} | jq -s '.[] .[0] .loader .version' | tr -d '"')
+  LATEST_INSTALLER=$(curl -s https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml | xmllint --xpath "/metadata/versioning/latest/text()" -)
+  
+  if [ "$MC_VERSION" != "null" ]; then
+    VER=$MC_VERSION
+  else
+    echo "Minecraft version not set"
+    exit 1
+  fi
+
+  if [ "$MC_LOADER_VERSION" == "null" ]; then
+    DL_URL=https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION}/${LATEST_BUILD}/${LATEST_INSTALLER}/server/jar
+  else
+    DL_URL=https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION}/${MC_LOADER_VERSION}/${LATEST_INSTALLER}/server/jar
+  fi
+
+  if [ "$LATEST_BUILD" != "null" ]; then
+    echo "$DL_URL"
+    curl -o server.jar ${DL_URL}
+  else
+    echo "TODO ERROR TEXT"
+  fi
+
+}
+
+# Forge Server
+getForge() {
+  SERVER_TYPE="Forge Server"
+  LATEST_BUILD=$(curl -s https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json | jq -r ".promos[\"${MC_VERSION}-latest\"]")
+  DL_BUILD=${MC_VERSION}-${LATEST_BUILD}
+  DL_URL=https://maven.minecraftforge.net/net/minecraftforge/forge/$DL_BUILD/forge-$DL_BUILD-installer.jar
+  if [ "$LATEST_BUILD" != "null" ]; then
+    echo "$DL_URL"
+    curl -o forge-install.jar ${DL_URL}
+    echo "$JAVA -jar forge-install.jar --installServer"
+    $JAVA -jar forge-install.jar --installServer
+    ln -s forge-${MC_VERSION}-${LATEST_BUILD}-shim.jar server.jar
+    touch server.properties
+
+    rm -f user_jvm_args.txt
+    rm -f forge-install.jar
+    rm -f forge-install.jar.log
+    rm -f README.txt
+    rm -f run.bat
+    rm -f run.sh
+  else
+    echo "TODO ERROR TEXT"
+  fi
+}
+
+# Server route choice
+serverSelect() {
+  mkdir -p /data/server
+  cd /data/server
+  if [[ ! -f server.jar ]]; then
+    case $MC_LOADER in
+    vanilla)
+      getVanilla
+      ;;
+    paper)
+      getPaper
+      ;;
+    fabric)
+      getFabric
+      ;;
+    forge)
+      getForge
+      ;;
+    *)
+      echo "Server of type ${MC_LOADER} is not recognized."
+      crash
+      ;;
+    esac
+  fi
+}
+# Build out java command
 buildCommand() {
   JAVA_ARGS="-Xms${MEM} -Xmx${MEM}"
-  if [[ -z ${ADD_ARGS+x} ]]; then
+  if [[ ! -z ${ADD_ARGS+x} ]]; then
     RUN_STRING="${ADD_ARGS} ${JAVA_ARGS} -jar ${JAR} nogui"
   else
     RUN_STRING="${JAVA_ARGS} -jar ${JAR} nogui"
@@ -31,17 +181,61 @@ buildCommand() {
 }
 
 setperms
-
+javaCheck
-mc
+serverSelect
-
 buildCommand
 
-cd /data/server
+setEula
-if [[ -f "server.jar" ]]; then
-  echo "$JAVA_HOME/bin/java $RUN_STRING"
-  exec $JAVA_HOME/bin/java $RUN_STRING
-else
-  echo "Server Not Found."
-  exit 1
-fi
 
+serverInfoWrite() {
+  cat <<EOF > server.info
+MC_VERSION=$MC_VERSION
+
+MC_LOADER=$MC_LOADER
+MC_LOADER_VERSION=$MC_LOADER_VERSION
+
+JAVA_VERSION=$JAVA_VERSION
+JAR=$JAR
+
+MEMORY=$MEM
+ADD_ARGS=$ADD_ARGS
+
+PUID=$PUID
+PGID=$PGID
+EOF
+}
+
+## ----------------- SEND IT ----------------- ##
+while true; do
+  cd /data/server
+  if [[ ! -f "server.properties" ]]; then touch "server.properties"; fi
+  if [[ -f $JAR ]]; then
+  echo -e "|_______________________________________________________|"
+  echo -e "|##----------------- Server Starting -----------------##|"
+  echo -e "|#| Minecraft Version: $MC_VERSION"
+  echo -e "|#| "
+  echo -e "|#| Loader Type: ${SERVER_TYPE:-$MC_LOADER}"
+  echo -e "|#| Loader Version: $MC_LOADER_VERSION"
+  echo -e "|#| "
+  echo -e "|#| Java Version: $JAVA_VERSION"
+  echo -e "|#| Jar: $JAR"
+
+  echo -e "|#| Memory Allocated: $MEM"
+  echo -e "|#| Additional Args: $ADD_ARGS"
+  echo -e "|#| "
+  echo -e "|#| Running as:"
+  echo -e "|#|   User:  $PUID"
+  echo -e "|#|   Group: $PGID"
+  echo -e "|#| "
+  echo -e "|#| Run Command:"
+  echo -e "|#|   java $RUN_STRING"
+  echo -e "|##---------------------------------------------------##|"
+  echo -e "|-------------------------------------------------------|"
+  echo -e " "
+  serverInfoWrite
+  exec java $RUN_STRING
+  else
+    echo "Server Not Found."
+    crash
+  fi
+done

scripts/mc

@@ -1,160 +0,0 @@
-#!/bin/env bash
-
-MC_LOADER="${MC_LOADER:-"paper"}"
-MC_VERSION=${MC_VERSION:-"1.21.4"}
-
-JAVA_VERSION=${JAVA_VERSION:-"temurin@21"}
-JAR=${JAR:-"server.jar"}
-MEM=${MEMORY:-2G}
-ADD_ARGS=${ADD_ARGS:-""}
-
-RESTART=${RESTART:-"true"}
-
-crash() {
-  sleep 5
-  exit 1
-}
-
-setEula() {
-  echo "#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://aka.ms/MinecraftEULA)." >eula.txt
-  echo "eula=true" >>eula.txt
-}
-
-javaCheck() {
-  JAVA_HOME=/data/java/${JAVA_VERSION}
-  if [[ -f "$HOME/.jabba/jabba.sh" ]]; then
-    source $HOME/.jabba/jabba.sh
-  else
-    echo "Something went wrong with locating jabba(the java installer)"
-    exit 0
-  fi
-
-  if [[ ! -n "${JAVA_VERSION}" ]]; then
-    echo "NO JAVA_VERSION ENVIRONMENT VARIABLE SET SET IT"
-    crash
-  fi
-
-  if [[ ! -f "/data/java/${JAVA_VERSION}/bin/java" ]]; then
-    rm -rf /data/java/${JAVA_VERSION}
-    jabba install ${JAVA_VERSION} -o /data/java/${JAVA_VERSION}
-  fi
-  PATH=${JAVA_HOME}/bin:$PATH
-  JAVA="java"
-}
-
-getPaper() {
-  LATEST_BUILD=$(curl -s https://api.papermc.io/v2/projects/${MC_LOADER}/versions/${MC_VERSION}/builds |
-    jq -r '.builds | map(select(.channel == "default") | .build) | .[-1]')
-
-  if [ "$LATEST_BUILD" != "null" ]; then
-    JAR_NAME=${MC_LOADER}-${MC_VERSION}-${LATEST_BUILD}.jar
-    PAPERMC_URL="https://api.papermc.io/v2/projects/${MC_LOADER}/versions/${MC_VERSION}/builds/${LATEST_BUILD}/downloads/${JAR_NAME}"
-
-    # Download the latest Paper version
-    curl -o server.jar $PAPERMC_URL
-    echo "Download completed"
-    echo "Minecraft Version: ${MC_VERSION}"
-    echo "Paper Version: ${LATEST_BUILD}"
-  else
-    echo "No stable build for version $MC_VERSION found :("
-  fi
-}
-
-getFabric() {
-  LATEST_BUILD=$(curl -s https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION} | jq -s '.[] .[0] .loader .version' | tr -d '"')
-  LATEST_INSTALLER=$(curl -s https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml | xmllint --xpath "/metadata/versioning/latest/text()" -)
-  DL_URL=https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION}/${LATEST_BUILD}/${LATEST_INSTALLER}/server/jar
-  if [ "$LATEST_BUILD" != "null" ]; then
-    echo "$DL_URL"
-    curl -o server.jar ${DL_URL}
-  else
-    echo "TODO ERROR TEXT"
-  fi
-
-}
-
-getForge() {
-  LATEST_BUILD=$(curl -s https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json | jq -r ".promos[\"${MC_VERSION}-latest\"]")
-  DL_BUILD=${MC_VERSION}-${LATEST_BUILD}
-  DL_URL=https://maven.minecraftforge.net/net/minecraftforge/forge/$DL_BUILD/forge-$DL_BUILD-installer.jar
-  if [ "$LATEST_BUILD" != "null" ]; then
-    echo "$DL_URL"
-    curl -o forge-install.jar ${DL_URL}
-    echo "$JAVA -jar forge-install.jar --installServer"
-    $JAVA -jar forge-install.jar --installServer
-    ln -s forge-${MC_VERSION}-${LATEST_BUILD}-shim.jar server.jar
-    touch server.properties
-
-    rm -f user_jvm_args.txt
-    rm -f forge-install.jar
-    rm -f forge-install.jar.log
-    rm -f README.txt
-    rm -f run.bat
-    rm -f run.sh
-  else
-    echo "TODO ERROR TEXT"
-  fi
-}
-
-serverSelect() {
-  mkdir -p /data/server
-  cd /data/server
-  if [[ ! -f server.jar ]]; then
-    case $MC_LOADER in
-    vanilla)
-      getVanilla
-      ;;
-    paper)
-      getPaper
-      ;;
-    fabric)
-      getFabric
-      ;;
-    forge)
-      getForge
-      ;;
-    *)
-      echo "Server of type ${MC_LOADER} is not recognized."
-      crash
-      ;;
-    esac
-  fi
-}
-
-buildCommand() {
-  JAVA_ARGS="-Xms${MEM} -Xmx${MEM}"
-  if [[ -z ${ADD_ARGS+x} ]]; then
-    RUN_STRING="${ADD_ARGS} ${JAVA_ARGS} -jar ${JAR} nogui"
-  else
-    RUN_STRING="${JAVA_ARGS} -jar ${JAR} nogui"
-  fi
-}
-
-runServer() {
-  setEula
-  while true; do
-    if [[ -f $JAR ]]; then
-      buildCommand
-      echo "${JAVA} ${RUN_STRING}"
-      $JAVA ${RUN_STRING}
-    else
-      echo "${JAR} not found."
-    fi
-    if [[ "${RESTART}" != "true" ]]; then
-      echo "Exiting..."
-      exit 0
-    fi
-    echo -e "\n${RD}Automatically restarting server in 5 seconds. Press CTRL + C to abort and exit.${NC}"
-    sleep 5
-  done
-}
-
-# ------------------------------------------------------------------------------- #
-
-javaCheck
-
-serverSelect
-
-setEula
-
-#runServer