Merge remote-tracking branch 'main/master'

the-h-team · Feb 18, 2021 · 1ff687f · 1ff687f
2 parents 70d82e6 + 340eb32
commit 1ff687f
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 14 deletions.
diff --git a/Labyrinth.iml b/Labyrinth.iml
@@ -20,18 +20,18 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.16.3-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: me.clip:placeholderapi:2.10.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.MilkBowl:VaultAPI:1.7" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.13.1-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.MilkBowl:VaultAPI:1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.bukkit:bukkit:1.13.1-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.10" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
     <orderEntry type="library" name="Maven: com.github.ms5984.api:MenuMan:1.0.3-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.the-h-team:Enterprise:1.4" level="project" />
+    <orderEntry type="library" name="Maven: com.github.the-h-team:Enterprise:1.4" level="project" />
   </component>
 </module>
diff --git a/pom.xml b/pom.xml
@@ -38,13 +38,37 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>com.github.MilkBowl:VaultAPI</include>
+                                    <include>com.github.ms5984.api:MenuMan</include>
+                                    <include>com.github.the-h-team:Enterprise</include>
+                                </includes>
+                            </artifactSet>
                             <filters>
+                                <filter>
+                                    <artifact>com.github.MilkBowl:VaultAPI</artifact>
+                                    <includes>
+                                        <include>net/milkbowl/vault/economy/Economy**</include>
+                                        <include>META-INF/**</include>
+                                    </includes>
+                                    <excludes>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                    </excludes>
+                                </filter>
                                 <filter>
                                     <artifact>com.github.ms5984.api:MenuMan</artifact>
                                     <excludes>
                                         <exclude>META-INF/MANIFEST.MF</exclude>
                                     </excludes>
                                 </filter>
+                                <filter>
+                                    <artifact>com.github.the-h-team:Enterprise</artifact>
+                                    <includes>
+                                        <include>com/github/sanctum/economy/construct/account/permissive/AccountType**</include>
+                                        <include>com/github/sanctum/economy/construct/implement/AdvancedEconomy**</include>
+                                    </includes>
+                                </filter>
                             </filters>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
                         </configuration>
@@ -100,7 +124,7 @@
             <groupId>com.github.MilkBowl</groupId>
             <artifactId>VaultAPI</artifactId>
             <version>1.7</version>
-            <scope>provided</scope>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.github.ms5984.api</groupId>
@@ -110,8 +134,7 @@
         <dependency>
             <groupId>com.github.the-h-team</groupId>
             <artifactId>Enterprise</artifactId>
-            <version> 1.4</version>
-            <scope>provided</scope>
+            <version>1.4</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/src/main/java/com/github/sanctum/labyrinth/data/AdvancedHook.java b/src/main/java/com/github/sanctum/labyrinth/data/AdvancedHook.java
@@ -2,7 +2,6 @@
 
 import com.github.sanctum.economy.construct.implement.AdvancedEconomy;
 import com.github.sanctum.labyrinth.Labyrinth;
-import net.milkbowl.vault.economy.Economy;
 import org.bukkit.plugin.RegisteredServiceProvider;
 
 public class AdvancedHook {