Edit package to work with Forge 1.9.4

9 files changed, 54 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bff29d0b6708..1178ef5b094a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
-pkgbase = forge-server-1.10.2
+pkgbase = forge-server-1.9.4
 	pkgdesc = Minecraft Forge server unit files, script, and jar
-	pkgver = 1.10.2_12.18.3.2185
-	pkgrel = 2
+	pkgver = 1.9.4_12.17.0.1976
+	pkgrel = 1
 	url = https://minecraftforge.net/
-	install = forge-server-1.10.2.install
+	install = forge-server-1.9.4.install
 	arch = any
 	license = custom
 	depends = java-runtime-headless=8
@@ -14,26 +14,26 @@ pkgbase = forge-server-1.10.2
 	depends = sed
 	optdepends = tar: needed in order to create world backups
 	optdepends = netcat: required in order to suspend an idle server
-	noextract = forge-1.10.2-1.10.2-12.18.3.2185-installer.jar
-	backup = etc/conf.d/forge-1.10.2
-	source = forge-1.10.2-1.10.2-12.18.3.2185-installer.jar::https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.10.2-12.18.3.2185/forge-1.10.2-12.18.3.2185-installer.jar
-	source = forge-1.10.2d-backup.service
-	source = forge-1.10.2d-backup.timer
-	source = forge-1.10.2d.service
-	source = forge-1.10.2d.conf
-	source = forge-1.10.2d.sh
+	noextract = forge-1.9.4-1.9.4-12.17.0.1976-installer.jar
+	backup = etc/conf.d/forge-1.9.4
+	source = forge-1.9.4-1.9.4-12.17.0.1976-installer.jar::https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.9.4-12.17.0.1976/forge-1.9.4-12.17.0.1976-installer.jar
+	source = forge-1.9.4d-backup.service
+	source = forge-1.9.4d-backup.timer
+	source = forge-1.9.4d.service
+	source = forge-1.9.4d.conf
+	source = forge-1.9.4d.sh
 	source = LICENSE-fml.txt
 	source = LICENSE-new.txt
 	source = MinecraftForge-License.txt
-	sha512sums = 12ef115f29883ee48ddfe0463e5a817d8754fba776d97951347b9d657227836f148c392df49eaed61887f7fb7f8653321ba419e07d34df89e76888e42f2283ae
-	sha512sums = c56f06606d96a08e7b55ef00e95d57d2931218f2e887f70a2be092dc20e47a3fc40c4898a5d315964f08126eb4860c8d7925e26bc52acf0dbaf681e6906f2915
+	sha512sums = 0f81a142a8dab015734f573fa20cf7089fe6020c23597d72a35a8e4f1e85cf7746aead735c2db6c5f33d186f77ad8a288899c1f7abf5c9b5521bf02031da5382
+	sha512sums = cb12850b8aed8cd8a624e86ede13a79613cbd5734ad8f898eeeb00813b168fce1d6a46e0d811b0d1528669826ded044c7f528dbd42744d1e901ca2d773e6f6f7
 	sha512sums = a47b5a9e2262877008a5dcae3a833fe99f911631d6fdbe97b95e0451e1dd2b5a26b6f7b843dd6a8ccd4f663cf5c3bca53a89a1d3aabb363281ab6c6fb19e41a4
-	sha512sums = 1c97696602817701590faac010855702f74e1a4c9b628e6c27b53187dc27fd563a57f2027cd3af94377bf189b48fdd8e5b154b2b9314bec893234cdf4100c175
-	sha512sums = 78578e1e736d946ff09c4f2eeaa9a667d5baeb56918dc702b9eae6969aaf62369207612e6825d0b4f88cd70ec5f120400d7badcbe95255a5486077805c60d730
-	sha512sums = 9f2d532dd2f7c897f6082aee8a1164fcd9f639e49bd1f025ae2b6ca7a97560ad0b34971a618eb669cdfc19a86426850bae4c7600805a4ce9fc40576154971f08
+	sha512sums = 0ce70357697009b986850c8aa2c29f874a99c656c44b2eb903b8ac445ef87e03fa7c2eca9091e435f983018bb678d41a18d63c0e73f0b2dd35aaf1c53d35abd9
+	sha512sums = 3a5a2609d7e2b387b410276ad443265cf669ded719eb8a4162fc3c920040dc3e562cb0e861697828d00244fc3c2525084d9851aca4e5f9dff3e3de0ca9d4afb0
+	sha512sums = 1cd03db8ff6cf98a59ac669ad6b78e1a8e4ee808e13e17a3c39b884f586ff96636f6d77a857581a6648d4c2d2e9202935404ae443e3c3c696407b829a9f4765b
 	sha512sums = 07860198b7d40726e9597f9ac748904a8e27bdcf87151f0b1c8c2ade024ad16aa83d412b70f900a7de3f58773f325ee45eb6c30cb1395e45a4d8092a19b4f845
 	sha512sums = 7fe8163f3f1bb86e59508aff851eb571e280da36c24a6faf49ae51d6a000282bac8c388ac1c0c1208220b3f8fb62466285a306213f5a014faa1b619f4c48bf9b
 	sha512sums = dedd8e121e79bdd39c824a2d4acbc231ae6339cfd29894c4e7299359d23bc92423f4a865865372745be996b0bc14f5777e06baae8b1f4e5c302eadeac5aecf15
 
-pkgname = forge-server-1.10.2
+pkgname = forge-server-1.9.4
 
diff --git a/.gitignore b/.gitignore
index 8946647254cb..3a7fa20f9d41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,10 @@
 *
-!forge-server-1.10.2.install
-!forge-1.10.2d-backup.service
-!forge-1.10.2d-backup.timer
-!forge-1.10.2d.conf
-!forge-1.10.2d.service
-!forge-1.10.2d.sh
+!forge-server-1.9.4.install
+!forge-1.9.4d-backup.service
+!forge-1.9.4d-backup.timer
+!forge-1.9.4d.conf
+!forge-1.9.4d.service
+!forge-1.9.4d.sh
 !LICENSE-fml.txt
 !LICENSE-new.txt
 !MinecraftForge-License.txt
diff --git a/PKGBUILD b/PKGBUILD
index 8349682555d2..cd4e4b727c48 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,15 @@
 # Contributor: Philip Abernethy <chais.z3r0@gmail.com>
 # Contributor: sowieso <sowieso@dukun.de>
 
-_game="forge-1.10.2"
-_server_root="/srv/forge-1.10.2"
+_game="forge-1.9.4"
+_server_root="/srv/forge-1.9.4"
 
-_minecraft_ver=1.10.2
-_pkgver=${_minecraft_ver}-12.18.3.2185
+_minecraft_ver=1.9.4
+_pkgver=${_minecraft_ver}-12.17.0.1976
 
-pkgname=forge-server-1.10.2
+pkgname=forge-server-1.9.4
 pkgver=${_pkgver//-/_}
-pkgrel=2
+pkgrel=1
 pkgdesc="Minecraft Forge server unit files, script, and jar"
 arch=('any')
 url="https://minecraftforge.net/"
@@ -30,18 +30,17 @@ source=("${_game}-${_pkgver}-installer.jar"::"https://files.minecraftforge.net/m
 	"LICENSE-new.txt"
 	"MinecraftForge-License.txt")
 noextract=("${_game}-${_pkgver}-installer.jar")
-sha512sums=('12ef115f29883ee48ddfe0463e5a817d8754fba776d97951347b9d657227836f148c392df49eaed61887f7fb7f8653321ba419e07d34df89e76888e42f2283ae'
-            'c56f06606d96a08e7b55ef00e95d57d2931218f2e887f70a2be092dc20e47a3fc40c4898a5d315964f08126eb4860c8d7925e26bc52acf0dbaf681e6906f2915'
+sha512sums=('0f81a142a8dab015734f573fa20cf7089fe6020c23597d72a35a8e4f1e85cf7746aead735c2db6c5f33d186f77ad8a288899c1f7abf5c9b5521bf02031da5382'
+            'cb12850b8aed8cd8a624e86ede13a79613cbd5734ad8f898eeeb00813b168fce1d6a46e0d811b0d1528669826ded044c7f528dbd42744d1e901ca2d773e6f6f7'
             'a47b5a9e2262877008a5dcae3a833fe99f911631d6fdbe97b95e0451e1dd2b5a26b6f7b843dd6a8ccd4f663cf5c3bca53a89a1d3aabb363281ab6c6fb19e41a4'
-            '1c97696602817701590faac010855702f74e1a4c9b628e6c27b53187dc27fd563a57f2027cd3af94377bf189b48fdd8e5b154b2b9314bec893234cdf4100c175'
-            '78578e1e736d946ff09c4f2eeaa9a667d5baeb56918dc702b9eae6969aaf62369207612e6825d0b4f88cd70ec5f120400d7badcbe95255a5486077805c60d730'
-            '9f2d532dd2f7c897f6082aee8a1164fcd9f639e49bd1f025ae2b6ca7a97560ad0b34971a618eb669cdfc19a86426850bae4c7600805a4ce9fc40576154971f08'
+            '0ce70357697009b986850c8aa2c29f874a99c656c44b2eb903b8ac445ef87e03fa7c2eca9091e435f983018bb678d41a18d63c0e73f0b2dd35aaf1c53d35abd9'
+            '3a5a2609d7e2b387b410276ad443265cf669ded719eb8a4162fc3c920040dc3e562cb0e861697828d00244fc3c2525084d9851aca4e5f9dff3e3de0ca9d4afb0'
+            '1cd03db8ff6cf98a59ac669ad6b78e1a8e4ee808e13e17a3c39b884f586ff96636f6d77a857581a6648d4c2d2e9202935404ae443e3c3c696407b829a9f4765b'
             '07860198b7d40726e9597f9ac748904a8e27bdcf87151f0b1c8c2ade024ad16aa83d412b70f900a7de3f58773f325ee45eb6c30cb1395e45a4d8092a19b4f845'
             '7fe8163f3f1bb86e59508aff851eb571e280da36c24a6faf49ae51d6a000282bac8c388ac1c0c1208220b3f8fb62466285a306213f5a014faa1b619f4c48bf9b'
             'dedd8e121e79bdd39c824a2d4acbc231ae6339cfd29894c4e7299359d23bc92423f4a865865372745be996b0bc14f5777e06baae8b1f4e5c302eadeac5aecf15')
 
 prepare() {
-	mkdir mods
 	java -jar "${_game}-${_pkgver}-installer.jar" --installServer
 }
 
@@ -55,7 +54,6 @@ 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 "mods/mod_list.json"                     "${pkgdir}${_server_root}/mods/mod_list.json"
 	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/forge-1.10.2d-backup.service b/forge-1.9.4d-backup.service
index 6b51925223d8..df82b56eae50 100644
--- a/forge-1.10.2d-backup.service
+++ b/forge-1.9.4d-backup.service
@@ -4,9 +4,9 @@ After=local-fs.target
 
 [Service]
 Type=forking
-ExecStart=/usr/bin/forge-1.10.2d backup
-User=forge-1-10-2
-Group=forge-1-10-2
+ExecStart=/usr/bin/forge-1.9.4d backup
+User=forge-1-9-4
+Group=forge-1-9-4
 
 [Install]
 WantedBy=multi-user.target
diff --git a/forge-1.10.2d-backup.timer b/forge-1.9.4d-backup.timer
index 882aa3bcbcd3..882aa3bcbcd3 100644
--- a/forge-1.10.2d-backup.timer
+++ b/forge-1.9.4d-backup.timer
diff --git a/forge-1.10.2d.conf b/forge-1.9.4d.conf
index 2fdb7b2607d6..a9fb87a7a674 100644
--- a/forge-1.10.2d.conf
+++ b/forge-1.9.4d.conf
@@ -2,13 +2,13 @@
 # Variables are interpreted in bash. Simply using bash-syntax is sufficient.
 
 # General parameters
-SERVER_ROOT="/srv/forge-1.10.2"
-BACKUP_DEST="/srv/forge-1.10.2/backup"
+SERVER_ROOT="/srv/forge-1.9.4"
+BACKUP_DEST="/srv/forge-1.9.4/backup"
 BACKUP_PATHS="world" # World paths separated by spaces relative to SERVER_ROOT
 KEEP_BACKUPS="10"
-GAME_USER="forge-1-10-2"
-MAIN_EXECUTABLE="forge-1.10.2.jar"
-SESSION_NAME="forge-1.10.2"
+GAME_USER="forge-1-9-4"
+MAIN_EXECUTABLE="forge-1.9.4.jar"
+SESSION_NAME="forge-1.9.4"
 
 # 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/forge-1.10.2d.service b/forge-1.9.4d.service
index 14796bcba654..da8f05890961 100644
--- a/forge-1.10.2d.service
+++ b/forge-1.9.4d.service
@@ -4,10 +4,10 @@ After=local-fs.target network.target multi-user.target
 
 [Service]
 Type=forking
-ExecStart=/usr/bin/forge-1.10.2d start
-ExecStop=/usr/bin/forge-1.10.2d stop
-User=forge-1-10-2
-Group=forge-1-10-2
+ExecStart=/usr/bin/forge-1.9.4d start
+ExecStop=/usr/bin/forge-1.9.4d stop
+User=forge-1-9-4
+Group=forge-1-9-4
 
 [Install]
 WantedBy=multi-user.target
diff --git a/forge-1.10.2d.sh b/forge-1.9.4d.sh
index 62853219ad7d..eb0feee298d6 100755
--- a/forge-1.10.2d.sh
+++ b/forge-1.9.4d.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # The actual program name
-declare -r myname="forge-1.10.2d"
-declare -r game="forge-1.10.2"
+declare -r myname="forge-1.9.4d"
+declare -r game="forge-1.9.4"
 
 # 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-1.10.2"
 [[ -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-1-10-2"
-[[ -n "${MAIN_EXECUTABLE}" ]] && declare -r MAIN_EXECUTABLE=${MAIN_EXECUTABLE} || MAIN_EXECUTABLE="forge-1.10.2.jar"
+[[ -n "${GAME_USER}" ]]    && declare -r GAME_USER=${GAME_USER}       || GAME_USER="forge-1-9-4"
+[[ -n "${MAIN_EXECUTABLE}" ]] && declare -r MAIN_EXECUTABLE=${MAIN_EXECUTABLE} || MAIN_EXECUTABLE="forge-1.9.4.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-1.10.2.install b/forge-server-1.9.4.install
index eaf25a0b6342..0f9b7107ae54 100644
--- a/forge-server-1.10.2.install
+++ b/forge-server-1.9.4.install
@@ -1,6 +1,6 @@
-_game="forge-1.10.2"
-_user="forge-1-10-2"
-_server_root="/srv/forge-1.10.2"
+_game="forge-1.9.4"
+_user="forge-1-9-4"
+_server_root="/srv/forge-1.9.4"
 
 post_install() {
 	getent group "${_user}" &>/dev/null