From 52b75722ccb8b71073a3161c4d835b102009d9f3 Mon Sep 17 00:00:00 2001
From: fithwum <fithwum@hotmail.com>
Date: Mon, 20 Jul 2026 14:08:19 -0700
Subject: [PATCH] console test

---
 testing/Dockerfile        |  2 +-
 testing/install_script.sh | 70 ++++++++++++++++++++++++++-------------
 2 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/testing/Dockerfile b/testing/Dockerfile
index 242a8dc..8c5e1b8 100644
--- a/testing/Dockerfile
+++ b/testing/Dockerfile
@@ -26,7 +26,7 @@ ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/maste
 
 # Install Java & Dependencies.
 RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release jq \
+	&& apt-get install -y --no-install-recommends bzip2 lsb-release jq screen \
 	&& apt-get -y --fix-broken install \
 	&& apt-get -y autoclean \
 	&& apt-get -y autoremove \
diff --git a/testing/install_script.sh b/testing/install_script.sh
index cf3d5c9..071bffc 100644
--- a/testing/install_script.sh
+++ b/testing/install_script.sh
@@ -113,10 +113,16 @@ if [ $MC_TYPE = "vanilla" ]; then
 			JAR=./mcserver-*.jar
 
 			while [ true ]; do
-				exec java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
-				if [ $? -eq 0 ]; then
-					break
-				fi
+				java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+				
+				EXIT_CODE=$?
+
+				echo "Minecraft exited with code $EXIT_CODE"
+
+				[ "$EXIT_CODE" -eq 0 ] && break
+
+				echo "Restarting server in 5 seconds..."
+				sleep 5
 			done
 			EOF
 			chmod +x run-$MC_TYPE-$MC_VERSION.sh
@@ -153,10 +159,16 @@ elif [ $MC_TYPE = "bukkit" ]; then
 			JAR=./craftbukkit-*.jar
 			
 			while [ true ]; do
-				exec java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
-				if [ $? -eq 0 ]; then
-					break
-				fi
+				java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+				
+				EXIT_CODE=$?
+
+				echo "Minecraft exited with code $EXIT_CODE"
+
+				[ "$EXIT_CODE" -eq 0 ] && break
+
+				echo "Restarting server in 5 seconds..."
+				sleep 5
 			done
 			EOF
 			chmod +x run-$MC_TYPE-$MC_VERSION.sh
@@ -193,10 +205,16 @@ elif [ $MC_TYPE = "fabric" ]; then
 			JAR=./fabric-*-*.jar
 			
 			while [ true ]; do
-				exec java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
-				if [ $? -eq 0 ]; then
-					break
-				fi
+				java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+				
+				EXIT_CODE=$?
+
+				echo "Minecraft exited with code $EXIT_CODE"
+
+				[ "$EXIT_CODE" -eq 0 ] && break
+
+				echo "Restarting server in 5 seconds..."
+				sleep 5
 			done
 			EOF
 			chmod +x run-$MC_TYPE-$MC_VERSION.sh
@@ -238,10 +256,16 @@ elif [ $MC_TYPE = "quilt" ]; then
 			JAR=./quilt-server-launch.jar
 			
 			while [ true ]; do
-				exec java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
-				if [ $? -eq 0 ]; then
-					break
-				fi
+				java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+				
+				EXIT_CODE=$?
+
+				echo "Minecraft exited with code $EXIT_CODE"
+
+				[ "$EXIT_CODE" -eq 0 ] && break
+
+				echo "Restarting server in 5 seconds..."
+				sleep 5
 			done
 			EOF
 			chmod +x run-$MC_TYPE-$MC_VERSION.sh
@@ -349,13 +373,13 @@ else
     sleep infinity
 fi
 
-if [ -f $MC_DIR/start.sh ]; then
-    echo "INFO ! start.sh found ... moving on."
-else
-	echo "WARNING ! start.sh missing ... downloading default file."
-    wget --no-cache --show-progress --progress=bar:force:noscroll $START_FILE -O $MC_DIR/start.sh
-	chmod +x start.sh
-fi
+# if [ -f $MC_DIR/start.sh ]; then
+#     echo "INFO ! start.sh found ... moving on."
+# else
+# 	echo "WARNING ! start.sh missing ... downloading default file."
+#     wget --no-cache --show-progress --progress=bar:force:noscroll $START_FILE -O $MC_DIR/start.sh
+# 	chmod +x $MC_DIR/start.sh
+# fi
 
 # Set permissions.
 chown 99:100 -R $MC_DIR