From 40d7b89823fc0c4856e5a9af8f797900b334ccf0 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Tue, 9 Nov 2021 21:46:42 +0800
Subject: [PATCH] Update minimum Java version for Forge Desktop executable -
 forge.exe and forge-adventure.exe needs at least Java 11.0.1 - for Java 8,
 user should use forge-old.exe for Forge Desktop, and forge-adventure-old.exe
 for Forge Adventure

---
 forge-adventure/pom.xml   | 57 ++++++++++++++++++++++++++++++-
 forge-gui-desktop/pom.xml | 71 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 124 insertions(+), 4 deletions(-)

diff --git a/forge-adventure/pom.xml b/forge-adventure/pom.xml
index 534932584a0..65185c922c6 100644
--- a/forge-adventure/pom.xml
+++ b/forge-adventure/pom.xml
@@ -49,7 +49,7 @@
                             </goals>
                             <configuration>
                                 <headerType>gui</headerType>
-                                <outfile>${project.build.directory}/forge-adventure.exe</outfile>
+                                <outfile>${project.build.directory}/forge-adventure-old.exe</outfile>
                                 <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
                                 <dontWrapJar>true</dontWrapJar>
                                 <errTitle>forge</errTitle>
@@ -66,6 +66,60 @@
                                         <opt>-Dfile.encoding=UTF-8</opt>
                                     </opts>
                                 </jre>
+                                <versionInfo>
+                                    <fileVersion>
+                                        1.0.0.0
+                                    </fileVersion>
+                                    <txtFileVersion>
+                                        1.0.0.0
+                                    </txtFileVersion>
+                                    <fileDescription>Forge</fileDescription>
+                                    <copyright>Forge</copyright>
+                                    <productVersion>
+                                        1.0.0.0
+                                    </productVersion>
+                                    <txtProductVersion>
+                                        1.0.0.0
+                                    </txtProductVersion>
+                                    <productName>forge-adventure</productName>
+                                    <internalName>forge-adventure</internalName>
+                                    <originalFilename>forge-adventure-old.exe</originalFilename>
+                                </versionInfo>
+                            </configuration>
+                        </execution>
+                        <!--extra-->
+                        <execution>
+                            <id>l4j-adv2</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>launch4j</goal>
+                            </goals>
+                            <configuration>
+                                <headerType>gui</headerType>
+                                <outfile>${project.build.directory}/forge-adventure.exe</outfile>
+                                <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
+                                <dontWrapJar>true</dontWrapJar>
+                                <errTitle>forge</errTitle>
+                                <downloadUrl>https://www.oracle.com/java/technologies/downloads/</downloadUrl>
+                                <icon>src/main/config/forge-adventure.ico</icon>
+                                <classPath>
+                                    <mainClass>forge.adventure.Main</mainClass>
+                                    <addDependencies>false</addDependencies>
+                                    <preCp>anything</preCp>
+                                </classPath>
+                                <jre>
+                                    <minVersion>11.0.1</minVersion>
+                                    <jdkPreference>jdkOnly</jdkPreference>
+                                    <maxHeapSize>4096</maxHeapSize>
+                                    <opts>
+                                        <opt>-Dfile.encoding=UTF-8</opt>
+                                        <opt>--add-opens java.base/java.lang=ALL-UNNAMED</opt>
+                                        <opt>--add-opens java.base/java.util=ALL-UNNAMED</opt>
+                                        <opt>--add-opens java.base/java.lang.reflect=ALL-UNNAMED</opt>
+                                        <opt>--add-opens java.base/java.text=ALL-UNNAMED</opt>
+                                        <opt>--add-opens java.desktop/java.awt.font=ALL-UNNAMED</opt>
+                                    </opts>
+                                </jre>
                                 <versionInfo>
                                     <fileVersion>
                                         1.0.0.0
@@ -87,6 +141,7 @@
                                 </versionInfo>
                             </configuration>
                         </execution>
+                        <!--extra-->
                     </executions>
             </plugin>
 
diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml
index 06153bc2924..e9dfd91d6e9 100644
--- a/forge-gui-desktop/pom.xml
+++ b/forge-gui-desktop/pom.xml
@@ -250,7 +250,7 @@
                                 </goals>
                                 <configuration>
                                     <headerType>gui</headerType>
-                                    <outfile>${project.build.directory}/forge.exe</outfile>
+                                    <outfile>${project.build.directory}/forge-old.exe</outfile>
                                     <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
                                     <dontWrapJar>true</dontWrapJar>
                                     <errTitle>forge</errTitle>
@@ -284,7 +284,7 @@
                                         </txtProductVersion>
                                         <productName>Forge</productName>
                                         <internalName>forge</internalName>
-                                        <originalFilename>forge.exe</originalFilename>
+                                        <originalFilename>forge-old.exe</originalFilename>
                                     </versionInfo>
                                 </configuration>
                             </execution>
@@ -322,6 +322,7 @@
                                                 <include name="res/**" />
                                                 <exclude name="res/cardsfolder/**" />
                                             </fileset>
+                                            <fileset dir="${project.build.directory}" includes="forge-old.exe" />
                                             <fileset dir="${project.build.directory}" includes="forge.exe" />
                                             <fileset dir="${project.build.directory}" includes="${project.build.finalName}-jar-with-dependencies.jar" />
                                         </copy>
@@ -329,18 +330,21 @@
                                         <zip destfile="${project.build.directory}/${project.build.finalName}/res/cardsfolder/cardsfolder.zip" basedir="${basedir}/../forge-gui/res/cardsfolder" level="1" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge.sh" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge.command" perm="a+rx" />
+                                        <chmod file="${project.build.directory}/${project.build.finalName}/forge-old.exe" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge.exe" perm="a+rx" />
                                         <tar destfile="${project.build.directory}/${project.build.finalName}.tar.bz2" compression="bzip2">
                                             <tarfileset filemode="755" dir="${project.build.directory}/${project.build.finalName}">
                                                 <include name="forge.sh" />
                                                 <include name="forge.command" />
                                                 <include name="forge.exe" />
+                                                <include name="forge-old.exe" />
                                             </tarfileset>
                                             <tarfileset dir="${project.build.directory}/${project.build.finalName}">
                                                 <include name="**" />
                                                 <exclude name="forge.sh" />
                                                 <exclude name="forge.command" />
                                                 <exclude name="forge.exe" />
+                                                <exclude name="forge-old.exe" />
                                             </tarfileset>
                                         </tar>
                                     </target>
@@ -407,7 +411,7 @@
                                 </goals>
                                 <configuration>
                                     <headerType>gui</headerType>
-                                    <outfile>${project.build.directory}/forge.exe</outfile>
+                                    <outfile>${project.build.directory}/forge-old.exe</outfile>
                                     <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
                                     <dontWrapJar>true</dontWrapJar>
                                     <errTitle>forge</errTitle>
@@ -424,6 +428,60 @@
                                             <opt>-Dfile.encoding=UTF-8</opt>
                                         </opts>
                                     </jre>
+                                    <versionInfo>
+                                        <fileVersion>
+                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
+                                        </fileVersion>
+                                        <txtFileVersion>
+                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
+                                        </txtFileVersion>
+                                        <fileDescription>Forge</fileDescription>
+                                        <copyright>Forge</copyright>
+                                        <productVersion>
+                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
+                                        </productVersion>
+                                        <txtProductVersion>
+                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
+                                        </txtProductVersion>
+                                        <productName>Forge</productName>
+                                        <internalName>forge</internalName>
+                                        <originalFilename>forge-old.exe</originalFilename>
+                                    </versionInfo>
+                                </configuration>
+                            </execution>
+                            <!--extra-->
+                            <execution>
+                                <id>l4j-gui2</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>launch4j</goal>
+                                </goals>
+                                <configuration>
+                                    <headerType>gui</headerType>
+                                    <outfile>${project.build.directory}/forge.exe</outfile>
+                                    <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
+                                    <dontWrapJar>true</dontWrapJar>
+                                    <errTitle>forge</errTitle>
+                                    <downloadUrl>https://www.oracle.com/java/technologies/downloads/</downloadUrl>
+                                    <icon>src/main/config/forge.ico</icon>
+                                    <classPath>
+                                        <mainClass>forge.view.Main</mainClass>
+                                        <addDependencies>false</addDependencies>
+                                        <preCp>anything</preCp>
+                                    </classPath>
+                                    <jre>
+                                        <minVersion>11.0.1</minVersion>
+                                        <jdkPreference>jdkOnly</jdkPreference>
+                                        <maxHeapSize>4096</maxHeapSize>
+                                        <opts>
+                                            <opt>-Dfile.encoding=UTF-8</opt>
+                                            <opt>--add-opens java.base/java.lang=ALL-UNNAMED</opt>
+                                            <opt>--add-opens java.base/java.util=ALL-UNNAMED</opt>
+                                            <opt>--add-opens java.base/java.lang.reflect=ALL-UNNAMED</opt>
+                                            <opt>--add-opens java.base/java.text=ALL-UNNAMED</opt>
+                                            <opt>--add-opens java.desktop/java.awt.font=ALL-UNNAMED</opt>
+                                        </opts>
+                                    </jre>
                                     <versionInfo>
                                         <fileVersion>
                                             ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
@@ -445,6 +503,7 @@
                                     </versionInfo>
                                 </configuration>
                             </execution>
+                            <!--extra-->
                         </executions>
                     </plugin>
 
@@ -482,9 +541,11 @@
                                                 <include name="res/**" />
                                                 <exclude name="res/cardsfolder/**" />
                                             </fileset>
+                                            <fileset dir="${project.build.directory}" includes="forge-old.exe" />
                                             <fileset dir="${project.build.directory}" includes="forge.exe" />
                                             <fileset dir="${project.build.directory}" includes="${project.build.finalName}-jar-with-dependencies.jar" />
                                             <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure.exe" />
+                                            <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-old.exe" />
                                             <fileset dir="${project.build.directory}/../../forge-adventure/target"  includes="forge-adventure.sh" />
                                             <fileset dir="${project.build.directory}/../../forge-adventure/target"  includes="forge-adventure.command" />
                                             <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-${project.version}-jar-with-dependencies.jar" />
@@ -495,18 +556,22 @@
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge.command" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.sh" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.command" perm="a+rx" />
+                                        <chmod file="${project.build.directory}/${project.build.finalName}/forge-old.exe" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge.exe" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.exe" perm="a+rx" />
+                                        <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-old.exe" perm="a+rx" />
                                         <tar destfile="${project.build.directory}/${project.build.finalName}.tar.bz2" compression="bzip2">
                                             <tarfileset filemode="755" dir="${project.build.directory}/${project.build.finalName}">
                                                 <include name="forge.sh" />
                                                 <include name="forge.command" />
+                                                <include name="forge-old.exe" />
                                                 <include name="forge.exe" />
                                             </tarfileset>
                                             <tarfileset dir="${project.build.directory}/${project.build.finalName}">
                                                 <include name="**" />
                                                 <exclude name="forge.sh" />
                                                 <exclude name="forge.command" />
+                                                <exclude name="forge-old.exe" />
                                                 <exclude name="forge.exe" />
                                             </tarfileset>
                                         </tar>