From 0224ff737d9786812ec2d00b5ec0aedfd100839b Mon Sep 17 00:00:00 2001 From: fithwum <34775371+fithwum@users.noreply.github.com> Date: Thu, 23 Mar 2023 08:29:45 -0700 Subject: [PATCH] update fabric --- .../fabric-1.19.3}/Dockerfile | 4 ++-- .../fabric-1.19.3}/files/Install_Script.sh | 18 +++++++++--------- .../fabric-1.19.3}/files/eula.txt | 0 .../fabric-1.19.3}/files/ops.json | 0 .../fabric-1.19.3}/files/run.sh | 0 .../fabric-1.19.3}/files/server.properties | 2 +- .../fabric-1.19.3}/files/whitelist.json | 0 7 files changed, 12 insertions(+), 12 deletions(-) rename {forge/forge-1.19.3 => fabric/fabric-1.19.3}/Dockerfile (84%) rename {forge/forge-1.19.3 => fabric/fabric-1.19.3}/files/Install_Script.sh (81%) rename {forge/forge-1.19.3 => fabric/fabric-1.19.3}/files/eula.txt (100%) rename {forge/forge-1.19.3 => fabric/fabric-1.19.3}/files/ops.json (100%) rename {forge/forge-1.19.3 => fabric/fabric-1.19.3}/files/run.sh (100%) rename {forge/forge-1.19.3 => fabric/fabric-1.19.3}/files/server.properties (96%) rename {forge/forge-1.19.3 => fabric/fabric-1.19.3}/files/whitelist.json (100%) diff --git a/forge/forge-1.19.3/Dockerfile b/fabric/fabric-1.19.3/Dockerfile similarity index 84% rename from forge/forge-1.19.3/Dockerfile rename to fabric/fabric-1.19.3/Dockerfile index 8c44d22..5c4e549 100644 --- a/forge/forge-1.19.3/Dockerfile +++ b/fabric/fabric-1.19.3/Dockerfile @@ -5,12 +5,12 @@ ENV ACCEPT_EULA="false" ENV GAME_PORT=25565 # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/forge/forge-1.19.3/files/Install_Script.sh +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 unzip openjdk-17-jdk \ + && apt-get install -y software-properties-common openjdk-17-jdk \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates -f; diff --git a/forge/forge-1.19.3/files/Install_Script.sh b/fabric/fabric-1.19.3/files/Install_Script.sh similarity index 81% rename from forge/forge-1.19.3/files/Install_Script.sh rename to fabric/fabric-1.19.3/files/Install_Script.sh index ff2d974..11796df 100644 --- a/forge/forge-1.19.3/files/Install_Script.sh +++ b/fabric/fabric-1.19.3/files/Install_Script.sh @@ -14,26 +14,26 @@ 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/forge/forge-${MC_VERSION}/files/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/fabric/fabric-${MC_VERSION}/files/run.sh -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 -SERVER_PROPERTIES=https://raw.githubusercontent.com/fithwum/minecraft/master/forge/forge-${MC_VERSION}/files/server.properties +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. -if [ -e /MCserver/forge-${MC_VERSION}-${FABRIC_VERSION}.zip ] +if [ -e /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.zip ] then echo " " - echo "INFO ! forge-${MC_VERSION}-${FABRIC_VERSION}.zip found starting now." + echo "INFO ! fabric-${MC_VERSION}-${FABRIC_VERSION}.zip found starting now." else echo " " - echo "WARNING ! forge-${MC_VERSION}-${FABRIC_VERSION}.zip is out of date/missing ... will download now." + echo "WARNING ! fabric-${MC_VERSION}-${FABRIC_VERSION}.zip is out of date/missing ... will download now." echo " " echo "INFO ! Cleaning old files." mkdir /MCserver/old-server-versions/${MC_VERSION_OLD}-${FABRIC_VERSION_OLD} - mv /MCserver/forge-${MC_VERSION_OLD}-${FABRIC_VERSION}.zip /MCserver/old-server-versions/${MC_VERSION_OLD}-${FABRIC_VERSION_OLD} + mv /MCserver/fabric-${MC_VERSION_OLD}-${FABRIC_VERSION}.zip /MCserver/old-server-versions/${MC_VERSION_OLD}-${FABRIC_VERSION_OLD} wget --no-cache ${SERVER_FILE} -O /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar fi diff --git a/forge/forge-1.19.3/files/eula.txt b/fabric/fabric-1.19.3/files/eula.txt similarity index 100% rename from forge/forge-1.19.3/files/eula.txt rename to fabric/fabric-1.19.3/files/eula.txt diff --git a/forge/forge-1.19.3/files/ops.json b/fabric/fabric-1.19.3/files/ops.json similarity index 100% rename from forge/forge-1.19.3/files/ops.json rename to fabric/fabric-1.19.3/files/ops.json diff --git a/forge/forge-1.19.3/files/run.sh b/fabric/fabric-1.19.3/files/run.sh similarity index 100% rename from forge/forge-1.19.3/files/run.sh rename to fabric/fabric-1.19.3/files/run.sh diff --git a/forge/forge-1.19.3/files/server.properties b/fabric/fabric-1.19.3/files/server.properties similarity index 96% rename from forge/forge-1.19.3/files/server.properties rename to fabric/fabric-1.19.3/files/server.properties index 93faa28..a4270af 100644 --- a/forge/forge-1.19.3/files/server.properties +++ b/fabric/fabric-1.19.3/files/server.properties @@ -8,7 +8,7 @@ gamemode=survival enable-query=false generator-settings={} level-name=world -motd=Welcome to H.O.O.T.S. Forge Server +motd=Welcome to H.O.O.T.S. Fabric Server query.port=25565 pvp=true generate-structures=true diff --git a/forge/forge-1.19.3/files/whitelist.json b/fabric/fabric-1.19.3/files/whitelist.json similarity index 100% rename from forge/forge-1.19.3/files/whitelist.json rename to fabric/fabric-1.19.3/files/whitelist.json