From 158a54491034f0083a00c0de744605a86d90ba31 Mon Sep 17 00:00:00 2001
From: Leonard Steppy <leonard.steppy@outlook.de>
Date: Mon, 22 Dec 2025 20:51:46 +0100
Subject: [PATCH] Clean up configuration section

---
 configure.sh | 76 +++++++++++++++++++++++++++++++++-------------------
 1 file changed, 49 insertions(+), 27 deletions(-)

diff --git a/configure.sh b/configure.sh
index 962264c..618f37e 100755
--- a/configure.sh
+++ b/configure.sh
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+# port of the server in standalone mode, aka the open port
+STANDALONE_PORT=25565
+# port of the server in proxy mode, aka the internal port
+PROXY_PORT=25566
+
 function main {
 
   # parse arguments
@@ -44,7 +49,7 @@ function main {
   if $help; then
     echo "Configure the server to be used with BungeeCord, Velcity or in standalone mode."
     echo ""
-    echo "Usage $0 [OPTIONS] <mode>"
+    echo "Usage: $0 [OPTIONS] <mode>"
     echo ""
     echo "mode:"
     echo "  velocity"
@@ -68,35 +73,52 @@ function main {
     fi
   fi
 
-  # TODO clean this part up a bit
+  # Do the actual configuration
   if $velocity; then
-    #disable online-mode
-    sed -ie "/online-mode/c\online-mode=false" server.properties
-    #change port to 25566
-    sed -ie "/server-port/c\server-port=25566" server.properties
-    #enable velocity
-    yq -iy ".proxies.velocity.enabled = true" config/paper-global.yml
-    #disable bungeecord
-    yq -iy ".settings.bungeecord = false" spigot.yml
+    enable_online_mode false
+    set_port "$PROXY_PORT"
+    enable_velocity true
+    enable_bungeecord false
   elif $bungeecord; then
-    #disable online-mode
-    sed -ie "/online-mode/c\online-mode=false" server.properties
-    #change port to 25566
-    sed -ie "/server-port/c\server-port=25566" server.properties
-    #disable velocity
-    yq -iy ".proxies.velocity.enabled = false" config/paper-global.yml
-    #enable bungeecord
-    yq -iy ".settings.bungeecord = true" spigot.yml
+    enable_online_mode false
+    set_port "$PROXY_PORT"
+    enable_velocity false
+    enable_bungeecord true
   elif $standalone; then
-    #enable online-mode
-    sed -ie "/online-mode/c\online-mode=true" server.properties
-    #change port to 25565
-    sed -ie "/server-port/c\server-port=25565" server.properties
-    #disable velocity
-    yq -iy ".proxies.velocity.enabled = false" config/paper-global.yml
-    #disable bungeecord
-    yq -iy ".settings.bungeecord = false" spigot.yml
+    enable_online_mode true
+    set_port "$STANDALONE_PORT"
+    enable_velocity false
+    enable_bungeecord false
   fi
 }
 
-main
+# Enables or disables online mode
+#
+# Usage: enable_online_mode <true|false>
+function enable_online_mode {
+  sed -ie "/online-mode/c\online-mode=$1" server.properties
+}
+
+# Set the port of the server
+#
+# Usage: set_port <port>
+function set_port {
+  sed -ie "/server-port/c\server-port=$1" server.properties
+}
+
+# Enables or disables velocity in the paper config.
+# Does NOT configure the forwarding secret!
+#
+# Usage: enable_velocity <true|false>
+function enable_velocity {
+  yq -iy ".proxies.velocity.enabled = $1" config/paper-global.yml
+}
+
+# Enables or disables bungeecord in spigot.yml.
+#
+# Usage: enable_bungeecord <true|false>
+function enable_bungeecord {
+  yq -iy ".settings.bungeecord = $1" spigot.yml
+}
+
+main "@$"