diff --git a/forge-adventure/src/main/config/forge-adventure-editor.cmd b/forge-adventure/src/main/config/forge-adventure-editor.cmd
index 2a9bc45c440..39ee18ff370 100644
--- a/forge-adventure/src/main/config/forge-adventure-editor.cmd
+++ b/forge-adventure/src/main/config/forge-adventure-editor.cmd
@@ -16,7 +16,7 @@ if %jver% LEQ 16 (
)
if %jver% GEQ 17 (
- java --add-opens java.desktop/java.beans=ALL-UNNAMED --add-opens java.desktop/javax.swing.border=ALL-UNNAMED --add-opens java.desktop/javax.swing.event=ALL-UNNAMED --add-opens java.desktop/sun.swing=ALL-UNNAMED --add-opens java.desktop/java.awt.image=ALL-UNNAMED --add-opens java.desktop/java.awt.color=ALL-UNNAMED --add-opens java.desktop/sun.awt.image=ALL-UNNAMED --add-opens java.desktop/javax.swing=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.base/java.util=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.desktop/java.awt.font=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true -Xmx4096m -Dfile.encoding=UTF-8 -jar $project.build.finalName$
+ java -Xmx4096m -Dfile.encoding=UTF-8 -jar $project.build.finalName$
popd
exit /b 0
)
diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml
index 02fcb4c8482..6b707b65295 100644
--- a/forge-gui-desktop/pom.xml
+++ b/forge-gui-desktop/pom.xml
@@ -15,6 +15,7 @@
0
0
0
+ --add-opens java.desktop/java.beans=ALL-UNNAMED --add-opens java.desktop/javax.swing.border=ALL-UNNAMED --add-opens java.desktop/javax.swing.event=ALL-UNNAMED --add-opens java.desktop/sun.swing=ALL-UNNAMED --add-opens java.desktop/java.awt.image=ALL-UNNAMED --add-opens java.desktop/java.awt.color=ALL-UNNAMED --add-opens java.desktop/sun.awt.image=ALL-UNNAMED --add-opens java.desktop/javax.swing=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.base/java.util=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.desktop/java.awt.font=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true -Dfile.encoding=UTF-8
@@ -56,6 +57,10 @@
$project.build.finalName$
${project.build.finalName}-jar-with-dependencies.jar
+
+ $mandatory.java.args$
+ ${mandatory.java.args}
+
@@ -380,28 +385,7 @@
true
4096
- -Dfile.encoding=UTF-8
- --add-opens java.base/java.lang=ALL-UNNAMED
- --add-opens java.base/java.math=ALL-UNNAMED
- --add-opens java.base/jdk.internal.misc=ALL-UNNAMED
- --add-opens java.base/java.nio=ALL-UNNAMED
- --add-opens java.base/sun.nio.ch=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=ALL-UNNAMED
- --add-opens java.desktop/java.awt.font=ALL-UNNAMED
- --add-opens java.desktop/java.awt.image=ALL-UNNAMED
- --add-opens java.desktop/java.awt.color=ALL-UNNAMED
- --add-opens java.desktop/sun.awt.image=ALL-UNNAMED
- --add-opens java.desktop/javax.swing=ALL-UNNAMED
- --add-opens java.desktop/javax.swing.border=ALL-UNNAMED
- --add-opens java.desktop/javax.swing.event=ALL-UNNAMED
- --add-opens java.desktop/sun.swing=ALL-UNNAMED
- --add-opens java.desktop/java.beans=ALL-UNNAMED
- --add-opens java.base/java.util.concurrent=ALL-UNNAMED
- --add-opens java.base/java.net=ALL-UNNAMED
- -Dio.netty.tryReflectionSetAccessible=true
+ ${mandatory.java.args}
@@ -566,28 +550,7 @@
true
4096
- -Dfile.encoding=UTF-8
- --add-opens java.base/java.lang=ALL-UNNAMED
- --add-opens java.base/java.math=ALL-UNNAMED
- --add-opens java.base/jdk.internal.misc=ALL-UNNAMED
- --add-opens java.base/java.nio=ALL-UNNAMED
- --add-opens java.base/sun.nio.ch=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=ALL-UNNAMED
- --add-opens java.desktop/java.awt.font=ALL-UNNAMED
- --add-opens java.desktop/java.awt.image=ALL-UNNAMED
- --add-opens java.desktop/java.awt.color=ALL-UNNAMED
- --add-opens java.desktop/sun.awt.image=ALL-UNNAMED
- --add-opens java.desktop/javax.swing=ALL-UNNAMED
- --add-opens java.desktop/javax.swing.border=ALL-UNNAMED
- --add-opens java.desktop/javax.swing.event=ALL-UNNAMED
- --add-opens java.desktop/sun.swing=ALL-UNNAMED
- --add-opens java.desktop/java.beans=ALL-UNNAMED
- --add-opens java.base/java.util.concurrent=ALL-UNNAMED
- --add-opens java.base/java.net=ALL-UNNAMED
- -Dio.netty.tryReflectionSetAccessible=true
+ ${mandatory.java.args}
diff --git a/forge-gui-desktop/src/main/config/forge.cmd b/forge-gui-desktop/src/main/config/forge.cmd
index 2a9bc45c440..31c7816b15a 100644
--- a/forge-gui-desktop/src/main/config/forge.cmd
+++ b/forge-gui-desktop/src/main/config/forge.cmd
@@ -16,7 +16,7 @@ if %jver% LEQ 16 (
)
if %jver% GEQ 17 (
- java --add-opens java.desktop/java.beans=ALL-UNNAMED --add-opens java.desktop/javax.swing.border=ALL-UNNAMED --add-opens java.desktop/javax.swing.event=ALL-UNNAMED --add-opens java.desktop/sun.swing=ALL-UNNAMED --add-opens java.desktop/java.awt.image=ALL-UNNAMED --add-opens java.desktop/java.awt.color=ALL-UNNAMED --add-opens java.desktop/sun.awt.image=ALL-UNNAMED --add-opens java.desktop/javax.swing=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.base/java.util=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.desktop/java.awt.font=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true -Xmx4096m -Dfile.encoding=UTF-8 -jar $project.build.finalName$
+ java -Xmx4096m $mandatory.java.args$ -jar $project.build.finalName$
popd
exit /b 0
)
diff --git a/forge-gui-desktop/src/main/config/forge.command b/forge-gui-desktop/src/main/config/forge.command
index 1e3165f2ed0..6aa6eee97e0 100644
--- a/forge-gui-desktop/src/main/config/forge.command
+++ b/forge-gui-desktop/src/main/config/forge.command
@@ -1,3 +1,3 @@
#!/bin/sh
cd $(dirname "${0}")
-java -Xmx4096m -Dfile.encoding=UTF-8 -jar $project.build.finalName$
+java -Xmx4096m $mandatory.java.args$ -jar $project.build.finalName$
diff --git a/forge-gui-desktop/src/main/config/forge.sh b/forge-gui-desktop/src/main/config/forge.sh
index 575b5a5b090..6aa6eee97e0 100644
--- a/forge-gui-desktop/src/main/config/forge.sh
+++ b/forge-gui-desktop/src/main/config/forge.sh
@@ -1,3 +1,3 @@
#!/bin/sh
cd $(dirname "${0}")
-java -Xmx4096m --add-opens java.desktop/java.beans=ALL-UNNAMED --add-opens java.desktop/javax.swing.border=ALL-UNNAMED --add-opens java.desktop/javax.swing.event=ALL-UNNAMED --add-opens java.desktop/sun.swing=ALL-UNNAMED --add-opens java.desktop/java.awt.image=ALL-UNNAMED --add-opens java.desktop/java.awt.color=ALL-UNNAMED --add-opens java.desktop/sun.awt.image=ALL-UNNAMED --add-opens java.desktop/javax.swing=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.base/java.util=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.desktop/java.awt.font=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true -Dfile.encoding=UTF-8 -jar $project.build.finalName$
+java -Xmx4096m $mandatory.java.args$ -jar $project.build.finalName$
diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml
index 9973aef52a4..1b9e87305e2 100644
--- a/forge-gui-mobile-dev/pom.xml
+++ b/forge-gui-mobile-dev/pom.xml
@@ -1,5 +1,10 @@
4.0.0
+
+ ${maven.build.timestamp}
+ yyyy-MM-dd HH:mm:ss
+ --add-opens java.desktop/java.beans=ALL-UNNAMED --add-opens java.desktop/javax.swing.border=ALL-UNNAMED --add-opens java.desktop/javax.swing.event=ALL-UNNAMED --add-opens java.desktop/sun.swing=ALL-UNNAMED --add-opens java.desktop/java.awt.image=ALL-UNNAMED --add-opens java.desktop/java.awt.color=ALL-UNNAMED --add-opens java.desktop/sun.awt.image=ALL-UNNAMED --add-opens java.desktop/javax.swing=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.base/java.util=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.desktop/java.awt.font=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true -Dfile.encoding=UTF-8
+
forge
@@ -63,28 +68,7 @@
true
4096
- -Dfile.encoding=UTF-8
- --add-opens java.base/java.lang=ALL-UNNAMED
- --add-opens java.base/java.math=ALL-UNNAMED
- --add-opens java.base/jdk.internal.misc=ALL-UNNAMED
- --add-opens java.base/java.nio=ALL-UNNAMED
- --add-opens java.base/sun.nio.ch=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=ALL-UNNAMED
- --add-opens java.desktop/java.awt.font=ALL-UNNAMED
- --add-opens java.desktop/java.awt.image=ALL-UNNAMED
- --add-opens java.desktop/java.awt.color=ALL-UNNAMED
- --add-opens java.desktop/sun.awt.image=ALL-UNNAMED
- --add-opens java.desktop/javax.swing=ALL-UNNAMED
- --add-opens java.desktop/javax.swing.border=ALL-UNNAMED
- --add-opens java.desktop/javax.swing.event=ALL-UNNAMED
- --add-opens java.desktop/sun.swing=ALL-UNNAMED
- --add-opens java.desktop/java.beans=ALL-UNNAMED
- --add-opens java.base/java.util.concurrent=ALL-UNNAMED
- --add-opens java.base/java.net=ALL-UNNAMED
- -Dio.netty.tryReflectionSetAccessible=true
+ ${mandatory.java.args}
@@ -134,6 +118,10 @@
$project.build.finalName$
${project.build.finalName}-jar-with-dependencies.jar
+
+ $mandatory.java.args$
+ ${mandatory.java.args}
+
@@ -147,9 +135,12 @@
forge.app.Main
- true
+
+ ${project.name}
+ ${project.build.finalName}
+ ${project.organization.name}
splash/logo.gif
diff --git a/forge-gui-mobile-dev/src/main/config/forge-adventure-mac.sh b/forge-gui-mobile-dev/src/main/config/forge-adventure-mac.sh
index 6d208042fee..50a16a2aa78 100644
--- a/forge-gui-mobile-dev/src/main/config/forge-adventure-mac.sh
+++ b/forge-gui-mobile-dev/src/main/config/forge-adventure-mac.sh
@@ -1,3 +1,3 @@
#!/bin/sh
cd $(dirname "${0}")
-java -XstartOnFirstThread -Xmx4096m --add-opens java.desktop/java.beans=ALL-UNNAMED --add-opens java.desktop/javax.swing.border=ALL-UNNAMED --add-opens java.desktop/javax.swing.event=ALL-UNNAMED --add-opens java.desktop/sun.swing=ALL-UNNAMED --add-opens java.desktop/java.awt.image=ALL-UNNAMED --add-opens java.desktop/java.awt.color=ALL-UNNAMED --add-opens java.desktop/sun.awt.image=ALL-UNNAMED --add-opens java.desktop/javax.swing=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.base/java.util=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.desktop/java.awt.font=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true -Dfile.encoding=UTF-8 -jar $project.build.finalName$
+java -XstartOnFirstThread -Xmx4096m $mandatory.java.args$ -jar $project.build.finalName$
diff --git a/forge-gui-mobile-dev/src/main/config/forge-adventure.cmd b/forge-gui-mobile-dev/src/main/config/forge-adventure.cmd
index 2a9bc45c440..31c7816b15a 100644
--- a/forge-gui-mobile-dev/src/main/config/forge-adventure.cmd
+++ b/forge-gui-mobile-dev/src/main/config/forge-adventure.cmd
@@ -16,7 +16,7 @@ if %jver% LEQ 16 (
)
if %jver% GEQ 17 (
- java --add-opens java.desktop/java.beans=ALL-UNNAMED --add-opens java.desktop/javax.swing.border=ALL-UNNAMED --add-opens java.desktop/javax.swing.event=ALL-UNNAMED --add-opens java.desktop/sun.swing=ALL-UNNAMED --add-opens java.desktop/java.awt.image=ALL-UNNAMED --add-opens java.desktop/java.awt.color=ALL-UNNAMED --add-opens java.desktop/sun.awt.image=ALL-UNNAMED --add-opens java.desktop/javax.swing=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.base/java.util=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.desktop/java.awt.font=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true -Xmx4096m -Dfile.encoding=UTF-8 -jar $project.build.finalName$
+ java -Xmx4096m $mandatory.java.args$ -jar $project.build.finalName$
popd
exit /b 0
)
diff --git a/forge-gui-mobile-dev/src/main/config/forge-adventure.command b/forge-gui-mobile-dev/src/main/config/forge-adventure.command
index 1e3165f2ed0..6aa6eee97e0 100644
--- a/forge-gui-mobile-dev/src/main/config/forge-adventure.command
+++ b/forge-gui-mobile-dev/src/main/config/forge-adventure.command
@@ -1,3 +1,3 @@
#!/bin/sh
cd $(dirname "${0}")
-java -Xmx4096m -Dfile.encoding=UTF-8 -jar $project.build.finalName$
+java -Xmx4096m $mandatory.java.args$ -jar $project.build.finalName$
diff --git a/forge-gui-mobile-dev/src/main/config/forge-adventure.sh b/forge-gui-mobile-dev/src/main/config/forge-adventure.sh
index 575b5a5b090..6aa6eee97e0 100644
--- a/forge-gui-mobile-dev/src/main/config/forge-adventure.sh
+++ b/forge-gui-mobile-dev/src/main/config/forge-adventure.sh
@@ -1,3 +1,3 @@
#!/bin/sh
cd $(dirname "${0}")
-java -Xmx4096m --add-opens java.desktop/java.beans=ALL-UNNAMED --add-opens java.desktop/javax.swing.border=ALL-UNNAMED --add-opens java.desktop/javax.swing.event=ALL-UNNAMED --add-opens java.desktop/sun.swing=ALL-UNNAMED --add-opens java.desktop/java.awt.image=ALL-UNNAMED --add-opens java.desktop/java.awt.color=ALL-UNNAMED --add-opens java.desktop/sun.awt.image=ALL-UNNAMED --add-opens java.desktop/javax.swing=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.base/java.util=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.desktop/java.awt.font=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true -Dfile.encoding=UTF-8 -jar $project.build.finalName$
+java -Xmx4096m $mandatory.java.args$ -jar $project.build.finalName$