From 012d1635dc2b1416f835d3780287d41779c88748 Mon Sep 17 00:00:00 2001
From: SashegDev <gdsasheg@gmail.com>
Date: Tue, 5 May 2026 11:35:33 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=D0=B8=D1=81=D0=BA=D0=BB=D1=8E=D1=87?=
 =?UTF-8?q?=D0=B0=D0=B5=D0=BC=20javafx=20=D0=B8=D0=B7=20shade,=20=D0=B8?=
 =?UTF-8?q?=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D1=8F=D0=B5=D0=BC=20antrun?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 launcher/dependency-reduced-pom.xml | 26 +++++++++++++++++++++++++-
 launcher/pom.xml                    | 21 ++++++++-------------
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/launcher/dependency-reduced-pom.xml b/launcher/dependency-reduced-pom.xml
index 140cb06..add5618 100644
--- a/launcher/dependency-reduced-pom.xml
+++ b/launcher/dependency-reduced-pom.xml
@@ -122,6 +122,9 @@
             </configuration>
           </execution>
         </executions>
+        <configuration>
+          <skip>${skip.launch4j}</skip>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -139,7 +142,9 @@
                   <fileset />
                 </copy>
                 <copy>
-                  <fileset />
+                  <fileset>
+                    <include>*${javafx.classifier}.jar</include>
+                  </fileset>
                 </copy>
                 <zip />
               </target>
@@ -166,6 +171,22 @@
         <server.url>http://87.120.187.36:1582</server.url>
       </properties>
     </profile>
+    <profile>
+      <id>win</id>
+      <properties>
+        <os.suffix>win</os.suffix>
+        <javafx.classifier>win</javafx.classifier>
+        <skip.launch4j>false</skip.launch4j>
+      </properties>
+    </profile>
+    <profile>
+      <id>linux</id>
+      <properties>
+        <os.suffix>linux</os.suffix>
+        <javafx.classifier>linux</javafx.classifier>
+        <skip.launch4j>true</skip.launch4j>
+      </properties>
+    </profile>
   </profiles>
   <dependencies>
     <dependency>
@@ -194,7 +215,10 @@
     <mainClass>me.sashegdev.zernmc.launcher.Main</mainClass>
     <maven.compiler.source>21</maven.compiler.source>
     <project.organization.name>ZernMC</project.organization.name>
+    <javafx.classifier>win</javafx.classifier>
+    <skip.launch4j>false</skip.launch4j>
     <maven.compiler.target>21</maven.compiler.target>
+    <os.suffix>win</os.suffix>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.inceptionYear>2026</project.inceptionYear>
   </properties>
diff --git a/launcher/pom.xml b/launcher/pom.xml
index 3c0090c..e20f898 100644
--- a/launcher/pom.xml
+++ b/launcher/pom.xml
@@ -149,17 +149,11 @@
                                         <exclude>META-INF/*.RSA</exclude>
                                     </excludes>
                                 </filter>
-                                <!-- Исключаем Linux версии JavaFX и сам JavaFX из shade (он будет в lib-javafx) -->
+                                <!-- Исключаем JavaFX из shade полностью (он будет в lib-javafx) -->
                                 <filter>
-                                    <artifact>org.openjfx:javafx-*</artifact>
+                                    <artifact>org.openjfx:*</artifact>
                                     <excludes>
-                                        <exclude>**/*-linux.jar</exclude>
-                                    </excludes>
-                                </filter>
-                                <filter>
-                                    <artifact>*:javafx-*</artifact>
-                                    <excludes>
-                                        <exclude>*</exclude>
+                                        <exclude>**/*</exclude>
                                     </excludes>
                                 </filter>
                             </filters>
@@ -168,6 +162,9 @@
                                 <useProjectArtifact>false</useProjectArtifact>
                                 <unpack>true</unpack>
                                 <scope>runtime</scope>
+                                <excludes>
+                                    <exclude>org.openjfx:*</exclude>
+                                </excludes>
                             </dependencySet>
                         </configuration>
                     </execution>
@@ -258,11 +255,9 @@
                                     <fileset dir="${user.home}/launcher/jre/jre21"/>
                                 </copy>
 
-                                <!-- Копируем JavaFX JAR в builds (только для текущей OS) -->
+                                <!-- Копируем JavaFX JAR в builds -->
                                 <copy todir="../server/builds/lib-javafx" overwrite="true">
-                                    <fileset dir="${project.build.directory}/lib-javafx">
-                                        <include>*${javafx.classifier}.jar</include>
-                                    </fileset>
+                                    <fileset dir="${project.build.directory}/lib-javafx"/>
                                 </copy>
 
                                 <!-- Создаём zip с .exe, jre21 и lib-javafx (без .jar и build.version) -->