From 06629a1094d59b734c44d0d94343560e55015fd6 Mon Sep 17 00:00:00 2001
From: godot <lukanetik@sezam.cz>
Date: Sun, 30 Jun 2024 20:50:13 +0000
Subject: [PATCH] modified files

---
 eula.txt          |   3 +
 run.sh            |   6 +
 server.properties | 110 ++++++++-------
 start.sh          | 337 ----------------------------------------------
 4 files changed, 67 insertions(+), 389 deletions(-)
 create mode 100644 eula.txt
 create mode 100755 run.sh
 delete mode 100644 start.sh

diff --git a/eula.txt b/eula.txt
new file mode 100644
index 0000000..1adc2fe
--- /dev/null
+++ b/eula.txt
@@ -0,0 +1,3 @@
+#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://aka.ms/MinecraftEULA).
+#Mon Jun 24 20:33:09 UTC 2024
+eula=true
diff --git a/run.sh b/run.sh
new file mode 100755
index 0000000..18e6fa0
--- /dev/null
+++ b/run.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+# Forge requires a configured set of both JVM and program arguments.
+# Add custom JVM arguments to the user_jvm_args.txt
+# Add custom program arguments {such as nogui} to this file in the next line before the "$@" or
+#  pass them to this script directly
+java @user_jvm_args.txt @libraries/net/minecraftforge/forge/1.20.1-47.3.0/unix_args.txt --nogui"$@"
diff --git a/server.properties b/server.properties
index 37da128..f284592 100644
--- a/server.properties
+++ b/server.properties
@@ -1,52 +1,58 @@
-#Minecraft server properties
-#Wed Dec 23 23:04:12 CET 2020
-allow-flight=true
-allow-nether=true
-broadcast-console-to-ops=true
-broadcast-rcon-to-ops=true
-difficulty=easy
-enable-command-block=true
-enable-jmx-monitoring=false
-enable-query=false
-enable-rcon=false
-enable-status=true
-enforce-whitelist=true
-entity-broadcast-range-percentage=100
-force-gamemode=false
-function-permission-level=2
-gamemode=survival
-generate-structures=true
-generator-settings=
-hardcore=false
-level-name=world
-level-seed=
-level-type=default
-max-build-height=256
-max-players=10
-max-tick-time=120000
-max-world-size=29999984
-motd=A Minecraft Server
-network-compression-threshold=256
-online-mode=true
-op-permission-level=4
-player-idle-timeout=0
-prevent-proxy-connections=false
-pvp=true
-query.port=25565
-rate-limit=0
-rcon.password=
-rcon.port=25575
-resource-pack=
-resource-pack-sha1=
-server-ip=
-server-port=25565
-snooper-enabled=false
-spawn-animals=true
-spawn-monsters=true
-spawn-npcs=true
-spawn-protection=16
-sync-chunk-writes=true
-text-filtering-config=
-use-native-transport=true
-view-distance=10
-white-list=false
+#Minecraft server properties
+#Sat Jun 29 14:29:55 UTC 2024
+allow-flight=false
+allow-nether=true
+broadcast-console-to-ops=true
+broadcast-rcon-to-ops=true
+difficulty=easy
+enable-command-block=false
+enable-jmx-monitoring=false
+enable-query=false
+enable-rcon=false
+enable-status=true
+enforce-secure-profile=true
+enforce-whitelist=false
+entity-broadcast-range-percentage=100
+force-gamemode=false
+function-permission-level=2
+gamemode=survival
+generate-structures=true
+generator-settings={}
+hardcore=false
+hide-online-players=false
+initial-disabled-packs=
+initial-enabled-packs=vanilla
+level-name=world
+level-seed=3390523434318704240
+level-type=minecraft\:normal
+max-chained-neighbor-updates=1000000
+max-players=20
+max-tick-time=60000
+max-world-size=29999984
+motd=A Minecraft Server
+network-compression-threshold=256
+online-mode=true
+op-permission-level=4
+player-idle-timeout=0
+prevent-proxy-connections=false
+pvp=true
+query.port=25565
+rate-limit=0
+rcon.password=
+rcon.port=25575
+require-resource-pack=false
+resource-pack=
+resource-pack-prompt=
+resource-pack-sha1=
+server-ip=
+server-port=25565
+simulation-distance=10
+spawn-animals=true
+spawn-monsters=true
+spawn-npcs=true
+spawn-protection=16
+sync-chunk-writes=true
+text-filtering-config=
+use-native-transport=true
+view-distance=10
+white-list=false
diff --git a/start.sh b/start.sh
deleted file mode 100644
index 5e6db51..0000000
--- a/start.sh
+++ /dev/null
@@ -1,337 +0,0 @@
-#!/usr/bin/env bash
-
-# Start script generated by ServerPackCreator 4.3.0.
-# Depending on which modloader is set, different checks are run to ensure the server will start accordingly.
-# If the modloader checks and setup are passed, Minecraft and EULA checks are run.
-# If everything is in order, the server is started.
-
-if [[ "$(id -u)" == "0" ]]; then
-  echo "Warning! Running with administrator-privileges is not recommended."
-fi
-
-echo "Start script generated by ServerPackCreator 4.3.0."
-echo "To change the launch settings of this server, such as JVM args / flags, Minecraft version, modloader version etc., edit the variables.txt-file."
-
-# Acquire variables from variables.txt
-source "variables.txt"
-
-# Variables with do_not_manually_edit are set automatically during script execution,
-# so manually editing them will have no effect, as they will be overridden.
-MINECRAFT_SERVER_JAR_LOCATION="do_not_manually_edit"
-LAUNCHER_JAR_LOCATION="do_not_manually_edit"
-SERVER_RUN_COMMAND="do_not_manually_edit"
-
-crash() {
-  echo "Exiting..."
-  read -n 1 -s -r -p "Press any key to continue"
-  exit 1
-}
-
-# $1 = Filename to check for
-# $2 = Filename to save download as
-# $3 = URL to download $2 from
-# true if the file was successfully downloaded, false if it already exists
-downloadIfNotExist() {
-  if [[ ! -s "${1}" ]]; then
-
-    echo "${1} could not be found." >&2
-    echo "Downloading ${2}" >&2
-    echo "from ${3}" >&2
-    curl -# -L -o "./${2}" "${3}"
-
-    if [[ -s "${2}" ]]; then
-      echo "Download complete." >&2
-      echo "true"
-    fi
-
-  else
-    echo "${1} present." >&2
-    echo "false"
-  fi
-}
-
-runJavaCommand() {
-  "$JAVA" ${1}
-}
-
-checkJavaBitness() {
-  "$JAVA" "-version" 2>&1 | grep -i "32-Bit" && echo "WARNING! 32-Bit Java detected! It is highly recommended to use a 64-Bit version of Java!"
-}
-
-# If modloader = Forge, run Forge-specific checks
-setup_forge() {
-  echo ""
-  echo "Running Forge checks and setup..."
-
-  FORGE_INSTALLER_URL="https://files.minecraftforge.net/maven/net/minecraftforge/forge/${MINECRAFT_VERSION}-${MODLOADER_VERSION}/forge-${MINECRAFT_VERSION}-${MODLOADER_VERSION}-installer.jar"
-
-  FORGE_JAR_LOCATION="do_not_manually_edit"
-  IFS="." read -ra MINOR <<<"${MINECRAFT_VERSION}"
-
-  if [[ ${MINOR[1]} -le 16 ]]; then
-    FORGE_JAR_LOCATION="forge.jar"
-    LAUNCHER_JAR_LOCATION="forge.jar"
-    MINECRAFT_SERVER_JAR_LOCATION="minecraft_server.${MINECRAFT_VERSION}.jar"
-    SERVER_RUN_COMMAND="-Dlog4j2.formatMsgNoLookups=true ${JAVA_ARGS} -jar ${LAUNCHER_JAR_LOCATION} nogui"
-  else
-    FORGE_JAR_LOCATION="libraries/net/minecraftforge/forge/${MINECRAFT_VERSION}-${MODLOADER_VERSION}/forge-${MINECRAFT_VERSION}-${MODLOADER_VERSION}-server.jar"
-    MINECRAFT_SERVER_JAR_LOCATION="libraries/net/minecraft/server/${MINECRAFT_VERSION}/server-${MINECRAFT_VERSION}.jar"
-    SERVER_RUN_COMMAND="-Dlog4j2.formatMsgNoLookups=true @user_jvm_args.txt @libraries/net/minecraftforge/forge/${MINECRAFT_VERSION}-${MODLOADER_VERSION}/unix_args.txt nogui"
-
-    echo "Generating user_jvm_args.txt from variables..."
-    echo "Edit JAVA_ARGS in your variables.txt. Do not edit user_jvm_args.txt directly!"
-    echo "Manually made changes to user_jvm_args.txt will be lost in the nether!"
-    rm -f user_jvm_args.txt
-    {
-      echo "# Xmx and Xms set the maximum and minimum RAM usage, respectively."
-      echo "# They can take any number, followed by an M or a G."
-      echo "# M means Megabyte, G means Gigabyte."
-      echo "# For example, to set the maximum to 3GB: -Xmx3G"
-      echo "# To set the minimum to 2.5GB: -Xms2500M"
-      echo "# A good default for a modded server is 4GB."
-      echo "# Uncomment the next line to set it."
-      echo "# -Xmx4G"
-      echo "${JAVA_ARGS}"
-    } >>user_jvm_args.txt
-  fi
-
-  if [[ $(downloadIfNotExist "${FORGE_JAR_LOCATION}" "forge-installer.jar" "${FORGE_INSTALLER_URL}") == "true" ]]; then
-
-    echo "Forge Installer downloaded. Installing..."
-    runJavaCommand "-jar forge-installer.jar --installServer"
-
-    if [[ ${MINOR[1]} -gt 16 ]]; then
-      rm -f run.bat
-      rm -f run.sh
-    else
-      echo "Renaming forge-${MINECRAFT_VERSION}-${MODLOADER_VERSION}.jar to forge.jar"
-      mv forge-"${MINECRAFT_VERSION}"-"${MODLOADER_VERSION}".jar forge.jar
-    fi
-
-    if [[ -s "${FORGE_JAR_LOCATION}" ]]; then
-      rm -f forge-installer.jar
-      rm -f forge-installer.jar.log
-      echo "Installation complete. forge-installer.jar deleted."
-    else
-      rm -f forge-installer.jar
-      echo "Something went wrong during the server installation. Please try again in a couple of minutes and check your internet connection."
-      crash
-    fi
-
-  fi
-}
-
-# If modloader = Fabric, run Fabric-specific checks
-setup_fabric() {
-  echo ""
-  echo "Running Fabric checks and setup..."
-
-  FABRIC_INSTALLER_URL="https://maven.fabricmc.net/net/fabricmc/fabric-installer/${FABRIC_INSTALLER_VERSION}/fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
-  FABRIC_CHECK_URL="https://meta.fabricmc.net/v2/versions/loader/${MINECRAFT_VERSION}/${MODLOADER_VERSION}/server/json"
-  FABRIC_AVAILABLE="$(curl -LI ${FABRIC_CHECK_URL} -o /dev/null -w '%{http_code}\n' -s)"
-  IMPROVED_FABRIC_LAUNCHER_URL="https://meta.fabricmc.net/v2/versions/loader/${MINECRAFT_VERSION}/${MODLOADER_VERSION}/${FABRIC_INSTALLER_VERSION}/server/jar"
-  IMPROVED_FABRIC_LAUNCHER_AVAILABLE="$(curl -LI ${IMPROVED_FABRIC_LAUNCHER_URL} -o /dev/null -w '%{http_code}\n' -s)"
-
-  if [[ "$IMPROVED_FABRIC_LAUNCHER_AVAILABLE" == "200" ]]; then
-    echo "Improved Fabric Server Launcher available..."
-    echo "The improved launcher will be used to run this Fabric server."
-    LAUNCHER_JAR_LOCATION="fabric-server-launcher.jar"
-    downloadIfNotExist "fabric-server-launcher.jar" "fabric-server-launcher.jar" "${IMPROVED_FABRIC_LAUNCHER_URL}" >/dev/null
-  elif [[ "${FABRIC_AVAILABLE}" != "200" ]]; then
-    echo "Fabric is not available for Minecraft ${MINECRAFT_VERSION}, Fabric ${MODLOADER_VERSION}."
-    crash
-  elif [[ $(downloadIfNotExist "fabric-server-launch.jar" "fabric-installer.jar" "${FABRIC_INSTALLER_URL}") == "true" ]]; then
-
-    echo "Installer downloaded..."
-    LAUNCHER_JAR_LOCATION="fabric-server-launch.jar"
-    MINECRAFT_SERVER_JAR_LOCATION="server.jar"
-    runJavaCommand "-jar fabric-installer.jar server -mcversion ${MINECRAFT_VERSION} -loader ${MODLOADER_VERSION} -downloadMinecraft"
-
-    if [[ -s "fabric-server-launch.jar" ]]; then
-      rm -rf .fabric-installer
-      rm -f fabric-installer.jar
-      echo "Installation complete. fabric-installer.jar deleted."
-    else
-      rm -f fabric-installer.jar
-      echo "fabric-server-launch.jar not found. Maybe the Fabric servers are having trouble."
-      echo "Please try again in a couple of minutes and check your internet connection."
-      crash
-    fi
-
-  else
-    echo "fabric-server-launch.jar present. Moving on..."
-    LAUNCHER_JAR_LOCATION="fabric-server-launcher.jar"
-    MINECRAFT_SERVER_JAR_LOCATION="server.jar"
-  fi
-
-  SERVER_RUN_COMMAND="-Dlog4j2.formatMsgNoLookups=true ${JAVA_ARGS} -jar ${LAUNCHER_JAR_LOCATION} nogui"
-}
-
-# If modloader = Quilt, run Quilt-specific checks
-setup_quilt() {
-  echo ""
-  echo "Running Quilt checks and setup..."
-
-  QUILT_INSTALLER_URL="https://maven.quiltmc.org/repository/release/org/quiltmc/quilt-installer/${QUILT_INSTALLER_VERSION}/quilt-installer-${QUILT_INSTALLER_VERSION}.jar"
-  QUILT_CHECK_URL="https://meta.fabricmc.net/v2/versions/intermediary/${MINECRAFT_VERSION}"
-  QUILT_AVAILABLE="$(curl -LI ${QUILT_CHECK_URL} -o /dev/null -w '%{http_code}\n' -s)"
-
-  if [[ "${#QUILT_AVAILABLE}" -eq "2" ]]; then
-    echo "Quilt is not available for Minecraft ${MINECRAFT_VERSION}, Quilt ${MODLOADER_VERSION}."
-    crash
-  elif [[ $(downloadIfNotExist "quilt-server-launch.jar" "quilt-installer.jar" "${QUILT_INSTALLER_URL}") == "true" ]]; then
-    echo "Installer downloaded. Installing..."
-    runJavaCommand "-jar quilt-installer.jar install server ${MINECRAFT_VERSION} --download-server --install-dir=."
-
-    if [[ -s "quilt-server-launch.jar" ]]; then
-      rm quilt-installer.jar
-      echo "Installation complete. quilt-installer.jar deleted."
-    else
-      rm -f quilt-installer.jar
-      echo "quilt-server-launch.jar not found. Maybe the Quilt servers are having trouble."
-      echo "Please try again in a couple of minutes and check your internet connection."
-      crash
-    fi
-
-  fi
-
-  LAUNCHER_JAR_LOCATION="quilt-server-launch.jar"
-  MINECRAFT_SERVER_JAR_LOCATION="server.jar"
-  SERVER_RUN_COMMAND="-Dlog4j2.formatMsgNoLookups=true ${JAVA_ARGS} -jar ${LAUNCHER_JAR_LOCATION} nogui"
-}
-
-# If modloader = LegacyFabric, run LegacyFabric-specific checks
-setup_legacyfabric() {
-  echo ""
-  echo "Running LegacyFabric checks and setup..."
-
-  LEGACYFABRIC_INSTALLER_URL="https://maven.legacyfabric.net/net/legacyfabric/fabric-installer/${LEGACYFABRIC_INSTALLER_VERSION}/fabric-installer-${LEGACYFABRIC_INSTALLER_VERSION}.jar"
-  LEGACYFABRIC_CHECK_URL="https://meta.legacyfabric.net/v2/versions/loader/${MINECRAFT_VERSION}"
-  LEGACYFABRIC_AVAILABLE="$(curl -LI ${LEGACYFABRIC_CHECK_URL} -o /dev/null -w '%{http_code}\n' -s)"
-
-  if [[ "${#LEGACYFABRIC_AVAILABLE}" -eq "2" ]]; then
-    echo "LegacyFabric is not available for Minecraft ${MINECRAFT_VERSION}, LegacyFabric ${MODLOADER_VERSION}."
-    crash
-  elif [[ $(downloadIfNotExist "fabric-server-launch.jar" "legacyfabric-installer.jar" "${LEGACYFABRIC_INSTALLER_URL}") == "true" ]]; then
-    echo "Installer downloaded. Installing..."
-    runJavaCommand "-jar legacyfabric-installer.jar server -mcversion ${MINECRAFT_VERSION} -loader ${MODLOADER_VERSION} -downloadMinecraft"
-
-    if [[ -s "fabric-server-launch.jar" ]]; then
-      rm legacyfabric-installer.jar
-      echo "Installation complete. legacyfabric-installer.jar deleted."
-    else
-      rm -f legacyfabric-installer.jar
-      echo "fabric-server-launch.jar not found. Maybe the LegacyFabric servers are having trouble."
-      echo "Please try again in a couple of minutes and check your internet connection."
-      crash
-    fi
-
-  fi
-
-  LAUNCHER_JAR_LOCATION="fabric-server-launch.jar"
-  MINECRAFT_SERVER_JAR_LOCATION="server.jar"
-  SERVER_RUN_COMMAND="-Dlog4j2.formatMsgNoLookups=true ${JAVA_ARGS} -jar ${LAUNCHER_JAR_LOCATION} nogui"
-}
-
-# Check for a minecraft server and download it if necessary
-minecraft() {
-  echo ""
-  if [[ "${MODLOADER}" == "Fabric" && "$IMPROVED_FABRIC_LAUNCHER_AVAILABLE" == "200" ]]; then
-    echo "Skipping Minecraft Server JAR checks because we are using the improved Fabric Server Launcher."
-  else
-    downloadIfNotExist "${MINECRAFT_SERVER_JAR_LOCATION}" "${MINECRAFT_SERVER_JAR_LOCATION}" "${MINECRAFT_SERVER_URL}" >/dev/null
-  fi
-}
-
-# Check for eula.txt and generate if necessary
-eula() {
-  echo ""
-  if [[ ! -s "eula.txt" ]]; then
-
-    echo "Mojang's EULA has not yet been accepted. In order to run a Minecraft server, you must accept Mojang's EULA."
-    echo "Mojang's EULA is available to read at https://aka.ms/MinecraftEULA"
-    echo "If you agree to Mojang's EULA then type 'I agree'"
-    echo -n "Response: "
-    read -r ANSWER
-
-    if [[ "${ANSWER}" == "I agree" ]]; then
-      echo "User agreed to Mojang's EULA."
-      echo "#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://aka.ms/MinecraftEULA)." >eula.txt
-      echo "eula=true" >>eula.txt
-    else
-      echo "User did not agree to Mojang's EULA."
-      echo "Entered: ${ANSWER}"
-      crash
-    fi
-
-  fi
-}
-
-# Main
-case ${MODLOADER} in
-
-  "Forge")
-    setup_forge
-    ;;
-
-  "Fabric")
-    setup_fabric
-    ;;
-
-  "Quilt")
-    setup_quilt
-    ;;
-
-  "LegacyFabric")
-    setup_legacyfabric
-    ;;
-
-  *)
-    echo "Incorrect modloader specified: ${MODLOADER}"
-    crash
-esac
-
-if [[ "${PWD}" == *" "*  ]]; then
-
-    echo "WARNING! The current location of this script contains spaces. This may cause this server to crash!"
-    echo "It is strongly recommended to move this server pack to a location whose path does NOT contain SPACES!"
-    echo ""
-    echo "Current path:"
-    echo "${PWD}"
-    echo ""
-    echo -n "Are you sure you want to continue? (Yes/No): "
-    read -r WHY
-
-    if [[ "${WHY}" == "Yes" ]]; then
-        echo "Alrighty. Prepare for unforseen consequences, Mr. Freeman..."
-    else
-        crash
-    fi
-fi
-
-checkJavaBitness
-minecraft
-eula
-
-echo ""
-echo "Starting server..."
-echo "Minecraft version: ${MINECRAFT_VERSION}"
-echo "Modloader:         ${MODLOADER}"
-echo "Modloader version: ${MODLOADER_VERSION}"
-if [[ ${LAUNCHER_JAR_LOCATION} != "do_not_manually_edit" ]]; then
-  echo "Launcher JAR:      ${LAUNCHER_JAR_LOCATION}"
-fi
-echo ""
-echo "Java args:         ${JAVA_ARGS}"
-echo "Java path:         ${JAVA}"
-echo "Run Command:       ${JAVA} ${SERVER_RUN_COMMAND}"
-echo "Java version:"
-"${JAVA}" -version
-echo ""
-
-runJavaCommand "${SERVER_RUN_COMMAND}"
-
-echo ""
-echo "Exiting..."
-read -n 1 -s -r -p "Press any key to continue"
-exit 0