From 7c8cc1e4fa9ad0276bc8fe3790d66cbb19065c06 Mon Sep 17 00:00:00 2001
From: fithwum <fithwum@hotmail.com>
Date: Mon, 13 Nov 2023 06:17:30 -0800
Subject: [PATCH] updates

---
 bedrock/Dockerfile        |  34 ++++++++++++
 bedrock/install_script.sh | 106 ++++++++++++++++++++++++++++++++++++++
 bedrock/run.sh            |  13 +++++
 fabric/install_script.sh  |   4 +-
 testing/install_script.sh |   4 +-
 testing/test.sh           |   2 +-
 vanilla/install_script.sh |   4 +-
 7 files changed, 160 insertions(+), 7 deletions(-)
 create mode 100644 bedrock/Dockerfile
 create mode 100644 bedrock/install_script.sh
 create mode 100644 bedrock/run.sh

diff --git a/bedrock/Dockerfile b/bedrock/Dockerfile
new file mode 100644
index 0000000..3b8c79b
--- /dev/null
+++ b/bedrock/Dockerfile
@@ -0,0 +1,34 @@
+FROM fithwum/debian-base:bullseye
+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://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/bedrock/install_script.sh
+
+# Install java-17 & Dependencies.
+RUN apt-get -y update \
+	&& apt-get -y --fix-broken install \
+	&& apt-get install -y software-properties-common screen jq curl \
+	&& apt-get clean \
+	&& 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
+ADD "$INSTALL_SCRIPT" /MCtemp
+RUN chmod +x /MCtemp/install_script.sh
+
+# Directory where data is stored
+VOLUME /MCserver
+
+# Run command
+CMD [ "/bin/bash", "./MCtemp/install_script.sh" ]
\ No newline at end of file
diff --git a/bedrock/install_script.sh b/bedrock/install_script.sh
new file mode 100644
index 0000000..6c9eab1
--- /dev/null
+++ b/bedrock/install_script.sh
@@ -0,0 +1,106 @@
+#!/bin/bash
+# Copyright (c) 2022 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://gitlab.fithwum.tech/fithwum/minecraft/-/raw/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
+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
+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
+chmod +x /MCserver/run-$MC_VERSION.sh
+chmod +x /MCserver/MCserver-$MC_VERSION.jar
+
+sleep 1
+
+# Run Minecraft server.
+echo " "
+echo "INFO ! Starting Minecraft Server $MC_VERSION"
+exec /MCserver/run-$MC_VERSION.sh --dataPath=/MCserver
+
+exit
\ No newline at end of file
diff --git a/bedrock/run.sh b/bedrock/run.sh
new file mode 100644
index 0000000..f294f43
--- /dev/null
+++ b/bedrock/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
\ No newline at end of file
diff --git a/fabric/install_script.sh b/fabric/install_script.sh
index 489b42f..f47a6ae 100644
--- a/fabric/install_script.sh
+++ b/fabric/install_script.sh
@@ -24,7 +24,7 @@ if [ -e /MCserver/fabric-$MC_VERSION-$FABRIC_VERSION.jar ]
 			echo "INFO ! Cleaning old files."
 			mkdir /MCserver/old-server-versions
 			mv /MCserver/fabric-*-*.jar /MCserver/old-server-versions/
-			wget --no-cache $SERVER_FILE -O /MCserver/fabric-$MC_VERSION-$FABRIC_VERSION.jar
+			wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_FILE -O /MCserver/fabric-$MC_VERSION-$FABRIC_VERSION.jar
 fi
 
 sleep 1
@@ -38,7 +38,7 @@ if [ -e /MCserver/run-$MC_VERSION.sh ]
 		echo " "
 		echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will download now."
 		mv /MCserver/run-*.sh /MCserver/old-server-versions/
-		wget --no-cache $MC_RUN_FILE -O /MCserver/run-$MC_VERSION.sh
+		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O /MCserver/run-$MC_VERSION.sh
 fi
 
 # Check for EULA
diff --git a/testing/install_script.sh b/testing/install_script.sh
index a714d9d..6ed7a7b 100644
--- a/testing/install_script.sh
+++ b/testing/install_script.sh
@@ -26,7 +26,7 @@ if [ -e /MCserver/MCserver-$MC_VERSION.jar ]
 			mkdir /MCserver/old-server-versions/
 			mv /MCserver/MCserver-*.jar /MCserver/old-server-versions/
 			mv /MCserver/run-*.sh /MCserver/old-server-versions/
-			wget --no-cache $MC_SERVER_FILE -O /MCserver/MCserver-$MC_VERSION.jar
+			wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O /MCserver/MCserver-$MC_VERSION.jar
 fi
 
 sleep 1
@@ -39,7 +39,7 @@ if [ -e /MCserver/run-$MC_VERSION.sh ]
 	else
 		echo " "
 		echo "WARNING ! run.sh is out of date/missing ... will download now."
-		wget --no-cache $MC_RUN_FILE -O /MCserver/run-$MC_VERSION.sh
+		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O /MCserver/run-$MC_VERSION.sh
 fi
 
 sleep 1
diff --git a/testing/test.sh b/testing/test.sh
index bb10d08..a01be6e 100755
--- a/testing/test.sh
+++ b/testing/test.sh
@@ -9,4 +9,4 @@ MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url
 
 echo "Server url: $MC_SERVER_FILE"
 
-wget --no-cache $MC_SERVER_FILE -O /mnt/Other/Dockers/minecraft/testing/server-$MC_VERSION.jar
\ No newline at end of file
+wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O /mnt/Other/Dockers/minecraft/testing/server-$MC_VERSION.jar
\ No newline at end of file
diff --git a/vanilla/install_script.sh b/vanilla/install_script.sh
index 61dfde7..6c9eab1 100644
--- a/vanilla/install_script.sh
+++ b/vanilla/install_script.sh
@@ -26,7 +26,7 @@ if [ -e /MCserver/MCserver-$MC_VERSION.jar ]
 			mkdir /MCserver/old-server-versions/
 			mv /MCserver/MCserver-*.jar /MCserver/old-server-versions/
 			mv /MCserver/run-*.sh /MCserver/old-server-versions/
-			wget --no-cache $MC_SERVER_FILE -O /MCserver/MCserver-$MC_VERSION.jar
+			wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O /MCserver/MCserver-$MC_VERSION.jar
 fi
 
 sleep 1
@@ -39,7 +39,7 @@ if [ -e /MCserver/run-$MC_VERSION.sh ]
 	else
 		echo " "
 		echo "WARNING ! run.sh is out of date/missing ... will download now."
-		wget --no-cache $MC_RUN_FILE -O /MCserver/run-$MC_VERSION.sh
+		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O /MCserver/run-$MC_VERSION.sh
 fi
 
 sleep 1