added forge & updates neoforged

prep for bukket servers

.gitea/workflows/pipeline.yml

@@ -21,7 +21,7 @@ env:
   IMAGE_REPO_MINECRAFT: minecraft
   IMAGE_TAG_DEBIAN: bookworm
   DIGEST_FILE: .cache/debian-base.digest
-  VERSIONS: vanilla testing-vanilla fabric testing-fabric neoforged testing-neoforged
+  VERSIONS: vanilla testing-vanilla fabric testing-fabric neoforged testing-neoforged forge testing-forge
 
 jobs:
   poll-debian-base-and-detect-changes:
@@ -149,7 +149,7 @@ jobs:
       needs.poll-debian-base-and-detect-changes.outputs.new_versions != ''
     strategy:
       matrix:
-        version: [vanilla, testing-vanilla, fabric, testing-fabric, neoforged, testing-neoforged]
+        version: [vanilla, testing-vanilla, fabric, testing-fabric, neoforged, testing-neoforged, forge, testing-forge]
     name: Build and Push ${{ matrix.version }}
     steps:
       - name: Checkout repo

bukkit/Dockerfile

@@ -0,0 +1,43 @@
+FROM gitea.fithwum.tech/fithwum/debian-base:bookworm
+LABEL maintainer="fithwum"
+
+# Environment Variables
+ENV ACCEPT_EULA=""
+ENV GAME_PORT=""
+ENV MC_VERSION=""
+ENV XMX_SIZE=""
+ENV XMS_SIZE=""
+ENV XMN_SIZE=""
+
+# URL's for files
+ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/vanilla/install_script.sh
+
+# Install Dependencies.
+RUN apt-get -y update \
+	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq \
+	&& apt-get -y --fix-broken install \
+	&& apt-get -y autoclean \
+	&& apt-get -y autoremove \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& update-ca-certificates -f;
+
+# Install java
+RUN wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+	&& dpkg -i packages-microsoft-prod.deb \
+	&& apt-get update && apt-get install -y msopenjdk-21 \
+	&& apt-get -y update && apt-get -y --fix-broken install
+
+# Folder creation.
+RUN mkdir -p /MCserver /MCtemp \
+	&& chmod 777 -R /MCserver /MCtemp \
+	&& chown 99:100 -R /MCserver /MCtemp
+
+# Main script
+RUN wget "$INSTALL_SCRIPT" -O /MCtemp/install_script.sh \
+	&& chmod +x /MCtemp/install_script.sh
+
+# Directory where data is stored
+VOLUME /MCserver
+
+# Run command
+CMD [ "/bin/bash", "./MCtemp/install_script.sh" ]

bukkit/install_script.sh

@@ -0,0 +1,103 @@
+#!/bin/bash
+# Copyright (c) 2022 fithwum
+# All rights reserved
+
+VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json')
+MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url')
+MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/vanilla/run.sh
+
+rm -fr /MCserver/MCserver_*.jar
+rm -fr /MCserver/run_*.sh
+
+# Main install (Debian).
+# Check for server files and download if needed.
+if [ -e /MCserver/MCserver-$MC_VERSION.jar ]
+	then
+		echo " "
+		echo "INFO ! MCserver-$MC_VERSION.jar found starting now."
+	else
+		echo " "
+		echo "WARNING ! MCserver-$MC_VERSION.jar is out of date/missing ... will download now."
+		echo " "
+		echo "INFO ! Cleaning old files."
+		mkdir /MCserver/old-server-versions/
+		mv /MCserver/MCserver-*.jar /MCserver/old-server-versions/
+		mv /MCserver/run-*.sh /MCserver/old-server-versions/
+		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O /MCserver/MCserver-$MC_VERSION.jar
+		chmod +x /MCserver/MCserver-$MC_VERSION.jar
+fi
+
+sleep 1
+
+# Looking for run-${MC_VERSION}.sh
+if [ -e /MCserver/run-$MC_VERSION.sh ]
+	then
+		echo " "
+		echo "INFO ! run-$MC_VERSION.sh found ... will use existing file."
+	else
+		echo " "
+		echo "WARNING ! run.sh is out of date/missing ... will download now."
+		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O /MCserver/run-$MC_VERSION.sh
+		chmod +x /MCserver/run-$MC_VERSION.sh
+fi
+
+sleep 1
+
+# Check for EULA
+if [ ! -f /MCserver/eula.txt ]; then
+	:
+else
+	if [ "$ACCEPT_EULA" == "false" ]; then
+		if grep -rq 'eula=true' /MCserver/eula.txt; then
+			sed -i '/eula=true/c\eula=false' /MCserver/eula.txt
+		fi
+			echo " "
+			echo "WARNING ! EULA not accepted, you must accept the EULA"
+			echo "			to start the Server, putting server in sleep mode"
+		sleep infinity
+    fi
+fi
+
+sleep 1
+
+if [ ! -f /MCserver/eula.txt ]; then
+	echo " "
+	echo "WARNING ! EULA not found please stand by..."
+	sleep 5
+fi
+if [ "$ACCEPT_EULA" == "true" ]; then
+	if grep -rq 'eula=false' /MCserver/eula.txt; then
+		sed -i '/eula=false/c\eula=true' /MCserver/eula.txt
+		echo " "
+		echo "INFO ! EULA accepted, server restarting, please wait..."
+		sleep 1
+		exec /MCserver/run-$MC_VERSION.sh --dataPath=/MCserver
+		exit 0
+	fi
+elif [ "$ACCEPT_EULA" == "false" ]; then
+	echo " "
+	echo "WARNING ! EULA not accepted, you must accept the EULA"
+	echo "			to start the Server, putting server in sleep mode"
+	sleep infinity
+else
+	echo " "
+	echo "WARNING ! Something went wrong, please check EULA variable"
+fi
+
+sleep 1
+echo "INFO ! Setting game port."
+sed -i '/server-port='*'/c\server-port='$GAME_PORT'' /MCserver/server.properties
+sleep 1
+
+# Set permissions.
+chown 99:100 -R /MCserver
+chmod 777 -R /MCserver
+
+sleep 1
+
+# Run Minecraft server.
+echo " "
+echo "INFO ! Starting Minecraft Server $MC_VERSION"
+exec /MCserver/run-$MC_VERSION.sh --dataPath=/MCserver
+
+exit

bukkit/run.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+# Copyright (c) 2022 fithwum
+# All rights reserved
+
+cd /MCserver
+JAR=./MCserver-*.jar
+
+while [ true ]; do
+  java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
+  if [ $? -eq 0 ]; then
+    break
+  fi
+done

forge/Dockerfile

@@ -0,0 +1,41 @@
+FROM gitea.fithwum.tech/fithwum/debian-base:bookworm
+LABEL maintainer="fithwum"
+
+ENV ACCEPT_EULA=""
+ENV GAME_PORT=""
+ENV MC_VERSION=""
+ENV FORGE_VERSION=""
+ENV XMX_SIZE=""
+ENV XMS_SIZE=""
+ENV XMN_SIZE=""
+
+# URL's for files
+ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/forge/Install_Script.sh
+
+# Install java-17 & Dependencies.
+RUN apt-get -y update && apt-get -y autoclean && apt-get -y autoremove \
+	&& apt-get install -y wget
+RUN wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+	&& dpkg -i packages-microsoft-prod.deb
+RUN apt-get -y update && apt-get -y --fix-broken install \
+	&& apt-get install -y --no-install-recommends msopenjdk-21 bzip2 lsb-release screen jq \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& update-ca-certificates -f;
+
+# Folder creation.
+RUN mkdir -p /MCserver /MCtemp \
+	&& chmod 777 -R /MCserver /MCtemp \
+	&& chown 99:100 -R /MCserver /MCtemp \
+	&& cd /MCserver
+
+ADD "$INSTALL_SCRIPT" /MCtemp
+RUN chmod +x /MCtemp/Install_Script.sh
+
+# Directory where data is stored
+VOLUME /MCserver
+
+# 25565 Default.
+EXPOSE 25565/udp 25565/tcp
+
+# Run command
+CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ]

forge/Install_Script.sh

@@ -0,0 +1,96 @@
+#!/bin/bash
+# Copyright (c) 2022 fithwum
+# All rights reserved
+
+MC_DIR=/MCserver
+
+# Main Install Links
+INSTALLER_FILE=https://maven.minecraftforge.net/net/minecraftforge/forge/$MC_VERSION-$FORGE_VERSION/forge-$MC_VERSION-$FORGE_VERSION-installer.jar
+MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/neoforged/run.sh
+
+# Main install (Debian).
+# Check for server files and download if needed.
+if [ -e $MC_DIR/forge-$MC_VERSION-$FORGE_VERSION-installer.jar ]
+	then
+		echo " "
+		echo "INFO ! forge-$MC_VERSION-$FORGE_VERSION-installer.jar found starting now."
+	else
+		echo " "
+		echo "WARNING ! forge-$MC_VERSION-$FORGE_VERSION-installer.jar is out of date/missing ... will download now."
+		echo " "
+		echo "INFO ! Cleaning old files."
+		cd $MC_DIR
+		rm -fr neoforge-*.jar run-*.sh /libraries
+		wget --no-cache --show-progress --progress=bar:force:noscroll $INSTALLER_FILE -O forge-$MC_VERSION-$FORGE_VERSION-installer.jar
+		chmod +x forge-$MC_VERSION-$FORGE_VERSION-installer.jar
+		java -jar forge-$MC_VERSION-$FORGE_VERSION-installer.jar --installServer
+		mv run.sh run-$MC_VERSION-$FORGE_VERSION.sh
+		chmod +x run-$MC_VERSION-$FORGE_VERSION.sh
+		cd ..
+fi
+
+# Check for EULA
+if [ ! -f $MC_DIR/eula.txt ]; then
+	:
+else
+	if [ "$ACCEPT_EULA" == "false" ]; then
+		if grep -rq 'eula=true' $MC_DIR/eula.txt; then
+			sed -i '/eula=true/c\eula=false' $MC_DIR/eula.txt
+		fi
+			echo " "
+			echo "WARNING ! EULA not accepted, you must accept the EULA"
+			echo "			to start the Server, putting server in sleep mode"
+		sleep infinity
+    fi
+fi
+
+if [ ! -f $MC_DIR/eula.txt ]; then
+	echo " "
+	echo "WARNING ! EULA not found please stand by..."
+	sleep 5
+fi
+if [ "$ACCEPT_EULA" == "true" ]; then
+	if grep -rq 'eula=false' $MC_DIR/eula.txt; then
+		sed -i '/eula=false/c\eula=true' $MC_DIR/eula.txt
+		echo " "
+		echo "INFO ! EULA accepted, server restarting, please wait..."
+		sleep 1
+		cd $MC_DIR
+		exec ./run-$MC_VERSION-$FORGE_VERSION.sh nogui
+		exit 0
+	fi
+elif [ "$ACCEPT_EULA" == "false" ]; then
+	echo " "
+	echo "WARNING ! EULA not accepted, you must accept the EULA"
+	echo "			to start the Server, putting server in sleep mode"
+	sleep infinity
+else
+	echo " "
+	echo "WARNING ! Something went wrong, please check EULA variable"
+fi
+
+echo "INFO ! Setting game port."
+if [ -f $MC_DIR/server.properties ]; then
+	sed -i '/server-port='*'/c\server-port='$GAME_PORT'' $MC_DIR/server.properties
+fi
+
+echo "INFO ! Setting java settings."
+cat > $MC_DIR/user_jvm_args.txt <<EOF
+-Xmx${XMX_SIZE}
+-Xms${XMS_SIZE}
+EOF
+[ -n "$XMN_SIZE" ] && echo "-Xmn${XMN_SIZE}" >> $MC_DIR/user_jvm_args.txt
+
+# Set permissions.
+chown 99:100 -R $MC_DIR
+chmod 777 -R $MC_DIR
+
+sleep 1
+
+# Run Minecraft server.
+echo " "
+echo "INFO ! Starting Minecraft Server $MC_VERSION-$FORGE_VERSION"
+cd $MC_DIR
+exec ./run-$MC_VERSION-$FORGE_VERSION.sh nogui
+
+exit

neoforged/Dockerfile

@@ -3,7 +3,6 @@ LABEL maintainer="fithwum"
 
 ENV ACCEPT_EULA=""
 ENV GAME_PORT=""
-ENV SERVER_VERSION=""
 ENV NEOFORGED_VERSION=""
 ENV XMX_SIZE=""
 ENV XMS_SIZE=""

neoforged/Install_Script.sh

@@ -6,8 +6,6 @@ MC_DIR=/MCserver
 
 # Main Install Links
 INSTALLER_FILE=https://maven.neoforged.net/releases/net/neoforged/neoforge/$NEOFORGED_VERSION/neoforge-$NEOFORGED_VERSION-installer.jar
-SERVER_FILE=https://github.com/neoforged/ServerStarterJar/releases/download/$SERVER_VERSION/server.jar
-MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/neoforged/run.sh
 
 # Main install (Debian).
 # Check for server files and download if needed.

testing-bukkit/Dockerfile

@@ -0,0 +1,43 @@
+FROM gitea.fithwum.tech/fithwum/debian-base:bookworm
+LABEL maintainer="fithwum"
+
+# Environment Variables
+ENV ACCEPT_EULA=""
+ENV GAME_PORT=""
+ENV MC_VERSION=""
+ENV XMX_SIZE=""
+ENV XMS_SIZE=""
+ENV XMN_SIZE=""
+
+# URL's for files
+ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing-vanilla/install_script.sh
+
+# Install Dependencies.
+RUN apt-get -y update \
+	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq \
+	&& apt-get -y --fix-broken install \
+	&& apt-get -y autoclean \
+	&& apt-get -y autoremove \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& update-ca-certificates -f;
+
+# Install java
+RUN wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+	&& dpkg -i packages-microsoft-prod.deb \
+	&& apt-get update && apt-get install -y msopenjdk-21 \
+	&& apt-get -y update && apt-get -y --fix-broken install
+
+# Folder creation.
+RUN mkdir -p /MCserver /MCtemp \
+	&& chmod 777 -R /MCserver /MCtemp \
+	&& chown 99:100 -R /MCserver /MCtemp
+
+# Main script
+RUN wget "$INSTALL_SCRIPT" -O /MCtemp/install_script.sh \
+	&& chmod +x /MCtemp/install_script.sh
+
+# Directory where data is stored
+VOLUME /MCserver
+
+# Run command
+CMD [ "/bin/bash", "./MCtemp/install_script.sh" ]

testing-bukkit/install_script.sh

@@ -0,0 +1,107 @@
+#!/bin/bash
+# Copyright (c) 2020 fithwum
+# All rights reserved
+
+# Display setup
+#export DISPLAY=0
+
+VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json')
+MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url')
+MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/run.sh
+
+rm -fr /MCserver/MCserver_*.jar
+rm -fr /MCserver/run_*.sh
+
+# Main install (Debian).
+# Check for files in /MCserver and download if needed.
+if [ -e /MCserver/MCserver-$MC_VERSION.jar ]
+	then
+		echo " "
+		echo "INFO ! MCserver-$MC_VERSION.jar found starting now."
+	else
+		echo " "
+		echo "WARNING ! MCserver-$MC_VERSION.jar is out of date/missing ... will download now."
+		echo " "
+		echo "INFO ! Cleaning old files."
+		mkdir /MCserver/old-server-versions/
+		mv /MCserver/MCserver-*.jar /MCserver/old-server-versions/
+		mv /MCserver/run-*.sh /MCserver/old-server-versions/
+		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O /MCserver/MCserver-$MC_VERSION.jar
+		chmod +x /MCserver/MCserver-$MC_VERSION.jar
+fi
+
+sleep 1
+
+# Looking for run.sh
+if [ -e /MCserver/run-$MC_VERSION.sh ]
+	then
+		echo " "
+		echo "INFO ! run-$MC_VERSION.sh found ... will use existing file."
+	else
+		echo " "
+		echo "WARNING ! run.sh is out of date/missing ... will download now."
+		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O /MCserver/run-$MC_VERSION.sh
+		chmod +x /MCserver/run-$MC_VERSION.sh
+fi
+
+sleep 1
+
+# Check for EULA
+if [ ! -f /MCserver/eula.txt ]; then
+	:
+else
+	if [ "$ACCEPT_EULA" == "false" ]; then
+		if grep -rq 'eula=true' /MCserver/eula.txt; then
+			sed -i '/eula=true/c\eula=false' /MCserver/eula.txt
+		fi
+			echo " "
+			echo "WARNING ! EULA not accepted, you must accept the EULA"
+			echo "			to start the Server, putting server in sleep mode"
+		sleep infinity
+    fi
+fi
+
+sleep 1
+
+if [ ! -f /MCserver/eula.txt ]; then
+	echo " "
+	echo "WARNING ! EULA not found please stand by..."
+	sleep 5
+fi
+if [ "$ACCEPT_EULA" == "true" ]; then
+	if grep -rq 'eula=false' /MCserver/eula.txt; then
+		sed -i '/eula=false/c\eula=true' /MCserver/eula.txt
+		echo " "
+		echo "INFO ! EULA accepted, server restarting, please wait..."
+		sleep 1
+		exec /MCserver/run-$MC_VERSION.sh --dataPath=/MCserver
+		exit 0
+	fi
+elif [ "$ACCEPT_EULA" == "false" ]; then
+	echo " "
+	echo "WARNING ! EULA not accepted, you must accept the EULA"
+	echo "			to start the Server, putting server in sleep mode"
+	sleep infinity
+else
+	echo " "
+	echo "WARNING ! Something went wrong, please check EULA variable"
+fi
+
+sleep 1
+echo "INFO ! Setting game port."
+sed -i '/server-port='*'/c\server-port='$GAME_PORT'' /MCserver/server.properties
+sleep 1
+
+# Set permissions.
+chown 99:100 -R /MCserver
+chmod 777 -R /MCserver
+
+sleep 1
+
+# Run Minecraft server.
+echo " "
+echo "INFO ! Starting Minecraft Server $MC_VERSION"
+exec /MCserver/run-$MC_VERSION.sh --dataPath=/MCserver
+#screen -dmS mcserver /MCserver/run-$MC_VERSION.sh --dataPath=/MCserver
+
+exit

testing-bukkit/run.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+# Copyright (c) 2020 fithwum
+# All rights reserved
+
+cd /MCserver
+JAR=./MCserver-*.jar
+
+# # Check if a screen session is already running
+# if screen -list | grep -q "MCserver"; then
+#   echo "INFO ! A screen session for the Minecraft server is already running."
+# else
+#   # Start the Minecraft server in a detached screen session
+#   echo "INFO ! Starting Minecraft Server in a screen session."
+#   screen -mS mcserver bash -c 'while true; do
+#     java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
+#     if [ $? -eq 0 ]; then
+#       break
+#     fi
+#   done'
+# fi
+
+while [ true ]; do
+  java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
+  if [ $? -eq 0 ]; then
+    break
+  fi
+done

testing-bukkit/test.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+# Copyright (c) 2023 fithwum
+# All rights reserved
+
+MC_VERSION="1.14.4"
+
+VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json')
+MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url')
+
+echo "Server url: $MC_SERVER_FILE"
+
+wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O /mnt/Other/Dockers/minecraft/testing/server-$MC_VERSION.jar

testing-forge/Dockerfile

@@ -0,0 +1,41 @@
+FROM gitea.fithwum.tech/fithwum/debian-base:bookworm
+LABEL maintainer="fithwum"
+
+ENV ACCEPT_EULA=""
+ENV GAME_PORT=""
+ENV MC_VERSION=""
+ENV FORGE_VERSION=""
+ENV XMX_SIZE=""
+ENV XMS_SIZE=""
+ENV XMN_SIZE=""
+
+# URL's for files
+ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/forge/Install_Script.sh
+
+# Install java-17 & Dependencies.
+RUN apt-get -y update && apt-get -y autoclean && apt-get -y autoremove \
+	&& apt-get install -y wget
+RUN wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+	&& dpkg -i packages-microsoft-prod.deb
+RUN apt-get -y update && apt-get -y --fix-broken install \
+	&& apt-get install -y --no-install-recommends msopenjdk-21 bzip2 lsb-release screen jq \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& update-ca-certificates -f;
+
+# Folder creation.
+RUN mkdir -p /MCserver /MCtemp \
+	&& chmod 777 -R /MCserver /MCtemp \
+	&& chown 99:100 -R /MCserver /MCtemp \
+	&& cd /MCserver
+
+ADD "$INSTALL_SCRIPT" /MCtemp
+RUN chmod +x /MCtemp/Install_Script.sh
+
+# Directory where data is stored
+VOLUME /MCserver
+
+# 25565 Default.
+EXPOSE 25565/udp 25565/tcp
+
+# Run command
+CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ]

testing-forge/Install_Script.sh

@@ -0,0 +1,96 @@
+#!/bin/bash
+# Copyright (c) 2022 fithwum
+# All rights reserved
+
+MC_DIR=/MCserver
+
+# Main Install Links
+INSTALLER_FILE=https://maven.minecraftforge.net/net/minecraftforge/forge/$MC_VERSION-$FORGE_VERSION/forge-$MC_VERSION-$FORGE_VERSION-installer.jar
+MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/neoforged/run.sh
+
+# Main install (Debian).
+# Check for server files and download if needed.
+if [ -e $MC_DIR/forge-$MC_VERSION-$FORGE_VERSION-installer.jar ]
+	then
+		echo " "
+		echo "INFO ! forge-$MC_VERSION-$FORGE_VERSION-installer.jar found starting now."
+	else
+		echo " "
+		echo "WARNING ! forge-$MC_VERSION-$FORGE_VERSION-installer.jar is out of date/missing ... will download now."
+		echo " "
+		echo "INFO ! Cleaning old files."
+		cd $MC_DIR
+		rm -fr neoforge-*.jar run-*.sh /libraries
+		wget --no-cache --show-progress --progress=bar:force:noscroll $INSTALLER_FILE -O forge-$MC_VERSION-$FORGE_VERSION-installer.jar
+		chmod +x forge-$MC_VERSION-$FORGE_VERSION-installer.jar
+		java -jar forge-$MC_VERSION-$FORGE_VERSION-installer.jar --installServer
+		mv run.sh run-$MC_VERSION-$FORGE_VERSION.sh
+		chmod +x run-$MC_VERSION-$FORGE_VERSION.sh
+		cd ..
+fi
+
+# Check for EULA
+if [ ! -f $MC_DIR/eula.txt ]; then
+	:
+else
+	if [ "$ACCEPT_EULA" == "false" ]; then
+		if grep -rq 'eula=true' $MC_DIR/eula.txt; then
+			sed -i '/eula=true/c\eula=false' $MC_DIR/eula.txt
+		fi
+			echo " "
+			echo "WARNING ! EULA not accepted, you must accept the EULA"
+			echo "			to start the Server, putting server in sleep mode"
+		sleep infinity
+    fi
+fi
+
+if [ ! -f $MC_DIR/eula.txt ]; then
+	echo " "
+	echo "WARNING ! EULA not found please stand by..."
+	sleep 5
+fi
+if [ "$ACCEPT_EULA" == "true" ]; then
+	if grep -rq 'eula=false' $MC_DIR/eula.txt; then
+		sed -i '/eula=false/c\eula=true' $MC_DIR/eula.txt
+		echo " "
+		echo "INFO ! EULA accepted, server restarting, please wait..."
+		sleep 1
+		cd $MC_DIR
+		exec ./run-$MC_VERSION-$FORGE_VERSION.sh nogui
+		exit 0
+	fi
+elif [ "$ACCEPT_EULA" == "false" ]; then
+	echo " "
+	echo "WARNING ! EULA not accepted, you must accept the EULA"
+	echo "			to start the Server, putting server in sleep mode"
+	sleep infinity
+else
+	echo " "
+	echo "WARNING ! Something went wrong, please check EULA variable"
+fi
+
+echo "INFO ! Setting game port."
+if [ -f $MC_DIR/server.properties ]; then
+	sed -i '/server-port='*'/c\server-port='$GAME_PORT'' $MC_DIR/server.properties
+fi
+
+echo "INFO ! Setting java settings."
+cat > $MC_DIR/user_jvm_args.txt <<EOF
+-Xmx${XMX_SIZE}
+-Xms${XMS_SIZE}
+EOF
+[ -n "$XMN_SIZE" ] && echo "-Xmn${XMN_SIZE}" >> $MC_DIR/user_jvm_args.txt
+
+# Set permissions.
+chown 99:100 -R $MC_DIR
+chmod 777 -R $MC_DIR
+
+sleep 1
+
+# Run Minecraft server.
+echo " "
+echo "INFO ! Starting Minecraft Server $MC_VERSION-$FORGE_VERSION"
+cd $MC_DIR
+exec ./run-$MC_VERSION-$FORGE_VERSION.sh nogui
+
+exit

testing-neoforged/Dockerfile

@@ -3,7 +3,6 @@ LABEL maintainer="fithwum"
 
 ENV ACCEPT_EULA=""
 ENV GAME_PORT=""
-ENV SERVER_VERSION=""
 ENV NEOFORGED_VERSION=""
 ENV XMX_SIZE=""
 ENV XMS_SIZE=""

testing-neoforged/Install_Script.sh

@@ -6,8 +6,6 @@ MC_DIR=/MCserver
 
 # Main Install Links
 INSTALLER_FILE=https://maven.neoforged.net/releases/net/neoforged/neoforge/$NEOFORGED_VERSION/neoforge-$NEOFORGED_VERSION-installer.jar
-SERVER_FILE=https://github.com/neoforged/ServerStarterJar/releases/download/$SERVER_VERSION/server.jar
-MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/neoforged/run.sh
 
 # Main install (Debian).
 # Check for server files and download if needed.