From f09eb4920001956f83628d6990c32458eac8dcc5 Mon Sep 17 00:00:00 2001
From: fithwum <fithwum@hotmail.com>
Date: Mon, 20 Jul 2026 12:40:43 -0700
Subject: [PATCH] update

---
 minecraft/install_script.sh  |  9 +++++++++
 testing/install_script.sh    | 21 ++++++++++++++++++++-
 testing/{run.sh => start.sh} | 11 +++--------
 3 files changed, 32 insertions(+), 9 deletions(-)
 rename testing/{run.sh => start.sh} (64%)

diff --git a/minecraft/install_script.sh b/minecraft/install_script.sh
index 38be898..6014ed4 100644
--- a/minecraft/install_script.sh
+++ b/minecraft/install_script.sh
@@ -7,6 +7,8 @@ MC_DIR=/mcserver
 EULA_FILE=$MC_DIR/eula.txt
 EULA_MARKER=$MC_DIR/.eula_accepted
 
+SERVER_PROPERTIES=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/minecraft/server.properties
+
 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')
 BUKKIT_INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERSION.jar
@@ -295,6 +297,13 @@ else
     sleep infinity
 fi
 
+if [ -f $MC_DIR/server.properties ]; then
+    echo "INFO ! server.properties found ... moving on."
+else
+	echo "WARNING ! server.properties missing ... downloading default file."
+    wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_PROPERTIES -O $MC_DIR/server.properties
+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
diff --git a/testing/install_script.sh b/testing/install_script.sh
index 2efcd9c..58e74dd 100644
--- a/testing/install_script.sh
+++ b/testing/install_script.sh
@@ -15,6 +15,9 @@ fi
 EULA_FILE=$MC_DIR/eula.txt
 EULA_MARKER=$MC_DIR/.eula_accepted
 
+SERVER_PROPERTIES=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/server.properties
+START_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/start.sh
+
 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')
 BUKKIT_INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERSION.jar
@@ -303,6 +306,13 @@ else
     sleep infinity
 fi
 
+if [ -f $MC_DIR/server.properties ]; then
+    echo "INFO ! server.properties found ... moving on."
+else
+	echo "WARNING ! server.properties missing ... downloading default file."
+    wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_PROPERTIES -O $MC_DIR/server.properties
+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
@@ -335,6 +345,14 @@ 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
+
 # Set permissions.
 chown 99:100 -R $MC_DIR
 chmod 776 -R $MC_DIR
@@ -345,6 +363,7 @@ sleep 1
 echo " "
 echo "INFO ! Starting Minecraft Server $MC_TYPE-$MC_VERSION"
 cd $MC_DIR
-exec ./run-$MC_TYPE-$MC_VERSION.sh
+exec ./start.sh
+# exec ./run-$MC_TYPE-$MC_VERSION.sh
 
 exit
\ No newline at end of file
diff --git a/testing/run.sh b/testing/start.sh
similarity index 64%
rename from testing/run.sh
rename to testing/start.sh
index 46b2a38..c883d41 100644
--- a/testing/run.sh
+++ b/testing/start.sh
@@ -2,8 +2,8 @@
 # Copyright (c) 2020 fithwum
 # All rights reserved
 
-cd /MCserver
-JAR=./MCserver-*.jar
+cd /mcserver
+exec ./run-$MC_TYPE-$MC_VERSION.sh
 
 # Check if a screen session is already running
 if screen -list | grep -q "mcserver"; then
@@ -11,10 +11,5 @@ if screen -list | grep -q "mcserver"; then
 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'
+  screen -mS mcserver bash -c ./run-$MC_TYPE-$MC_VERSION.sh
 fi
\ No newline at end of file