Update package to 1.14.4-28.1.0, add .gitignore

4 files changed, 19 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..5e20eb562368
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+*
+!forge-server.install
+!forged-backup.service
+!forged-backup.timer
+!forged.conf
+!forged.service
+!forged.sh
+!LICENSE.txt
+!PKGBUILD
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 4c594b1d0626..5db22dd0720d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: sowieso <sowieso@dukun.de>
 
 pkgname=forge-server
-_minecraft_ver=1.12.2
-pkgver=${_minecraft_ver}_14.23.5.2768
+_minecraft_ver=1.14.4
+pkgver=${_minecraft_ver}_28.1.0
 _ver=${pkgver//_/-}
 pkgrel=1
 pkgdesc="Minecraft Forge server unit files, script, and jar"
@@ -25,12 +25,12 @@ source=("forge-${_ver}-installer.jar"::"https://files.minecraftforge.net/maven/n
 	"forged.sh"
 	"LICENSE.txt")
 noextract=("forge-${_ver}-installer.jar")
-sha512sums=('fefaabeccd17b98752cbef8bd01f4bce27e351106c256edf6aba92267e0fc4ded36fba089f9b7f5fc2d210e5f7b07bca38d8254a2f4732516720e45a249dc5c2'
+sha512sums=('2890b40882c6b91a96024ba7ace6feef85530be74bfde4441fd55ca5244b5a739ccfd8d2d99b47e6fb97b1acc3ee5aa5a648d637f8afa2f353abdb1986d4dcb9'
             'e9a391a330320a7aea127a3e8ad399d8d6e3c926eac2c0df7a4e550ba61cc13fec737f7e984bd98b9e1f9f9d5a654ee241eeef6a2e433ec845e300ef29405f62'
             'a47b5a9e2262877008a5dcae3a833fe99f911631d6fdbe97b95e0451e1dd2b5a26b6f7b843dd6a8ccd4f663cf5c3bca53a89a1d3aabb363281ab6c6fb19e41a4'
             'd6bde61a7aa479b85e35b4a3eccb9b3237a6c97f8919b3d704434f1df15672b74c7ae9ca9473eea6a0593e6e80892a2510782115185c1b7fe332720ccb78a7bd'
-            'ad305f48d869d18cb13f4c4fbae2c5cdfb87d0910ae3d8dd8c0fe83ff0533a8f944fd694718faa1b2cdd6e891d9a4ab3fa43434f75bd9ce5b1ae3b54844f714b'
-            '56e4dfa327a4ab23d067e0bbde372718401027023771c01248bd2283807007379dfca2bbf0ec070d8047cffdef49f3d19fb5776cf6315f5c1aaff6d605215b6d'
+            '81251b608fe1a62867c0b5c431fb88135e8a2200327fa57b07c7c83863eddd3c9840190d98dd4a8312c66e6a24d4593b2fda743553386412362c94c0cf6a75c4'
+            'ae4626563595165c8f34de87b6d83f473aef81e1437711e5a11fd9694a59311f3f3d420fb43e5e0a59bd6681298c9544781c667cc6f9abedd9c18035da66d9a4'
             '3da10d63a5edee4bc8bcd3d5c2730771062f7fa58626a8c51635fbe96bfbceca3ff6937cfaad3e17f16a94ef95137f7c78cc6dac1c846a6b9a8f18d3c6355973')
 
 _game="forge"
@@ -48,9 +48,9 @@ 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}-${_ver}-universal.jar"         "${pkgdir}${_server_root}/${_game}-${_ver}-universal.jar"
+	install -Dm644 "${_game}-${_ver}.jar"                   "${pkgdir}${_server_root}/${_game}-${_ver}.jar"
 	install -Dm644 "minecraft_server.${_minecraft_ver}.jar" "${pkgdir}${_server_root}/minecraft_server.${_minecraft_ver}.jar"
-	ln -s "${_game}-${_ver}-universal.jar" "${pkgdir}${_server_root}/${_game}-universal.jar"
+	ln -s "${_game}-${_ver}.jar" "${pkgdir}${_server_root}/${_game}.jar"
 
 	# Install libraries
 	find libraries -type f -print0 | xargs -0 -i@ install -Dm644 '@' "${pkgdir}${_server_root}/@"
diff --git a/forged.conf b/forged.conf
index c7f288fc54b5..3256bdf05d33 100644
--- a/forged.conf
+++ b/forged.conf
@@ -7,7 +7,7 @@ BACKUP_DEST="/srv/forge/backup"
 BACKUP_PATHS="world" # World paths separated by spaces relative to SERVER_ROOT
 KEEP_BACKUPS="10"
 GAME_USER="forge"
-MAIN_EXECUTABLE="forge-universal.jar"
+MAIN_EXECUTABLE="forge.jar"
 SESSION_NAME="forge"
 
 # System parameters for java
diff --git a/forged.sh b/forged.sh
index 6534d39d7a7b..eb82d931091e 100755
--- a/forged.sh
+++ b/forged.sh
@@ -14,7 +14,7 @@ declare -r game="forge"
 [[ -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-universal.jar"
+[[ -n "${MAIN_EXECUTABLE}" ]] && declare -r MAIN_EXECUTABLE=${MAIN_EXECUTABLE} || MAIN_EXECUTABLE="forge.jar"
 [[ -n "${SESSION_NAME}" ]] && declare -r SESSION_NAME=${SESSION_NAME} || SESSION_NAME="${game}"
 
 # Command and parameter declaration with which to start the server