From fb406122d83d626928e2af1b2db5f478c4e520ce Mon Sep 17 00:00:00 2001 From: ceze88 Date: Thu, 11 Jan 2024 16:09:04 +0100 Subject: [PATCH] Migrate to dynamic dependency loading --- pom.xml | 11 +++++++++++ .../com/craftaro/epicenchants/EpicEnchants.java | 10 +++++++++- .../epicenchants/commands/CommandApply.java | 2 +- .../epicenchants/effect/effects/DropHead.java | 2 +- .../listeners/item/BookListener.java | 2 +- .../listeners/item/WhiteScrollListener.java | 2 +- .../craftaro/epicenchants/objects/Enchant.java | 2 +- .../epicenchants/utils/objects/ItemBuilder.java | 2 +- .../epicenchants/utils/single/ItemGroup.java | 4 ++-- src/main/java/com/songoda/epicenchants/.DS_Store | Bin 6148 -> 0 bytes 10 files changed, 28 insertions(+), 9 deletions(-) delete mode 100644 src/main/java/com/songoda/epicenchants/.DS_Store diff --git a/pom.xml b/pom.xml index 6499f50..41f47e3 100644 --- a/pom.xml +++ b/pom.xml @@ -74,6 +74,17 @@ **/nms/v*/** + + **/third_party/org/apache/** + **/third_party/net/kyori/** + **/third_party/com/zaxxer/** + **/third_party/org/jooq/** + **/third_party/org/mariadb/** + **/third_party/com/h2database/** + **/third_party/org/h2/** + **/third_party/com/cryptomorin/** + **/third_party/org/reactivestreams/** + diff --git a/src/main/java/com/craftaro/epicenchants/EpicEnchants.java b/src/main/java/com/craftaro/epicenchants/EpicEnchants.java index 541134b..4b752fb 100644 --- a/src/main/java/com/craftaro/epicenchants/EpicEnchants.java +++ b/src/main/java/com/craftaro/epicenchants/EpicEnchants.java @@ -4,9 +4,10 @@ import com.craftaro.core.SongodaCore; import com.craftaro.core.SongodaPlugin; import com.craftaro.core.commands.CommandManager; import com.craftaro.core.configuration.Config; +import com.craftaro.core.dependency.Dependency; import com.craftaro.core.gui.GuiManager; import com.craftaro.core.hooks.EconomyManager; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.epicenchants.listeners.ArmorListener; import com.craftaro.epicenchants.listeners.EntityListener; import com.craftaro.epicenchants.listeners.HeldItemListener; @@ -39,7 +40,9 @@ import com.craftaro.epicenchants.utils.single.ItemGroup; import org.bukkit.Bukkit; import org.bukkit.plugin.PluginManager; +import java.util.HashSet; import java.util.List; +import java.util.Set; import java.util.stream.Collectors; public class EpicEnchants extends SongodaPlugin { @@ -54,6 +57,11 @@ public class EpicEnchants extends SongodaPlugin { private EnchantUtils enchantUtils; private ItemGroup itemGroup; + @Override + protected Set getDependencies() { + return new HashSet<>(); + } + @Override public void onPluginLoad() { } diff --git a/src/main/java/com/craftaro/epicenchants/commands/CommandApply.java b/src/main/java/com/craftaro/epicenchants/commands/CommandApply.java index 99af82d..75b7e57 100644 --- a/src/main/java/com/craftaro/epicenchants/commands/CommandApply.java +++ b/src/main/java/com/craftaro/epicenchants/commands/CommandApply.java @@ -1,7 +1,7 @@ package com.craftaro.epicenchants.commands; import com.craftaro.core.commands.AbstractCommand; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.epicenchants.objects.Enchant; import com.craftaro.epicenchants.CommandCommons; import com.craftaro.epicenchants.EpicEnchants; diff --git a/src/main/java/com/craftaro/epicenchants/effect/effects/DropHead.java b/src/main/java/com/craftaro/epicenchants/effect/effects/DropHead.java index df6da9d..5877e83 100644 --- a/src/main/java/com/craftaro/epicenchants/effect/effects/DropHead.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/DropHead.java @@ -1,6 +1,6 @@ package com.craftaro.epicenchants.effect.effects; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.epicenchants.effect.EffectExecutor; import com.craftaro.epicenchants.enums.EventType; import org.bukkit.configuration.ConfigurationSection; diff --git a/src/main/java/com/craftaro/epicenchants/listeners/item/BookListener.java b/src/main/java/com/craftaro/epicenchants/listeners/item/BookListener.java index 94d0011..36d1075 100644 --- a/src/main/java/com/craftaro/epicenchants/listeners/item/BookListener.java +++ b/src/main/java/com/craftaro/epicenchants/listeners/item/BookListener.java @@ -1,6 +1,6 @@ package com.craftaro.epicenchants.listeners.item; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem; import com.craftaro.epicenchants.events.EnchantApplyEvent; import com.craftaro.epicenchants.objects.Enchant; diff --git a/src/main/java/com/craftaro/epicenchants/listeners/item/WhiteScrollListener.java b/src/main/java/com/craftaro/epicenchants/listeners/item/WhiteScrollListener.java index 80d6db2..f875ca3 100644 --- a/src/main/java/com/craftaro/epicenchants/listeners/item/WhiteScrollListener.java +++ b/src/main/java/com/craftaro/epicenchants/listeners/item/WhiteScrollListener.java @@ -1,6 +1,6 @@ package com.craftaro.epicenchants.listeners.item; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem; import com.craftaro.epicenchants.EpicEnchants; import com.craftaro.epicenchants.utils.objects.ItemBuilder; diff --git a/src/main/java/com/craftaro/epicenchants/objects/Enchant.java b/src/main/java/com/craftaro/epicenchants/objects/Enchant.java index 797f776..835f345 100644 --- a/src/main/java/com/craftaro/epicenchants/objects/Enchant.java +++ b/src/main/java/com/craftaro/epicenchants/objects/Enchant.java @@ -1,6 +1,6 @@ package com.craftaro.epicenchants.objects; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.epicenchants.effect.EffectExecutor; import com.craftaro.epicenchants.enums.EventType; import com.craftaro.epicenchants.enums.TriggerType; diff --git a/src/main/java/com/craftaro/epicenchants/utils/objects/ItemBuilder.java b/src/main/java/com/craftaro/epicenchants/utils/objects/ItemBuilder.java index b30ba67..a913b71 100644 --- a/src/main/java/com/craftaro/epicenchants/utils/objects/ItemBuilder.java +++ b/src/main/java/com/craftaro/epicenchants/utils/objects/ItemBuilder.java @@ -1,6 +1,6 @@ package com.craftaro.epicenchants.utils.objects; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem; import com.craftaro.epicenchants.objects.Placeholder; import com.craftaro.epicenchants.wrappers.EnchantmentWrapper; diff --git a/src/main/java/com/craftaro/epicenchants/utils/single/ItemGroup.java b/src/main/java/com/craftaro/epicenchants/utils/single/ItemGroup.java index 234f3a1..b7649eb 100644 --- a/src/main/java/com/craftaro/epicenchants/utils/single/ItemGroup.java +++ b/src/main/java/com/craftaro/epicenchants/utils/single/ItemGroup.java @@ -1,6 +1,6 @@ package com.craftaro.epicenchants.utils.single; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import org.apache.commons.lang.StringUtils; @@ -15,7 +15,7 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import static com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial.*; +import static com.craftaro.third_party.com.cryptomorin.xseries.XMaterial.*; public class ItemGroup { diff --git a/src/main/java/com/songoda/epicenchants/.DS_Store b/src/main/java/com/songoda/epicenchants/.DS_Store deleted file mode 100644 index 36367fa1286512404fccb28cd1e6c0da2e27e8f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}xR_5N-jbV2m70S$mDRRT9M$GObTLayLNQi>ODLrPm|{t!!3u;P|JqJDZGO5 zWtsQxAnK~<4kFX4X*MA-KnxHAOU{7Z_QcwfualNX3=jjqX8`vH35w`gObzO-0~-8& z#CQ%71#G-aAWDml#nd1~K)5LdG^N~LF}NuQzqEOd#nhlFXI#$=