From b65cea5fa4ab3d334116c1598c93973ba006eb27 Mon Sep 17 00:00:00 2001 From: ceze88 Date: Thu, 11 Jan 2024 16:13:13 +0100 Subject: [PATCH] Migrate to dynamic dependency loading --- pom.xml | 16 ++++++++++++++++ .../com/craftaro/epicvouchers/EpicVouchers.java | 10 +++++++++- .../libraries/inventory/PlayersMenu.java | 4 ++-- .../craftaro/epicvouchers/menus/ActionMenu.java | 2 +- .../craftaro/epicvouchers/menus/ConfirmMenu.java | 2 +- .../craftaro/epicvouchers/menus/OptionMenu.java | 2 +- .../epicvouchers/menus/VoucherEditorMenu.java | 2 +- .../menus/sub/editor/SetItemMenu.java | 2 +- .../craftaro/epicvouchers/voucher/Voucher.java | 2 +- 9 files changed, 33 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index eb0372e..1f2c997 100644 --- a/pom.xml +++ b/pom.xml @@ -58,6 +58,22 @@ LICENSE.** + + + com.craftaro:CraftaroCore + false + + **/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/epicvouchers/EpicVouchers.java b/src/main/java/com/craftaro/epicvouchers/EpicVouchers.java index ec089df..7206876 100644 --- a/src/main/java/com/craftaro/epicvouchers/EpicVouchers.java +++ b/src/main/java/com/craftaro/epicvouchers/EpicVouchers.java @@ -4,8 +4,9 @@ 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.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.epicvouchers.commands.CommandEditor; import com.craftaro.epicvouchers.commands.CommandEpicVouchers; import com.craftaro.epicvouchers.commands.CommandForce; @@ -34,7 +35,9 @@ import org.bukkit.plugin.PluginManager; import java.io.File; import java.util.Collection; import java.util.Collections; +import java.util.HashSet; import java.util.List; +import java.util.Set; public class EpicVouchers extends SongodaPlugin { private final GuiManager guiManager = new GuiManager(this); @@ -54,6 +57,11 @@ public class EpicVouchers extends SongodaPlugin { return getPlugin(EpicVouchers.class); } + @Override + protected Set getDependencies() { + return new HashSet<>(); + } + @Override public void onPluginLoad() { } diff --git a/src/main/java/com/craftaro/epicvouchers/libraries/inventory/PlayersMenu.java b/src/main/java/com/craftaro/epicvouchers/libraries/inventory/PlayersMenu.java index 4906910..b9bfb00 100644 --- a/src/main/java/com/craftaro/epicvouchers/libraries/inventory/PlayersMenu.java +++ b/src/main/java/com/craftaro/epicvouchers/libraries/inventory/PlayersMenu.java @@ -1,7 +1,7 @@ package com.craftaro.epicvouchers.libraries.inventory; -import com.craftaro.core.third_party.com.cryptomorin.xseries.SkullUtils; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.SkullUtils; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.epicvouchers.EpicVouchers; import com.craftaro.epicvouchers.libraries.ItemBuilder; import com.craftaro.epicvouchers.menus.ActionMenu; diff --git a/src/main/java/com/craftaro/epicvouchers/menus/ActionMenu.java b/src/main/java/com/craftaro/epicvouchers/menus/ActionMenu.java index 977863e..255577f 100644 --- a/src/main/java/com/craftaro/epicvouchers/menus/ActionMenu.java +++ b/src/main/java/com/craftaro/epicvouchers/menus/ActionMenu.java @@ -1,6 +1,6 @@ package com.craftaro.epicvouchers.menus; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.utils.TextUtils; import com.craftaro.epicvouchers.EpicVouchers; import com.craftaro.epicvouchers.libraries.ItemBuilder; diff --git a/src/main/java/com/craftaro/epicvouchers/menus/ConfirmMenu.java b/src/main/java/com/craftaro/epicvouchers/menus/ConfirmMenu.java index 3e628df..7a69d85 100644 --- a/src/main/java/com/craftaro/epicvouchers/menus/ConfirmMenu.java +++ b/src/main/java/com/craftaro/epicvouchers/menus/ConfirmMenu.java @@ -1,6 +1,6 @@ package com.craftaro.epicvouchers.menus; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.epicvouchers.EpicVouchers; import com.craftaro.epicvouchers.libraries.ItemBuilder; import com.craftaro.epicvouchers.libraries.inventory.FastInv; diff --git a/src/main/java/com/craftaro/epicvouchers/menus/OptionMenu.java b/src/main/java/com/craftaro/epicvouchers/menus/OptionMenu.java index 930650c..40f12e8 100644 --- a/src/main/java/com/craftaro/epicvouchers/menus/OptionMenu.java +++ b/src/main/java/com/craftaro/epicvouchers/menus/OptionMenu.java @@ -1,6 +1,6 @@ package com.craftaro.epicvouchers.menus; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.utils.TextUtils; import com.craftaro.epicvouchers.EpicVouchers; import com.craftaro.epicvouchers.libraries.ItemBuilder; diff --git a/src/main/java/com/craftaro/epicvouchers/menus/VoucherEditorMenu.java b/src/main/java/com/craftaro/epicvouchers/menus/VoucherEditorMenu.java index 4616a2e..6a22778 100644 --- a/src/main/java/com/craftaro/epicvouchers/menus/VoucherEditorMenu.java +++ b/src/main/java/com/craftaro/epicvouchers/menus/VoucherEditorMenu.java @@ -1,6 +1,6 @@ package com.craftaro.epicvouchers.menus; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.utils.ItemUtils; import com.craftaro.epicvouchers.EpicVouchers; import com.craftaro.epicvouchers.libraries.ItemBuilder; diff --git a/src/main/java/com/craftaro/epicvouchers/menus/sub/editor/SetItemMenu.java b/src/main/java/com/craftaro/epicvouchers/menus/sub/editor/SetItemMenu.java index 7317b5e..8211c76 100644 --- a/src/main/java/com/craftaro/epicvouchers/menus/sub/editor/SetItemMenu.java +++ b/src/main/java/com/craftaro/epicvouchers/menus/sub/editor/SetItemMenu.java @@ -1,6 +1,6 @@ package com.craftaro.epicvouchers.menus.sub.editor; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.epicvouchers.EpicVouchers; import com.craftaro.epicvouchers.libraries.ItemBuilder; import com.craftaro.epicvouchers.libraries.inventory.FastInv; diff --git a/src/main/java/com/craftaro/epicvouchers/voucher/Voucher.java b/src/main/java/com/craftaro/epicvouchers/voucher/Voucher.java index 9f210d9..001d781 100644 --- a/src/main/java/com/craftaro/epicvouchers/voucher/Voucher.java +++ b/src/main/java/com/craftaro/epicvouchers/voucher/Voucher.java @@ -1,7 +1,7 @@ package com.craftaro.epicvouchers.voucher; import com.craftaro.core.compatibility.ServerVersion; -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.core.utils.ItemUtils; import com.craftaro.core.utils.TextUtils;