* porting some things to windows

launcher
Dominika 2022-06-15 01:10:24 +02:00
parent a493fa57d8
commit 6969c5fcbc
2 changed files with 43 additions and 14 deletions

View File

@ -12,17 +12,43 @@ function launch() {
7z x -onatives/ $i -y
done
fi
if [[ $(uname -o) == "Msys" ]]; then # winblows
windows_fetch_java
/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)"
../jdk-18*/bin/java \
-Xms128M \
-Xmx4G \
-Djava.library.path=natives/ \
-cp $(find libraries/ -type f | tr '\n' ';')client.jar \
$(jq -r '.mainClass' < manifest.json) \
--gameDir . \
--assetsDir assets \
--version $1 \
--accessToken "$(jq -r '.accessToken' < ../auth.json)" \
--username "$(jq -r '.selectedProfile.name' < ../auth.json)" \
--uuid "$(jq -r '.selectedProfile.id' < ../auth.json)"
else
java \
-Xms128M \
-Xmx4G \
-Djava.library.path=natives/ \
-cp $(find libraries/ -type f | tr '\n' ':')client.jar \
$(jq -r '.mainClass' < manifest.json) \
--gameDir . \
--assetsDir assets \
--version $1 \
--accessToken "$(jq -r '.accessToken' < ../auth.json)" \
--username "$(jq -r '.selectedProfile.name' < ../auth.json)" \
--uuid "$(jq -r '.selectedProfile.id' < ../auth.json)"
fi
}
function windows_fetch_java() {
if [[ $(ls jdk-18*) == '' ]]; then
url="$(curl https://jdk.java.net/18/ | grep windows-x64 | grep -Poh 'https:.*?zip"' | sed 's/"//')"
curl -o java.zip "$url"
7z x java.zip
fi
}

View File

@ -26,8 +26,11 @@ function fetch_version() {
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)"
if [[ "$(uname -o)" == "Msys" ]]; then # winblows
mew="$(jq -r '.libraries[].downloads | if .classifiers then select(.classifiers["natives-windows"]) | .classifiers["natives-windows"] else .artifact end | "\(.url) \(.path)"' < manifest.json)"
else
mew="$(jq -r '.libraries[].downloads | if .classifiers then select(.classifiers["natives-linux"]) | .classifiers["natives-linux"] else .artifact end | "\(.url) \(.path)"' < manifest.json)"
fi
IFS=$'\n'
mkdir -p libraries; cd libraries