From e5b48b624fa5babbc753dd04ea9b0c1999d9cda5 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Sat, 13 Jan 2024 21:13:59 +0100 Subject: [PATCH] Upgrade Craftaro Core (+dynamic library loading; +MC 1.20.4 support) Notable changes: * Spigot 1.20.3/3 compatibility * dynamic library/dependency loading * Smaller plugin jar size --- .../com/craftaro/epicanchors/api/AnchorManager.java | 2 +- EpicAnchors-Plugin/pom.xml | 12 +++++++++++- .../com/craftaro/epicanchors/AnchorManagerImpl.java | 4 ++-- .../java/com/craftaro/epicanchors/EpicAnchors.java | 3 ++- .../com/craftaro/epicanchors/files/Settings.java | 2 +- .../com/craftaro/epicanchors/guis/AnchorGui.java | 4 ++-- .../epicanchors/guis/DestroyConfirmationGui.java | 2 +- .../epicanchors/listener/AnchorListener.java | 2 +- 8 files changed, 21 insertions(+), 10 deletions(-) diff --git a/EpicAnchors-API/src/main/java/com/craftaro/epicanchors/api/AnchorManager.java b/EpicAnchors-API/src/main/java/com/craftaro/epicanchors/api/AnchorManager.java index 265720c..19e7c24 100644 --- a/EpicAnchors-API/src/main/java/com/craftaro/epicanchors/api/AnchorManager.java +++ b/EpicAnchors-API/src/main/java/com/craftaro/epicanchors/api/AnchorManager.java @@ -1,7 +1,7 @@ package com.craftaro.epicanchors.api; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.epicanchors.utils.Callback; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.Material; diff --git a/EpicAnchors-Plugin/pom.xml b/EpicAnchors-Plugin/pom.xml index 82890ed..3164bdb 100644 --- a/EpicAnchors-Plugin/pom.xml +++ b/EpicAnchors-Plugin/pom.xml @@ -56,8 +56,18 @@ false **/nms/v*/** - **/core/third_party/org/h2/** + + **/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/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/AnchorManagerImpl.java b/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/AnchorManagerImpl.java index 94f69b4..6b10c2f 100644 --- a/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/AnchorManagerImpl.java +++ b/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/AnchorManagerImpl.java @@ -4,8 +4,6 @@ import com.craftaro.core.SongodaPlugin; import com.craftaro.core.compatibility.CompatibleMaterial; import com.craftaro.core.compatibility.CompatibleParticleHandler; import com.craftaro.core.hooks.HologramManager; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem; import com.craftaro.core.utils.TextUtils; import com.craftaro.core.utils.TimeUtils; @@ -17,6 +15,8 @@ import com.craftaro.epicanchors.files.Settings; import com.craftaro.epicanchors.utils.Callback; import com.craftaro.epicanchors.utils.UpdateCallback; import com.craftaro.epicanchors.utils.Utils; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XSound; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.Location; diff --git a/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/EpicAnchors.java b/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/EpicAnchors.java index 88df5a2..bbb58ee 100644 --- a/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/EpicAnchors.java +++ b/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/EpicAnchors.java @@ -4,10 +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.hooks.HologramManager; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.epicanchors.api.AnchorManager; import com.craftaro.epicanchors.commands.EpicAnchorsCommand; import com.craftaro.epicanchors.commands.sub.GiveCommand; @@ -24,6 +24,7 @@ import com.craftaro.epicanchors.listener.WorldListener; import com.craftaro.epicanchors.tasks.AnchorTask; import com.craftaro.epicanchors.tasks.VisualizeTask; import com.craftaro.epicanchors.utils.ThreadSync; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.plugin.PluginManager; diff --git a/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/files/Settings.java b/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/files/Settings.java index 9e47c3b..168a995 100644 --- a/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/files/Settings.java +++ b/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/files/Settings.java @@ -5,8 +5,8 @@ import com.craftaro.core.compatibility.CompatibleParticleHandler; import com.craftaro.core.configuration.Config; import com.craftaro.core.configuration.ConfigSetting; import com.craftaro.core.hooks.EconomyManager; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.epicanchors.EpicAnchors; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import org.bukkit.plugin.java.JavaPlugin; public class Settings { diff --git a/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/guis/AnchorGui.java b/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/guis/AnchorGui.java index dfaf051..878dee9 100644 --- a/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/guis/AnchorGui.java +++ b/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/guis/AnchorGui.java @@ -4,13 +4,13 @@ import com.craftaro.core.compatibility.CompatibleParticleHandler; import com.craftaro.core.gui.Gui; import com.craftaro.core.gui.GuiUtils; import com.craftaro.core.hooks.EconomyManager; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.core.utils.TextUtils; import com.craftaro.core.utils.TimeUtils; import com.craftaro.epicanchors.EpicAnchors; import com.craftaro.epicanchors.api.Anchor; import com.craftaro.epicanchors.files.Settings; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XSound; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.GameMode; diff --git a/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/guis/DestroyConfirmationGui.java b/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/guis/DestroyConfirmationGui.java index d8e473a..f987fe1 100644 --- a/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/guis/DestroyConfirmationGui.java +++ b/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/guis/DestroyConfirmationGui.java @@ -3,12 +3,12 @@ package com.craftaro.epicanchors.guis; import com.craftaro.core.gui.Gui; import com.craftaro.core.gui.GuiUtils; import com.craftaro.core.gui.methods.Closable; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.utils.TextUtils; import com.craftaro.epicanchors.EpicAnchors; import com.craftaro.epicanchors.api.Anchor; import com.craftaro.epicanchors.files.Settings; import com.craftaro.epicanchors.utils.Callback; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; public class DestroyConfirmationGui extends Gui { private final EpicAnchors plugin; diff --git a/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/listener/AnchorListener.java b/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/listener/AnchorListener.java index f1776f0..184d940 100644 --- a/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/listener/AnchorListener.java +++ b/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/listener/AnchorListener.java @@ -2,7 +2,6 @@ package com.craftaro.epicanchors.listener; import com.craftaro.core.compatibility.CompatibleHand; import com.craftaro.core.compatibility.CompatibleParticleHandler; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.epicanchors.AnchorManagerImpl; import com.craftaro.epicanchors.EpicAnchors; import com.craftaro.epicanchors.api.Anchor; @@ -10,6 +9,7 @@ import com.craftaro.epicanchors.files.Settings; import com.craftaro.epicanchors.guis.AnchorGui; import com.craftaro.epicanchors.guis.DestroyConfirmationGui; import com.craftaro.epicanchors.utils.Utils; +import com.craftaro.third_party.com.cryptomorin.xseries.XSound; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.Material;