testing update

neoforged/run.sh

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

testing-neoforged/Install_Script.sh

@@ -2,69 +2,41 @@
 # Copyright (c) 2022 fithwum
 # All rights reserved
 
+MC_DIR=/MCserver
+
 # Main Install Links
-INSTALLER_FILE=https://maven.neoforged.net/releases/net/neoforged/neoforge/$NEOFORGED_VERSION-beta/neoforge-$NEOFORGED_VERSION-beta-installer.jar
+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.
-if [ -e /MCserver/run-$NEOFORGED_VERSION.sh ]
+if [ -e $MC_DIR/neoforge-$NEOFORGED_VERSION-installer.jar ]
 	then
 		echo " "
-		echo "INFO ! run-$NEOFORGED_VERSION.sh found ... will use existing file."
+		echo "INFO ! neoforge-$NEOFORGED_VERSION-installer.jar found starting now."
 	else
 		echo " "
-		echo "WARNING ! run-$NEOFORGED_VERSION.sh is out of date/missing ... will download now."
-		rm -fr /MCserver/run-*.sh
-		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O /MCserver/run-$NEOFORGED_VERSION.sh
-		chmod +x /MCserver/run-$NEOFORGED_VERSION.sh
+		echo "WARNING ! neoforge-$NEOFORGED_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 neoforge-$NEOFORGED_VERSION-installer.jar
+		chmod +x neoforge-$NEOFORGED_VERSION-installer.jar
+		java -jar neoforge-$NEOFORGED_VERSION-installer.jar --installServer
+		mv run.sh run-$NEOFORGED_VERSION.sh
+		chmod +x run-$NEOFORGED_VERSION.sh
+		cd ..
 fi
 
-if [ -e /MCserver/neoforge-$NEOFORGED_VERSION-beta-installer.jar ]
-	then
-		echo " "
-		echo "INFO ! neoforge-$NEOFORGED_VERSION-beta-installer.jar found starting now."
-	else
-		echo " "
-		echo "WARNING ! neoforge-$NEOFORGED_VERSION-beta-installer.jar is out of date/missing ... will download now."
-			echo " "
-			echo "INFO ! Cleaning old files."
-			cd /MCserver
-			rm -fr neoforge-*.jar
-			wget --no-cache --show-progress --progress=bar:force:noscroll $INSTALLER_FILE -O neoforge-$NEOFORGED_VERSION-beta-installer.jar
-			chmod +x neoforge-$NEOFORGED_VERSION-beta-installer.jar
-			java -jar neoforge-$NEOFORGED_VERSION-beta-installer.jar --installServer
-			# mv run.sh run-$NEOFORGED_VERSION.sh
-			# chmod +x run-$NEOFORGED_VERSION.sh
-			cd ..
-fi
-
-if [ -e /MCserver/server-$SERVER_VERSION.jar ]
-	then
-		echo " "
-		echo "INFO ! server-$SERVER_VERSION.jar found starting now."
-			exec /MCserver/run-$NEOFORGED_VERSION.sh
-	else
-		echo " "
-		echo "WARNING ! server-$SERVER_VERSION.jar is out of date/missing ... will download now."
-			echo " "
-			echo "INFO ! Cleaning old files."
-			rm -fr /MCserver/server-*.jar
-			wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_FILE -O /MCserver/server-$SERVER_VERSION.jar
-			chmod +x /MCserver/server-$SERVER_VERSION.jar
-			exec /MCserver/run-$NEOFORGED_VERSION.sh
-fi
-
-sleep 1
-
 # Check for EULA
-if [ ! -f /MCserver/eula.txt ]; then
+if [ ! -f $MC_DIR/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
+		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"
@@ -73,20 +45,19 @@ else
     fi
 fi
 
-sleep 1
-
-if [ ! -f /MCserver/eula.txt ]; then
+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' /MCserver/eula.txt; then
-		sed -i '/eula=false/c\eula=true' /MCserver/eula.txt
+	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
-		exec /MCserver/run-$NEOFORGED_VERSION.sh --dataPath=/MCserver
+		cd $MC_DIR
+		exec ./run-$NEOFORGED_VERSION.sh nogui
 		exit 0
 	fi
 elif [ "$ACCEPT_EULA" == "false" ]; then
@@ -99,30 +70,28 @@ else
 	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
+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."
-sed -i '/-Xmx='*'/c\-Xmx='$XMX_SIZE'' /MCserver/user_jvm_args.txt
-sed -i '/-Xms='*'/c\-Xms='$XMS_SIZE'' /MCserver/user_jvm_args.txt
-sed -i '/-Xmn='*'/c\-Xmn='$XMN_SIZE'' /MCserver/user_jvm_args.txt
-
-sleep 1
+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 /MCserver
-chmod 777 -R /MCserver
+chown 99:100 -R $MC_DIR
+chmod 777 -R $MC_DIR
 
 sleep 1
 
 # Run Minecraft server.
 echo " "
 echo "INFO ! Starting Minecraft Server $NEOFORGED_VERSION"
-cd /MCserver
-exec /run-$NEOFORGED_VERSION.sh #--dataPath=/MCserver
+cd $MC_DIR
+exec ./run-$NEOFORGED_VERSION.sh nogui
 
 exit

testing-neoforged/run.sh

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