* porting some things to windows
This commit is contained in:
parent
a493fa57d8
commit
6969c5fcbc
|
@ -12,17 +12,43 @@ function launch() {
|
||||||
7z x -onatives/ $i -y
|
7z x -onatives/ $i -y
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ $(uname -o) == "Msys" ]]; then # winblows
|
||||||
|
windows_fetch_java
|
||||||
|
|
||||||
/usr/lib/jvm/java-8-openjdk/bin/java \
|
../jdk-18*/bin/java \
|
||||||
-Xms128M \
|
-Xms128M \
|
||||||
-Xmx1G \
|
-Xmx4G \
|
||||||
-Djava.library.path=natives/ \
|
-Djava.library.path=natives/ \
|
||||||
-cp $(find libraries/ -type f | tr '\n' ':'):client.jar \
|
-cp $(find libraries/ -type f | tr '\n' ';')client.jar \
|
||||||
$(jq -r '.mainClass' < manifest.json) \
|
$(jq -r '.mainClass' < manifest.json) \
|
||||||
--gameDir "$(realpath .)" \
|
--gameDir . \
|
||||||
--assetsDir "$(realpath .)/assets" \
|
--assetsDir assets \
|
||||||
--version $1 \
|
--version $1 \
|
||||||
--accessToken "$(jq -r '.accessToken' < ../auth.json)" \
|
--accessToken "$(jq -r '.accessToken' < ../auth.json)" \
|
||||||
--username "$(jq -r '.selectedProfile.name' < ../auth.json)" \
|
--username "$(jq -r '.selectedProfile.name' < ../auth.json)" \
|
||||||
--uuid "$(jq -r '.selectedProfile.id' < ../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
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,8 +26,11 @@ function fetch_version() {
|
||||||
curl -o client.jar "$(jq -r '.downloads.client.url' < manifest.json)"
|
curl -o client.jar "$(jq -r '.downloads.client.url' < manifest.json)"
|
||||||
curl -o assets.json "$(jq -r '.assetIndex.url' < manifest.json)"
|
curl -o assets.json "$(jq -r '.assetIndex.url' < manifest.json)"
|
||||||
|
|
||||||
|
if [[ "$(uname -o)" == "Msys" ]]; then # winblows
|
||||||
mew="$(jq -r '.libraries[].downloads | if .classifiers then select(.classifiers["natives-linux"]) | .classifiers["natives-linux"] else .artifact end | "\(.url) \(.path)"' < manifest.json)"
|
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'
|
IFS=$'\n'
|
||||||
mkdir -p libraries; cd libraries
|
mkdir -p libraries; cd libraries
|
||||||
|
|
Loading…
Reference in a new issue