diff --git a/README.MD b/README.MD index 07a5baf..0c96b52 100644 --- a/README.MD +++ b/README.MD @@ -32,9 +32,9 @@ You can also use Java 11 if you remove the `-Djava.security.manager=allow` argum > If you're using GTNH 2.5.1 or older, use the lwjgl3ify 1.x arguments from . > The following arguments are relevant to the 2.x version. -For MultiMC, you need to manually put in extra java arguments, prismlauncher can load them from the patches json files automatically: +For MultiMC, you need to manually put in extra java arguments, Prism Launcher can load them from the patches json files automatically: ``` --Dfile.encoding=UTF-8 -Djava.system.class.loader=com.gtnewhorizons.retrofuturabootstrap.RfbSystemClassLoader -Djava.security.manager=allow --add-opens java.base/jdk.internal.loader=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/jdk.internal.reflect=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED,java.naming --add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/sun.awt.image=ALL-UNNAMED --add-opens jdk.dynalink/jdk.dynalink.beans=ALL-UNNAMED --add-opens java.sql.rowset/javax.sql.rowset.serial=ALL-UNNAMED +-Dfile.encoding=UTF-8 -Djava.system.class.loader=com.gtnewhorizons.retrofuturabootstrap.RfbSystemClassLoader -Djava.security.manager=allow --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.lang.invoke=ALL-UNNAMED --add-opens java.base/java.lang.ref=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.net.spi=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.nio.channels=ALL-UNNAMED --add-opens java.base/java.nio.charset=ALL-UNNAMED --add-opens java.base/java.nio.file=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.base/java.time.chrono=ALL-UNNAMED --add-opens java.base/java.time.format=ALL-UNNAMED --add-opens java.base/java.time.temporal=ALL-UNNAMED --add-opens java.base/java.time.zone=ALL-UNNAMED --add-opens java.base/java.time=ALL-UNNAMED --add-opens java.base/java.util.concurrent.atomics=ALL-UNNAMED --add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED --add-opens java.base/java.util.jar=ALL-UNNAMED --add-opens java.base/java.util.zip=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/jdk.internal.loader=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED --add-opens java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/jdk.internal.reflect=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.desktop/com.sun.imageio.plugins.png=ALL-UNNAMED --add-opens java.desktop/sun.awt.image=ALL-UNNAMED --add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens java.sql.rowset/javax.sql.rowset.serial=ALL-UNNAMED --add-opens jdk.dynalink/jdk.dynalink.beans=ALL-UNNAMED --add-opens jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED,java.naming ``` ### (Experimental) Relauncher installation diff --git a/build.gradle.kts b/build.gradle.kts index b712886..408b4d7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,24 +19,39 @@ val newJavaToolchainSpec: JavaToolchainSpec.() -> Unit = { } val addOpens = listOf( - "java.base/jdk.internal.loader=ALL-UNNAMED", - "java.base/java.net=ALL-UNNAMED", - "java.base/java.nio=ALL-UNNAMED", "java.base/java.io=ALL-UNNAMED", - "java.base/java.lang=ALL-UNNAMED", + "java.base/java.lang.invoke=ALL-UNNAMED", "java.base/java.lang.ref=ALL-UNNAMED", - "java.base/java.util.concurrent.locks=ALL-UNNAMED", "java.base/java.lang.reflect=ALL-UNNAMED", + "java.base/java.lang=ALL-UNNAMED", + "java.base/java.net.spi=ALL-UNNAMED", + "java.base/java.net=ALL-UNNAMED", + "java.base/java.nio.channels=ALL-UNNAMED", + "java.base/java.nio.charset=ALL-UNNAMED", + "java.base/java.nio.file=ALL-UNNAMED", + "java.base/java.nio=ALL-UNNAMED", "java.base/java.text=ALL-UNNAMED", + "java.base/java.time.chrono=ALL-UNNAMED", + "java.base/java.time.format=ALL-UNNAMED", + "java.base/java.time.temporal=ALL-UNNAMED", + "java.base/java.time.zone=ALL-UNNAMED", + "java.base/java.time=ALL-UNNAMED", + "java.base/java.util.concurrent.atomics=ALL-UNNAMED", + "java.base/java.util.concurrent.locks=ALL-UNNAMED", + "java.base/java.util.jar=ALL-UNNAMED", + "java.base/java.util.zip=ALL-UNNAMED", "java.base/java.util=ALL-UNNAMED", + "java.base/jdk.internal.loader=ALL-UNNAMED", + "java.base/jdk.internal.misc=ALL-UNNAMED", + "java.base/jdk.internal.ref=ALL-UNNAMED", "java.base/jdk.internal.reflect=ALL-UNNAMED", "java.base/sun.nio.ch=ALL-UNNAMED", - "jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED,java.naming", - "java.desktop/sun.awt=ALL-UNNAMED", - "java.desktop/sun.awt.image=ALL-UNNAMED", "java.desktop/com.sun.imageio.plugins.png=ALL-UNNAMED", - "jdk.dynalink/jdk.dynalink.beans=ALL-UNNAMED", + "java.desktop/sun.awt.image=ALL-UNNAMED", + "java.desktop/sun.awt=ALL-UNNAMED", "java.sql.rowset/javax.sql.rowset.serial=ALL-UNNAMED", + "jdk.dynalink/jdk.dynalink.beans=ALL-UNNAMED", + "jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED,java.naming", ) val extraJavaArgs = mutableListOf( @@ -48,6 +63,15 @@ for (openSpec in addOpens) { extraJavaArgs += listOf("--add-opens", openSpec) } +tasks.register("updateJava9ArgsTxt") { + group = taskGroup + description = "Updates java9args.txt with the current argument list" + outputs.file("java9args.txt") + doLast { + file("java9args.txt").writeText(extraJavaArgs.joinToString("\n") + "\n", Charsets.UTF_8) + } +} + minecraft { injectedTags.put("RECOMMENDED_JAVA_ARGS", extraJavaArgs.joinToString("\t")) } diff --git a/java9args.txt b/java9args.txt index 9e18013..4202b99 100644 --- a/java9args.txt +++ b/java9args.txt @@ -2,34 +2,68 @@ -Djava.system.class.loader=com.gtnewhorizons.retrofuturabootstrap.RfbSystemClassLoader -Djava.security.manager=allow --add-opens -java.base/jdk.internal.loader=ALL-UNNAMED ---add-opens -java.base/java.net=ALL-UNNAMED ---add-opens -java.base/java.nio=ALL-UNNAMED ---add-opens java.base/java.io=ALL-UNNAMED --add-opens -java.base/java.lang=ALL-UNNAMED +java.base/java.lang.invoke=ALL-UNNAMED +--add-opens +java.base/java.lang.ref=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens +java.base/java.lang=ALL-UNNAMED +--add-opens +java.base/java.net.spi=ALL-UNNAMED +--add-opens +java.base/java.net=ALL-UNNAMED +--add-opens +java.base/java.nio.channels=ALL-UNNAMED +--add-opens +java.base/java.nio.charset=ALL-UNNAMED +--add-opens +java.base/java.nio.file=ALL-UNNAMED +--add-opens +java.base/java.nio=ALL-UNNAMED +--add-opens java.base/java.text=ALL-UNNAMED --add-opens +java.base/java.time.chrono=ALL-UNNAMED +--add-opens +java.base/java.time.format=ALL-UNNAMED +--add-opens +java.base/java.time.temporal=ALL-UNNAMED +--add-opens +java.base/java.time.zone=ALL-UNNAMED +--add-opens +java.base/java.time=ALL-UNNAMED +--add-opens +java.base/java.util.concurrent.atomics=ALL-UNNAMED +--add-opens +java.base/java.util.concurrent.locks=ALL-UNNAMED +--add-opens +java.base/java.util.jar=ALL-UNNAMED +--add-opens +java.base/java.util.zip=ALL-UNNAMED +--add-opens java.base/java.util=ALL-UNNAMED --add-opens +java.base/jdk.internal.loader=ALL-UNNAMED +--add-opens +java.base/jdk.internal.misc=ALL-UNNAMED +--add-opens +java.base/jdk.internal.ref=ALL-UNNAMED +--add-opens java.base/jdk.internal.reflect=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens -jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED,java.naming ---add-opens -java.desktop/sun.awt=ALL-UNNAMED +java.desktop/com.sun.imageio.plugins.png=ALL-UNNAMED --add-opens java.desktop/sun.awt.image=ALL-UNNAMED --add-opens -java.desktop/com.sun.imageio.plugins.png=ALL-UNNAMED +java.desktop/sun.awt=ALL-UNNAMED +--add-opens +java.sql.rowset/javax.sql.rowset.serial=ALL-UNNAMED --add-opens jdk.dynalink/jdk.dynalink.beans=ALL-UNNAMED --add-opens -java.sql.rowset/javax.sql.rowset.serial=ALL-UNNAMED +jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED,java.naming