GameServerManagers · AlexCS1337 · Jun 11, 2022 · Jun 11, 2022 · Jun 11, 2022 · Jun 11, 2022
diff --git a/lgsm/config-default/config-lgsm/jk2server/_default.cfg b/lgsm/config-default/config-lgsm/jk2server/_default.cfg
@@ -14,7 +14,7 @@ steampass='password'
 
 ## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
 ip="0.0.0.0"
-port="27960"
+port="28070"
 defaultmap="ffa_bespin"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters

diff --git a/lgsm/config-default/config-lgsm/jk3server/_default.cfg b/lgsm/config-default/config-lgsm/jk3server/_default.cfg
@@ -0,0 +1,189 @@
+##################################
+######## Default Settings ########
+##################################
+# DO NOT EDIT, ANY CHANGES WILL BE OVERWRITTEN!
+# Copy settings from here and use them in either:
+# common.cfg - applies settings to every instance.
+# [instance].cfg - applies settings to a specific instance.
+
+#### Game Server Settings ####
+
+## SteamCMD Login | https://docs.linuxgsm.com/steamcmd#steamcmd-login
+steamuser="username"
+steampass='password'
+
+## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
+ip="0.0.0.0"
+port="29070"
+defaultmap="mp/ffa3"
+
+## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
+startparameters="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set net_ip ${ip} +set net_port ${port} +exec ${servercfg} +map ${defaultmap}"
+
+#### LinuxGSM Settings ####
+
+## LinuxGSM Stats
+# Send useful stats to LinuxGSM developers.
+# https://docs.linuxgsm.com/configuration/linuxgsm-stats
+# (on|off)
+stats="off"
+
+## Notification Alerts
+# (on|off)
+
+# Display IP | https://docs.linuxgsm.com/alerts#display-ip
+displayip=""
+
+# More info | https://docs.linuxgsm.com/alerts#more-info
+postalert="off"
+
+# Alert on Start/Stop/Restart
+statusalert="off"
+
+# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
+discordalert="off"
+discordwebhook="webhook"
+
+# Email Alerts | https://docs.linuxgsm.com/alerts/email
+emailalert="off"
+email="[email protected]"
+emailfrom=""
+
+# Gotify Alerts | https://docs.linuxgsm.com/alerts/gotify
+gotifyalert="off"
+gotifytoken="token"
+gotifywebhook="webhook"
+
+# IFTTT Alerts | https://docs.linuxgsm.com/alerts/ifttt
+iftttalert="off"
+ifttttoken="accesstoken"
+iftttevent="linuxgsm_alert"
+
+# Pushbullet Alerts | https://docs.linuxgsm.com/alerts/pushbullet
+pushbulletalert="off"
+pushbullettoken="accesstoken"
+channeltag=""
+
+# Pushover Alerts | https://docs.linuxgsm.com/alerts/pushover
+pushoveralert="off"
+pushovertoken="accesstoken"
+pushoveruserkey="userkey"
+
+# Rocket.Chat Alerts | https://docs.linuxgsm.com/alerts/rocket.chat
+rocketchatalert="off"
+rocketchatwebhook="webhook"
+
+# Slack Alerts | https://docs.linuxgsm.com/alerts/slack
+slackalert="off"
+slackwebhook="webhook"
+
+# Telegram Alerts | https://docs.linuxgsm.com/alerts/telegram
+# You can add a custom cURL string eg proxy (useful in Russia) in "curlcustomstring".
+# For example "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help".
+telegramapi="api.telegram.org"
+telegramalert="off"
+telegramtoken="accesstoken"
+telegramchatid=""
+telegramthreadid=""
+telegramsilentnotification="false"
+curlcustomstring=""
+
+## Updating | https://docs.linuxgsm.com/commands/update
+updateonstart="off"
+
+## Backup | https://docs.linuxgsm.com/commands/backup
+maxbackups="4"
+maxbackupdays="30"
+stoponbackup="on"
+
+## Logging | https://docs.linuxgsm.com/features/logging
+consolelogging="on"
+logdays="7"
+
+## Monitor | https://docs.linuxgsm.com/commands/monitor
+# Query delay time
+querydelay="1"
+
+## ANSI Colors | https://docs.linuxgsm.com/features/ansi-colors
+ansi="on"
+
+#### Advanced Settings ####
+
+## Message Display Time | https://docs.linuxgsm.com/features/message-display-time
+sleeptime="0.5"
+
+## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
+# Server appid
+appid="6020"
+steamcmdforcewindows="yes"
+# SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
+branch=""
+betapassword=""
+# Master Server | https://docs.linuxgsm.com/steamcmd/steam-master-server
+steammaster="true"
+
+## Stop Mode | https://docs.linuxgsm.com/features/stop-mode
+# 1: tmux kill
+# 2: CTRL+c
+# 3: quit
+# 4: quit 120s
+# 5: stop
+# 6: q
+# 7: exit
+# 8: 7 Days to Die
+# 9: GoldSrc
+# 10: Avorion
+# 11: end
+stopmode="3"
+
+## Query mode
+# 1: session only
+# 2: gamedig (gsquery fallback)
+# 3: gamedig
+# 4: gsquery
+# 5: tcp
+querymode="2"
+querytype="protocol-quake3"
+
+## Console type
+consoleverbose="yes"
+consoleinteract="yes"
+
+## Game Server Details
+# Do not edit
+gamename="Jedi Knight: Jedi Academy"
+engine="idtech3"
+glibc="2.15"
+
+#### Directories ####
+# Edit with care
+
+## Game Server Directories
+systemdir="${serverfiles}/GameData"
+executabledir="${systemdir}"
+executable="./openjkded.x86_64"
+servercfg="${selfname}.cfg"
+servercfgdefault="server.cfg"
+servercfgdir="${systemdir}"
+servercfgfullpath="${servercfgdir}/${servercfg}"
+
+## Backup Directory
+backupdir="${lgsmdir}/backups"
+
+## Logging Directories
+[ -n "${LGSM_LOGDIR}" ] && logdir="${LGSM_LOGDIR}" || logdir="${rootdir}/log"
+gamelogdir="${systemdir}/logs"
+lgsmlogdir="${logdir}/script"
+consolelogdir="${logdir}/console"
+lgsmlog="${lgsmlogdir}/${selfname}-script.log"
+consolelog="${consolelogdir}/${selfname}-console.log"
+alertlog="${lgsmlogdir}/${selfname}-alert.log"
+postdetailslog="${lgsmlogdir}/${selfname}-postdetails.log"
+
+## Logs Naming
+lgsmlogdate="${lgsmlogdir}/${selfname}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
+consolelogdate="${consolelogdir}/${selfname}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
+
+## Log Parameters
+logtimestamp="off"
+logtimestampformat="%Y-%m-%d %H:%M:%S"
diff --git a/lgsm/data/almalinux-8.csv b/lgsm/data/almalinux-8.csv
@@ -61,6 +61,7 @@ ios
 jc2
 jc3
 jk2
+jk3
 kf
 kf2
 l4d

diff --git a/lgsm/data/almalinux-9.csv b/lgsm/data/almalinux-9.csv
@@ -61,6 +61,7 @@ ios
 jc2
 jc3
 jk2
+jk3
 kf
 kf2
 l4d

diff --git a/lgsm/data/centos-7.csv b/lgsm/data/centos-7.csv
@@ -61,6 +61,7 @@ ios
 jc2
 jc3
 jk2
+jk3
 kf
 kf2
 l4d

diff --git a/lgsm/data/centos-8.csv b/lgsm/data/centos-8.csv
@@ -61,6 +61,7 @@ ios
 jc2
 jc3
 jk2
+jk3
 kf
 kf2
 l4d

diff --git a/lgsm/data/centos-9.csv b/lgsm/data/centos-9.csv
@@ -61,6 +61,7 @@ ios
 jc2
 jc3
 jk2
+jk3
 kf
 kf2
 l4d

diff --git a/lgsm/data/debian-10.csv b/lgsm/data/debian-10.csv
@@ -60,6 +60,7 @@ ios
 jc2
 jc3
 jk2
+jk3
 kf
 kf2
 l4d

diff --git a/lgsm/data/debian-11.csv b/lgsm/data/debian-11.csv
@@ -61,6 +61,7 @@ ios
 jc2
 jc3
 jk2
+jk3
 kf
 kf2
 l4d

diff --git a/lgsm/data/debian-12.csv b/lgsm/data/debian-12.csv
@@ -61,6 +61,7 @@ ios
 jc2
 jc3
 jk2
+jk3
 kf
 kf2
 l4d

diff --git a/lgsm/data/gameicons/jk3-icon.png b/lgsm/data/gameicons/jk3-icon.png
diff --git a/lgsm/data/rhel-7.csv b/lgsm/data/rhel-7.csv
@@ -62,6 +62,7 @@ ios
 jc2
 jc3
 jk2
+jk3
 kf
 kf2
 l4d

diff --git a/lgsm/data/rhel-8.csv b/lgsm/data/rhel-8.csv
@@ -61,6 +61,7 @@ ios
 jc2
 jc3
 jk2
+jk3
 kf
 kf2
 l4d

diff --git a/lgsm/data/rocky-9.csv b/lgsm/data/rocky-9.csv
@@ -61,6 +61,7 @@ ios
 jc2
 jc3
 jk2
+jk3
 kf
 kf2
 l4d

diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv
@@ -60,6 +60,7 @@ ios,iosserver,IOSoccer,ubuntu-22.04
 jc2,jc2server,Just Cause 2,ubuntu-22.04
 jc3,jc3server,Just Cause 3,ubuntu-22.04
 jk2,jk2server,Jedi Knight II: Jedi Outcast,ubuntu-22.04
+jk3,jk3server,Jedi Knight: Jedi Academy,ubuntu-22.04
 kf,kfserver,Killing Floor,ubuntu-22.04
 kf2,kf2server,Killing Floor 2,ubuntu-22.04
 l4d,l4dserver,Left 4 Dead,ubuntu-22.04

diff --git a/lgsm/data/ubuntu-16.04.csv b/lgsm/data/ubuntu-16.04.csv
@@ -62,6 +62,7 @@ ios
 jc2
 jc3
 jk2
+jk3
 kf
 kf2
 l4d

diff --git a/lgsm/data/ubuntu-18.04.csv b/lgsm/data/ubuntu-18.04.csv
@@ -62,6 +62,7 @@ ios
 jc2
 jc3
 jk2
+jk3
 kf
 kf2
 l4d

diff --git a/lgsm/data/ubuntu-20.04.csv b/lgsm/data/ubuntu-20.04.csv
@@ -61,6 +61,7 @@ ios
 jc2
 jc3
 jk2
+jk3
 kf
 kf2
 l4d

diff --git a/lgsm/data/ubuntu-22.04.csv b/lgsm/data/ubuntu-22.04.csv
@@ -61,6 +61,7 @@ ios
 jc2
 jc3
 jk2
+jk3
 kf
 kf2
 l4d

diff --git a/lgsm/data/ubuntu-23.04.csv b/lgsm/data/ubuntu-23.04.csv
@@ -61,6 +61,7 @@ ios
 jc2
 jc3
 jk2
+jk3
 kf
 kf2
 l4d

diff --git a/lgsm/data/ubuntu-23.10.csv b/lgsm/data/ubuntu-23.10.csv
@@ -61,6 +61,7 @@ ios
 jc2
 jc3
 jk2
+jk3
 kf
 kf2
 l4d

diff --git a/lgsm/data/ubuntu-24.04.csv b/lgsm/data/ubuntu-24.04.csv
@@ -61,6 +61,7 @@ ios
 jc2
 jc3
 jk2
+jk3
 kf
 kf2
 l4d

diff --git a/lgsm/modules/command_check_update.sh b/lgsm/modules/command_check_update.sh
@@ -28,6 +28,8 @@ elif [ "${shortname}" == "mta" ]; then
 	update_mta.sh
 elif [ "${shortname}" == "jk2" ]; then
 	update_jk2.sh
+elif [ "${shortname}" == "jk3" ]; then
+	update_jk3.sh
 elif [ "${shortname}" == "vints" ]; then
 	update_vints.sh
 elif [ "${shortname}" == "ut99" ]; then

diff --git a/lgsm/modules/command_start.sh b/lgsm/modules/command_start.sh
@@ -18,6 +18,13 @@ fn_start_jk2() {
 	tmux -L "${socketname}" end -t "${sessionname}" version ENTER > /dev/null 2>&1
 }
 
+# Like above but for Jedi Academy version to be printed in console on start.
+# Used to allow update to detect OpenJK server version.
+fn_start_jk3() {
+	fn_start_tmux
+	tmux -L "${socketname}" end -t "${sessionname}" version ENTER > /dev/null 2>&1
+}
+
 fn_start_tmux() {
 	# check for tmux size variables.
 	if [[ "${servercfgtmuxwidth}" =~ ^[0-9]+$ ]]; then
@@ -199,6 +206,8 @@ fi
 fn_print_dots "${servername}"
 if [ "${shortname}" == "jk2" ]; then
 	fn_start_jk2
+elif [ "$shortname" == "jk3" ]; then
+	fn_start_jk3
 else
 	fn_start_tmux
 fi

diff --git a/lgsm/modules/command_update.sh b/lgsm/modules/command_update.sh
@@ -29,6 +29,8 @@ elif [ "${shortname}" == "mta" ]; then
 	update_mta.sh
 elif [ "${shortname}" == "jk2" ]; then
 	update_jk2.sh
+elif [ "${shortname}" == "jk3" ]; then
+	update_jk3.sh
 elif [ "${shortname}" == "vints" ]; then
 	update_vints.sh
 elif [ "${shortname}" == "ut99" ]; then
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,6 +61,7 @@ ios @@
     jc2
     jc3
     jk2
+    jk3
     kf
     kf2
     l4d
@@ Expand Down @@