From 51296f1cae6accacc1f572b8b1de8c6d28c1a285 Mon Sep 17 00:00:00 2001
From: libraryaddict <github@lib.co.nz>
Date: Thu, 20 Feb 2020 00:18:52 +1300
Subject: [PATCH] Shade asm into Lib's Disguises for now, need to fetch
 remotely and save for 1.12

---
 pom.xml                                       | 30 +++++++++++++++++--
 .../utilities/reflection/asm/Asm14.java       |  2 +-
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8d2ef879..d0092a22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <!-- A good example on why temporary names for project identification shouldn't be used -->
     <groupId>LibsDisguises</groupId>
     <artifactId>LibsDisguises</artifactId>
-    <version>9.9.6</version>
+    <version>9.9.6-SNAPSHOT</version>
 
     <build>
         <defaultGoal>exec:java clean install</defaultGoal>
@@ -50,6 +50,32 @@
                     <mainClass>me.libraryaddict.disguise.utilities.watchers.CompileMethods</mainClass>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.2</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.objectweb.asm</pattern>
+                                    <shadedPattern>me.libraryaddict.asm</shadedPattern>
+                                </relocation>
+                            </relocations>
+                            <artifactSet>
+                                <includes>
+                                    <include>org.ow2.asm:asm</include>
+                                </includes>
+                            </artifactSet>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -69,13 +95,11 @@
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
             <version>7.3.1</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>1.18.10</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.comphenix.protocol</groupId>
diff --git a/src/main/java/me/libraryaddict/disguise/utilities/reflection/asm/Asm14.java b/src/main/java/me/libraryaddict/disguise/utilities/reflection/asm/Asm14.java
index 639b8238..421ebf77 100644
--- a/src/main/java/me/libraryaddict/disguise/utilities/reflection/asm/Asm14.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/reflection/asm/Asm14.java
@@ -1,6 +1,6 @@
 package me.libraryaddict.disguise.utilities.reflection.asm;
 
-import org.bukkit.craftbukkit.libs.org.objectweb.asm.*;
+import org.objectweb.asm.*;
 
 import java.io.IOException;
 import java.lang.reflect.Field;