From a493fa57d85282e20c548e08a124ab9c2529f11c Mon Sep 17 00:00:00 2001
From: Dominika Liberda <ja@sdomi.pl>
Date: Mon, 23 May 2022 20:03:34 +0200
Subject: [PATCH] * fixes in launcher

---
 launcher/launch.sh  | 27 ++++++++++++++++++++-------
 launcher/version.sh |  7 ++++---
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/launcher/launch.sh b/launcher/launch.sh
index 036a387..f32cb1f 100755
--- a/launcher/launch.sh
+++ b/launcher/launch.sh
@@ -4,12 +4,25 @@ function launch() {
 	cd "$1"
 	mkdir -p natives
 
-	for i in $(find libraries/ | grep natives); do
-		cp "$i" natives/
-	done
-	for i in natives/*.jar; do
-		7z x -onatives/ $i -y
-	done
+	if [[ "$2" == '' ]]; then # for testing
+		for i in $(find libraries/ | grep natives); do
+			cp "$i" natives/
+		done
+		for i in natives/*.jar; do
+			7z x -onatives/ $i -y
+		done
+	fi
 	
-	java -Djava.library.path=natives/ -cp $(find libraries/ -type f | tr '\n' ':'):client.jar $(jq -r '.mainClass' < manifest.json)	
+	/usr/lib/jvm/java-8-openjdk/bin/java \
+		-Xms128M \
+		-Xmx1G \
+		-Djava.library.path=natives/ \
+		-cp $(find libraries/ -type f | tr '\n' ':'):client.jar \
+		$(jq -r '.mainClass' < manifest.json) \
+		--gameDir "$(realpath .)" \
+		--assetsDir "$(realpath .)/assets" \
+		--version $1 \
+		--accessToken "$(jq -r '.accessToken' < ../auth.json)" \
+		--username "$(jq -r '.selectedProfile.name' < ../auth.json)" \
+		--uuid "$(jq -r '.selectedProfile.id' < ../auth.json)"
 }
diff --git a/launcher/version.sh b/launcher/version.sh
index 5d493a0..04592c7 100755
--- a/launcher/version.sh
+++ b/launcher/version.sh
@@ -21,8 +21,11 @@ function fetch_version() {
 		return 1
 	fi
 
-	mkdir -p meow; cd meow
+	mkdir -p $1; cd $1
 	curl -o manifest.json "$url"
+	curl -o client.jar "$(jq -r '.downloads.client.url' < manifest.json)"
+	curl -o assets.json "$(jq -r '.assetIndex.url' < manifest.json)"
+
 
 	mew="$(jq -r '.libraries[].downloads | if .classifiers then select(.classifiers["natives-linux"]) | .classifiers["natives-linux"] else .artifact end | "\(.url) \(.path)"' < manifest.json)"
 
@@ -35,8 +38,6 @@ function fetch_version() {
 		curl -o "$path" "$_url"
 	done
 	cd ..
-	curl -o client.jar "$(jq -r '.downloads.client.url' < manifest.json)"
-	curl -o assets.json "$(jq -r '.assetIndex.url' < manifest.json)"
 	
 	# assets
 	mkdir -p assets; cd assets