Edit forge-server to work with Forge 1.12.2

9 files changed, 55 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 17a8d4c3ff1e..3d8680f505a7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
-pkgbase = forge-server
+pkgbase = forge-server-1.12.2
 	pkgdesc = Minecraft Forge server unit files, script, and jar
-	pkgver = 1.14.4_28.1.0
-	pkgrel = 2
+	pkgver = 1.12.2_14.23.5.2768
+	pkgrel = 1
 	url = https://minecraftforge.net/
-	install = forge-server.install
+	install = forge-server-1.12.2.install
 	arch = any
 	license = custom
 	depends = java-runtime-headless=8
@@ -14,22 +14,22 @@ pkgbase = forge-server
 	depends = sed
 	optdepends = tar: needed in order to create world backups
 	optdepends = netcat: required in order to suspend an idle server
-	noextract = forge-1.14.4-28.1.0-installer.jar
-	backup = etc/conf.d/forge
-	source = forge-1.14.4-28.1.0-installer.jar::https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.14.4-28.1.0/forge-1.14.4-28.1.0-installer.jar
-	source = forged-backup.service
-	source = forged-backup.timer
-	source = forged.service
-	source = forged.conf
-	source = forged.sh
+	noextract = forge-1.12.2-1.12.2-14.23.5.2768-installer.jar
+	backup = etc/conf.d/forge-1.12.2
+	source = forge-1.12.2-1.12.2-14.23.5.2768-installer.jar::https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.12.2-14.23.5.2768/forge-1.12.2-14.23.5.2768-installer.jar
+	source = forge-1.12.2d-backup.service
+	source = forge-1.12.2d-backup.timer
+	source = forge-1.12.2d.service
+	source = forge-1.12.2d.conf
+	source = forge-1.12.2d.sh
 	source = LICENSE.txt
-	sha512sums = 2890b40882c6b91a96024ba7ace6feef85530be74bfde4441fd55ca5244b5a739ccfd8d2d99b47e6fb97b1acc3ee5aa5a648d637f8afa2f353abdb1986d4dcb9
-	sha512sums = e9a391a330320a7aea127a3e8ad399d8d6e3c926eac2c0df7a4e550ba61cc13fec737f7e984bd98b9e1f9f9d5a654ee241eeef6a2e433ec845e300ef29405f62
+	sha512sums = fefaabeccd17b98752cbef8bd01f4bce27e351106c256edf6aba92267e0fc4ded36fba089f9b7f5fc2d210e5f7b07bca38d8254a2f4732516720e45a249dc5c2
+	sha512sums = 7647801c4cc3192693030b026986df29c53b4124460556543d7601558f8ef09ce65acd0eae52ee51fe3974589d6c0f09d473992d9e44653519f70f75f9987efa
 	sha512sums = a47b5a9e2262877008a5dcae3a833fe99f911631d6fdbe97b95e0451e1dd2b5a26b6f7b843dd6a8ccd4f663cf5c3bca53a89a1d3aabb363281ab6c6fb19e41a4
-	sha512sums = d6bde61a7aa479b85e35b4a3eccb9b3237a6c97f8919b3d704434f1df15672b74c7ae9ca9473eea6a0593e6e80892a2510782115185c1b7fe332720ccb78a7bd
-	sha512sums = 81251b608fe1a62867c0b5c431fb88135e8a2200327fa57b07c7c83863eddd3c9840190d98dd4a8312c66e6a24d4593b2fda743553386412362c94c0cf6a75c4
-	sha512sums = ae4626563595165c8f34de87b6d83f473aef81e1437711e5a11fd9694a59311f3f3d420fb43e5e0a59bd6681298c9544781c667cc6f9abedd9c18035da66d9a4
+	sha512sums = e23afa1b34f666f18e4f3ded3210c11b120678d53ca6fcc075b869b600b40fbb52014478be4f22d9fdd785409487092f4cc952ae79ef85561a3ab2b8bbbd07a9
+	sha512sums = da2fbd5bc62aa2e26334b32d49839cde771c0ad913414240f997b3e0d662a90cb2f62ed822f96fbcbc726b176017122c73b8624bbdbef9992f1e90ac4478c9cb
+	sha512sums = e356c5d3cedab6dd74ac1902d2ad355e25060d19e9ae143d0a4f06f78b575a6f5a94c09b724a88ef2c4f463014de1bb49ac26cd0987f61c9034fe5e7bb732904
 	sha512sums = 3da10d63a5edee4bc8bcd3d5c2730771062f7fa58626a8c51635fbe96bfbceca3ff6937cfaad3e17f16a94ef95137f7c78cc6dac1c846a6b9a8f18d3c6355973
 
-pkgname = forge-server
+pkgname = forge-server-1.12.2
 
diff --git a/.gitignore b/.gitignore
index 5195fdbceaaa..e8c4cb48e316 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,10 @@
 *
-!forge-server.install
-!forged-backup.service
-!forged-backup.timer
-!forged.conf
-!forged.service
-!forged.sh
+!forge-server-1.12.2.install
+!forge-1.12.2d-backup.service
+!forge-1.12.2d-backup.timer
+!forge-1.12.2d.conf
+!forge-1.12.2d.service
+!forge-1.12.2d.sh
 !LICENSE.txt
 !PKGBUILD
 !.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index ee86788a3465..c5c4b2cd37bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,15 @@
 # Contributor: Philip Abernethy <chais.z3r0@gmail.com>
 # Contributor: sowieso <sowieso@dukun.de>
 
-_game="forge"
-_server_root="/srv/forge"
+_game="forge-1.12.2"
+_server_root="/srv/forge-1.12.2"
 
-_minecraft_ver=1.14.4
-_pkgver=${_minecraft_ver}-28.1.0
+_minecraft_ver=1.12.2
+_pkgver=${_minecraft_ver}-14.23.5.2768
 
-pkgname=forge-server
+pkgname=forge-server-1.12.2
 pkgver=${_pkgver//-/_}
-pkgrel=2
+pkgrel=1
 pkgdesc="Minecraft Forge server unit files, script, and jar"
 arch=('any')
 url="https://minecraftforge.net/"
@@ -29,12 +29,12 @@ source=("${_game}-${_pkgver}-installer.jar"::"https://files.minecraftforge.net/m
 	"${_game}d.sh"
 	"LICENSE.txt")
 noextract=("${_game}-${_pkgver}-installer.jar")
-sha512sums=('2890b40882c6b91a96024ba7ace6feef85530be74bfde4441fd55ca5244b5a739ccfd8d2d99b47e6fb97b1acc3ee5aa5a648d637f8afa2f353abdb1986d4dcb9'
-            'e9a391a330320a7aea127a3e8ad399d8d6e3c926eac2c0df7a4e550ba61cc13fec737f7e984bd98b9e1f9f9d5a654ee241eeef6a2e433ec845e300ef29405f62'
+sha512sums=('fefaabeccd17b98752cbef8bd01f4bce27e351106c256edf6aba92267e0fc4ded36fba089f9b7f5fc2d210e5f7b07bca38d8254a2f4732516720e45a249dc5c2'
+            '7647801c4cc3192693030b026986df29c53b4124460556543d7601558f8ef09ce65acd0eae52ee51fe3974589d6c0f09d473992d9e44653519f70f75f9987efa'
             'a47b5a9e2262877008a5dcae3a833fe99f911631d6fdbe97b95e0451e1dd2b5a26b6f7b843dd6a8ccd4f663cf5c3bca53a89a1d3aabb363281ab6c6fb19e41a4'
-            'd6bde61a7aa479b85e35b4a3eccb9b3237a6c97f8919b3d704434f1df15672b74c7ae9ca9473eea6a0593e6e80892a2510782115185c1b7fe332720ccb78a7bd'
-            '81251b608fe1a62867c0b5c431fb88135e8a2200327fa57b07c7c83863eddd3c9840190d98dd4a8312c66e6a24d4593b2fda743553386412362c94c0cf6a75c4'
-            'ae4626563595165c8f34de87b6d83f473aef81e1437711e5a11fd9694a59311f3f3d420fb43e5e0a59bd6681298c9544781c667cc6f9abedd9c18035da66d9a4'
+            'e23afa1b34f666f18e4f3ded3210c11b120678d53ca6fcc075b869b600b40fbb52014478be4f22d9fdd785409487092f4cc952ae79ef85561a3ab2b8bbbd07a9'
+            'da2fbd5bc62aa2e26334b32d49839cde771c0ad913414240f997b3e0d662a90cb2f62ed822f96fbcbc726b176017122c73b8624bbdbef9992f1e90ac4478c9cb'
+            'e356c5d3cedab6dd74ac1902d2ad355e25060d19e9ae143d0a4f06f78b575a6f5a94c09b724a88ef2c4f463014de1bb49ac26cd0987f61c9034fe5e7bb732904'
             '3da10d63a5edee4bc8bcd3d5c2730771062f7fa58626a8c51635fbe96bfbceca3ff6937cfaad3e17f16a94ef95137f7c78cc6dac1c846a6b9a8f18d3c6355973')
 
 prepare() {
@@ -49,7 +49,7 @@ package() {
 	install -Dm644 "${_game}d.service"                      "${pkgdir}/usr/lib/systemd/system/${_game}d.service"
 	install -Dm644 "${_game}d-backup.service"               "${pkgdir}/usr/lib/systemd/system/${_game}d-backup.service"
 	install -Dm644 "${_game}d-backup.timer"                 "${pkgdir}/usr/lib/systemd/system/${_game}d-backup.timer"
-	install -Dm644 "${_game}-${_pkgver}.jar"                "${pkgdir}${_server_root}/${_game}-${_pkgver}.jar"
+	install -Dm644 "forge-${_pkgver}-universal.jar"         "${pkgdir}${_server_root}/${_game}-${_pkgver}.jar"
 	install -Dm644 "minecraft_server.${_minecraft_ver}.jar" "${pkgdir}${_server_root}/minecraft_server.${_minecraft_ver}.jar"
 	ln -s "${_game}-${_pkgver}.jar" "${pkgdir}${_server_root}/${_game}.jar"
 
diff --git a/forged-backup.service b/forge-1.12.2d-backup.service
index d4bc5a9f0fc5..ad3895e79b7d 100644
--- a/forged-backup.service
+++ b/forge-1.12.2d-backup.service
@@ -4,9 +4,9 @@ After=local-fs.target
 
 [Service]
 Type=forking
-ExecStart=/usr/bin/forged backup
-User=forge
-Group=forge
+ExecStart=/usr/bin/forge-1.12.2d backup
+User=forge-1-12-2
+Group=forge-1-12-2
 
 [Install]
 WantedBy=multi-user.target
diff --git a/forged-backup.timer b/forge-1.12.2d-backup.timer
index 882aa3bcbcd3..882aa3bcbcd3 100644
--- a/forged-backup.timer
+++ b/forge-1.12.2d-backup.timer
diff --git a/forged.conf b/forge-1.12.2d.conf
index 3256bdf05d33..ae4f03853069 100644
--- a/forged.conf
+++ b/forge-1.12.2d.conf
@@ -2,13 +2,13 @@
 # Variables are interpreted in bash. Simply using bash-syntax is sufficient.
 
 # General parameters
-SERVER_ROOT="/srv/forge"
-BACKUP_DEST="/srv/forge/backup"
+SERVER_ROOT="/srv/forge-1.12.2"
+BACKUP_DEST="/srv/forge-1.12.2/backup"
 BACKUP_PATHS="world" # World paths separated by spaces relative to SERVER_ROOT
 KEEP_BACKUPS="10"
-GAME_USER="forge"
-MAIN_EXECUTABLE="forge.jar"
-SESSION_NAME="forge"
+GAME_USER="forge-1-12-2"
+MAIN_EXECUTABLE="forge-1.12.2.jar"
+SESSION_NAME="forge-1.12.2"
 
 # System parameters for java
 #  -Xms sets the intial heap size (must be a multiple of 1024 and greater than 2MB, no spaces!)
diff --git a/forged.service b/forge-1.12.2d.service
index 091d37b68866..b036ac03fb39 100644
--- a/forged.service
+++ b/forge-1.12.2d.service
@@ -4,10 +4,10 @@ After=local-fs.target network.target multi-user.target
 
 [Service]
 Type=forking
-ExecStart=/usr/bin/forged start
-ExecStop=/usr/bin/forged stop
-User=forge
-Group=forge
+ExecStart=/usr/bin/forge-1.12.2d start
+ExecStop=/usr/bin/forge-1.12.2d stop
+User=forge-1-12-2
+Group=forge-1-12-2
 
 [Install]
 WantedBy=multi-user.target
diff --git a/forged.sh b/forge-1.12.2d.sh
index eb82d931091e..423e73bf816d 100755
--- a/forged.sh
+++ b/forge-1.12.2d.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # The actual program name
-declare -r myname="forged"
-declare -r game="forge"
+declare -r myname="forge-1.12.2d"
+declare -r game="forge-1.12.2"
 
 # General rule for the variable-naming-schema:
 # Variables in capital letters may be passed through the command line others not.
@@ -13,8 +13,8 @@ declare -r game="forge"
 [[ -n "${BACKUP_DEST}" ]]  && declare -r BACKUP_DEST=${BACKUP_DEST}   || BACKUP_DEST="/srv/${game}/backup"
 [[ -n "${BACKUP_PATHS}" ]] && declare -r BACKUP_PATHS=${BACKUP_PATHS} || BACKUP_PATHS="world"
 [[ -n "${KEEP_BACKUPS}" ]] && declare -r KEEP_BACKUPS=${KEEP_BACKUPS} || KEEP_BACKUPS="10"
-[[ -n "${GAME_USER}" ]]    && declare -r GAME_USER=${GAME_USER}       || GAME_USER="forge"
-[[ -n "${MAIN_EXECUTABLE}" ]] && declare -r MAIN_EXECUTABLE=${MAIN_EXECUTABLE} || MAIN_EXECUTABLE="forge.jar"
+[[ -n "${GAME_USER}" ]]    && declare -r GAME_USER=${GAME_USER}       || GAME_USER="forge-1-12-2"
+[[ -n "${MAIN_EXECUTABLE}" ]] && declare -r MAIN_EXECUTABLE=${MAIN_EXECUTABLE} || MAIN_EXECUTABLE="forge-1.12.2.jar"
 [[ -n "${SESSION_NAME}" ]] && declare -r SESSION_NAME=${SESSION_NAME} || SESSION_NAME="${game}"
 
 # Command and parameter declaration with which to start the server
diff --git a/forge-server.install b/forge-server-1.12.2.install
index 65bd5bc9c782..99cded37828d 100644
--- a/forge-server.install
+++ b/forge-server-1.12.2.install
@@ -1,6 +1,6 @@
-_game="forge"
-_user="forge"
-_server_root="/srv/forge"
+_game="forge-1.12.2"
+_user="forge-1-12-2"
+_server_root="/srv/forge-1.12.2"
 
 post_install() {
 	getent group "${_user}" &>/dev/null