From 4d3c4fca1773ee9699b5fe832d00f831b26378d5 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Thu, 29 Jun 2023 10:07:26 +0200 Subject: [PATCH] Change the project structure to allow a dedicated API module to exist --- .gitignore | 2 +- EpicHoppers-API/pom.xml | 68 ++++++++ EpicHoppers-Plugin/pom.xml | 159 ++++++++++++++++++ .../com/songoda/epichoppers/EpicHoppers.java | 0 .../api/events/HopperAccessEvent.java | 0 .../api/events/HopperBreakEvent.java | 0 .../epichoppers/api/events/HopperEvent.java | 0 .../api/events/HopperPlaceEvent.java | 0 .../songoda/epichoppers/boost/BoostData.java | 0 .../epichoppers/boost/BoostManager.java | 0 .../epichoppers/commands/CommandBoost.java | 0 .../epichoppers/commands/CommandGive.java | 0 .../epichoppers/commands/CommandReload.java | 0 .../epichoppers/commands/CommandSettings.java | 0 .../compatibility/EpicHoppersPermission.java | 0 .../containers/ContainerManager.java | 0 .../containers/CustomContainer.java | 0 .../epichoppers/containers/IContainer.java | 0 .../impl/AdvancedChestImplementation.java | 0 .../impl/EpicFarmingImplementation.java | 0 .../impl/FabledSkyBlockImplementation.java | 0 .../epichoppers/database/DataManager.java | 0 .../migrations/_1_InitialMigration.java | 0 .../epichoppers/gui/GUIAutoSellFilter.java | 0 .../songoda/epichoppers/gui/GUICrafting.java | 0 .../songoda/epichoppers/gui/GUIFilter.java | 0 .../songoda/epichoppers/gui/GUIOverview.java | 0 .../songoda/epichoppers/gui/GUISmeltable.java | 0 .../songoda/epichoppers/hopper/Filter.java | 0 .../songoda/epichoppers/hopper/Hopper.java | 0 .../epichoppers/hopper/HopperBuilder.java | 0 .../epichoppers/hopper/HopperManager.java | 0 .../songoda/epichoppers/hopper/ItemType.java | 0 .../songoda/epichoppers/hopper/LinkType.java | 0 .../epichoppers/hopper/levels/Level.java | 0 .../hopper/levels/LevelManager.java | 0 .../hopper/levels/modules/Module.java | 0 .../levels/modules/ModuleAutoCrafting.java | 1 - .../hopper/levels/modules/ModuleAutoSell.java | 0 .../levels/modules/ModuleAutoSmelter.java | 0 .../levels/modules/ModuleBlockBreak.java | 0 .../levels/modules/ModuleMobHopper.java | 0 .../hopper/levels/modules/ModuleSuction.java | 0 .../hopper/teleport/TeleportHandler.java | 22 +-- .../hopper/teleport/TeleportTrigger.java | 0 .../epichoppers/listeners/BlockListeners.java | 0 .../listeners/EntityListeners.java | 0 .../listeners/HopperListeners.java | 0 .../listeners/InteractListeners.java | 0 .../listeners/InventoryListeners.java | 0 .../epichoppers/player/PlayerData.java | 0 .../epichoppers/player/PlayerDataManager.java | 0 .../songoda/epichoppers/player/SyncType.java | 0 .../epichoppers/settings/Settings.java | 0 .../songoda/epichoppers/tasks/HopTask.java | 0 .../songoda/epichoppers/utils/CostType.java | 0 .../epichoppers/utils/HopperDirection.java | 0 .../songoda/epichoppers/utils/Methods.java | 0 .../utils/StorageContainerCache.java | 0 .../src}/main/resources/en_US.lang | 0 .../src}/main/resources/levels.yml | 0 .../src}/main/resources/plugin.yml | 6 +- pom.xml | 152 +++-------------- 63 files changed, 261 insertions(+), 149 deletions(-) create mode 100644 EpicHoppers-API/pom.xml create mode 100644 EpicHoppers-Plugin/pom.xml rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/EpicHoppers.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/api/events/HopperAccessEvent.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/api/events/HopperBreakEvent.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/api/events/HopperEvent.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/api/events/HopperPlaceEvent.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/boost/BoostData.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/boost/BoostManager.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/commands/CommandBoost.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/commands/CommandGive.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/commands/CommandReload.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/commands/CommandSettings.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/compatibility/EpicHoppersPermission.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/containers/ContainerManager.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/containers/CustomContainer.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/containers/IContainer.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/containers/impl/AdvancedChestImplementation.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/containers/impl/EpicFarmingImplementation.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/containers/impl/FabledSkyBlockImplementation.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/database/DataManager.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/database/migrations/_1_InitialMigration.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/gui/GUIAutoSellFilter.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/gui/GUICrafting.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/gui/GUIFilter.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/gui/GUIOverview.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/gui/GUISmeltable.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/hopper/Filter.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/hopper/Hopper.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/hopper/HopperBuilder.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/hopper/HopperManager.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/hopper/ItemType.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/hopper/LinkType.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/hopper/levels/Level.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/hopper/levels/LevelManager.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/hopper/levels/modules/Module.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java (99%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoSell.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoSmelter.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleMobHopper.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleSuction.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/hopper/teleport/TeleportHandler.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/hopper/teleport/TeleportTrigger.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/listeners/BlockListeners.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/listeners/EntityListeners.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/listeners/HopperListeners.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/listeners/InteractListeners.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/listeners/InventoryListeners.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/player/PlayerData.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/player/PlayerDataManager.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/player/SyncType.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/settings/Settings.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/tasks/HopTask.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/utils/CostType.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/utils/HopperDirection.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/utils/Methods.java (100%) rename {src => EpicHoppers-Plugin/src}/main/java/com/songoda/epichoppers/utils/StorageContainerCache.java (100%) rename {src => EpicHoppers-Plugin/src}/main/resources/en_US.lang (100%) rename {src => EpicHoppers-Plugin/src}/main/resources/levels.yml (100%) rename {src => EpicHoppers-Plugin/src}/main/resources/plugin.yml (84%) diff --git a/.gitignore b/.gitignore index b9c4362..8b3e126 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ ## Maven /**/target/ -/dependency-reduced-pom.xml +/**/dependency-reduced-pom.xml ## Misc. .DS_Store diff --git a/EpicHoppers-API/pom.xml b/EpicHoppers-API/pom.xml new file mode 100644 index 0000000..2821045 --- /dev/null +++ b/EpicHoppers-API/pom.xml @@ -0,0 +1,68 @@ + + + 4.0.0 + + + com.craftaro + EpicHoppers-Parent + 3.0.0-SNAPSHOT + ../pom.xml + + EpicHoppers-API + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + + + + jar + + + + + + + https://hub.spigotmc.org/javadocs/spigot/ + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + + + jar + + + + + + + + + + com.craftaro + CraftaroCore + ${craftaro.coreVersion} + provided + + + + org.spigotmc + spigot-api + 1.8-R0.1-SNAPSHOT + provided + + + diff --git a/EpicHoppers-Plugin/pom.xml b/EpicHoppers-Plugin/pom.xml new file mode 100644 index 0000000..6bd9adc --- /dev/null +++ b/EpicHoppers-Plugin/pom.xml @@ -0,0 +1,159 @@ + + + 4.0.0 + + + com.craftaro + EpicHoppers-Parent + 3.0.0-SNAPSHOT + ../pom.xml + + EpicHoppers-Plugin + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.4.1 + + + + package + + shade + + + + ${project.parent.name}-${project.version} + + false + true + true + + + + com.craftaro.core + com.songoda.epichoppers.core + + + + + + *:* + + + META-INF/** + LICENSE + LICENSE.** + + + + + com.craftaro:CraftaroCore + false + + **/nms/v*/** + + + + + + + + + + + + src/main/resources + true + + + + + + + public + https://repo.songoda.com/repository/public/ + + + + jitpack.io + https://jitpack.io/ + + + + + + com.craftaro + EpicHoppers-API + 3.0.0-SNAPSHOT + compile + + + + com.craftaro + CraftaroCore + 3.0.0-SNAPSHOT + compile + + + + org.spigotmc + spigot-api + 1.19.4-R0.1-SNAPSHOT + provided + + + + com.songoda + skyblock + 2.3.30 + provided + + + + com.songoda + EpicFarming + 3.0.24 + provided + + + + com.github.brcdev-minecraft + shopgui-api + 2.2.0 + provided + + + + com.github.Gypopo + EconomyShopGUI-API + 1.4.0 + provided + + + + com.songoda + UltimateStacker + 2.1.6 + provided + + + + com.bgsoftware + wildstacker + 3.5.1 + provided + + + + com.github.DeadSilenceIV + AdvancedChestsAPI + 2.2 + provided + + + diff --git a/src/main/java/com/songoda/epichoppers/EpicHoppers.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/EpicHoppers.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/EpicHoppers.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/EpicHoppers.java diff --git a/src/main/java/com/songoda/epichoppers/api/events/HopperAccessEvent.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/api/events/HopperAccessEvent.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/api/events/HopperAccessEvent.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/api/events/HopperAccessEvent.java diff --git a/src/main/java/com/songoda/epichoppers/api/events/HopperBreakEvent.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/api/events/HopperBreakEvent.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/api/events/HopperBreakEvent.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/api/events/HopperBreakEvent.java diff --git a/src/main/java/com/songoda/epichoppers/api/events/HopperEvent.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/api/events/HopperEvent.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/api/events/HopperEvent.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/api/events/HopperEvent.java diff --git a/src/main/java/com/songoda/epichoppers/api/events/HopperPlaceEvent.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/api/events/HopperPlaceEvent.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/api/events/HopperPlaceEvent.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/api/events/HopperPlaceEvent.java diff --git a/src/main/java/com/songoda/epichoppers/boost/BoostData.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/boost/BoostData.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/boost/BoostData.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/boost/BoostData.java diff --git a/src/main/java/com/songoda/epichoppers/boost/BoostManager.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/boost/BoostManager.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/boost/BoostManager.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/boost/BoostManager.java diff --git a/src/main/java/com/songoda/epichoppers/commands/CommandBoost.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/commands/CommandBoost.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/commands/CommandBoost.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/commands/CommandBoost.java diff --git a/src/main/java/com/songoda/epichoppers/commands/CommandGive.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/commands/CommandGive.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/commands/CommandGive.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/commands/CommandGive.java diff --git a/src/main/java/com/songoda/epichoppers/commands/CommandReload.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/commands/CommandReload.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/commands/CommandReload.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/commands/CommandReload.java diff --git a/src/main/java/com/songoda/epichoppers/commands/CommandSettings.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/commands/CommandSettings.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/commands/CommandSettings.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/commands/CommandSettings.java diff --git a/src/main/java/com/songoda/epichoppers/compatibility/EpicHoppersPermission.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/compatibility/EpicHoppersPermission.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/compatibility/EpicHoppersPermission.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/compatibility/EpicHoppersPermission.java diff --git a/src/main/java/com/songoda/epichoppers/containers/ContainerManager.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/containers/ContainerManager.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/containers/ContainerManager.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/containers/ContainerManager.java diff --git a/src/main/java/com/songoda/epichoppers/containers/CustomContainer.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/containers/CustomContainer.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/containers/CustomContainer.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/containers/CustomContainer.java diff --git a/src/main/java/com/songoda/epichoppers/containers/IContainer.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/containers/IContainer.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/containers/IContainer.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/containers/IContainer.java diff --git a/src/main/java/com/songoda/epichoppers/containers/impl/AdvancedChestImplementation.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/containers/impl/AdvancedChestImplementation.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/containers/impl/AdvancedChestImplementation.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/containers/impl/AdvancedChestImplementation.java diff --git a/src/main/java/com/songoda/epichoppers/containers/impl/EpicFarmingImplementation.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/containers/impl/EpicFarmingImplementation.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/containers/impl/EpicFarmingImplementation.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/containers/impl/EpicFarmingImplementation.java diff --git a/src/main/java/com/songoda/epichoppers/containers/impl/FabledSkyBlockImplementation.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/containers/impl/FabledSkyBlockImplementation.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/containers/impl/FabledSkyBlockImplementation.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/containers/impl/FabledSkyBlockImplementation.java diff --git a/src/main/java/com/songoda/epichoppers/database/DataManager.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/database/DataManager.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/database/DataManager.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/database/DataManager.java diff --git a/src/main/java/com/songoda/epichoppers/database/migrations/_1_InitialMigration.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/database/migrations/_1_InitialMigration.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/database/migrations/_1_InitialMigration.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/database/migrations/_1_InitialMigration.java diff --git a/src/main/java/com/songoda/epichoppers/gui/GUIAutoSellFilter.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/gui/GUIAutoSellFilter.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/gui/GUIAutoSellFilter.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/gui/GUIAutoSellFilter.java diff --git a/src/main/java/com/songoda/epichoppers/gui/GUICrafting.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/gui/GUICrafting.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/gui/GUICrafting.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/gui/GUICrafting.java diff --git a/src/main/java/com/songoda/epichoppers/gui/GUIFilter.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/gui/GUIFilter.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/gui/GUIFilter.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/gui/GUIFilter.java diff --git a/src/main/java/com/songoda/epichoppers/gui/GUIOverview.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/gui/GUIOverview.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/gui/GUIOverview.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/gui/GUIOverview.java diff --git a/src/main/java/com/songoda/epichoppers/gui/GUISmeltable.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/gui/GUISmeltable.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/gui/GUISmeltable.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/gui/GUISmeltable.java diff --git a/src/main/java/com/songoda/epichoppers/hopper/Filter.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/Filter.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/hopper/Filter.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/Filter.java diff --git a/src/main/java/com/songoda/epichoppers/hopper/Hopper.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/Hopper.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/hopper/Hopper.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/Hopper.java diff --git a/src/main/java/com/songoda/epichoppers/hopper/HopperBuilder.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/HopperBuilder.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/hopper/HopperBuilder.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/HopperBuilder.java diff --git a/src/main/java/com/songoda/epichoppers/hopper/HopperManager.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/HopperManager.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/hopper/HopperManager.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/HopperManager.java diff --git a/src/main/java/com/songoda/epichoppers/hopper/ItemType.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/ItemType.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/hopper/ItemType.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/ItemType.java diff --git a/src/main/java/com/songoda/epichoppers/hopper/LinkType.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/LinkType.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/hopper/LinkType.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/LinkType.java diff --git a/src/main/java/com/songoda/epichoppers/hopper/levels/Level.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/Level.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/hopper/levels/Level.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/Level.java diff --git a/src/main/java/com/songoda/epichoppers/hopper/levels/LevelManager.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/LevelManager.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/hopper/levels/LevelManager.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/LevelManager.java diff --git a/src/main/java/com/songoda/epichoppers/hopper/levels/modules/Module.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/Module.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/hopper/levels/modules/Module.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/Module.java diff --git a/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java similarity index 99% rename from src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java index aa5315f..bbfe39e 100644 --- a/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java +++ b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java @@ -1,6 +1,5 @@ package com.songoda.epichoppers.hopper.levels.modules; -import com.craftaro.core.compatibility.CompatibleMaterial; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.utils.TextUtils; import com.songoda.epichoppers.EpicHoppers; diff --git a/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoSell.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoSell.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoSell.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoSell.java diff --git a/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoSmelter.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoSmelter.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoSmelter.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoSmelter.java diff --git a/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java diff --git a/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleMobHopper.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleMobHopper.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleMobHopper.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleMobHopper.java diff --git a/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleSuction.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleSuction.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleSuction.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleSuction.java diff --git a/src/main/java/com/songoda/epichoppers/hopper/teleport/TeleportHandler.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/teleport/TeleportHandler.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/hopper/teleport/TeleportHandler.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/teleport/TeleportHandler.java index 28530f0..cefe592 100644 --- a/src/main/java/com/songoda/epichoppers/hopper/teleport/TeleportHandler.java +++ b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/teleport/TeleportHandler.java @@ -30,6 +30,17 @@ public class TeleportHandler { Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, this::teleportRunner, 0, Settings.TELEPORT_TICKS.getLong()); } + public void tpEntity(Entity entity, Hopper hopper) { + if (hopper == null || !this.plugin.getHopperManager().isHopper(hopper.getLocation())) { + return; + } + + Hopper lastHopper = this.getChain(hopper, 1); + if (!hopper.equals(lastHopper)) { + this.doTeleport(entity, lastHopper.getLocation()); + } + } + private void teleportRunner() { if (!this.plugin.getHopperManager().isReady()) { return; @@ -71,17 +82,6 @@ public class TeleportHandler { } } - public void tpEntity(Entity entity, Hopper hopper) { - if (hopper == null || !this.plugin.getHopperManager().isHopper(hopper.getLocation())) { - return; - } - - Hopper lastHopper = this.getChain(hopper, 1); - if (!hopper.equals(lastHopper)) { - this.doTeleport(entity, lastHopper.getLocation()); - } - } - /** * Recursively gets the next hopper in the linked hopper chain * diff --git a/src/main/java/com/songoda/epichoppers/hopper/teleport/TeleportTrigger.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/teleport/TeleportTrigger.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/hopper/teleport/TeleportTrigger.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/teleport/TeleportTrigger.java diff --git a/src/main/java/com/songoda/epichoppers/listeners/BlockListeners.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/BlockListeners.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/listeners/BlockListeners.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/BlockListeners.java diff --git a/src/main/java/com/songoda/epichoppers/listeners/EntityListeners.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/EntityListeners.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/listeners/EntityListeners.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/EntityListeners.java diff --git a/src/main/java/com/songoda/epichoppers/listeners/HopperListeners.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/HopperListeners.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/listeners/HopperListeners.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/HopperListeners.java diff --git a/src/main/java/com/songoda/epichoppers/listeners/InteractListeners.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/InteractListeners.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/listeners/InteractListeners.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/InteractListeners.java diff --git a/src/main/java/com/songoda/epichoppers/listeners/InventoryListeners.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/InventoryListeners.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/listeners/InventoryListeners.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/InventoryListeners.java diff --git a/src/main/java/com/songoda/epichoppers/player/PlayerData.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/player/PlayerData.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/player/PlayerData.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/player/PlayerData.java diff --git a/src/main/java/com/songoda/epichoppers/player/PlayerDataManager.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/player/PlayerDataManager.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/player/PlayerDataManager.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/player/PlayerDataManager.java diff --git a/src/main/java/com/songoda/epichoppers/player/SyncType.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/player/SyncType.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/player/SyncType.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/player/SyncType.java diff --git a/src/main/java/com/songoda/epichoppers/settings/Settings.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/settings/Settings.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/settings/Settings.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/settings/Settings.java diff --git a/src/main/java/com/songoda/epichoppers/tasks/HopTask.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/tasks/HopTask.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/tasks/HopTask.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/tasks/HopTask.java diff --git a/src/main/java/com/songoda/epichoppers/utils/CostType.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/utils/CostType.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/utils/CostType.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/utils/CostType.java diff --git a/src/main/java/com/songoda/epichoppers/utils/HopperDirection.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/utils/HopperDirection.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/utils/HopperDirection.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/utils/HopperDirection.java diff --git a/src/main/java/com/songoda/epichoppers/utils/Methods.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/utils/Methods.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/utils/Methods.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/utils/Methods.java diff --git a/src/main/java/com/songoda/epichoppers/utils/StorageContainerCache.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/utils/StorageContainerCache.java similarity index 100% rename from src/main/java/com/songoda/epichoppers/utils/StorageContainerCache.java rename to EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/utils/StorageContainerCache.java diff --git a/src/main/resources/en_US.lang b/EpicHoppers-Plugin/src/main/resources/en_US.lang similarity index 100% rename from src/main/resources/en_US.lang rename to EpicHoppers-Plugin/src/main/resources/en_US.lang diff --git a/src/main/resources/levels.yml b/EpicHoppers-Plugin/src/main/resources/levels.yml similarity index 100% rename from src/main/resources/levels.yml rename to EpicHoppers-Plugin/src/main/resources/levels.yml diff --git a/src/main/resources/plugin.yml b/EpicHoppers-Plugin/src/main/resources/plugin.yml similarity index 84% rename from src/main/resources/plugin.yml rename to EpicHoppers-Plugin/src/main/resources/plugin.yml index 91b21e0..3f04ac9 100644 --- a/src/main/resources/plugin.yml +++ b/EpicHoppers-Plugin/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ -name: ${project.name} -description: ${project.description} +name: ${project.parent.name} +description: ${project.parent.description} version: ${project.version} api-version: 1.13 @@ -26,7 +26,7 @@ softdepend: - WorldGuard author: Craftaro -website: ${project.url} +website: ${project.parent.url} commands: eh: diff --git a/pom.xml b/pom.xml index 5e6f928..c970a69 100644 --- a/pom.xml +++ b/pom.xml @@ -4,20 +4,32 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.songoda - EpicHoppers - 4.7.9 + com.craftaro + EpicHoppers-Parent + pom + 3.0.0-SNAPSHOT + + + + EpicHoppers-API + EpicHoppers-Plugin + EpicHoppers Connect hoppers over long distances, filter out unwanted items, auto break blocks, auto sell items and much more. https://craftaro.com/marketplace/product/15 + 3.0.0-SNAPSHOT + 8 1.8 1.8 UTF-8 + + https://sonarcloud.io + ${project.groupId}:${project.artifactId} @@ -30,67 +42,6 @@ scm:git:git://github.com/craftaro/EpicHoppers.git - - - - org.apache.maven.plugins - maven-shade-plugin - 3.4.1 - - - - package - - shade - - - - ${project.name}-${project.version} - - false - true - true - - - - com.craftaro.core - com.songoda.epichoppers.core - - - - - - *:* - - - META-INF/** - LICENSE - LICENSE.** - - - - - com.craftaro:CraftaroCore - false - - **/nms/v*/** - - - - - - - - - - - - src/main/resources - true - - - - craftaro-minecraft-plugins @@ -101,79 +52,14 @@ SpigotMC https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - public - https://repo.songoda.com/repository/public/ - - - - jitpack.io - https://jitpack.io/ - + - com.craftaro - CraftaroCore - 3.0.0-SNAPSHOT - compile - - - - org.spigotmc - spigot-api - 1.19.4-R0.1-SNAPSHOT - provided - - - - com.songoda - skyblock - 2.3.30 - provided - - - - com.songoda - EpicFarming - 3.0.24 - provided - - - - com.github.brcdev-minecraft - shopgui-api - 2.2.0 - provided - - - - com.github.Gypopo - EconomyShopGUI-API - 1.4.0 - provided - - - - com.songoda - UltimateStacker - 2.1.6 - provided - - - - com.bgsoftware - wildstacker - 3.5.1 - provided - - - - com.github.DeadSilenceIV - AdvancedChestsAPI - 2.2 + org.jetbrains + annotations + 24.0.1 provided