merged dev branch

4 files changed, 158 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b4986c61c204..221b191bbacf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = tlauncher
 	pkgdesc = TLauncher Legacy is freeware launcher of Minecraft.
 	pkgver = 1.114.4
-	pkgrel = 1
+	pkgrel = 3
 	epoch = 1
 	url = https://tlaun.ch
 	install = tlauncher.install
@@ -9,13 +9,72 @@ pkgbase = tlauncher
 	license = GPLv3
 	depends = java-runtime>=8
 	depends = xorg-xrandr
-	noextract = 972758e1c5cad62861844a94f2830a14c7e795975108cd3d31de729285c53eb6.jar
-	source = https://tlauncherrepo.com/legacy_beta/bootstrap/972758e1c5cad62861844a94f2830a14c7e795975108cd3d31de729285c53eb6.jar
+	noextract = tl_bootstrap_1.8.2_patched.jar
+	noextract = 6e40f9b10a2a5ef00004e4d406d33a5550ec069a6475be9bf26b8fe94b9b0bea.jar
+	noextract = jdom-2.0.2.jar
+	noextract = xz-1.5.jar
+	noextract = commons-lang3-3.4.jar
+	noextract = commons-compress-1.10.jar
+	noextract = jopt-simple-4.9.jar
+	noextract = commons-io-2.5.jar
+	noextract = gson-2.7.jar
+	noextract = java-semver-0.9.0.jar
+	noextract = jackson-core-2.7.3.jar
+	noextract = slf4j-api-1.7.21.jar
+	noextract = raven-7.8.1.jar
+	noextract = authlib-1.5.24.jar
+	noextract = guava-14.0.jar
+	noextract = log4j-api-2.8.1.jar
+	noextract = log4j-core-2.8.1.jar
+	noextract = nstweaker-1.0.jar
+	noextract = java-statsd-client-3.1.0.jar
+	noextract = tlauncher.desktop
+	noextract = tlauncher.install
+	noextract = tlauncher.bash
+	source = https://files.modder.pw/mc/tl_bootstrap_1.8.2_patched.jar
+	source = https://tlauncherrepo.com/legacy_beta/launcher/6e40f9b10a2a5ef00004e4d406d33a5550ec069a6475be9bf26b8fe94b9b0bea.jar
+	source = http://u.tlauncher.ru/repo/libraries/org/jdom/jdom/2.0.2/jdom-2.0.2.jar
+	source = http://u.tlauncher.ru/repo/libraries/org/tukaani/xz/1.5/xz-1.5.jar
+	source = http://u.tlauncher.ru/repo/libraries/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar
+	source = http://u.tlauncher.ru/repo/libraries/org/apache/commons/commons-compress/1.10/commons-compress-1.10.jar
+	source = http://u.tlauncher.ru/repo/libraries/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-4.9.jar
+	source = http://u.tlauncher.ru/repo/libraries/commons-io/commons-io/2.5/commons-io-2.5.jar
+	source = http://u.tlauncher.ru/repo/libraries/com/google/code/gson/gson/2.7/gson-2.7.jar
+	source = http://u.tlauncher.ru/repo/libraries/com/github/zafarkhaja/java-semver/0.9.0/java-semver-0.9.0.jar
+	source = http://u.tlauncher.ru/repo/libraries/com/fasterxml/jackson/core/jackson-core/2.7.3/jackson-core-2.7.3.jar
+	source = http://u.tlauncher.ru/repo/libraries/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21.jar
+	source = http://u.tlauncher.ru/repo/libraries/com/getsentry/raven/raven/7.8.1/raven-7.8.1.jar
+	source = http://u.tlauncher.ru/repo/libraries/com/mojang/authlib/1.5.24/authlib-1.5.24.jar
+	source = http://u.tlauncher.ru/repo/libraries/com/google/guava/14.0/guava-14.0.jar
+	source = http://u.tlauncher.ru/repo/libraries/org/apache/logging/log4j/log4j-api/2.8.1/log4j-api-2.8.1.jar
+	source = http://u.tlauncher.ru/repo/libraries/org/apache/logging/log4j/log4j-core/2.8.1/log4j-core-2.8.1.jar
+	source = http://u.tlauncher.ru/repo/libraries/ru/turikhay/app/nstweaker/1.0/nstweaker-1.0.jar
+	source = http://u.tlauncher.ru/repo/libraries/com/timgroup/java-statsd-client/3.1.0/java-statsd-client-3.1.0.jar
 	source = tlauncher.desktop
 	source = tlauncher.install
-	sha256sums = 972758e1c5cad62861844a94f2830a14c7e795975108cd3d31de729285c53eb6
-	sha256sums = ab05e25ac610dedf89b9554494eb56d2771789baf405d537f6ae3e2f069a115d
+	source = tlauncher.bash
+	sha256sums = b713eb25937d7f0a70a5c8dbd29c511c53f710a63cba6d5f824cc9f4cb9d8a93
+	sha256sums = 6e40f9b10a2a5ef00004e4d406d33a5550ec069a6475be9bf26b8fe94b9b0bea
+	sha256sums = 2bdf7a48fddc9259f5aa420eee328e939d71302a6a1b79a176e4fd47ee988b97
+	sha256sums = 86f30fa8775fa3a62cdb39d1ed78a6019164c1058864048d42cbee244e26e840
+	sha256sums = 734c8356420cc8e30c795d64fd1fcd5d44ea9d90342a2cc3262c5158fbc6d98b
+	sha256sums = 807c95293e41e8159477442077da6d0962a7f486d4b980be61f60a8db9cb290f
+	sha256sums = 26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5
+	sha256sums = a10418348d234968600ccb1d988efcbbd08716e1d96936ccc1880e7d22513474
+	sha256sums = 2d43eb5ea9e133d2ee2405cc14f5ee08951b8361302fdd93494a3a997b508d32
+	sha256sums = 2218c73b40f9af98b570d084420c1b4a81332297bd7fc27ddd552e903be8e93c
+	sha256sums = f6d5ef0f62dcd9788ec9f7538c352eda7372eeaa3efc3a3f38c9c223d2cced48
+	sha256sums = 1d5aeb6bd98b0fdd151269eae941c05f6468a791ea0f1e68d8e7fe518af3e7df
+	sha256sums = 9f061ad2a82e2018d7b14a62ac3307e294afd7cda9b90714f129c423073735d7
+	sha256sums = 795f783dc6301d10e356d1f3db9952d71692ed8004ffdd843f0049f813a0d1a5
+	sha256sums = c0127b076e3056f58294e4ae6c01a96599b8f58200345eb6f859192a2d9b2962
+	sha256sums = 1205ab764b1326f7d96d99baa4a4e12614599bf3d735790947748ee116511fa2
+	sha256sums = 815a73e20e90a413662eefe8594414684df3d5723edcd76070e1a5aee864616e
+	sha256sums = 6b4c15577b5256b64c7e3d69dcdbf8d18f17f68ac5928e36936bd6a40a91c218
+	sha256sums = bbb82aadb5e4209527c15fcc40e514b6f4c921a37bc66b68b3611bec70c538e8
+	sha256sums = bbb0eaa8d6714cc1e297d351f8e23acc25c08e4ddaf0bdcd0eb2c5a995c3561a
 	sha256sums = 0346fbc5e81522e498b63d392339024b8617a03de9fdf9126ba6364db94e188b
+	sha256sums = 724cd1866b16127d93f34d815a581c6fd30086a1313b7ed303e6cdbc78ea7a51
 
 pkgname = tlauncher
 
diff --git a/PKGBUILD b/PKGBUILD
index 2d703d806897..8da7b2010424 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,36 +3,106 @@
 # PLEASE do not mark it out-of date because "2.xx is released", *2.xx a separate project with same name from other dev team*
 pkgname=tlauncher
 pkgver=1.114.4
-pkgrel=1
+pkgrel=3
 epoch=1
 pkgdesc='TLauncher Legacy is freeware launcher of Minecraft.'
 url='https://tlaun.ch'
 arch=('any')
 license=('GPLv3')
 depends=('java-runtime>=8' 'xorg-xrandr')
-#makedepends=('jq')
-#_checksum=$(curl -sL 'https://cdn.turikhay.ru/tlauncher/legacy_beta/bootstrap.json' | jq -r '.update.bootstrap.downloads.JAR.checksum')
-_checksum='972758e1c5cad62861844a94f2830a14c7e795975108cd3d31de729285c53eb6' # mark out-of-date if you'll get 404
+
 # try to change repo if default sends 404
-source=(#"https://turikhay.ru/tlauncher/legacy_beta/bootstrap/${_checksum}.jar"
-        #"https://u.tlauncher.ru/legacy_beta/bootstrap/${_checksum}.jar"
-        "https://tlauncherrepo.com/legacy_beta/bootstrap/${_checksum}.jar"
+_repo="https://tlauncherrepo.com"
+# _repo="https://turikhay.ru/tlauncher"
+# _repo="https://u.tlauncher.ru"
+_librepo='http://u.tlauncher.ru/repo'
+# _librepo='http://repo.tlauncher.ru/repo'
+# _librepo='http://turikhay.ru/tlauncher/repo'
+
+_bootstrap_checksum='972758e1c5cad62861844a94f2830a14c7e795975108cd3d31de729285c53eb6'
+_launcher_checksum='6e40f9b10a2a5ef00004e4d406d33a5550ec069a6475be9bf26b8fe94b9b0bea'
+
+source=(#"${_repo}/legacy_beta/bootstrap/${_bootstrap_checksum}.jar"
+        # Patched bootstrap to allow launching without RW rights (RO only)
+        # Pached by TL dev; if you're having questions you can ask it
+        # using support email support[at]tlauncher.ru
+        "https://files.modder.pw/mc/tl_bootstrap_1.8.2_patched.jar"
+        "${_repo}/legacy_beta/launcher/${_launcher_checksum}.jar"
+
+        "${_librepo}/libraries/org/jdom/jdom/2.0.2/jdom-2.0.2.jar"
+        "${_librepo}/libraries/org/tukaani/xz/1.5/xz-1.5.jar"
+        "${_librepo}/libraries/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar"
+        "${_librepo}/libraries/org/apache/commons/commons-compress/1.10/commons-compress-1.10.jar"
+        "${_librepo}/libraries/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-4.9.jar"
+        "${_librepo}/libraries/commons-io/commons-io/2.5/commons-io-2.5.jar"
+        "${_librepo}/libraries/com/google/code/gson/gson/2.7/gson-2.7.jar"
+        "${_librepo}/libraries/com/github/zafarkhaja/java-semver/0.9.0/java-semver-0.9.0.jar"
+        "${_librepo}/libraries/com/fasterxml/jackson/core/jackson-core/2.7.3/jackson-core-2.7.3.jar"
+        "${_librepo}/libraries/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21.jar"
+        "${_librepo}/libraries/com/getsentry/raven/raven/7.8.1/raven-7.8.1.jar"
+        "${_librepo}/libraries/com/mojang/authlib/1.5.24/authlib-1.5.24.jar"
+        "${_librepo}/libraries/com/google/guava/14.0/guava-14.0.jar"
+        "${_librepo}/libraries/org/apache/logging/log4j/log4j-api/2.8.1/log4j-api-2.8.1.jar"
+        "${_librepo}/libraries/org/apache/logging/log4j/log4j-core/2.8.1/log4j-core-2.8.1.jar"
+        "${_librepo}/libraries/ru/turikhay/app/nstweaker/1.0/nstweaker-1.0.jar"
+        "${_librepo}/libraries/com/timgroup/java-statsd-client/3.1.0/java-statsd-client-3.1.0.jar"
+
         'tlauncher.desktop'
-        'tlauncher.install')
-noextract=("${_checksum}.jar")
-sha256sums=("${_checksum}"
-            'ab05e25ac610dedf89b9554494eb56d2771789baf405d537f6ae3e2f069a115d'
-            '0346fbc5e81522e498b63d392339024b8617a03de9fdf9126ba6364db94e188b')
-install="${pkgname}.install"
+        'tlauncher.install'
+        'tlauncher.bash')
+noextract=("${source[@]##*/}")
+sha256sums=(#"${_bootstrap_checksum}"
+            'b713eb25937d7f0a70a5c8dbd29c511c53f710a63cba6d5f824cc9f4cb9d8a93'
+            "${_launcher_checksum}"
 
-#pkgver() {
-#  echo $(curl -sL 'http://cdn.turikhay.ru/tlauncher/legacy_beta/bootstrap.json' | jq -r '.update.launcher.version')
-#}
+            '2bdf7a48fddc9259f5aa420eee328e939d71302a6a1b79a176e4fd47ee988b97'
+            '86f30fa8775fa3a62cdb39d1ed78a6019164c1058864048d42cbee244e26e840'
+            '734c8356420cc8e30c795d64fd1fcd5d44ea9d90342a2cc3262c5158fbc6d98b'
+            '807c95293e41e8159477442077da6d0962a7f486d4b980be61f60a8db9cb290f'
+            '26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5'
+            'a10418348d234968600ccb1d988efcbbd08716e1d96936ccc1880e7d22513474'
+            '2d43eb5ea9e133d2ee2405cc14f5ee08951b8361302fdd93494a3a997b508d32'
+            '2218c73b40f9af98b570d084420c1b4a81332297bd7fc27ddd552e903be8e93c'
+            'f6d5ef0f62dcd9788ec9f7538c352eda7372eeaa3efc3a3f38c9c223d2cced48'
+            '1d5aeb6bd98b0fdd151269eae941c05f6468a791ea0f1e68d8e7fe518af3e7df'
+            '9f061ad2a82e2018d7b14a62ac3307e294afd7cda9b90714f129c423073735d7'
+            '795f783dc6301d10e356d1f3db9952d71692ed8004ffdd843f0049f813a0d1a5'
+            'c0127b076e3056f58294e4ae6c01a96599b8f58200345eb6f859192a2d9b2962'
+            '1205ab764b1326f7d96d99baa4a4e12614599bf3d735790947748ee116511fa2'
+            '815a73e20e90a413662eefe8594414684df3d5723edcd76070e1a5aee864616e'
+            '6b4c15577b5256b64c7e3d69dcdbf8d18f17f68ac5928e36936bd6a40a91c218'
+            'bbb82aadb5e4209527c15fcc40e514b6f4c921a37bc66b68b3611bec70c538e8'
+
+            'bbb0eaa8d6714cc1e297d351f8e23acc25c08e4ddaf0bdcd0eb2c5a995c3561a'
+            '0346fbc5e81522e498b63d392339024b8617a03de9fdf9126ba6364db94e188b'
+            '724cd1866b16127d93f34d815a581c6fd30086a1313b7ed303e6cdbc78ea7a51')
+install="${pkgname}.install"
 
-# tlauncher.jar needs at least 666 to launch =(
 package() {
-  mkdir -p "${pkgdir}/opt/tlauncher"
-  mkdir -p "${pkgdir}/usr/share/applications/"
-  install -m0644 "${srcdir}/tlauncher.desktop" "${pkgdir}/usr/share/applications/"
-  install -Dm0666 "${srcdir}/${_checksum}.jar" "${pkgdir}/opt/tlauncher/tlauncher.jar"
+  install -Dm0644 "${srcdir}/tlauncher.desktop" "${pkgdir}/usr/share/applications/tlauncher.desktop"
+  install -Dm0755 "${srcdir}/tlauncher.bash" "${pkgdir}/usr/bin/tlauncher"
+
+#  install -Dm0644 "${srcdir}/${_bootstrap_checksum}.jar" "${pkgdir}/opt/tlauncher/bootstrap.jar"
+  install -Dm0644 "${srcdir}/tl_bootstrap_1.8.2_patched.jar" "${pkgdir}/opt/tlauncher/bootstrap.jar"
+  install -Dm0644 "${srcdir}/${_launcher_checksum}.jar" "${pkgdir}/opt/tlauncher/launcher.jar"
+
+  install -Dm0644 "${srcdir}/jdom-2.0.2.jar" "${pkgdir}/opt/tlauncher/lib/org/jdom/jdom/2.0.2/jdom-2.0.2.jar"
+  install -Dm0644 "${srcdir}/xz-1.5.jar" "${pkgdir}/opt/tlauncher/lib/org/tukaani/xz/1.5/xz-1.5.jar"
+  install -Dm0644 "${srcdir}/commons-lang3-3.4.jar" "${pkgdir}/opt/tlauncher/lib/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar"
+  install -Dm0644 "${srcdir}/commons-compress-1.10.jar" "${pkgdir}/opt/tlauncher/lib/org/apache/commons/commons-compress/1.10/commons-compress-1.10.jar"
+  install -Dm0644 "${srcdir}/jopt-simple-4.9.jar" "${pkgdir}/opt/tlauncher/lib/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-4.9.jar"
+  install -Dm0644 "${srcdir}/commons-io-2.5.jar" "${pkgdir}/opt/tlauncher/lib/commons-io/commons-io/2.5/commons-io-2.5.jar"
+  install -Dm0644 "${srcdir}/gson-2.7.jar" "${pkgdir}/opt/tlauncher/lib/com/google/code/gson/gson/2.7/gson-2.7.jar"
+  install -Dm0644 "${srcdir}/java-semver-0.9.0.jar" "${pkgdir}/opt/tlauncher/lib/com/github/zafarkhaja/java-semver/0.9.0/java-semver-0.9.0.jar"
+  install -Dm0644 "${srcdir}/jackson-core-2.7.3.jar" "${pkgdir}/opt/tlauncher/lib/com/fasterxml/jackson/core/jackson-core/2.7.3/jackson-core-2.7.3.jar"
+  install -Dm0644 "${srcdir}/slf4j-api-1.7.21.jar" "${pkgdir}/opt/tlauncher/lib/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21.jar"
+  install -Dm0644 "${srcdir}/raven-7.8.1.jar" "${pkgdir}/opt/tlauncher/lib/com/getsentry/raven/raven/7.8.1/raven-7.8.1.jar"
+  install -Dm0644 "${srcdir}/authlib-1.5.24.jar" "${pkgdir}/opt/tlauncher/lib/com/mojang/authlib/1.5.24/authlib-1.5.24.jar"
+  install -Dm0644 "${srcdir}/guava-14.0.jar" "${pkgdir}/opt/tlauncher/lib/com/google/guava/14.0/guava-14.0.jar"
+  install -Dm0644 "${srcdir}/log4j-api-2.8.1.jar" "${pkgdir}/opt/tlauncher/lib/org/apache/logging/log4j/log4j-api/2.8.1/log4j-api-2.8.1.jar"
+  install -Dm0644 "${srcdir}/log4j-core-2.8.1.jar" "${pkgdir}/opt/tlauncher/lib/org/apache/logging/log4j/log4j-core/2.8.1/log4j-core-2.8.1.jar"
+  install -Dm0644 "${srcdir}/nstweaker-1.0.jar" "${pkgdir}/opt/tlauncher/lib/ru/turikhay/app/nstweaker/1.0/nstweaker-1.0.jar"
+  install -Dm0644 "${srcdir}/java-statsd-client-3.1.0.jar" "${pkgdir}/opt/tlauncher/lib/com/timgroup/java-statsd-client/3.1.0/java-statsd-client-3.1.0.jar"
+
+
 }
diff --git a/tlauncher.bash b/tlauncher.bash
new file mode 100644
index 000000000000..a94906695161
--- /dev/null
+++ b/tlauncher.bash
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+java -Dtlauncher.bootstrap.targetLibFolder=/opt/tlauncher/lib -Dtlauncher.bootstrap.brand=legacy_beta -Dtlauncher.bootstrap.ignoreSelfUpdate=true -Dtlauncher.bootstrap.ignoreUpdate=true -Dtlauncher.bootstrap.targetJar=/opt/tlauncher/launcher.jar -jar /opt/tlauncher/bootstrap.jar
diff --git a/tlauncher.desktop b/tlauncher.desktop
index 3a06ef4a3571..0596caea0cba 100644
--- a/tlauncher.desktop
+++ b/tlauncher.desktop
@@ -4,9 +4,8 @@ Type=Application
 Name=TLauncher
 Comment=TLauncher is Minecraft Launcher
 Icon=minecraft
-Exec=java -jar /opt/tlauncher/tlauncher.jar
+Exec=/usr/bin/tlauncher
 NoDisplay=false
 Categories=Application;Game;
 StartupNotify=false
 Terminal=false
-