From 08000bda0d8fcf4e7b8d0ad2c66400693d8c5dd3 Mon Sep 17 00:00:00 2001
From: Sage M <sager1018@gmail.com>
Date: Mon, 6 Dec 2021 22:25:29 -0600
Subject: [PATCH] Fix shading of modules

---
 plugin/pom.xml   | 9 +++++++++
 v1_18_R1/pom.xml | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index a3ae6844..db4aaafc 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -75,6 +75,14 @@
                 </executions>
                 <configuration>
                     <minimizeJar>true</minimizeJar>
+                    <filters>
+                        <filter>
+                            <artifact>LibsDisguises:*</artifact>
+                            <includes>
+                                <include>**</include>
+                            </includes>
+                        </filter>
+                    </filters>
                     <artifactSet>
                         <includes>
                             <include>net.kyori:*</include>
@@ -165,6 +173,7 @@
             <groupId>LibsDisguises</groupId>
             <artifactId>v1_18_R1</artifactId>
             <version>${project.version}</version>
+            <classifier>remapped-spigot</classifier>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
diff --git a/v1_18_R1/pom.xml b/v1_18_R1/pom.xml
index a7b6b95c..b3c3684d 100644
--- a/v1_18_R1/pom.xml
+++ b/v1_18_R1/pom.xml
@@ -67,8 +67,8 @@
                             <inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile>
                             <srgIn>org.spigotmc:minecraft-server:1.18-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
                             <remappedDependencies>org.spigotmc:spigot:1.18-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
-                            <finalName>${project.name}</finalName>
-                            <outputDirectory>${dir}</outputDirectory>
+                            <remappedArtifactAttached>true</remappedArtifactAttached>
+                            <remappedClassifierName>remapped-spigot</remappedClassifierName>
                         </configuration>
                     </execution>
                 </executions>