From e9fa2a5fea8b63fe806453a5638a9636d478f2f2 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Mon, 21 Oct 2024 15:26:30 +0800
Subject: [PATCH] remove adventure-mac command (-XstartOnFirstThread isn't
 needed anymore to start on Mac)

---
 forge-gui-mobile-dev/pom.xml                                | 2 +-
 forge-gui-mobile-dev/src/main/config/forge-adventure-mac.sh | 3 ---
 forge-gui/src/main/java/forge/util/JVMOptions.java          | 1 -
 forge-installer/pom.xml                                     | 2 --
 4 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 forge-gui-mobile-dev/src/main/config/forge-adventure-mac.sh

diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml
index 70a22e26193..03726cc664d 100644
--- a/forge-gui-mobile-dev/pom.xml
+++ b/forge-gui-mobile-dev/pom.xml
@@ -109,7 +109,7 @@
                 </executions>
                 <configuration>
                     <basedir>${basedir}/${configSourceDirectory}</basedir>
-                    <filesToInclude>forge-adventure.sh, forge-adventure-mac.sh, forge-adventure.command, forge-adventure.cmd</filesToInclude>
+                    <filesToInclude>forge-adventure.sh, forge-adventure.command, forge-adventure.cmd</filesToInclude>
                     <outputBasedir>${project.build.directory}</outputBasedir>
                     <outputDir>.</outputDir>
                     <regex>false</regex>
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
deleted file mode 100644
index 50a16a2aa78..00000000000
--- a/forge-gui-mobile-dev/src/main/config/forge-adventure-mac.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd $(dirname "${0}")
-java -XstartOnFirstThread -Xmx4096m $mandatory.java.args$ -jar $project.build.finalName$
diff --git a/forge-gui/src/main/java/forge/util/JVMOptions.java b/forge-gui/src/main/java/forge/util/JVMOptions.java
index 602704d1b0e..ced2e6e3b66 100644
--- a/forge-gui/src/main/java/forge/util/JVMOptions.java
+++ b/forge-gui/src/main/java/forge/util/JVMOptions.java
@@ -31,7 +31,6 @@ public class JVMOptions {
             sb.append("Forge failed to initialize JVM arguments.\n")
                     .append("Use forge.exe | forge.sh | forge.cmd for Desktop UI.\n")
                     .append("Use forge-adventure.exe | forge-adventure.sh | forge-adventure.cmd for Mobile UI.\n")
-                    .append("(Use forge-adventure-mac.sh is for macOS to run properly).\n")
                     .append("Alternatively, add all these JVM Options in your Command line: \n");
             for (String arg : mandatoryArgs)
                 sb.append(arg.replace("=", " ")).append("\n");
diff --git a/forge-installer/pom.xml b/forge-installer/pom.xml
index 24e06cff8fe..f558649fc64 100644
--- a/forge-installer/pom.xml
+++ b/forge-installer/pom.xml
@@ -186,7 +186,6 @@
                                             <fileset dir="${project.build.directory}/../../adventure-editor/target" includes="adventure-editor-jar-with-dependencies.jar" />
                                             <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.exe" />
                                             <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.sh" />
-                                            <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure-mac.sh" />
                                             <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.command" />
                                             <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.cmd" />
                                             <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-gui-mobile-dev-${project.version}-jar-with-dependencies.jar" />
@@ -198,7 +197,6 @@
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge.command" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge.cmd" 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-mac.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-adventure.cmd" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/adventure-editor.sh" perm="a+rx" />