From b23aa18661beaa79b0968436e48d5f986cea881b Mon Sep 17 00:00:00 2001
From: ME1312 <admin@me1312.net>
Date: Sun, 9 Apr 2023 05:29:41 -0400
Subject: [PATCH] Ensure folia is not required to compile against us

---
 SubServers.Client/Bukkit/pom.xml              |  7 ++---
 .../jar-with-some-dependencies-plus-folia.xml | 29 +++++++++++++++++++
 SubServers.Client/Universal/pom.xml           |  2 +-
 3 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 SubServers.Client/Folia/jar-with-some-dependencies-plus-folia.xml

diff --git a/SubServers.Client/Bukkit/pom.xml b/SubServers.Client/Bukkit/pom.xml
index c5d6f1ff..e839d00f 100644
--- a/SubServers.Client/Bukkit/pom.xml
+++ b/SubServers.Client/Bukkit/pom.xml
@@ -89,7 +89,7 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>prepare-package</phase>
+                        <phase>process-resources</phase>
                         <goals>
                             <goal>run</goal>
                         </goals>
@@ -97,9 +97,6 @@
                             <tasks>
                                 <mkdir dir="${project.build.directory}" />
                                 <copy file="${basedir}/../../LICENSE" todir="${project.build.directory}/classes" />
-                                <copy overwrite="true" todir="${project.build.directory}/classes">
-                                    <fileset dir="../../out/compile/target/SubServers.Client.Folia/classes" />
-                                </copy>
                             </tasks>
                         </configuration>
                     </execution>
@@ -125,7 +122,7 @@
                         <manifestFile>src/META-INF/MANIFEST.MF</manifestFile>
                     </archive>
                     <descriptors>
-                        <descriptor>../Common/jar-with-some-dependencies.xml</descriptor>
+                        <descriptor>../Folia/jar-with-some-dependencies-plus-folia.xml</descriptor>
                     </descriptors>
                     <appendAssemblyId>false</appendAssemblyId>
                 </configuration>
diff --git a/SubServers.Client/Folia/jar-with-some-dependencies-plus-folia.xml b/SubServers.Client/Folia/jar-with-some-dependencies-plus-folia.xml
new file mode 100644
index 00000000..50a76584
--- /dev/null
+++ b/SubServers.Client/Folia/jar-with-some-dependencies-plus-folia.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.1 https://maven.apache.org/xsd/assembly-2.1.1.xsd">
+    <id>jar-with-some-dependencies-plus-folia</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <useProjectArtifact>true</useProjectArtifact>
+            <unpack>true</unpack>
+            <scope>runtime</scope>
+            <excludes>
+                <exclude>org.json:json</exclude>
+                <exclude>org.yaml:snakeyaml</exclude>
+            </excludes>
+        </dependencySet>
+    </dependencySets>
+    <fileSets>
+        <fileSet>
+            <outputDirectory>/</outputDirectory>
+            <directory>../../out/compile/target/SubServers.Client.Folia/classes</directory>
+            <includes>
+                <include>**</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/SubServers.Client/Universal/pom.xml b/SubServers.Client/Universal/pom.xml
index 71f908b5..0a066905 100644
--- a/SubServers.Client/Universal/pom.xml
+++ b/SubServers.Client/Universal/pom.xml
@@ -45,7 +45,7 @@
                         <manifestFile>MANIFEST.MF</manifestFile>
                     </archive>
                     <descriptors>
-                        <descriptor>../Common/jar-with-some-dependencies.xml</descriptor>
+                        <descriptor>../Folia/jar-with-some-dependencies-plus-folia.xml</descriptor>
                     </descriptors>
                     <appendAssemblyId>false</appendAssemblyId>
                 </configuration>