diff --git a/pom.xml b/pom.xml index 2757585..4dd773e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.craftaro EpicFarming - 4.0.0 + 4.0.1 EpicFarming Allow your players to grow crops faster, automatically replant, harvest and store crops and animal produce in the farm's inventory, as well as much more @@ -74,8 +74,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/src/main/java/com/craftaro/epicfarming/EpicFarming.java b/src/main/java/com/craftaro/epicfarming/EpicFarming.java index 7b6af69..cbb26f9 100644 --- a/src/main/java/com/craftaro/epicfarming/EpicFarming.java +++ b/src/main/java/com/craftaro/epicfarming/EpicFarming.java @@ -6,11 +6,12 @@ import com.craftaro.core.commands.CommandManager; import com.craftaro.core.compatibility.ServerVersion; import com.craftaro.core.configuration.Config; import com.craftaro.core.database.DatabaseConnector; +import com.craftaro.core.dependency.Dependency; import com.craftaro.core.gui.GuiManager; import com.craftaro.core.hooks.EconomyManager; import com.craftaro.core.hooks.EntityStackerManager; 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.epicfarming.database.migrations._1_InitialMigration; @@ -59,7 +60,9 @@ import org.bukkit.plugin.PluginManager; import java.io.File; import java.util.ArrayList; import java.util.Collections; +import java.util.HashSet; import java.util.List; +import java.util.Set; import java.util.UUID; public class EpicFarming extends SongodaPlugin { @@ -76,6 +79,11 @@ public class EpicFarming extends SongodaPlugin { private EntityUtils entityUtils; + @Override + protected Set getDependencies() { + return new HashSet<>(); + } + @Override public void onPluginLoad() { } diff --git a/src/main/java/com/craftaro/epicfarming/boost/BoostData.java b/src/main/java/com/craftaro/epicfarming/boost/BoostData.java index 41b3d50..389b811 100644 --- a/src/main/java/com/craftaro/epicfarming/boost/BoostData.java +++ b/src/main/java/com/craftaro/epicfarming/boost/BoostData.java @@ -53,6 +53,11 @@ public class BoostData implements Data { && Objects.equals(this.player, other.player); } + @Override + public UUID getUniqueId() { + return this.player; + } + @Override public Map serialize() { Map map = new java.util.HashMap<>(); diff --git a/src/main/java/com/craftaro/epicfarming/farming/Farm.java b/src/main/java/com/craftaro/epicfarming/farming/Farm.java index 378c2df..c2756d9 100644 --- a/src/main/java/com/craftaro/epicfarming/farming/Farm.java +++ b/src/main/java/com/craftaro/epicfarming/farming/Farm.java @@ -6,9 +6,9 @@ import com.craftaro.core.database.Data; import com.craftaro.core.database.SerializedLocation; import com.craftaro.core.hooks.EconomyManager; import com.craftaro.core.hooks.ProtectionManager; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XBlock; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; +import com.craftaro.third_party.com.cryptomorin.xseries.XBlock; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.epicfarming.EpicFarming; import com.craftaro.epicfarming.farming.levels.Level; import com.craftaro.epicfarming.gui.OverviewGui; diff --git a/src/main/java/com/craftaro/epicfarming/farming/FarmManager.java b/src/main/java/com/craftaro/epicfarming/farming/FarmManager.java index 45a06ae..beabdda 100644 --- a/src/main/java/com/craftaro/epicfarming/farming/FarmManager.java +++ b/src/main/java/com/craftaro/epicfarming/farming/FarmManager.java @@ -1,6 +1,6 @@ package com.craftaro.epicfarming.farming; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.epicfarming.farming.levels.Level; import com.craftaro.epicfarming.farming.levels.LevelManager; import com.craftaro.epicfarming.settings.Settings; diff --git a/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoBreeding.java b/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoBreeding.java index b824919..11bb7a0 100644 --- a/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoBreeding.java +++ b/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoBreeding.java @@ -3,7 +3,7 @@ package com.craftaro.epicfarming.farming.levels.modules; import com.craftaro.core.compatibility.CompatibleParticleHandler; import com.craftaro.core.gui.GuiUtils; import com.craftaro.core.hooks.EntityStackerManager; -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.farming.Farm; import com.craftaro.epicfarming.farming.FarmType; diff --git a/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoButcher.java b/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoButcher.java index fc0fd72..69908a8 100644 --- a/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoButcher.java +++ b/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoButcher.java @@ -2,8 +2,8 @@ package com.craftaro.epicfarming.farming.levels.modules; import com.craftaro.core.gui.GuiUtils; import com.craftaro.core.hooks.EntityStackerManager; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XSound; import com.craftaro.epicfarming.EpicFarming; import com.craftaro.epicfarming.farming.Farm; import com.craftaro.epicfarming.farming.FarmType; diff --git a/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoCollect.java b/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoCollect.java index 47b8d22..d7d5613 100644 --- a/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoCollect.java +++ b/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoCollect.java @@ -2,8 +2,8 @@ package com.craftaro.epicfarming.farming.levels.modules; import com.craftaro.core.compatibility.CompatibleMaterial; import com.craftaro.core.gui.GuiUtils; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XBlock; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XBlock; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.utils.BlockUtils; import com.craftaro.epicfarming.EpicFarming; import com.craftaro.epicfarming.boost.BoostData; diff --git a/src/main/java/com/craftaro/epicfarming/gui/OverviewGui.java b/src/main/java/com/craftaro/epicfarming/gui/OverviewGui.java index 9840862..f17cb8f 100644 --- a/src/main/java/com/craftaro/epicfarming/gui/OverviewGui.java +++ b/src/main/java/com/craftaro/epicfarming/gui/OverviewGui.java @@ -2,7 +2,7 @@ package com.craftaro.epicfarming.gui; 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/src/main/java/com/craftaro/epicfarming/listeners/BlockListeners.java b/src/main/java/com/craftaro/epicfarming/listeners/BlockListeners.java index 49e99ce..411ae6c 100644 --- a/src/main/java/com/craftaro/epicfarming/listeners/BlockListeners.java +++ b/src/main/java/com/craftaro/epicfarming/listeners/BlockListeners.java @@ -1,6 +1,6 @@ package com.craftaro.epicfarming.listeners; -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.settings.Settings; import com.craftaro.epicfarming.farming.Farm; diff --git a/src/main/java/com/craftaro/epicfarming/listeners/EntityListeners.java b/src/main/java/com/craftaro/epicfarming/listeners/EntityListeners.java index 82f45c0..bbc3020 100644 --- a/src/main/java/com/craftaro/epicfarming/listeners/EntityListeners.java +++ b/src/main/java/com/craftaro/epicfarming/listeners/EntityListeners.java @@ -1,7 +1,7 @@ package com.craftaro.epicfarming.listeners; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XBlock; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XBlock; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.epicfarming.EpicFarming; import com.craftaro.epicfarming.farming.levels.modules.Module; import com.craftaro.epicfarming.farming.levels.modules.ModuleAutoCollect; diff --git a/src/main/java/com/craftaro/epicfarming/listeners/InteractListeners.java b/src/main/java/com/craftaro/epicfarming/listeners/InteractListeners.java index b39d02b..d8e33ad 100644 --- a/src/main/java/com/craftaro/epicfarming/listeners/InteractListeners.java +++ b/src/main/java/com/craftaro/epicfarming/listeners/InteractListeners.java @@ -1,6 +1,6 @@ package com.craftaro.epicfarming.listeners; -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.settings.Settings; import com.craftaro.skyblock.SkyBlock; diff --git a/src/main/java/com/craftaro/epicfarming/tasks/FarmTask.java b/src/main/java/com/craftaro/epicfarming/tasks/FarmTask.java index a62db28..b5cd35b 100644 --- a/src/main/java/com/craftaro/epicfarming/tasks/FarmTask.java +++ b/src/main/java/com/craftaro/epicfarming/tasks/FarmTask.java @@ -2,8 +2,8 @@ package com.craftaro.epicfarming.tasks; import com.craftaro.core.compatibility.CompatibleMaterial; import com.craftaro.core.compatibility.ServerVersion; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XBlock; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XBlock; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.utils.BlockUtils; import com.craftaro.epicfarming.EpicFarming; import com.craftaro.epicfarming.farming.Crop; diff --git a/src/main/java/com/craftaro/epicfarming/tasks/GrowthTask.java b/src/main/java/com/craftaro/epicfarming/tasks/GrowthTask.java index 82eb902..fde55a3 100644 --- a/src/main/java/com/craftaro/epicfarming/tasks/GrowthTask.java +++ b/src/main/java/com/craftaro/epicfarming/tasks/GrowthTask.java @@ -1,8 +1,8 @@ package com.craftaro.epicfarming.tasks; import com.craftaro.core.compatibility.CompatibleMaterial; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XBlock; -import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.third_party.com.cryptomorin.xseries.XBlock; +import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.utils.BlockUtils; import com.craftaro.epicfarming.EpicFarming; import com.craftaro.epicfarming.farming.Crop; diff --git a/src/main/java/com/craftaro/epicfarming/tasks/HopperTask.java b/src/main/java/com/craftaro/epicfarming/tasks/HopperTask.java index a1952b1..d6aa14d 100644 --- a/src/main/java/com/craftaro/epicfarming/tasks/HopperTask.java +++ b/src/main/java/com/craftaro/epicfarming/tasks/HopperTask.java @@ -1,6 +1,6 @@ package com.craftaro.epicfarming.tasks; -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.farming.Farm; import com.craftaro.epicfarming.farming.FarmManager; diff --git a/src/main/java/com/craftaro/epicfarming/utils/DataHelper.java b/src/main/java/com/craftaro/epicfarming/utils/DataHelper.java index e147305..6054d97 100644 --- a/src/main/java/com/craftaro/epicfarming/utils/DataHelper.java +++ b/src/main/java/com/craftaro/epicfarming/utils/DataHelper.java @@ -1,7 +1,7 @@ package com.craftaro.epicfarming.utils; -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.epicfarming.EpicFarming; import com.craftaro.epicfarming.farming.Farm; diff --git a/src/main/java/com/craftaro/epicfarming/utils/EntityInfo.java b/src/main/java/com/craftaro/epicfarming/utils/EntityInfo.java index e6e1981..4fd0ae1 100644 --- a/src/main/java/com/craftaro/epicfarming/utils/EntityInfo.java +++ b/src/main/java/com/craftaro/epicfarming/utils/EntityInfo.java @@ -1,6 +1,6 @@ package com.craftaro.epicfarming.utils; -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.entity.EntityType; diff --git a/src/main/java/com/craftaro/epicfarming/utils/Methods.java b/src/main/java/com/craftaro/epicfarming/utils/Methods.java index 9a28feb..f2687d1 100644 --- a/src/main/java/com/craftaro/epicfarming/utils/Methods.java +++ b/src/main/java/com/craftaro/epicfarming/utils/Methods.java @@ -1,6 +1,6 @@ package com.craftaro.epicfarming.utils; -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.settings.Settings; import org.bukkit.Bukkit;