From 8582209cc561e7187e603083978b9d051585b7d5 Mon Sep 17 00:00:00 2001
From: fithwum <fithwum@hotmail.com>
Date: Tue, 10 Jun 2025 13:53:57 -0700
Subject: [PATCH] code changes

---
 vanilla/install_script.sh | 51 ++++++++++++++++-----------------------
 vanilla/server.sh         | 13 ----------
 2 files changed, 21 insertions(+), 43 deletions(-)
 delete mode 100644 vanilla/server.sh

diff --git a/vanilla/install_script.sh b/vanilla/install_script.sh
index f354e5a..6bc7ac3 100644
--- a/vanilla/install_script.sh
+++ b/vanilla/install_script.sh
@@ -3,57 +3,48 @@
 # All rights reserved
 
 VS_SERVER_FILE=https://cdn.vintagestory.at/gamefiles/stable/vs_server_linux-x64_$MC_VERSION.tar.gz
-VS_RUN_FILE=https://gitlab.fithwum.tech/fithwum/vintage-story/-/raw/master/vanilla/server.sh
-
-rm -fr /VSserver/VSserver_*.jar
-rm -fr /VSserver/server_*.sh
 
 # Main install (Debian).
 # Check for server files and download if needed.
-if [ -e /VSserver/VSserver-$VS_VERSION.jar ]
-	then
-		echo " "
-		echo "INFO ! VSserver-$VS_VERSION.jar found starting now."
-	else
-		echo " "
-		echo "WARNING ! VSserver-$VS_VERSION.jar is out of date/missing ... will download now."
-			echo " "
-			echo "INFO ! Cleaning old files."
-			mkdir /VSserver/old-server-versions/
-			mv /VSserver/VSserver-*.jar /VSserver/old-server-versions/
-			mv /VSserver/server-*.sh /VSserver/old-server-versions/
-			wget --no-cache --show-progress --progress=bar:force:noscroll $VS_SERVER_FILE -O /VStemp/vs_server_linux-x64_$MC_VERSION.tar.gz
-fi
-
-sleep 1
-
-# Looking for run-${VS_VERSION}.sh
 if [ -e /VSserver/server-$VS_VERSION.sh ]
 	then
 		echo " "
-		echo "INFO ! server-$VS_VERSION.sh found ... will use existing file."
+		echo "INFO ! server-$VS_VERSION.sh found starting now."
 	else
 		echo " "
-		echo "WARNING ! server.sh is out of date/missing ... will download now."
-		wget --no-cache --show-progress --progress=bar:force:noscroll $VS_RUN_FILE -O /VSserver/server-$VS_VERSION.sh
+		echo "WARNING ! server-$VS_VERSION.sh is out of date/missing ... will download now."
+			echo " "
+			echo "INFO ! Cleaning old files."
+			mkdir /VSserver/old-server-versions/
+			mv /VSserver/server/. /VSserver/old-server-versions/server/
+			mv /VSserver/server-*.sh /VSserver/old-server-versions/
+			wget --no-cache --show-progress --progress=bar:force:noscroll $VS_SERVER_FILE -O /VStemp/vs_server_linux-x64_$MC_VERSION.tar.gz
+			tar -xzf /VStemp/vs_server_linux-x64_$MC_VERSION.tar.gz -C /VStemp/files
+			rm -fr /VStemp/vs_server_linux-x64_*.*.*.tar.gz
+			cp -uR /VStemp/files/. /VSserver/server/
+			rm -fr /VStemp/files/
+			mv /VSserver/server/server.sh /VSserver/server/server-$VS_VERSION.sh
 fi
 
 sleep 1
-echo "INFO ! Setting game port."
-sed -i '/server-port='*'/c\server-port='$GAME_PORT'' /VSserver/server.properties
+
+echo "INFO ! Setting server path."
+sed -i '/VSPATH='*'/c\VSPATH='/VSserver/server'' /VSserver/server/server-$VS_VERSION.sh
+echo "INFO ! Setting data path."
+sed -i '/DATAPATH='*'/c\DATAPATH='/VSserver/data'' /VSserver/server/server-$VS_VERSION.sh
+
 sleep 1
 
 # Set permissions.
 chown 99:100 -R /VSserver
 chmod 777 -R /VSserver
-chmod +x /VSserver/server-$VS_VERSION.sh
-chmod +x /VSserver/VSserver-$VS_VERSION.jar
+chmod +x /VSserver/server/server-$VS_VERSION.sh
 
 sleep 1
 
 # Run vintage-story server.
 echo " "
 echo "INFO ! Starting vintage-story Server $VS_VERSION"
-exec /VSserver/server-$VS_VERSION.sh --dataPath=/VSserver
+exec /VSserver/server/server-$VS_VERSION.sh
 
 exit
\ No newline at end of file
diff --git a/vanilla/server.sh b/vanilla/server.sh
deleted file mode 100644
index 1bd0cf4..0000000
--- a/vanilla/server.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2022 fithwum
-# All rights reserved
-
-cd /VSserver
-JAR=./VSserver-*.jar
-
-while [ true ]; do
-  java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
-  if [ $? -eq 0 ]; then
-    break
-  fi
-done
\ No newline at end of file