mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-17 11:18:01 +00:00
Merge branch 'java-11plus' into 'master'
Update Forge scripts for Java 11+ and Java 17+ See merge request core-developers/forge!5566
This commit is contained in:
@@ -1,3 +1,52 @@
|
|||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
|
|
||||||
|
# returns the JDK version.
|
||||||
|
# 8 for 1.8.0_nn, 9 for 9-ea etc, and "no_java" for undetected
|
||||||
|
# Based on the code from this source: https://eed3si9n.com/detecting-java-version-bash
|
||||||
|
jdk_version() {
|
||||||
|
local result
|
||||||
|
local java_cmd
|
||||||
|
if [[ -n $(type -p java) ]]
|
||||||
|
then
|
||||||
|
java_cmd=java
|
||||||
|
elif [[ (-n "$JAVA_HOME") && (-x "$JAVA_HOME/bin/java") ]]
|
||||||
|
then
|
||||||
|
java_cmd="$JAVA_HOME/bin/java"
|
||||||
|
fi
|
||||||
|
local IFS=$'\n'
|
||||||
|
# remove \r for Cygwin
|
||||||
|
local lines=$("$java_cmd" -Xms32M -Xmx32M -version 2>&1 | tr '\r' '\n')
|
||||||
|
if [[ -z $java_cmd ]]
|
||||||
|
then
|
||||||
|
result=no_java
|
||||||
|
else
|
||||||
|
for line in $lines; do
|
||||||
|
if [[ (-z $result) && ($line = *"version \""*) ]]
|
||||||
|
then
|
||||||
|
local ver=$(echo $line | sed -e 's/.*version "\(.*\)"\(.*\)/\1/; 1q')
|
||||||
|
# on macOS, sed doesn't support '?'
|
||||||
|
if [[ $ver = "1."* ]]
|
||||||
|
then
|
||||||
|
result=$(echo $ver | sed -e 's/1\.\([0-9]*\)\(.*\)/\1/; 1q')
|
||||||
|
else
|
||||||
|
result=$(echo $ver | sed -e 's/\([0-9]*\)\(.*\)/\1/; 1q')
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
echo "$result"
|
||||||
|
}
|
||||||
|
v="$(jdk_version)"
|
||||||
|
|
||||||
|
SHAREDPARAMS='-Xmx4096m -Dfile.encoding=UTF-8 -jar $project.build.finalName$'
|
||||||
cd $(dirname "${0}")
|
cd $(dirname "${0}")
|
||||||
java -Xmx4096m -Dfile.encoding=UTF-8 -jar $project.build.finalName$
|
|
||||||
|
if [[ $v -ge 17 ]]
|
||||||
|
then
|
||||||
|
java --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED $SHAREDPARAMS
|
||||||
|
elif [[ $v -ge 11 ]]
|
||||||
|
then
|
||||||
|
java --illegal-access=permit $SHAREDPARAMS
|
||||||
|
else
|
||||||
|
java $SHAREDPARAMS
|
||||||
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user