From f09f931bb27df86a28cc603b69950c5bb025669c Mon Sep 17 00:00:00 2001
From: fithwum <34775371+fithwum@users.noreply.github.com>
Date: Mon, 20 Mar 2023 12:39:50 -0700
Subject: [PATCH] test

---
 1.14.1/Dockerfile              |  32 -----------
 1.14.1/files/Install_Script.sh | 102 ---------------------------------
 1.14.1/files/run.sh            |  15 -----
 1.14.2/Dockerfile              |  32 -----------
 1.14.2/files/Install_Script.sh | 102 ---------------------------------
 1.14.2/files/run.sh            |  15 -----
 1.14/Dockerfile                |  32 -----------
 1.14/files/Install_Script.sh   | 102 ---------------------------------
 1.14/files/run.sh              |  15 -----
 9 files changed, 447 deletions(-)
 delete mode 100644 1.14.1/Dockerfile
 delete mode 100644 1.14.1/files/Install_Script.sh
 delete mode 100644 1.14.1/files/run.sh
 delete mode 100644 1.14.2/Dockerfile
 delete mode 100644 1.14.2/files/Install_Script.sh
 delete mode 100644 1.14.2/files/run.sh
 delete mode 100644 1.14/Dockerfile
 delete mode 100644 1.14/files/Install_Script.sh
 delete mode 100644 1.14/files/run.sh

diff --git a/1.14.1/Dockerfile b/1.14.1/Dockerfile
deleted file mode 100644
index 5a07a9a..0000000
--- a/1.14.1/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM fithwum/debian-base:bullseye
-LABEL maintainer "fithwum"
-
-ENV ACCEPT_EULA="false"
-ENV GAME_PORT=25565
-
-# URL's for files
-ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/1.14.1/files/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 openjdk-17-jdk \
-	&& 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
-
-# 25565 Default.
-EXPOSE 25565/udp 25565/tcp
-
-# Run command
-CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ]
diff --git a/1.14.1/files/Install_Script.sh b/1.14.1/files/Install_Script.sh
deleted file mode 100644
index 9d08979..0000000
--- a/1.14.1/files/Install_Script.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2022 fithwum
-# All rights reserved
-
-# Variables.
-echo " "
-echo "INFO ! Checking for latest Minecraft Server version."
-MC_VERSION_OLD=1.14
-MC_VERSION=1.14.1
-MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/d0d0fe2b1dc6ab4c65554cb734270872b72dadd6/server.jar
-MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/${MC_VERSION}/files/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/${MC_VERSION_OLD}
-			mv /MCserver/MCserver_${MC_VERSION_OLD}.jar /MCserver/old-server-versions/${MC_VERSION_OLD}
-			mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-			wget --no-cache ${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_${MC_VERSION_OLD}.sh is out of date/missing ... will download now."
-		mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-		wget --no-cache ${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
-
-# 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
diff --git a/1.14.1/files/run.sh b/1.14.1/files/run.sh
deleted file mode 100644
index e440a15..0000000
--- a/1.14.1/files/run.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2022 fithwum
-# All rights reserved
-
-MC_VERSION=1.14.1
-
-cd /MCserver
-JAR=./MCserver_${MC_VERSION}.jar
-
-while [ true ]; do
-  java -Xmx4G -Xms1024M -Xmn1G -jar $JAR nogui
-  if [ $? -eq 0 ]; then
-    break
-  fi
-done
diff --git a/1.14.2/Dockerfile b/1.14.2/Dockerfile
deleted file mode 100644
index 82e80fd..0000000
--- a/1.14.2/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM fithwum/debian-base:bullseye
-LABEL maintainer "fithwum"
-
-ENV ACCEPT_EULA="false"
-ENV GAME_PORT=25565
-
-# URL's for files
-ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/1.14.2/files/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 openjdk-17-jdk \
-	&& 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
-
-# 25565 Default.
-EXPOSE 25565/udp 25565/tcp
-
-# Run command
-CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ]
diff --git a/1.14.2/files/Install_Script.sh b/1.14.2/files/Install_Script.sh
deleted file mode 100644
index 0e730b7..0000000
--- a/1.14.2/files/Install_Script.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2022 fithwum
-# All rights reserved
-
-# Variables.
-echo " "
-echo "INFO ! Checking for latest Minecraft Server version."
-MC_VERSION_OLD=1.14.1
-MC_VERSION=1.14.2
-MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/d0d0fe2b1dc6ab4c65554cb734270872b72dadd6/server.jar
-MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/${MC_VERSION}/files/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/${MC_VERSION_OLD}
-			mv /MCserver/MCserver_${MC_VERSION_OLD}.jar /MCserver/old-server-versions/${MC_VERSION_OLD}
-			mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-			wget --no-cache ${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_${MC_VERSION_OLD}.sh is out of date/missing ... will download now."
-		mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-		wget --no-cache ${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
-
-# 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
diff --git a/1.14.2/files/run.sh b/1.14.2/files/run.sh
deleted file mode 100644
index a0b6247..0000000
--- a/1.14.2/files/run.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2022 fithwum
-# All rights reserved
-
-MC_VERSION=1.14.2
-
-cd /MCserver
-JAR=./MCserver_${MC_VERSION}.jar
-
-while [ true ]; do
-  java -Xmx4G -Xms1024M -Xmn1G -jar $JAR nogui
-  if [ $? -eq 0 ]; then
-    break
-  fi
-done
diff --git a/1.14/Dockerfile b/1.14/Dockerfile
deleted file mode 100644
index 13ddee3..0000000
--- a/1.14/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM fithwum/debian-base:bullseye
-LABEL maintainer "fithwum"
-
-ENV ACCEPT_EULA="false"
-ENV GAME_PORT=25565
-
-# URL's for files
-ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/1.14/files/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 openjdk-17-jdk \
-	&& 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
-
-# 25565 Default.
-EXPOSE 25565/udp 25565/tcp
-
-# Run command
-CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ]
diff --git a/1.14/files/Install_Script.sh b/1.14/files/Install_Script.sh
deleted file mode 100644
index fbe7075..0000000
--- a/1.14/files/Install_Script.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2022 fithwum
-# All rights reserved
-
-# Variables.
-echo " "
-echo "INFO ! Checking for latest Minecraft Server version."
-MC_VERSION_OLD=1.13.2
-MC_VERSION=1.14
-MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/d0d0fe2b1dc6ab4c65554cb734270872b72dadd6/server.jar
-MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/${MC_VERSION}/files/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/${MC_VERSION_OLD}
-			mv /MCserver/MCserver_${MC_VERSION_OLD}.jar /MCserver/old-server-versions/${MC_VERSION_OLD}
-			mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-			wget --no-cache ${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_${MC_VERSION_OLD}.sh is out of date/missing ... will download now."
-		mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-		wget --no-cache ${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
-
-# 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
diff --git a/1.14/files/run.sh b/1.14/files/run.sh
deleted file mode 100644
index fc4c195..0000000
--- a/1.14/files/run.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2022 fithwum
-# All rights reserved
-
-MC_VERSION=1.14
-
-cd /MCserver
-JAR=./MCserver_${MC_VERSION}.jar
-
-while [ true ]; do
-  java -Xmx4G -Xms1024M -Xmn1G -jar $JAR nogui
-  if [ $? -eq 0 ]; then
-    break
-  fi
-done