From 711c1fc678375b16cbd2de2d8700f6c47dd464e2 Mon Sep 17 00:00:00 2001 From: fithwum <34775371+fithwum@users.noreply.github.com> Date: Thu, 23 Mar 2023 14:28:32 -0700 Subject: [PATCH] changes --- fabric/fabric-1.19.2/files/Install_Script.sh | 29 +++---- fabric/fabric-1.19.2/files/run.sh | 16 ---- fabric/fabric-1.19.2/files/server.properties | 56 -------------- fabric/fabric-1.19.3/files/Install_Script.sh | 29 +++---- fabric/fabric-1.19.3/files/run.sh | 16 ---- fabric/fabric-1.19.3/files/server.properties | 56 -------------- fabric/fabric-1.19.4/files/Install_Script.sh | 27 ++----- fabric/fabric-1.19.4/files/run.sh | 16 ---- fabric/fabric-1.19.4/files/server.properties | 56 -------------- .../1.11/files/run.sh => files/run-fabric.sh | 6 +- .../1.10/files/run.sh => files/run-vanilla.sh | 4 +- forge/forge-1.19.3/Dockerfile | 38 ++++++++++ forge/forge-1.19.3/files/Install_Script.sh | 76 +++++++++++++++++++ forge/forge-1.19.3/files/eula.txt | 3 + forge/forge-1.19.3/files/ops.json | 14 ++++ forge/forge-1.19.3/files/whitelist.json | 38 ++++++++++ stable/1.10.1/files/Install_Script.sh | 21 +++-- stable/1.10.1/files/run.sh | 15 ---- stable/1.10.2/files/Install_Script.sh | 21 +++-- stable/1.10.2/files/run.sh | 15 ---- stable/1.10/files/Install_Script.sh | 21 +++-- stable/1.11.1/files/Install_Script.sh | 21 +++-- stable/1.11.1/files/run.sh | 15 ---- stable/1.11.2/files/Install_Script.sh | 21 +++-- stable/1.11.2/files/run.sh | 15 ---- stable/1.11/files/Install_Script.sh | 21 +++-- stable/1.12.1/files/Install_Script.sh | 21 +++-- stable/1.12.1/files/run.sh | 15 ---- stable/1.12.2/files/Install_Script.sh | 22 +++--- stable/1.12.2/files/run.sh | 15 ---- stable/1.12/files/Install_Script.sh | 19 +++-- stable/1.12/files/run.sh | 15 ---- stable/1.13.1/files/Install_Script.sh | 21 +++-- stable/1.13.1/files/run.sh | 15 ---- stable/1.13.2/files/Install_Script.sh | 21 +++-- stable/1.13.2/files/run.sh | 15 ---- stable/1.13/files/Install_Script.sh | 21 +++-- stable/1.13/files/run.sh | 15 ---- stable/1.14.1/files/Install_Script.sh | 21 +++-- stable/1.14.1/files/run.sh | 15 ---- stable/1.14.2/files/Install_Script.sh | 21 +++-- stable/1.14.2/files/run.sh | 15 ---- stable/1.14.3/files/Install_Script.sh | 21 +++-- stable/1.14.3/files/run.sh | 15 ---- stable/1.14.4/files/Install_Script.sh | 21 +++-- stable/1.14.4/files/run.sh | 15 ---- stable/1.14/files/Install_Script.sh | 21 +++-- stable/1.14/files/run.sh | 15 ---- stable/1.15.1/files/Install_Script.sh | 21 +++-- stable/1.15.1/files/run.sh | 15 ---- stable/1.15.2/files/Install_Script.sh | 21 +++-- stable/1.15.2/files/run.sh | 15 ---- stable/1.15/files/Install_Script.sh | 21 +++-- stable/1.15/files/run.sh | 15 ---- stable/1.16.1/files/Install_Script.sh | 21 +++-- stable/1.16.1/files/run.sh | 15 ---- stable/1.16.2/files/Install_Script.sh | 21 +++-- stable/1.16.2/files/run.sh | 15 ---- stable/1.16.3/files/Install_Script.sh | 21 +++-- stable/1.16.3/files/run.sh | 15 ---- stable/1.16.4/files/Install_Script.sh | 21 +++-- stable/1.16.4/files/run.sh | 15 ---- stable/1.16.5/files/Install_Script.sh | 21 +++-- stable/1.16.5/files/run.sh | 15 ---- stable/1.16/files/Install_Script.sh | 21 +++-- stable/1.16/files/run.sh | 15 ---- stable/1.17.1/files/Install_Script.sh | 21 +++-- stable/1.17.1/files/run.sh | 15 ---- stable/1.17/files/Install_Script.sh | 21 +++-- stable/1.17/files/run.sh | 15 ---- stable/1.18.1/files/Install_Script.sh | 21 +++-- stable/1.18.1/files/run.sh | 15 ---- stable/1.18.2/files/Install_Script.sh | 21 +++-- stable/1.18.2/files/run.sh | 15 ---- stable/1.18/files/Install_Script.sh | 21 +++-- stable/1.18/files/run.sh | 15 ---- stable/1.19.1/files/Install_Script.sh | 21 +++-- stable/1.19.1/files/run.sh | 15 ---- stable/1.19.2/files/Install_Script.sh | 21 +++-- stable/1.19.2/files/run.sh | 15 ---- stable/1.19.3/files/Install_Script.sh | 21 +++-- stable/1.19.3/files/run.sh | 15 ---- stable/1.19.4/files/Install_Script.sh | 21 +++-- stable/1.19.4/files/run.sh | 15 ---- stable/1.19/files/Install_Script.sh | 21 +++-- stable/1.19/files/run.sh | 15 ---- 86 files changed, 558 insertions(+), 1187 deletions(-) delete mode 100644 fabric/fabric-1.19.2/files/run.sh delete mode 100644 fabric/fabric-1.19.2/files/server.properties delete mode 100644 fabric/fabric-1.19.3/files/run.sh delete mode 100644 fabric/fabric-1.19.3/files/server.properties delete mode 100644 fabric/fabric-1.19.4/files/run.sh delete mode 100644 fabric/fabric-1.19.4/files/server.properties rename stable/1.11/files/run.sh => files/run-fabric.sh (76%) rename stable/1.10/files/run.sh => files/run-vanilla.sh (78%) create mode 100644 forge/forge-1.19.3/Dockerfile create mode 100644 forge/forge-1.19.3/files/Install_Script.sh create mode 100644 forge/forge-1.19.3/files/eula.txt create mode 100644 forge/forge-1.19.3/files/ops.json create mode 100644 forge/forge-1.19.3/files/whitelist.json delete mode 100644 stable/1.10.1/files/run.sh delete mode 100644 stable/1.10.2/files/run.sh delete mode 100644 stable/1.11.1/files/run.sh delete mode 100644 stable/1.11.2/files/run.sh delete mode 100644 stable/1.12.1/files/run.sh delete mode 100644 stable/1.12.2/files/run.sh delete mode 100644 stable/1.12/files/run.sh delete mode 100644 stable/1.13.1/files/run.sh delete mode 100644 stable/1.13.2/files/run.sh delete mode 100644 stable/1.13/files/run.sh delete mode 100644 stable/1.14.1/files/run.sh delete mode 100644 stable/1.14.2/files/run.sh delete mode 100644 stable/1.14.3/files/run.sh delete mode 100644 stable/1.14.4/files/run.sh delete mode 100644 stable/1.14/files/run.sh delete mode 100644 stable/1.15.1/files/run.sh delete mode 100644 stable/1.15.2/files/run.sh delete mode 100644 stable/1.15/files/run.sh delete mode 100644 stable/1.16.1/files/run.sh delete mode 100644 stable/1.16.2/files/run.sh delete mode 100644 stable/1.16.3/files/run.sh delete mode 100644 stable/1.16.4/files/run.sh delete mode 100644 stable/1.16.5/files/run.sh delete mode 100644 stable/1.16/files/run.sh delete mode 100644 stable/1.17.1/files/run.sh delete mode 100644 stable/1.17/files/run.sh delete mode 100644 stable/1.18.1/files/run.sh delete mode 100644 stable/1.18.2/files/run.sh delete mode 100644 stable/1.18/files/run.sh delete mode 100644 stable/1.19.1/files/run.sh delete mode 100644 stable/1.19.2/files/run.sh delete mode 100644 stable/1.19.3/files/run.sh delete mode 100644 stable/1.19.4/files/run.sh delete mode 100644 stable/1.19/files/run.sh diff --git a/fabric/fabric-1.19.2/files/Install_Script.sh b/fabric/fabric-1.19.2/files/Install_Script.sh index 8b22167..5ac61cc 100644 --- a/fabric/fabric-1.19.2/files/Install_Script.sh +++ b/fabric/fabric-1.19.2/files/Install_Script.sh @@ -14,12 +14,11 @@ MC_VERSION=1.19.2 FABRIC_VERSION=0.14.18 SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION}/${FABRIC_VERSION}/0.11.2/server/jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/fabric/fabric-${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-fabric.sh EULA_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/fabric/fabric-${MC_VERSION}/files/eula.txt OPS_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/fabric/fabric-${MC_VERSION}/files/ops.json WHITELIST_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/fabric/fabric-${MC_VERSION}/files/whitelist.json -SERVER_PROPERTIES=https://raw.githubusercontent.com/fithwum/minecraft/master/fabric/fabric-${MC_VERSION}/files/server.properties # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -39,16 +38,16 @@ fi sleep 1 -# Looking for run_${MC_VERSION}.sh -if [ -e /MCserver/run_${MC_VERSION}.sh ] +# Looking for run-fabric_${MC_VERSION}.sh +if [ -e /MCserver/run-fabric_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-fabric_${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 + echo "WARNING ! run-fabric_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + mv /MCserver/run-fabric_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-fabric_${MC_VERSION}.sh fi # Check for needed files @@ -82,28 +81,18 @@ if [ -e /MCserver/whitelist.json ] wget --no-cache ${WHITELIST_FILE} -O /MCserver/whitelist.json fi -if [ -e /MCserver/server.properties ] - then - echo " " - echo "INFO ! server.properties found ... will use existing file." - else - echo " " - echo "WARNING ! server.properties is missing ... will download now." - wget --no-cache ${SERVER_PROPERTIES} -O /MCserver/server.properties -fi - sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-fabric_${MC_VERSION}.sh sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-fabric_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/fabric/fabric-1.19.2/files/run.sh b/fabric/fabric-1.19.2/files/run.sh deleted file mode 100644 index 9c2f198..0000000 --- a/fabric/fabric-1.19.2/files/run.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.19.2 -FABRIC_VERSION=0.14.18 - -cd /MCserver -JAR=./fabric-${MC_VERSION}-${FABRIC_VERSION}.jar - -while [ true ]; do - java -Xmx4G -Xms1024M -Xmn1G -jar $JAR nogui - if [ $? -eq 0 ]; then - break - fi -done diff --git a/fabric/fabric-1.19.2/files/server.properties b/fabric/fabric-1.19.2/files/server.properties deleted file mode 100644 index a4270af..0000000 --- a/fabric/fabric-1.19.2/files/server.properties +++ /dev/null @@ -1,56 +0,0 @@ -#Minecraft server properties -#Mon Mar 20 15:57:23 PDT 2023 -enable-jmx-monitoring=false -rcon.port=25575 -level-seed= -enable-command-block=true -gamemode=survival -enable-query=false -generator-settings={} -level-name=world -motd=Welcome to H.O.O.T.S. Fabric Server -query.port=25565 -pvp=true -generate-structures=true -difficulty=easy -network-compression-threshold=256 -max-tick-time=60000 -require-resource-pack=false -max-players=20 -use-native-transport=true -enable-status=true -online-mode=true -allow-flight=true -broadcast-rcon-to-ops=true -view-distance=10 -max-build-height=256 -server-ip= -resource-pack-prompt= -allow-nether=true -server-port=25566 -sync-chunk-writes=true -enable-rcon=false -op-permission-level=4 -prevent-proxy-connections=false -hide-online-players=false -resource-pack= -entity-broadcast-range-percentage=100 -simulation-distance=10 -player-idle-timeout=0 -rcon.password= -force-gamemode=false -rate-limit=0 -hardcore=false -white-list=true -broadcast-console-to-ops=true -spawn-npcs=true -spawn-animals=true -snooper-enabled=false -function-permission-level=2 -level-type=default -text-filtering-config= -spawn-monsters=true -enforce-whitelist=true -spawn-protection=16 -resource-pack-sha1= -max-world-size=29999984 diff --git a/fabric/fabric-1.19.3/files/Install_Script.sh b/fabric/fabric-1.19.3/files/Install_Script.sh index 11796df..092c874 100644 --- a/fabric/fabric-1.19.3/files/Install_Script.sh +++ b/fabric/fabric-1.19.3/files/Install_Script.sh @@ -14,12 +14,11 @@ MC_VERSION=1.19.3 FABRIC_VERSION=0.14.18 SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION}/${FABRIC_VERSION}/0.11.2/server/jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/fabric/fabric-${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-fabric.sh EULA_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/fabric/fabric-${MC_VERSION}/files/eula.txt OPS_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/fabric/fabric-${MC_VERSION}/files/ops.json WHITELIST_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/fabric/fabric-${MC_VERSION}/files/whitelist.json -SERVER_PROPERTIES=https://raw.githubusercontent.com/fithwum/minecraft/master/fabric/fabric-${MC_VERSION}/files/server.properties # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -39,16 +38,16 @@ fi sleep 1 -# Looking for run_${MC_VERSION}.sh -if [ -e /MCserver/run_${MC_VERSION}.sh ] +# Looking for run-fabric_${MC_VERSION}.sh +if [ -e /MCserver/run-fabric_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-fabric_${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 + echo "WARNING ! run-fabric_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + mv /MCserver/run-fabric_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-fabric_${MC_VERSION}.sh fi # Check for needed files @@ -82,28 +81,18 @@ if [ -e /MCserver/whitelist.json ] wget --no-cache ${WHITELIST_FILE} -O /MCserver/whitelist.json fi -if [ -e /MCserver/server.properties ] - then - echo " " - echo "INFO ! server.properties found ... will use existing file." - else - echo " " - echo "WARNING ! server.properties is missing ... will download now." - wget --no-cache ${SERVER_PROPERTIES} -O /MCserver/server.properties -fi - sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-fabric_${MC_VERSION}.sh sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-fabric_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/fabric/fabric-1.19.3/files/run.sh b/fabric/fabric-1.19.3/files/run.sh deleted file mode 100644 index 84f2c97..0000000 --- a/fabric/fabric-1.19.3/files/run.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.19.3 -FABRIC_VERSION=0.14.18 - -cd /MCserver -JAR=./fabric-${MC_VERSION}-${FABRIC_VERSION}.jar - -while [ true ]; do - java -Xmx4G -Xms1024M -Xmn1G -jar $JAR nogui - if [ $? -eq 0 ]; then - break - fi -done diff --git a/fabric/fabric-1.19.3/files/server.properties b/fabric/fabric-1.19.3/files/server.properties deleted file mode 100644 index a4270af..0000000 --- a/fabric/fabric-1.19.3/files/server.properties +++ /dev/null @@ -1,56 +0,0 @@ -#Minecraft server properties -#Mon Mar 20 15:57:23 PDT 2023 -enable-jmx-monitoring=false -rcon.port=25575 -level-seed= -enable-command-block=true -gamemode=survival -enable-query=false -generator-settings={} -level-name=world -motd=Welcome to H.O.O.T.S. Fabric Server -query.port=25565 -pvp=true -generate-structures=true -difficulty=easy -network-compression-threshold=256 -max-tick-time=60000 -require-resource-pack=false -max-players=20 -use-native-transport=true -enable-status=true -online-mode=true -allow-flight=true -broadcast-rcon-to-ops=true -view-distance=10 -max-build-height=256 -server-ip= -resource-pack-prompt= -allow-nether=true -server-port=25566 -sync-chunk-writes=true -enable-rcon=false -op-permission-level=4 -prevent-proxy-connections=false -hide-online-players=false -resource-pack= -entity-broadcast-range-percentage=100 -simulation-distance=10 -player-idle-timeout=0 -rcon.password= -force-gamemode=false -rate-limit=0 -hardcore=false -white-list=true -broadcast-console-to-ops=true -spawn-npcs=true -spawn-animals=true -snooper-enabled=false -function-permission-level=2 -level-type=default -text-filtering-config= -spawn-monsters=true -enforce-whitelist=true -spawn-protection=16 -resource-pack-sha1= -max-world-size=29999984 diff --git a/fabric/fabric-1.19.4/files/Install_Script.sh b/fabric/fabric-1.19.4/files/Install_Script.sh index d684712..c702698 100644 --- a/fabric/fabric-1.19.4/files/Install_Script.sh +++ b/fabric/fabric-1.19.4/files/Install_Script.sh @@ -14,12 +14,11 @@ MC_VERSION=1.19.4 FABRIC_VERSION=0.14.18 SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION}/${FABRIC_VERSION}/0.11.2/server/jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/fabric/fabric-${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-fabric.sh EULA_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/fabric/fabric-${MC_VERSION}/files/eula.txt OPS_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/fabric/fabric-${MC_VERSION}/files/ops.json WHITELIST_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/fabric/fabric-${MC_VERSION}/files/whitelist.json -SERVER_PROPERTIES=https://raw.githubusercontent.com/fithwum/minecraft/master/fabric/fabric-${MC_VERSION}/files/server.properties # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -40,15 +39,15 @@ fi sleep 1 # Looking for run_${MC_VERSION}.sh -if [ -e /MCserver/run_${MC_VERSION}.sh ] +if [ -e /MCserver/run-fabric_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-fabric_${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 + echo "WARNING ! run-fabric_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + mv /MCserver/run-fabric_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-fabric_${MC_VERSION}.sh fi # Check for needed files @@ -82,28 +81,18 @@ if [ -e /MCserver/whitelist.json ] wget --no-cache ${WHITELIST_FILE} -O /MCserver/whitelist.json fi -if [ -e /MCserver/server.properties ] - then - echo " " - echo "INFO ! server.properties found ... will use existing file." - else - echo " " - echo "WARNING ! server.properties is missing ... will download now." - wget --no-cache ${SERVER_PROPERTIES} -O /MCserver/server.properties -fi - sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-fabric_${MC_VERSION}.sh sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-fabric_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/fabric/fabric-1.19.4/files/run.sh b/fabric/fabric-1.19.4/files/run.sh deleted file mode 100644 index 8ef9581..0000000 --- a/fabric/fabric-1.19.4/files/run.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.19.4 -FABRIC_VERSION=0.14.18 - -cd /MCserver -JAR=./fabric-${MC_VERSION}-${FABRIC_VERSION}.jar - -while [ true ]; do - java -Xmx8G -Xms2048M -Xmn2G -jar $JAR nogui - if [ $? -eq 0 ]; then - break - fi -done diff --git a/fabric/fabric-1.19.4/files/server.properties b/fabric/fabric-1.19.4/files/server.properties deleted file mode 100644 index dfcf7f0..0000000 --- a/fabric/fabric-1.19.4/files/server.properties +++ /dev/null @@ -1,56 +0,0 @@ -#Minecraft server properties -#Mon Mar 20 15:57:23 PDT 2023 -enable-jmx-monitoring=false -rcon.port=25575 -level-seed= -enable-command-block=true -gamemode=survival -enable-query=false -generator-settings={} -level-name=world -motd=Welcome to H.O.O.T.S. Fabric Server -query.port=25565 -pvp=true -generate-structures=true -difficulty=easy -network-compression-threshold=256 -max-tick-time=60000 -require-resource-pack=false -max-players=20 -use-native-transport=true -enable-status=true -online-mode=true -allow-flight=true -broadcast-rcon-to-ops=true -view-distance=10 -max-build-height=256 -server-ip= -resource-pack-prompt= -allow-nether=true -server-port=25565 -sync-chunk-writes=true -enable-rcon=false -op-permission-level=4 -prevent-proxy-connections=false -hide-online-players=false -resource-pack= -entity-broadcast-range-percentage=100 -simulation-distance=10 -player-idle-timeout=0 -rcon.password= -force-gamemode=false -rate-limit=0 -hardcore=false -white-list=true -broadcast-console-to-ops=true -spawn-npcs=true -spawn-animals=true -snooper-enabled=false -function-permission-level=2 -level-type=default -text-filtering-config= -spawn-monsters=true -enforce-whitelist=true -spawn-protection=16 -resource-pack-sha1= -max-world-size=29999984 diff --git a/stable/1.11/files/run.sh b/files/run-fabric.sh similarity index 76% rename from stable/1.11/files/run.sh rename to files/run-fabric.sh index 91bdaca..f3175ad 100644 --- a/stable/1.11/files/run.sh +++ b/files/run-fabric.sh @@ -2,14 +2,12 @@ # Copyright (c) 2022 fithwum # All rights reserved -MC_VERSION=1.11 - cd /MCserver -JAR=./MCserver_${MC_VERSION}.jar +JAR=./fabric-*-*.jar while [ true ]; do java -Xmx4G -Xms1024M -Xmn1G -jar $JAR nogui if [ $? -eq 0 ]; then break fi -done +done \ No newline at end of file diff --git a/stable/1.10/files/run.sh b/files/run-vanilla.sh similarity index 78% rename from stable/1.10/files/run.sh rename to files/run-vanilla.sh index 6e0e144..31832c2 100644 --- a/stable/1.10/files/run.sh +++ b/files/run-vanilla.sh @@ -2,10 +2,8 @@ # Copyright (c) 2022 fithwum # All rights reserved -MC_VERSION=1.10 - cd /MCserver -JAR=./MCserver_${MC_VERSION}.jar +JAR=./MCserver_*.jar while [ true ]; do java -Xmx4G -Xms1024M -Xmn1G -jar $JAR nogui diff --git a/forge/forge-1.19.3/Dockerfile b/forge/forge-1.19.3/Dockerfile new file mode 100644 index 0000000..4328466 --- /dev/null +++ b/forge/forge-1.19.3/Dockerfile @@ -0,0 +1,38 @@ +FROM fithwum/debian-base:bullseye +LABEL maintainer "fithwum" + +ENV ACCEPT_EULA="false" +ENV GAME_PORT=25565 +ENV FORGE_URL=https://maven.minecraftforge.net/net/minecraftforge/forge/1.19.3-44.1.0/forge-1.19.3-44.1.0-installer.jar + +# URL's for files +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/fabric/fabric-1.19.3/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 \ + && cd /MCserver \ + && wget ${FORGE_URL} -O forge-1.19.3-44.1.0-installer.jar \ + && java -jar forge-1.19.3-44.1.0-installer.jar --installServer \ + && rm -frv forge-1.19.3-44.1.0-installer.jar forge-1.19.3-44.1.0-installer.jar.log + +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/forge/forge-1.19.3/files/Install_Script.sh b/forge/forge-1.19.3/files/Install_Script.sh new file mode 100644 index 0000000..11fa28f --- /dev/null +++ b/forge/forge-1.19.3/files/Install_Script.sh @@ -0,0 +1,76 @@ +#!/bin/bash +# Copyright (c) 2022 fithwum +# All rights reserved + +# Display setup +export DISPLAY=0 + +# Variables. +echo " " +echo "INFO ! Checking for latest Minecraft Server version." +MC_VERSION=1.19.3 +FORGE_VERSION=0.14.18 + +EULA_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/forge/forge-${MC_VERSION}/files/eula.txt +OPS_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/forge/forge-${MC_VERSION}/files/ops.json +WHITELIST_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/forge/forge-${MC_VERSION}/files/whitelist.json + +# Main install (Debian). +# Check for files in /MCserver and download if needed. +# Looking for run-forge_${MC_VERSION}.sh +if [ -e /MCserver/run.sh ] + then + echo " " + echo "INFO ! run-forge_${MC_VERSION}.sh found ... will use existing file." + else + echo " " + echo "WARNING ! run-forge_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + mv /MCserver/run.sh /MCserver/run-forge_${MC_VERSION}.sh +fi + +# Check for needed files +if [ -e /MCserver/eula.txt ] + then + echo " " + echo "INFO ! eula.txt found ... will use existing file." + else + echo " " + echo "WARNING ! eula.txt is missing ... will download now." + wget --no-cache ${EULA_FILE} -O /MCserver/eula.txt +fi + +if [ -e /MCserver/ops.json ] + then + echo " " + echo "INFO ! ops.json found ... will use existing file." + else + echo " " + echo "WARNING ! ops.json is missing ... will download now." + wget --no-cache ${OPS_FILE} -O /MCserver/ops.json +fi + +if [ -e /MCserver/whitelist.json ] + then + echo " " + echo "INFO ! whitelist.json found ... will use existing file." + else + echo " " + echo "WARNING ! whitelist.json is missing ... will download now." + wget --no-cache ${WHITELIST_FILE} -O /MCserver/whitelist.json +fi + +sleep 1 + +# Set permissions. +chown 99:100 -R /MCserver +chmod 777 -R /MCserver +chmod +x /MCserver/run-forge_${MC_VERSION}.sh + +sleep 1 + +# Run Minecraft server. +echo " " +echo "INFO ! Starting Minecraft Server ${MC_VERSION}" +exec /MCserver/run-forge_${MC_VERSION}.sh --dataPath=/MCserver + +exit diff --git a/forge/forge-1.19.3/files/eula.txt b/forge/forge-1.19.3/files/eula.txt new file mode 100644 index 0000000..9721c7a --- /dev/null +++ b/forge/forge-1.19.3/files/eula.txt @@ -0,0 +1,3 @@ +#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula). +#Mon Jul 13 15:34:07 PDT 2020 +eula=true diff --git a/forge/forge-1.19.3/files/ops.json b/forge/forge-1.19.3/files/ops.json new file mode 100644 index 0000000..33686a5 --- /dev/null +++ b/forge/forge-1.19.3/files/ops.json @@ -0,0 +1,14 @@ +[ + { + "uuid": "e9191443-8706-461c-a4a9-6b12b86f7fc0", + "name": "fithwum", + "level": 4, + "bypassesPlayerLimit": true + }, + { + "uuid": "fb505f65-bfb5-45f7-8e16-16ce5ef09eb2", + "name": "Lacarthian", + "level": 4, + "bypassesPlayerLimit": true + } +] \ No newline at end of file diff --git a/forge/forge-1.19.3/files/whitelist.json b/forge/forge-1.19.3/files/whitelist.json new file mode 100644 index 0000000..8db31e4 --- /dev/null +++ b/forge/forge-1.19.3/files/whitelist.json @@ -0,0 +1,38 @@ +[ + { + "uuid": "9b8d4ecf-beae-4277-ba52-7c9d25bb1968", + "name": "DHRmike" + }, + { + "uuid": "6218840a-7cba-4eb6-aec2-5246f2152c8a", + "name": "lordWiseman28" + }, + { + "uuid": "e9191443-8706-461c-a4a9-6b12b86f7fc0", + "name": "fithwum" + }, + { + "uuid": "62bb6a62-c176-4ad7-a49d-e5b2ce0954cf", + "name": "OzyWizard" + }, + { + "uuid": "fb505f65-bfb5-45f7-8e16-16ce5ef09eb2", + "name": "Lacarthian" + }, + { + "uuid": "a90f9d4e-33d5-4855-9be5-de025b707f54", + "name": "Drakaul" + }, + { + "uuid": "f4d00276-62f4-4d30-a085-998c71916ecd", + "name": "___ORANGE___" + }, + { + "uuid": "27b719c4-daf3-429b-af2d-da3aab113f79", + "name": "Rekage_" + }, + { + "uuid": "d02f2de9-d414-42e2-b2fd-ec18bc2625ef", + "name": "Izzy761" + } +] \ No newline at end of file diff --git a/stable/1.10.1/files/Install_Script.sh b/stable/1.10.1/files/Install_Script.sh index 28e6654..3a90cbb 100644 --- a/stable/1.10.1/files/Install_Script.sh +++ b/stable/1.10.1/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.10 MC_VERSION=1.10.1 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/cb4c6f9f51a845b09a8861cdbe0eea3ff6996dee/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.10.1/files/run.sh b/stable/1.10.1/files/run.sh deleted file mode 100644 index 01e1d60..0000000 --- a/stable/1.10.1/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.10.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/stable/1.10.2/files/Install_Script.sh b/stable/1.10.2/files/Install_Script.sh index 2ba5d97..7548604 100644 --- a/stable/1.10.2/files/Install_Script.sh +++ b/stable/1.10.2/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.10.1 MC_VERSION=1.10.2 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/3d501b23df53c548254f5e3f66492d178a48db63/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.10.2/files/run.sh b/stable/1.10.2/files/run.sh deleted file mode 100644 index b17c02e..0000000 --- a/stable/1.10.2/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.10.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/stable/1.10/files/Install_Script.sh b/stable/1.10/files/Install_Script.sh index 7b7c29a..2baf136 100644 --- a/stable/1.10/files/Install_Script.sh +++ b/stable/1.10/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.9.4 MC_VERSION=1.10 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/a96617ffdf5dabbb718ab11a9a68e50545fc5bee/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.11.1/files/Install_Script.sh b/stable/1.11.1/files/Install_Script.sh index bd238a6..1b8fc63 100644 --- a/stable/1.11.1/files/Install_Script.sh +++ b/stable/1.11.1/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.11 MC_VERSION=1.11.1 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/1f97bd101e508d7b52b3d6a7879223b000b5eba0/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.11.1/files/run.sh b/stable/1.11.1/files/run.sh deleted file mode 100644 index 08b3cf7..0000000 --- a/stable/1.11.1/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.11.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/stable/1.11.2/files/Install_Script.sh b/stable/1.11.2/files/Install_Script.sh index 086c6f8..4b40b15 100644 --- a/stable/1.11.2/files/Install_Script.sh +++ b/stable/1.11.2/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.11.1 MC_VERSION=1.11.2 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/f00c294a1576e03fddcac777c3cf4c7d404c4ba4/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.11.2/files/run.sh b/stable/1.11.2/files/run.sh deleted file mode 100644 index 7472dd5..0000000 --- a/stable/1.11.2/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.11.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/stable/1.11/files/Install_Script.sh b/stable/1.11/files/Install_Script.sh index 17a2d4f..e684560 100644 --- a/stable/1.11/files/Install_Script.sh +++ b/stable/1.11/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.10.2 MC_VERSION=1.11 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/48820c84cb1ed502cb5b2fe23b8153d5e4fa61c0/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.12.1/files/Install_Script.sh b/stable/1.12.1/files/Install_Script.sh index f2963f7..324ad11 100644 --- a/stable/1.12.1/files/Install_Script.sh +++ b/stable/1.12.1/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.12 MC_VERSION=1.12.1 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/561c7b2d54bae80cc06b05d950633a9ac95da816/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.12.1/files/run.sh b/stable/1.12.1/files/run.sh deleted file mode 100644 index b2e54c1..0000000 --- a/stable/1.12.1/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.12.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/stable/1.12.2/files/Install_Script.sh b/stable/1.12.2/files/Install_Script.sh index a391992..91ea3a6 100644 --- a/stable/1.12.2/files/Install_Script.sh +++ b/stable/1.12.2/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.12.1 MC_VERSION=1.12.2 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/886945bfb2b978778c3a0288fd7fab09d315b25f/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,22 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + mv /MCserver/run-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +71,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +89,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +97,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.12.2/files/run.sh b/stable/1.12.2/files/run.sh deleted file mode 100644 index 86c3354..0000000 --- a/stable/1.12.2/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.12.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/stable/1.12/files/Install_Script.sh b/stable/1.12/files/Install_Script.sh index 7d3dea4..4a87e83 100644 --- a/stable/1.12/files/Install_Script.sh +++ b/stable/1.12/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.11.2 MC_VERSION=1.12 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/8494e844e911ea0d63878f64da9dcc21f53a3463/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -29,16 +29,15 @@ fi sleep 1 -# Looking for run_${MC_VERSION}.sh -if [ -e /MCserver/run_${MC_VERSION}.sh ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.12/files/run.sh b/stable/1.12/files/run.sh deleted file mode 100644 index cad2bfe..0000000 --- a/stable/1.12/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.12 - -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/stable/1.13.1/files/Install_Script.sh b/stable/1.13.1/files/Install_Script.sh index 6a5e1da..9ee62d9 100644 --- a/stable/1.13.1/files/Install_Script.sh +++ b/stable/1.13.1/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.13 MC_VERSION=1.13.1 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/fe123682e9cb30031eae351764f653500b7396c9/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.13.1/files/run.sh b/stable/1.13.1/files/run.sh deleted file mode 100644 index 798f82a..0000000 --- a/stable/1.13.1/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.13.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/stable/1.13.2/files/Install_Script.sh b/stable/1.13.2/files/Install_Script.sh index a131b92..37af752 100644 --- a/stable/1.13.2/files/Install_Script.sh +++ b/stable/1.13.2/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.13.1 MC_VERSION=1.13.2 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/3737db93722a9e39eeada7c27e7aca28b144ffa7/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.13.2/files/run.sh b/stable/1.13.2/files/run.sh deleted file mode 100644 index 3e4325c..0000000 --- a/stable/1.13.2/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.13.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/stable/1.13/files/Install_Script.sh b/stable/1.13/files/Install_Script.sh index df5b75b..d3c29df 100644 --- a/stable/1.13/files/Install_Script.sh +++ b/stable/1.13/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.12.2 MC_VERSION=1.13 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/d0caafb8438ebd206f99930cfaecfa6c9a13dca0/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.13/files/run.sh b/stable/1.13/files/run.sh deleted file mode 100644 index dce2cd4..0000000 --- a/stable/1.13/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.13 - -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/stable/1.14.1/files/Install_Script.sh b/stable/1.14.1/files/Install_Script.sh index 34cd834..4888816 100644 --- a/stable/1.14.1/files/Install_Script.sh +++ b/stable/1.14.1/files/Install_Script.sh @@ -8,7 +8,7 @@ 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/ed76d597a44c5266be2a7fcd77a8270f1f0bc118/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.14.1/files/run.sh b/stable/1.14.1/files/run.sh deleted file mode 100644 index e440a15..0000000 --- a/stable/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/stable/1.14.2/files/Install_Script.sh b/stable/1.14.2/files/Install_Script.sh index 7d61a7e..5aff5af 100644 --- a/stable/1.14.2/files/Install_Script.sh +++ b/stable/1.14.2/files/Install_Script.sh @@ -8,7 +8,7 @@ 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/808be3869e2ca6b62378f9f4b33c946621620019/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.14.2/files/run.sh b/stable/1.14.2/files/run.sh deleted file mode 100644 index a0b6247..0000000 --- a/stable/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/stable/1.14.3/files/Install_Script.sh b/stable/1.14.3/files/Install_Script.sh index b58278e..d16b6cf 100644 --- a/stable/1.14.3/files/Install_Script.sh +++ b/stable/1.14.3/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.14.2 MC_VERSION=1.14.3 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/d0d0fe2b1dc6ab4c65554cb734270872b72dadd6/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.14.3/files/run.sh b/stable/1.14.3/files/run.sh deleted file mode 100644 index 01b5194..0000000 --- a/stable/1.14.3/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.14.3 - -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/stable/1.14.4/files/Install_Script.sh b/stable/1.14.4/files/Install_Script.sh index 9c5d1dd..50e91ec 100644 --- a/stable/1.14.4/files/Install_Script.sh +++ b/stable/1.14.4/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.14.3 MC_VERSION=1.14.4 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/3dc3d84a581f14691199cf6831b71ed1296a9fdf/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.14.4/files/run.sh b/stable/1.14.4/files/run.sh deleted file mode 100644 index 69ba22d..0000000 --- a/stable/1.14.4/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.14.4 - -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/stable/1.14/files/Install_Script.sh b/stable/1.14/files/Install_Script.sh index 6e7eff5..3ba1dbe 100644 --- a/stable/1.14/files/Install_Script.sh +++ b/stable/1.14/files/Install_Script.sh @@ -8,7 +8,7 @@ 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/f1a0073671057f01aa843443fef34330281333ce/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.14/files/run.sh b/stable/1.14/files/run.sh deleted file mode 100644 index fc4c195..0000000 --- a/stable/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 diff --git a/stable/1.15.1/files/Install_Script.sh b/stable/1.15.1/files/Install_Script.sh index 7980b96..140f7a4 100644 --- a/stable/1.15.1/files/Install_Script.sh +++ b/stable/1.15.1/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.15 MC_VERSION=1.15.1 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/4d1826eebac84847c71a77f9349cc22afd0cf0a1/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.15.1/files/run.sh b/stable/1.15.1/files/run.sh deleted file mode 100644 index ff5539e..0000000 --- a/stable/1.15.1/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.15.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/stable/1.15.2/files/Install_Script.sh b/stable/1.15.2/files/Install_Script.sh index 9d5e8db..f414f33 100644 --- a/stable/1.15.2/files/Install_Script.sh +++ b/stable/1.15.2/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.15.1 MC_VERSION=1.15.2 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.15.2/files/run.sh b/stable/1.15.2/files/run.sh deleted file mode 100644 index ada1007..0000000 --- a/stable/1.15.2/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.15.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/stable/1.15/files/Install_Script.sh b/stable/1.15/files/Install_Script.sh index 77898df..7cf8e17 100644 --- a/stable/1.15/files/Install_Script.sh +++ b/stable/1.15/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.14.4 MC_VERSION=1.15 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/e9f105b3c5c7e85c7b445249a93362a22f62442d/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.15/files/run.sh b/stable/1.15/files/run.sh deleted file mode 100644 index ea8b21f..0000000 --- a/stable/1.15/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.15 - -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/stable/1.16.1/files/Install_Script.sh b/stable/1.16.1/files/Install_Script.sh index 5549e92..c6a49d7 100644 --- a/stable/1.16.1/files/Install_Script.sh +++ b/stable/1.16.1/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.16 MC_VERSION=1.16.1 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/a412fd69db1f81db3f511c1463fd304675244077/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.16.1/files/run.sh b/stable/1.16.1/files/run.sh deleted file mode 100644 index 36021be..0000000 --- a/stable/1.16.1/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.16.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/stable/1.16.2/files/Install_Script.sh b/stable/1.16.2/files/Install_Script.sh index f33be16..02aa6b1 100644 --- a/stable/1.16.2/files/Install_Script.sh +++ b/stable/1.16.2/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.16.1 MC_VERSION=1.16.2 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/c5f6fb23c3876461d46ec380421e42b289789530/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.16.2/files/run.sh b/stable/1.16.2/files/run.sh deleted file mode 100644 index 0685dcd..0000000 --- a/stable/1.16.2/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.16.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/stable/1.16.3/files/Install_Script.sh b/stable/1.16.3/files/Install_Script.sh index 241869f..d1644a6 100644 --- a/stable/1.16.3/files/Install_Script.sh +++ b/stable/1.16.3/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.16.2 MC_VERSION=1.16.3 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/f02f4473dbf152c23d7d484952121db0b36698cb/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.16.3/files/run.sh b/stable/1.16.3/files/run.sh deleted file mode 100644 index 9b9fea2..0000000 --- a/stable/1.16.3/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.16.3 - -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/stable/1.16.4/files/Install_Script.sh b/stable/1.16.4/files/Install_Script.sh index 6de26f2..e913894 100644 --- a/stable/1.16.4/files/Install_Script.sh +++ b/stable/1.16.4/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.16.3 MC_VERSION=1.16.4 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/35139deedbd5182953cf1caa23835da59ca3d7cd/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.16.4/files/run.sh b/stable/1.16.4/files/run.sh deleted file mode 100644 index 4dd88d8..0000000 --- a/stable/1.16.4/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.16.4 - -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/stable/1.16.5/files/Install_Script.sh b/stable/1.16.5/files/Install_Script.sh index 1e6113b..d492651 100644 --- a/stable/1.16.5/files/Install_Script.sh +++ b/stable/1.16.5/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.16.4 MC_VERSION=1.16.5 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/1b557e7b033b583cd9f66746b7a9ab1ec1673ced/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.16.5/files/run.sh b/stable/1.16.5/files/run.sh deleted file mode 100644 index 2c87ca3..0000000 --- a/stable/1.16.5/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.16.5 - -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/stable/1.16/files/Install_Script.sh b/stable/1.16/files/Install_Script.sh index 6bcb7ff..62f6dbb 100644 --- a/stable/1.16/files/Install_Script.sh +++ b/stable/1.16/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.15.2 MC_VERSION=1.16 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/a0d03225615ba897619220e256a266cb33a44b6b/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.16/files/run.sh b/stable/1.16/files/run.sh deleted file mode 100644 index 243dfee..0000000 --- a/stable/1.16/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.16 - -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/stable/1.17.1/files/Install_Script.sh b/stable/1.17.1/files/Install_Script.sh index 3120987..4127035 100644 --- a/stable/1.17.1/files/Install_Script.sh +++ b/stable/1.17.1/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.17 MC_VERSION=1.17.1 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/a16d67e5807f57fc4e550299cf20226194497dc2/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.17.1/files/run.sh b/stable/1.17.1/files/run.sh deleted file mode 100644 index 33ac681..0000000 --- a/stable/1.17.1/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.17.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/stable/1.17/files/Install_Script.sh b/stable/1.17/files/Install_Script.sh index 8ffb92f..171b874 100644 --- a/stable/1.17/files/Install_Script.sh +++ b/stable/1.17/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.16.5 MC_VERSION=1.17 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.17/files/run.sh b/stable/1.17/files/run.sh deleted file mode 100644 index 367eaa1..0000000 --- a/stable/1.17/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.17 - -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/stable/1.18.1/files/Install_Script.sh b/stable/1.18.1/files/Install_Script.sh index 222aa1d..f3a9991 100644 --- a/stable/1.18.1/files/Install_Script.sh +++ b/stable/1.18.1/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.18 MC_VERSION=1.18.1 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/125e5adf40c659fd3bce3e66e67a16bb49ecc1b9/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.18.1/files/run.sh b/stable/1.18.1/files/run.sh deleted file mode 100644 index d325336..0000000 --- a/stable/1.18.1/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.18.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/stable/1.18.2/files/Install_Script.sh b/stable/1.18.2/files/Install_Script.sh index 74a95be..613b153 100644 --- a/stable/1.18.2/files/Install_Script.sh +++ b/stable/1.18.2/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.18.1 MC_VERSION=1.18.2 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.18.2/files/run.sh b/stable/1.18.2/files/run.sh deleted file mode 100644 index a6d53bd..0000000 --- a/stable/1.18.2/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.18.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/stable/1.18/files/Install_Script.sh b/stable/1.18/files/Install_Script.sh index 408425b..bda22d1 100644 --- a/stable/1.18/files/Install_Script.sh +++ b/stable/1.18/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.17.1 MC_VERSION=1.18 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/3cf24a8694aca6267883b17d934efacc5e44440d/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.18/files/run.sh b/stable/1.18/files/run.sh deleted file mode 100644 index 4bde46f..0000000 --- a/stable/1.18/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.18 - -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/stable/1.19.1/files/Install_Script.sh b/stable/1.19.1/files/Install_Script.sh index fa63a96..3062592 100644 --- a/stable/1.19.1/files/Install_Script.sh +++ b/stable/1.19.1/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.19 MC_VERSION=1.19.1 MC_SERVER_FILE=https://piston-data.mojang.com/v1/objects/8399e1211e95faa421c1507b322dbeae86d604df/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.19.1/files/run.sh b/stable/1.19.1/files/run.sh deleted file mode 100644 index c9c41f2..0000000 --- a/stable/1.19.1/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.19.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/stable/1.19.2/files/Install_Script.sh b/stable/1.19.2/files/Install_Script.sh index 577672d..9bd40c8 100644 --- a/stable/1.19.2/files/Install_Script.sh +++ b/stable/1.19.2/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.19.1 MC_VERSION=1.19.2 MC_SERVER_FILE=https://piston-data.mojang.com/v1/objects/f69c284232d7c7580bd89a5a4931c3581eae1378/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.19.2/files/run.sh b/stable/1.19.2/files/run.sh deleted file mode 100644 index 134a562..0000000 --- a/stable/1.19.2/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.19.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/stable/1.19.3/files/Install_Script.sh b/stable/1.19.3/files/Install_Script.sh index 4b4ab0f..28d92c0 100644 --- a/stable/1.19.3/files/Install_Script.sh +++ b/stable/1.19.3/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.19.2 MC_VERSION=1.19.3 MC_SERVER_FILE=https://piston-data.mojang.com/v1/objects/c9df48efed58511cdd0213c56b9013a7b5c9ac1f/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.19.3/files/run.sh b/stable/1.19.3/files/run.sh deleted file mode 100644 index 520e7ca..0000000 --- a/stable/1.19.3/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.19.3 - -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/stable/1.19.4/files/Install_Script.sh b/stable/1.19.4/files/Install_Script.sh index 22a9a6c..81be2d8 100644 --- a/stable/1.19.4/files/Install_Script.sh +++ b/stable/1.19.4/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.19.3 MC_VERSION=1.19.4 MC_SERVER_FILE=https://piston-data.mojang.com/v1/objects/8f3112a1049751cc472ec13e397eade5336ca7ae/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.19.4/files/run.sh b/stable/1.19.4/files/run.sh deleted file mode 100644 index 48d16d7..0000000 --- a/stable/1.19.4/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.19.4 - -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/stable/1.19/files/Install_Script.sh b/stable/1.19/files/Install_Script.sh index 5036c7a..ec6ff92 100644 --- a/stable/1.19/files/Install_Script.sh +++ b/stable/1.19/files/Install_Script.sh @@ -8,7 +8,7 @@ echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION_OLD=1.18.2 MC_VERSION=1.19 MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/e00c4052dac1d59a1188b2aa9d5a87113aaf1122/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -23,22 +23,21 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mv /MCserver/run-vanilla_${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 ] +# Looking for run-vanilla_${MC_VERSION}.sh +if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] then echo " " - echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + echo "INFO ! run-vanilla_${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 + echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi sleep 1 @@ -71,7 +70,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi elif [ "${ACCEPT_EULA}" == "false" ]; then @@ -89,7 +88,7 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/run-vanilla_${MC_VERSION}.sh chmod +x /MCserver/MCserver_${MC_VERSION}.jar sleep 1 @@ -97,6 +96,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver +exec /MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver exit diff --git a/stable/1.19/files/run.sh b/stable/1.19/files/run.sh deleted file mode 100644 index 0d21c6a..0000000 --- a/stable/1.19/files/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -MC_VERSION=1.19 - -cd /MCserver -JAR=./MCserver_${MC_VERSION}.jar - -while [ true ]; do - java -Xmx4G -Xms1024M -Xmn1G -jar $JAR nogui - if [ $? -eq 0 ]; then - break - fi -done