diff --git a/UltimateStacker-API/src/main/java/com/craftaro/ultimatestacker/api/stack/block/BlockStack.java b/UltimateStacker-API/src/main/java/com/craftaro/ultimatestacker/api/stack/block/BlockStack.java index d5578eb..32d82ef 100644 --- a/UltimateStacker-API/src/main/java/com/craftaro/ultimatestacker/api/stack/block/BlockStack.java +++ b/UltimateStacker-API/src/main/java/com/craftaro/ultimatestacker/api/stack/block/BlockStack.java @@ -1,7 +1,7 @@ package com.craftaro.ultimatestacker.api.stack.block; import com.craftaro.core.database.Data; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.ultimatestacker.api.utils.Hologramable; import com.craftaro.ultimatestacker.api.utils.Stackable; diff --git a/UltimateStacker-API/src/main/java/com/craftaro/ultimatestacker/api/stack/block/BlockStackManager.java b/UltimateStacker-API/src/main/java/com/craftaro/ultimatestacker/api/stack/block/BlockStackManager.java index d0139f9..9d6b322 100644 --- a/UltimateStacker-API/src/main/java/com/craftaro/ultimatestacker/api/stack/block/BlockStackManager.java +++ b/UltimateStacker-API/src/main/java/com/craftaro/ultimatestacker/api/stack/block/BlockStackManager.java @@ -1,7 +1,7 @@ package com.craftaro.ultimatestacker.api.stack.block; import com.craftaro.core.database.Data; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/UltimateStacker-API/src/main/java/com/craftaro/ultimatestacker/api/stack/spawner/SpawnerStack.java b/UltimateStacker-API/src/main/java/com/craftaro/ultimatestacker/api/stack/spawner/SpawnerStack.java index 07b3f51..e881cd0 100644 --- a/UltimateStacker-API/src/main/java/com/craftaro/ultimatestacker/api/stack/spawner/SpawnerStack.java +++ b/UltimateStacker-API/src/main/java/com/craftaro/ultimatestacker/api/stack/spawner/SpawnerStack.java @@ -2,7 +2,7 @@ package com.craftaro.ultimatestacker.api.stack.spawner; import com.craftaro.core.database.Data; import com.craftaro.core.nms.world.SpawnedEntity; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.ultimatestacker.api.utils.Hologramable; import com.craftaro.ultimatestacker.api.utils.Stackable; import org.bukkit.Location; diff --git a/UltimateStacker-Plugin/pom.xml b/UltimateStacker-Plugin/pom.xml index 6fdff63..48de5a7 100644 --- a/UltimateStacker-Plugin/pom.xml +++ b/UltimateStacker-Plugin/pom.xml @@ -55,8 +55,18 @@ false **/nms/v*/** - **/core/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/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/UltimateStacker.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/UltimateStacker.java index 0bae565..e2d2c95 100644 --- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/UltimateStacker.java +++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/UltimateStacker.java @@ -6,6 +6,7 @@ import com.craftaro.core.commands.CommandManager; import com.craftaro.core.compatibility.ServerVersion; import com.craftaro.core.configuration.Config; import com.craftaro.core.database.DataManager; +import com.craftaro.core.dependency.Dependency; import com.craftaro.core.gui.GuiManager; import com.craftaro.core.hooks.EntityStackerManager; import com.craftaro.core.hooks.HologramManager; @@ -13,7 +14,7 @@ import com.craftaro.core.hooks.HookManager; import com.craftaro.core.hooks.ProtectionManager; import com.craftaro.core.hooks.WorldGuardHook; import com.craftaro.core.hooks.holograms.DecentHologramsHolograms; -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.ultimatestacker.api.UltimateStackerApi; import com.craftaro.ultimatestacker.api.stack.block.BlockStack; @@ -103,6 +104,10 @@ public class UltimateStacker extends SongodaPlugin { return INSTANCE; } + @Override + protected Set getDependencies() { + } + @Override public void onPluginLoad() { INSTANCE = this; diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/gui/GUIConvert.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/gui/GUIConvert.java index c2f1159..2491fea 100644 --- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/gui/GUIConvert.java +++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/gui/GUIConvert.java @@ -2,7 +2,7 @@ package com.craftaro.ultimatestacker.gui; import com.craftaro.core.gui.Gui; 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.ultimatestacker.convert.StackMobConvert; import com.craftaro.ultimatestacker.convert.WildStackerConvert; import org.bukkit.Bukkit; diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/gui/GUIConvertWhat.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/gui/GUIConvertWhat.java index cea6d79..2be8b6d 100644 --- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/gui/GUIConvertWhat.java +++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/gui/GUIConvertWhat.java @@ -2,8 +2,9 @@ package com.craftaro.ultimatestacker.gui; import com.craftaro.core.gui.Gui; 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.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.ultimatestacker.convert.Convert; import org.bukkit.ChatColor; import org.bukkit.entity.Player; diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/BlockListeners.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/BlockListeners.java index 77f8cb3..8e2ba6b 100644 --- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/BlockListeners.java +++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/BlockListeners.java @@ -2,7 +2,7 @@ package com.craftaro.ultimatestacker.listeners; import com.craftaro.core.compatibility.CompatibleHand; 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.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.api.UltimateStackerApi; diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/InteractListeners.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/InteractListeners.java index 1bf140a..a3cf2a8 100644 --- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/InteractListeners.java +++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/InteractListeners.java @@ -1,7 +1,7 @@ package com.craftaro.ultimatestacker.listeners; 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.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.api.stack.entity.EntityStack; import com.craftaro.ultimatestacker.settings.Settings; diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/ShearListeners.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/ShearListeners.java index 44504cd..81d6086 100644 --- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/ShearListeners.java +++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/ShearListeners.java @@ -1,7 +1,7 @@ package com.craftaro.ultimatestacker.listeners; 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.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.api.stack.entity.EntityStack; import com.craftaro.ultimatestacker.api.stack.entity.EntityStackManager; diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/entity/EntityListeners.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/entity/EntityListeners.java index 6f704b6..7357cd4 100644 --- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/entity/EntityListeners.java +++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/entity/EntityListeners.java @@ -1,6 +1,6 @@ package com.craftaro.ultimatestacker.listeners.entity; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.api.UltimateStackerApi; import com.craftaro.ultimatestacker.api.stack.entity.EntityStack; diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemCurrentListener.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemCurrentListener.java index b474c8f..452c97c 100644 --- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemCurrentListener.java +++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemCurrentListener.java @@ -1,6 +1,6 @@ package com.craftaro.ultimatestacker.listeners.item; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; +import com.craftaro.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.ultimatestacker.api.UltimateStackerApi; import com.craftaro.ultimatestacker.api.stack.item.StackedItem; import com.craftaro.ultimatestacker.settings.Settings; diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemLegacyListener.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemLegacyListener.java index 1117fc4..78fc81f 100644 --- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemLegacyListener.java +++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemLegacyListener.java @@ -1,6 +1,6 @@ package com.craftaro.ultimatestacker.listeners.item; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; +import com.craftaro.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.ultimatestacker.api.UltimateStackerApi; import com.craftaro.ultimatestacker.settings.Settings; import com.craftaro.ultimatestacker.utils.Methods; diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemListeners.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemListeners.java index 57fe2b2..7a80415 100644 --- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemListeners.java +++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemListeners.java @@ -1,7 +1,7 @@ package com.craftaro.ultimatestacker.listeners.item; import com.craftaro.core.nms.NmsManager; -import com.craftaro.core.third_party.org.apache.commons.lang3.StringUtils; +import com.craftaro.third_party.org.apache.commons.lang3.StringUtils; import com.craftaro.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.api.UltimateStackerApi; import com.craftaro.ultimatestacker.api.stack.item.StackedItem; diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/lootables/LootablesManager.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/lootables/LootablesManager.java index 2e12445..142f70c 100644 --- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/lootables/LootablesManager.java +++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/lootables/LootablesManager.java @@ -8,8 +8,9 @@ import com.craftaro.core.lootables.loot.Loot; import com.craftaro.core.lootables.loot.LootBuilder; import com.craftaro.core.lootables.loot.LootManager; import com.craftaro.core.lootables.loot.Lootable; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.ultimatestacker.UltimateStacker; +import com.craftaro.ultimatestacker.hook.hooks.SuperiorSkyblock2Hook; import com.craftaro.ultimatestacker.settings.Settings; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Ageable; diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/block/BlockStackImpl.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/block/BlockStackImpl.java index a847b30..d6d62c5 100644 --- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/block/BlockStackImpl.java +++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/block/BlockStackImpl.java @@ -2,7 +2,7 @@ package com.craftaro.ultimatestacker.stackable.block; import com.craftaro.core.database.Data; import com.craftaro.core.database.SerializedLocation; -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.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.api.stack.block.BlockStack; diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/block/BlockStackManagerImpl.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/block/BlockStackManagerImpl.java index 50b9dcb..b7a92c0 100644 --- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/block/BlockStackManagerImpl.java +++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/block/BlockStackManagerImpl.java @@ -1,7 +1,7 @@ package com.craftaro.ultimatestacker.stackable.block; import com.craftaro.core.database.Data; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.api.stack.block.BlockStack; import com.craftaro.ultimatestacker.api.stack.block.BlockStackManager; diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/spawner/SpawnerStackImpl.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/spawner/SpawnerStackImpl.java index 30f8225..d72e8b4 100644 --- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/spawner/SpawnerStackImpl.java +++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/spawner/SpawnerStackImpl.java @@ -3,9 +3,10 @@ package com.craftaro.ultimatestacker.stackable.spawner; import com.craftaro.core.database.Data; import com.craftaro.core.database.SerializedLocation; import com.craftaro.core.nms.world.SpawnedEntity; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.utils.EntityUtils; import com.craftaro.core.world.SSpawner; +import com.craftaro.third_party.org.jooq.impl.DSL; import com.craftaro.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.api.UltimateStackerApi; import com.craftaro.ultimatestacker.api.stack.spawner.SpawnerStack; diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/tasks/StackingTask.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/tasks/StackingTask.java index 8749170..b90ce3f 100644 --- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/tasks/StackingTask.java +++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/tasks/StackingTask.java @@ -2,7 +2,7 @@ package com.craftaro.ultimatestacker.tasks; import com.craftaro.core.compatibility.ServerVersion; import com.craftaro.core.hooks.WorldGuardHook; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.world.SWorld; import com.craftaro.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.api.stack.entity.EntityStack; diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/utils/Methods.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/utils/Methods.java index f402b56..4e8df7f 100644 --- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/utils/Methods.java +++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/utils/Methods.java @@ -1,6 +1,6 @@ package com.craftaro.ultimatestacker.utils; -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.ultimatestacker.UltimateStacker;