From 990ee86b2eb2ebc4f2e7722242ca99f51de8e46a Mon Sep 17 00:00:00 2001 From: ceze88 Date: Sat, 13 Jan 2024 22:07:26 +0100 Subject: [PATCH] Migrate to dynamic dependency loading --- .../epichoppers/utils/StorageContainerCache.java | 2 +- EpicHoppers-Plugin/pom.xml | 12 +++++++++++- .../java/com/craftaro/epichoppers/EpicHoppers.java | 2 +- .../epichoppers/containers/impl/EpicFarmingImpl.java | 2 +- .../craftaro/epichoppers/gui/GUIAutoSellFilter.java | 2 +- .../com/craftaro/epichoppers/gui/GUICrafting.java | 2 +- .../java/com/craftaro/epichoppers/gui/GUIFilter.java | 2 +- .../com/craftaro/epichoppers/gui/GUIOverview.java | 2 +- .../com/craftaro/epichoppers/gui/GUISmeltable.java | 2 +- .../com/craftaro/epichoppers/hopper/HopperImpl.java | 4 ++-- .../hopper/levels/modules/ModuleAutoCrafting.java | 2 +- .../hopper/levels/modules/ModuleAutoSell.java | 2 +- .../hopper/levels/modules/ModuleAutoSmelter.java | 2 +- .../hopper/levels/modules/ModuleSuction.java | 2 +- .../hopper/teleport/TeleportHandlerImpl.java | 2 +- .../com/craftaro/epichoppers/utils/DataHelper.java | 4 ++-- 16 files changed, 28 insertions(+), 18 deletions(-) diff --git a/EpicHoppers-API/src/main/java/com/craftaro/epichoppers/utils/StorageContainerCache.java b/EpicHoppers-API/src/main/java/com/craftaro/epichoppers/utils/StorageContainerCache.java index d7fa841..3255e6e 100644 --- a/EpicHoppers-API/src/main/java/com/craftaro/epichoppers/utils/StorageContainerCache.java +++ b/EpicHoppers-API/src/main/java/com/craftaro/epichoppers/utils/StorageContainerCache.java @@ -3,7 +3,7 @@ import com.craftaro.core.compatibility.CompatibleMaterial; import com.craftaro.core.compatibility.ServerVersion; import com.craftaro.core.nms.Nms; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; diff --git a/EpicHoppers-Plugin/pom.xml b/EpicHoppers-Plugin/pom.xml index 8fb3ab2..cbecc03 100644 --- a/EpicHoppers-Plugin/pom.xml +++ b/EpicHoppers-Plugin/pom.xml @@ -56,8 +56,18 @@ false **/nms/v*/** - **/third_party/** + + **/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/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/EpicHoppers.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/EpicHoppers.java index 8489841..406af72 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/EpicHoppers.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/EpicHoppers.java @@ -8,7 +8,7 @@ import com.craftaro.core.gui.GuiManager; import com.craftaro.core.hooks.EconomyManager; import com.craftaro.core.hooks.ProtectionManager; -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.TextUtils; import com.craftaro.epichoppers.boost.BoostDataImpl; diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/containers/impl/EpicFarmingImpl.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/containers/impl/EpicFarmingImpl.java index 6562671..0721280 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/containers/impl/EpicFarmingImpl.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/containers/impl/EpicFarmingImpl.java @@ -1,6 +1,6 @@ package com.craftaro.epichoppers.containers.impl; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.epicfarming.EpicFarming; import com.craftaro.epicfarming.core.compatibility.CompatibleMaterial; import com.craftaro.epicfarming.farming.Farm; diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIAutoSellFilter.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIAutoSellFilter.java index 1d74217..ccb2349 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIAutoSellFilter.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIAutoSellFilter.java @@ -3,7 +3,7 @@ import com.craftaro.core.SongodaPlugin; import com.craftaro.core.gui.CustomizableGui; import com.craftaro.core.gui.GuiUtils; -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.epichoppers.hopper.Filter; import com.craftaro.epichoppers.hopper.Hopper; diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUICrafting.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUICrafting.java index 02faf16..fdfe997 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUICrafting.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUICrafting.java @@ -3,7 +3,7 @@ import com.craftaro.core.SongodaPlugin; import com.craftaro.core.gui.CustomizableGui; import com.craftaro.core.gui.GuiUtils; -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.epichoppers.hopper.Hopper; import com.craftaro.epichoppers.hopper.HopperImpl; diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIFilter.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIFilter.java index 72037eb..eca3761 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIFilter.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIFilter.java @@ -3,7 +3,7 @@ import com.craftaro.core.SongodaPlugin; import com.craftaro.core.gui.CustomizableGui; import com.craftaro.core.gui.GuiUtils; -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.epichoppers.EpicHoppersApi; import com.craftaro.epichoppers.hopper.Hopper; diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIOverview.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIOverview.java index ecd542f..d2674fd 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIOverview.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIOverview.java @@ -4,7 +4,7 @@ import com.craftaro.core.compatibility.ServerVersion; import com.craftaro.core.gui.CustomizableGui; import com.craftaro.core.gui.GuiUtils; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.utils.NumberUtils; import com.craftaro.core.utils.TextUtils; import com.craftaro.core.utils.TimeUtils; diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUISmeltable.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUISmeltable.java index 46bf021..669a352 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUISmeltable.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUISmeltable.java @@ -4,7 +4,7 @@ import com.craftaro.core.compatibility.CompatibleMaterial; import com.craftaro.core.gui.CustomizableGui; import com.craftaro.core.gui.GuiUtils; -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.epichoppers.hopper.Hopper; import com.craftaro.epichoppers.hopper.HopperImpl; diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/HopperImpl.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/HopperImpl.java index ef4adbf..f195f3c 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/HopperImpl.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/HopperImpl.java @@ -7,8 +7,8 @@ import com.craftaro.core.database.DataManager; import com.craftaro.core.database.SerializedLocation; import com.craftaro.core.hooks.EconomyManager; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; -import com.craftaro.core.third_party.org.jooq.impl.DSL; +import com.craftaro.third_party.com.cryptomorin.xseries.XSound; +import com.craftaro.third_party.org.jooq.impl.DSL; import com.craftaro.core.utils.ItemUtils; import com.craftaro.epichoppers.EpicHoppers; import com.craftaro.epichoppers.EpicHoppersApi; diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java index eeb028f..9501520 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java @@ -2,7 +2,7 @@ import com.craftaro.core.SongodaPlugin; 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.core.utils.TextUtils; import com.craftaro.epichoppers.hopper.Hopper; import com.craftaro.epichoppers.hopper.HopperImpl; diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoSell.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoSell.java index 2a733f4..75778b6 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoSell.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoSell.java @@ -3,7 +3,7 @@ import com.craftaro.core.SongodaPlugin; 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.core.utils.NumberUtils; import com.craftaro.core.utils.TextUtils; import com.craftaro.epichoppers.hopper.Hopper; diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoSmelter.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoSmelter.java index 4545bbd..53c0285 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoSmelter.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoSmelter.java @@ -3,7 +3,7 @@ import com.craftaro.core.SongodaPlugin; import com.craftaro.core.compatibility.CompatibleMaterial; 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.core.utils.TextUtils; import com.craftaro.epichoppers.hopper.Hopper; import com.craftaro.epichoppers.hopper.HopperImpl; diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleSuction.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleSuction.java index d5dfc86..5e7d801 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleSuction.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleSuction.java @@ -5,7 +5,7 @@ import com.craftaro.core.compatibility.CompatibleParticleHandler; import com.craftaro.core.gui.GuiManager; import com.craftaro.core.locale.Locale; -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.epichoppers.hopper.Hopper; import com.craftaro.epichoppers.hopper.HopperImpl; diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/teleport/TeleportHandlerImpl.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/teleport/TeleportHandlerImpl.java index fc32026..9a296eb 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/teleport/TeleportHandlerImpl.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/teleport/TeleportHandlerImpl.java @@ -1,7 +1,7 @@ package com.craftaro.epichoppers.hopper.teleport; import com.craftaro.core.compatibility.ServerVersion; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; +import com.craftaro.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.epichoppers.EpicHoppers; import com.craftaro.epichoppers.hopper.Hopper; import com.craftaro.epichoppers.hopper.HopperImpl; diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/utils/DataHelper.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/utils/DataHelper.java index a430bed..5bf60b5 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/utils/DataHelper.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/utils/DataHelper.java @@ -1,8 +1,8 @@ package com.craftaro.epichoppers.utils; import com.craftaro.core.database.DatabaseConnector; -import com.craftaro.core.third_party.org.jooq.Query; -import com.craftaro.core.third_party.org.jooq.impl.DSL; +import com.craftaro.third_party.org.jooq.Query; +import com.craftaro.third_party.org.jooq.impl.DSL; import com.craftaro.core.utils.ItemSerializer; import com.craftaro.epichoppers.EpicHoppers; import com.craftaro.epichoppers.hopper.Hopper;