From d60de693bbdf3151e89d4817119db47cd244efe2 Mon Sep 17 00:00:00 2001
From: XiaoMoMi <972454774@qq.com>
Date: Fri, 1 Sep 2023 02:23:12 +0800
Subject: [PATCH] 2.0-backup-1
---
.gitignore | 104 +-
api/.gitignore | 42 +
api/build.gradle.kts | 5 +
.../api/CustomFishingPlugin.java | 125 ++
.../customfishing/api/common/Key.java | 29 +
.../customfishing/api/common}/Pair.java | 2 +-
.../customfishing/api/common/Tuple.java | 42 +
.../api/data/DataStorageInterface.java | 29 +-
.../customfishing/api/data/EarningData.java | 26 +-
.../customfishing/api/data/InventoryData.java | 21 +
.../customfishing/api/data/PlayerData.java | 81 +
.../customfishing/api/data/StatisticData.java | 21 +
.../customfishing/api/data/StorageType.java | 14 +
.../api/data/user/OfflineUser.java | 24 +
.../api/data/user/OnlineUser.java | 27 +
.../api/event/LavaFishingEvent.java | 56 +
.../customfishing/api/event/RodCastEvent.java | 50 +
.../api/event/TotemActivateEvent.java | 4 +
.../integration/EnchantmentInterface.java | 2 +-
.../api/integration/LevelInterface.java | 9 +
.../api}/integration/SeasonInterface.java | 2 +-
.../api/manager/ActionManager.java | 18 +
.../api/manager/AdventureManager.java | 116 ++
.../customfishing/api/manager/BagManager.java | 11 +
.../api/manager/BlockManager.java | 22 +
.../api/manager/CommandManager.java | 6 +
.../api/manager/CompetitionManager.java | 26 +
.../api/manager/EffectManager.java | 15 +
.../api/manager/FishingManager.java | 27 +
.../api/manager/GameManager.java | 29 +
.../api/manager/IntegrationManager.java | 27 +
.../api/manager/ItemManager.java | 59 +
.../api/manager/LootManager.java | 8 +
.../api/manager/MarketManager.java | 13 +
.../customfishing/api/manager/MobManager.java | 15 +
.../api/manager/PlaceholderManager.java | 23 +
.../api/manager/RequirementManager.java | 41 +
.../api/manager/StorageManager.java | 58 +
.../api/manager/TotemManager.java | 4 +
.../api/manager/VersionManager.java | 18 +
.../api/mechanic/TempFishingState.java | 30 +
.../api/mechanic/action/Action.java | 9 +
.../api/mechanic/action/ActionBuilder.java | 6 +
.../api/mechanic/action/ActionTrigger.java | 9 +
.../api/mechanic/bag/FishingBagHolder.java | 35 +
.../api/mechanic/block/BlockConfig.java | 86 +
.../api/mechanic/block/BlockDataModifier.java | 8 +
.../block/BlockDataModifierBuilder.java | 8 +
.../api/mechanic/block/BlockLibrary.java | 14 +
.../api/mechanic/block/BlockSettings.java | 17 +
.../mechanic/block/BlockStateModifier.java | 9 +
.../block/BlockStateModifierBuilder.java | 6 +
.../competition/AbstractCompetitionInfo.java | 25 +
.../mechanic/competition/ActionBarConfig.java | 37 +
.../mechanic/competition/BossBarConfig.java | 68 +
.../competition/CompetitionConfig.java | 131 ++
.../mechanic/competition/CompetitionGoal.java | 22 +-
.../competition/CompetitionPlayer.java | 27 +-
.../competition/FishingCompetition.java | 30 +
.../api/mechanic/competition/Ranking.java | 27 +-
.../api/mechanic/condition/Condition.java | 72 +
.../condition/FishingPreparation.java | 143 ++
.../api/mechanic/effect/AbstractEffect.java | 96 +
.../api/mechanic/effect/Effect.java | 35 +
.../api/mechanic/effect/FishingEffect.java | 68 +
.../api/mechanic/game/AbstractGame.java | 14 +
.../mechanic/game/AbstractGamingPlayer.java | 101 +
.../customfishing/api/mechanic/game/Game.java | 9 +
.../api/mechanic/game/GameConfig.java | 11 +
.../api/mechanic/game/GameGroup.java | 61 +
.../api/mechanic/game/GameGroups.java | 33 +
.../api/mechanic/game/GameSettings.java | 20 +
.../api/mechanic/game/GamingPlayer.java | 23 +
.../api/mechanic/item/BuildableItem.java | 25 +
.../api/mechanic/item/ItemBuilder.java | 72 +
.../api/mechanic/item/ItemLibrary.java | 13 +
.../customfishing/api/mechanic/loot/Loot.java | 77 +
.../api/mechanic/loot/LootType.java | 9 +
.../api/mechanic/loot/Modifier.java | 5 +
.../api/mechanic/market/MarketGUI.java | 19 +
.../api/mechanic/mob/MobConfig.java | 75 +
.../api/mechanic/mob/MobLibrary.java | 13 +
.../api/mechanic/mob/MobSettings.java | 15 +
.../api/mechanic/requirement/Requirement.java | 8 +
.../requirement/RequirementBuilder.java | 14 +
.../api/mechanic/statistic/Statistics.java | 85 +
.../api/scheduler/CancellableTask.java | 8 +
.../api/scheduler/Scheduler.java | 22 +
.../customfishing/api/util/FontUtils.java | 8 +
.../api/util/InventoryUtils.java | 138 ++
.../customfishing/api/util/LogUtils.java | 18 +-
.../customfishing/api/util/OffsetUtils.java | 126 ++
.../api/util/ReflectionUtils.java | 50 +-
.../customfishing/api/util/WeightUtils.java | 60 +
build.gradle | 99 -
build.gradle.kts | 73 +
gradle.properties | 8 +
gradle/wrapper/gradle-wrapper.jar | Bin 59821 -> 60756 bytes
gradle/wrapper/gradle-wrapper.properties | 1 +
gradlew | 2 +-
libs/BetonQuest2.0.0-dev-668.jar | Bin 4778428 -> 0 bytes
libs/ClueScrolls-api.jar | Bin 1276918 -> 0 bytes
libs/battle-pass-api.jar | Bin 267277 -> 0 bytes
plugin/.gitignore | 42 +
plugin/build.gradle.kts | 85 +
.../libs}/AdvancedEnchantments-api.jar | Bin
{libs => plugin/libs}/BiomeAPI.jar | Bin
.../libs/CustomCrops-api.jar | Bin
.../libs}/RealisticSeasons-api.jar | Bin
{libs => plugin/libs}/mcMMO-api.jar | Bin
.../CustomFishingPluginImpl.java | 211 ++
.../adventure/AdventureManagerImpl.java | 204 ++
.../command/CommandManagerImpl.java | 51 +
.../command/sub/CompetitionCommand.java | 90 +
.../command/sub/FishingBagCommand.java | 55 +
.../command/sub/ItemCommand.java | 150 ++
.../compatibility/IntegrationManagerImpl.java | 160 ++
.../block/ItemsAdderBlockImpl.java | 27 +
.../compatibility/block/VanillaBlockImpl.java | 29 +
.../enchant/AdvancedEnchantmentsImpl.java | 12 +-
.../enchant/VanillaEnchantmentsImpl.java | 8 +-
.../item/CustomFishingItemImpl.java | 42 +
.../item/ItemsAdderItemImpl.java | 30 +-
.../compatibility/item/MMOItemsItemImpl.java | 51 +
.../item/McMMOBuildableItem.java | 51 +
.../item/MythicMobsItemImpl.java | 28 +-
.../item/NeigeItemsItemImpl.java | 47 +
.../compatibility/item/OraxenItemImpl.java | 44 +
.../compatibility/item/VanillaItemImpl.java | 26 +-
.../level/AureliumSkillsImpl.java | 19 +-
.../compatibility/level}/EcoJobsImpl.java | 21 +-
.../compatibility/level}/EcoSkillsImpl.java | 16 +-
.../compatibility/level/JobsRebornImpl.java | 55 +
.../compatibility/level}/MMOCoreImpl.java | 25 +-
.../compatibility/level/McMMOImpl.java | 14 +-
.../mob/MythicMobsLibraryImpl.java | 43 +
.../compatibility/mob/VanillaMobImpl.java | 22 +
.../papi/MiniPlaceholdersHook.java | 4 +
.../compatibility/papi/ParseUtils.java | 4 +-
.../papi/PlaceholderAPIHook.java | 34 +
.../papi/PlaceholderManagerImpl.java | 94 +
.../season/CustomCropsSeasonImpl.java | 4 +-
.../season/RealisticSeasonsImpl.java | 4 +-
.../inventorygui/DynamicGuiElement.java | 189 ++
.../inventorygui/GuiBackElement.java | 77 +
.../libraries/inventorygui/GuiElement.java | 235 +++
.../inventorygui/GuiElementGroup.java | 276 +++
.../inventorygui/GuiPageElement.java | 124 ++
.../inventorygui/GuiStateElement.java | 280 +++
.../inventorygui/GuiStorageElement.java | 368 ++++
.../libraries/inventorygui/InventoryGui.java | 1690 +++++++++++++++++
.../inventorygui/StaticGuiElement.java | 159 ++
.../libraryloader}/LibraryLoader.java | 154 +-
.../libraryloader}/MavenLibraries.java | 2 +-
.../libraryloader}/MavenLibrary.java | 2 +-
.../libraries/libraryloader}/Repository.java | 2 +-
.../libraryloader}/URLClassLoaderAccess.java | 2 +-
.../mechanic/action/ActionManagerImpl.java | 317 ++++
.../mechanic/bag/BagManagerImpl.java | 97 +
.../mechanic/block/BlockManagerImpl.java | 288 +++
.../mechanic/competition/Competition.java | 265 +++
.../competition/CompetitionManagerImpl.java | 259 +++
.../competition/CompetitionSchedule.java | 77 +
.../actionbar/ActionBarManager.java | 103 +
.../actionbar/ActionBarSender.java | 106 ++
.../competition/bossbar/BossBarManager.java | 103 +
.../competition/bossbar/BossBarSender.java | 132 +-
.../competition/ranking/LocalRankingImpl.java | 36 +-
.../competition/ranking/RedisRankingImpl.java | 115 ++
.../mechanic/effect/EffectManagerImpl.java | 114 ++
.../mechanic/fishing/BaitAnimationTask.java | 49 +
.../mechanic/fishing/FishingManagerImpl.java | 570 ++++++
.../mechanic/fishing/HookCheckTimerTask.java | 225 +++
.../mechanic/fishing/LavaEffectTask.java | 29 +-
.../mechanic/game/GameManagerImpl.java | 213 +++
.../mechanic/item/ItemManagerImpl.java | 554 ++++++
.../mechanic/loot/LootManagerImpl.java | 304 +++
.../mechanic/market/MarketManagerImpl.java | 136 ++
.../mechanic/mob/MobManagerImpl.java | 142 ++
.../requirement/AbstractRequirement.java | 24 +
.../requirement/ConditionalLoots.java | 46 +
.../requirement/RequirementManagerImpl.java | 475 +++++
.../requirement/inbuilt/LogicRequirement.java | 117 ++
.../mechanic/totem/TotemManagerImpl.java | 4 +
.../scheduler/BukkitSchedulerImpl.java | 70 +
.../scheduler/FoliaSchedulerImpl.java | 67 +
.../scheduler/SchedulerImpl.java | 113 ++
.../scheduler/SyncScheduler.java | 13 +-
.../customfishing/setting/Config.java | 139 ++
.../customfishing/setting/Locale.java | 83 +
.../storage/StorageManagerImpl.java | 278 +++
.../storage/method/AbstractStorage.java | 29 +
.../method/database/nosql/MongoDBImpl.java | 134 ++
.../method/database/nosql/RedisManager.java | 259 +++
.../database/sql/AbstractHikariDatabase.java | 103 +
.../database/sql/AbstractSQLDatabase.java | 143 ++
.../storage/method/database/sql/H2Impl.java | 47 +
.../method/database/sql/MariaDBImpl.java | 16 +
.../method/database/sql/MySQLImpl.java | 16 +
.../method/database/sql/SQLiteImpl.java | 151 ++
.../storage/method/file/JsonImpl.java | 97 +
.../storage/method/file/YAMLImpl.java | 88 +
.../storage/user/OfflineUserImpl.java | 87 +
.../storage/user/OnlineUserImpl.java | 20 +
.../customfishing/util/ArmorStandUtils.java | 25 +-
.../customfishing/util/ConfigUtils.java | 108 ++
.../customfishing/util}/DynamicText.java | 28 +-
.../customfishing/util/FakeItemUtils.java | 18 +-
.../customfishing/util/NBTUtils.java | 55 +-
.../version/VersionManagerImpl.java | 141 +-
plugin/src/main/resources/config.yml | 160 ++
.../main/resources/contents/baits/default.yml | 0
.../resources/contents/blocks/default.yml | 42 +
.../contents/competitions/default.yml | 123 ++
.../resources/contents/enchants/default.yml | 0
.../main/resources/contents/loots/default.yml | 332 +---
.../resources/contents/minigames}/default.yml | 91 +-
.../main/resources/contents/mobs/default.yml | 17 +
.../main/resources/contents/rods/default.yml | 10 +-
.../resources/contents/totems/default.yml | 0
.../contents/totems}/totem_blocks/default.yml | 0
.../main/resources/contents/utils/default.yml | 13 +
plugin/src/main/resources/database.yml | 80 +
plugin/src/main/resources/game-groups.yml | 28 +
plugin/src/main/resources/loot-conditions.yml | 83 +
plugin/src/main/resources/market.yml | 54 +
.../src/main/resources/messages/chinese.yml | 0
.../src/main/resources/messages/english.yml | 26 +
.../src/main/resources/messages/spanish.yml | 0
.../src/main/resources/messages/turkish.yml | 0
plugin/src/main/resources/plugin.yml | 39 +
plugin/src/main/resources/schema/h2.sql | 7 +
plugin/src/main/resources/schema/mariadb.sql | 11 +
plugin/src/main/resources/schema/mysql.sql | 7 +
plugin/src/main/resources/schema/sqlite.sql | 7 +
settings.gradle | 1 -
settings.gradle.kts | 3 +
.../customfishing/CustomFishing.java | 284 ---
.../customfishing/api/CustomFishingAPI.java | 303 ---
.../api/event/FishFinderEvent.java | 65 -
.../api/event/FishResultEvent.java | 110 --
.../api/event/MiniGameStartEvent.java | 65 -
.../customfishing/api/event/RodCastEvent.java | 66 -
.../api/event/SellFishEvent.java | 64 -
.../api/event/TotemActivationEvent.java | 69 -
.../commands/AbstractMainCommand.java | 75 -
.../commands/AbstractSubCommand.java | 134 --
.../commands/FishingBagCommand.java | 81 -
.../customfishing/commands/MainCommand.java | 38 -
.../commands/SellFishCommand.java | 49 -
.../commands/subcmd/AboutCommand.java | 44 -
.../commands/subcmd/CompetitionCommand.java | 88 -
.../commands/subcmd/ConvertCommand.java | 110 --
.../commands/subcmd/DebugCommand.java | 94 -
.../commands/subcmd/HelpCommand.java | 71 -
.../commands/subcmd/OpenBagCommand.java | 57 -
.../commands/subcmd/ReloadCommand.java | 44 -
.../commands/subcmd/SellShopCommand.java | 55 -
.../commands/subcmd/StatisticsCommand.java | 121 --
.../commands/subcmd/item/BaitCommand.java | 122 --
.../commands/subcmd/item/ItemsCommand.java | 33 -
.../commands/subcmd/item/LootCommand.java | 153 --
.../commands/subcmd/item/RodCommand.java | 122 --
.../commands/subcmd/item/UtilCommand.java | 122 --
.../customfishing/data/PlayerSellData.java | 45 -
.../data/PlayerStatisticsData.java | 147 --
.../data/storage/DataStorageInterface.java | 42 -
.../data/storage/FileStorageImpl.java | 149 --
.../data/storage/MySQLStorageImpl.java | 360 ----
.../data/storage/SqlConnection.java | 169 --
.../data/storage/SqlConstants.java | 35 -
.../data/storage/StorageType.java | 6 -
.../fishing/BobberCheckTask.java | 246 ---
.../customfishing/fishing/Effect.java | 163 --
.../customfishing/fishing/FishMeta.java | 4 -
.../customfishing/fishing/FishResult.java | 26 -
.../fishing/FishingCondition.java | 93 -
.../customfishing/fishing/MiniGameConfig.java | 47 -
.../customfishing/fishing/action/Action.java | 35 -
.../fishing/action/ChainImpl.java | 40 -
.../fishing/action/CommandActionImpl.java | 52 -
.../fishing/action/JobXPImpl.java | 25 -
.../fishing/action/MessageActionImpl.java | 52 -
.../fishing/action/SkillXPImpl.java | 42 -
.../fishing/action/SoundActionImpl.java | 46 -
.../fishing/action/VanillaXPImpl.java | 54 -
.../customfishing/fishing/bar/FishingBar.java | 53 -
.../customfishing/fishing/bar/ModeOneBar.java | 70 -
.../fishing/bar/ModeThreeBar.java | 100 -
.../customfishing/fishing/bar/ModeTwoBar.java | 102 -
.../fishing/competition/Competition.java | 283 ---
.../competition/CompetitionConfig.java | 143 --
.../fishing/competition/CompetitionGoal.java | 39 -
.../competition/CompetitionSchedule.java | 119 --
.../competition/bossbar/BossBarConfig.java | 63 -
.../competition/bossbar/BossBarManager.java | 101 -
.../competition/bossbar/BossBarOverlay.java | 26 -
.../competition/ranking/RedisRankingImpl.java | 117 --
.../fishing/loot/DroppedItem.java | 79 -
.../customfishing/fishing/loot/Item.java | 205 --
.../customfishing/fishing/loot/Loot.java | 40 -
.../customfishing/fishing/loot/LootImpl.java | 144 --
.../customfishing/fishing/loot/Mob.java | 48 -
.../customfishing/fishing/loot/MobVector.java | 31 -
.../fishing/mode/FishingGame.java | 149 --
.../fishing/mode/ModeOneGame.java | 78 -
.../fishing/mode/ModeThreeGame.java | 121 --
.../fishing/mode/ModeTwoGame.java | 163 --
.../fishing/requirements/BaitImpl.java | 28 -
.../fishing/requirements/BiomeImpl.java | 44 -
.../fishing/requirements/CompetitionImpl.java | 39 -
.../fishing/requirements/CustomPapi.java | 82 -
.../fishing/requirements/DateImpl.java | 27 -
.../fishing/requirements/JobLevelImpl.java | 27 -
.../fishing/requirements/PermissionImpl.java | 44 -
.../fishing/requirements/Requirement.java | 39 -
.../requirements/RequirementInterface.java | 25 -
.../fishing/requirements/RodImpl.java | 28 -
.../fishing/requirements/SeasonImpl.java | 49 -
.../fishing/requirements/SkillLevelImpl.java | 27 -
.../fishing/requirements/TimeImpl.java | 46 -
.../fishing/requirements/WeatherImpl.java | 50 -
.../fishing/requirements/WorldImpl.java | 44 -
.../fishing/requirements/YPosImpl.java | 46 -
.../requirements/papi/ExpressionAnd.java | 34 -
.../requirements/papi/ExpressionOr.java | 34 -
.../fishing/requirements/papi/PapiEquals.java | 33 -
.../requirements/papi/PapiGreater.java | 32 -
.../requirements/papi/PapiNoLarger.java | 32 -
.../fishing/requirements/papi/PapiNoLess.java | 32 -
.../requirements/papi/PapiNotEquals.java | 33 -
.../requirements/papi/PapiRequirement.java | 26 -
.../requirements/papi/PapiSmaller.java | 32 -
.../fishing/totem/ActivatedTotem.java | 155 --
.../fishing/totem/FinalModel.java | 77 -
.../fishing/totem/OriginalModel.java | 80 -
.../fishing/totem/TotemConfig.java | 125 --
.../fishing/totem/TotemParticle.java | 69 -
.../integration/BlockInterface.java | 50 -
.../integration/JobInterface.java | 8 -
.../integration/MobInterface.java | 25 -
.../integration/SkillInterface.java | 26 -
.../customfishing/integration/VaultHook.java | 40 -
.../block/ItemsAdderBlockImpl.java | 69 -
.../integration/block/OraxenBlockImpl.java | 71 -
.../integration/block/VanillaBlockImpl.java | 54 -
.../item/CustomFishingItemImpl.java | 62 -
.../integration/item/EcoItemRegister.java | 88 -
.../integration/item/ItemsAdderItemImpl.java | 57 -
.../integration/item/MMOItemsItemImpl.java | 65 -
.../integration/item/McMMOTreasure.java | 147 --
.../integration/item/NeigeItemsImpl.java | 37 -
.../integration/item/OraxenItemImpl.java | 57 -
.../integration/job/JobsRebornImpl.java | 92 -
.../integration/mob/MythicMobsMobImpl.java | 59 -
.../integration/papi/CompetitionPapi.java | 96 -
.../integration/papi/PlaceholderManager.java | 166 --
.../integration/papi/StatisticsPapi.java | 69 -
.../integration/quest/BattlePassCFQuest.java | 67 -
.../integration/quest/ClueScrollCFQuest.java | 47 -
.../quest/NewBetonQuestCFQuest.java | 112 --
.../quest/OldBetonQuestCFQuest.java | 159 --
.../listener/BreakBlockListener.java | 38 -
.../listener/ConsumeItemListener.java | 38 -
.../listener/InteractListener.java | 37 -
.../listener/InventoryListener.java | 49 -
.../listener/JobsRebornXPListener.java | 35 -
.../listener/JoinQuitListener.java | 37 -
.../listener/PickUpListener.java | 53 -
.../listener/PlayerFishListener.java | 86 -
.../listener/WindowPacketListener.java | 39 -
.../customfishing/manager/BagDataManager.java | 215 ---
.../manager/BarMechanicManager.java | 135 --
.../manager/CompetitionManager.java | 161 --
.../customfishing/manager/ConfigManager.java | 193 --
.../customfishing/manager/DataManager.java | 103 -
.../customfishing/manager/EffectManager.java | 278 ---
.../customfishing/manager/FishingManager.java | 1106 -----------
.../manager/IntegrationManager.java | 328 ----
.../customfishing/manager/LootManager.java | 327 ----
.../customfishing/manager/MessageManager.java | 118 --
.../customfishing/manager/OffsetManager.java | 135 --
.../customfishing/manager/SellManager.java | 498 -----
.../manager/StatisticsManager.java | 159 --
.../customfishing/manager/TotemManager.java | 689 -------
.../customfishing/object/DataFunction.java | 44 -
.../customfishing/object/Function.java | 63 -
.../object/InventoryFunction.java | 26 -
.../object/LeveledEnchantment.java | 24 -
.../customfishing/object/SimpleLocation.java | 57 -
.../scheduler/BukkitSchedulerImpl.java | 50 -
.../scheduler/BukkitTimerTask.java | 22 -
.../scheduler/FoliaSchedulerImpl.java | 33 -
.../scheduler/FoliaTimerTask.java | 22 -
.../customfishing/scheduler/Scheduler.java | 95 -
.../customfishing/scheduler/TimerTask.java | 8 -
.../customfishing/util/AdventureUtils.java | 315 ---
.../customfishing/util/ConfigUtils.java | 259 ---
.../customfishing/util/InventoryUtils.java | 151 --
.../customfishing/util/ItemStackUtils.java | 282 ---
.../customfishing/util/JedisUtils.java | 88 -
.../customfishing/util/LocationUtils.java | 65 -
src/main/resources/config.yml | 253 ---
.../resources/contents/categories/default.yml | 51 -
.../contents/competitions/default.yml | 94 -
.../resources/contents/enchants/default.yml | 61 -
src/main/resources/contents/loots/example.yml | 264 ---
.../resources/contents/minigames/default.yml | 110 --
src/main/resources/contents/mobs/default.yml | 26 -
.../resources/contents/utils/fish_finder.yml | 7 -
.../resources/contents/utils/splash_items.yml | 6 -
.../resources/contents/utils/totem_items.yml | 5 -
src/main/resources/database.yml | 59 -
.../resources/messages/messages_english.yml | 39 -
src/main/resources/plugin.yml | 71 -
src/main/resources/sell-fish.yml | 116 --
416 files changed, 16225 insertions(+), 18659 deletions(-)
create mode 100644 api/.gitignore
create mode 100644 api/build.gradle.kts
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/CustomFishingPlugin.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/common/Key.java
rename {src/main/java/net/momirealms/customfishing/object => api/src/main/java/net/momirealms/customfishing/api/common}/Pair.java (94%)
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/common/Tuple.java
rename src/main/java/net/momirealms/customfishing/fishing/totem/CorePos.java => api/src/main/java/net/momirealms/customfishing/api/data/DataStorageInterface.java (61%)
rename src/main/java/net/momirealms/customfishing/fishing/VanillaLoot.java => api/src/main/java/net/momirealms/customfishing/api/data/EarningData.java (62%)
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/data/InventoryData.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/data/PlayerData.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/data/StatisticData.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/data/StorageType.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/data/user/OfflineUser.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/data/user/OnlineUser.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/event/LavaFishingEvent.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/event/RodCastEvent.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/event/TotemActivateEvent.java
rename {src/main/java/net/momirealms/customfishing => api/src/main/java/net/momirealms/customfishing/api}/integration/EnchantmentInterface.java (74%)
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/integration/LevelInterface.java
rename {src/main/java/net/momirealms/customfishing => api/src/main/java/net/momirealms/customfishing/api}/integration/SeasonInterface.java (93%)
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/manager/ActionManager.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/manager/AdventureManager.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/manager/BagManager.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/manager/BlockManager.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/manager/CommandManager.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/manager/CompetitionManager.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/manager/EffectManager.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/manager/FishingManager.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/manager/GameManager.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/manager/IntegrationManager.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/manager/ItemManager.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/manager/LootManager.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/manager/MarketManager.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/manager/MobManager.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/manager/PlaceholderManager.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/manager/RequirementManager.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/manager/StorageManager.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/manager/TotemManager.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/manager/VersionManager.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/TempFishingState.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/action/Action.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/action/ActionBuilder.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/action/ActionTrigger.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/bag/FishingBagHolder.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockConfig.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockDataModifier.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockDataModifierBuilder.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockLibrary.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockSettings.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockStateModifier.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockStateModifierBuilder.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/AbstractCompetitionInfo.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/ActionBarConfig.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/BossBarConfig.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionConfig.java
rename src/main/java/net/momirealms/customfishing/fishing/action/AbstractAction.java => api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionGoal.java (64%)
rename {src/main/java/net/momirealms/customfishing/fishing => api/src/main/java/net/momirealms/customfishing/api/mechanic}/competition/CompetitionPlayer.java (73%)
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/FishingCompetition.java
rename src/main/java/net/momirealms/customfishing/fishing/competition/ranking/RankingInterface.java => api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/Ranking.java (68%)
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/condition/Condition.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/condition/FishingPreparation.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/AbstractEffect.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/Effect.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/FishingEffect.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/game/AbstractGame.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/game/AbstractGamingPlayer.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/game/Game.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/game/GameConfig.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/game/GameGroup.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/game/GameGroups.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/game/GameSettings.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/game/GamingPlayer.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/item/BuildableItem.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/item/ItemBuilder.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/item/ItemLibrary.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/Loot.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/LootType.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/Modifier.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/market/MarketGUI.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/mob/MobConfig.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/mob/MobLibrary.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/mob/MobSettings.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/requirement/Requirement.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/requirement/RequirementBuilder.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/mechanic/statistic/Statistics.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/scheduler/CancellableTask.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/scheduler/Scheduler.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/util/FontUtils.java
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/util/InventoryUtils.java
rename src/main/java/net/momirealms/customfishing/helper/Log.java => api/src/main/java/net/momirealms/customfishing/api/util/LogUtils.java (78%)
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/util/OffsetUtils.java
rename src/main/java/net/momirealms/customfishing/object/Reflection.java => api/src/main/java/net/momirealms/customfishing/api/util/ReflectionUtils.java (56%)
create mode 100644 api/src/main/java/net/momirealms/customfishing/api/util/WeightUtils.java
delete mode 100644 build.gradle
create mode 100644 build.gradle.kts
delete mode 100644 libs/BetonQuest2.0.0-dev-668.jar
delete mode 100644 libs/ClueScrolls-api.jar
delete mode 100644 libs/battle-pass-api.jar
create mode 100644 plugin/.gitignore
create mode 100644 plugin/build.gradle.kts
rename {libs => plugin/libs}/AdvancedEnchantments-api.jar (100%)
rename {libs => plugin/libs}/BiomeAPI.jar (100%)
rename libs/CustomCrops-api-3.3.1.2.jar => plugin/libs/CustomCrops-api.jar (100%)
rename {libs => plugin/libs}/RealisticSeasons-api.jar (100%)
rename {libs => plugin/libs}/mcMMO-api.jar (100%)
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/CustomFishingPluginImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/adventure/AdventureManagerImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/command/CommandManagerImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/command/sub/CompetitionCommand.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/command/sub/FishingBagCommand.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/command/sub/ItemCommand.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/compatibility/IntegrationManagerImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/compatibility/block/ItemsAdderBlockImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/compatibility/block/VanillaBlockImpl.java
rename src/main/java/net/momirealms/customfishing/integration/enchantment/AEImpl.java => plugin/src/main/java/net/momirealms/customfishing/compatibility/enchant/AdvancedEnchantmentsImpl.java (70%)
rename src/main/java/net/momirealms/customfishing/integration/enchantment/VanillaImpl.java => plugin/src/main/java/net/momirealms/customfishing/compatibility/enchant/VanillaEnchantmentsImpl.java (81%)
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/compatibility/item/CustomFishingItemImpl.java
rename src/main/java/net/momirealms/customfishing/fishing/action/PotionEffectImpl.java => plugin/src/main/java/net/momirealms/customfishing/compatibility/item/ItemsAdderItemImpl.java (52%)
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/compatibility/item/MMOItemsItemImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/compatibility/item/McMMOBuildableItem.java
rename {src/main/java/net/momirealms/customfishing/integration => plugin/src/main/java/net/momirealms/customfishing/compatibility}/item/MythicMobsItemImpl.java (67%)
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/compatibility/item/NeigeItemsItemImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/compatibility/item/OraxenItemImpl.java
rename src/main/java/net/momirealms/customfishing/integration/ItemInterface.java => plugin/src/main/java/net/momirealms/customfishing/compatibility/item/VanillaItemImpl.java (56%)
rename src/main/java/net/momirealms/customfishing/integration/skill/AureliumsImpl.java => plugin/src/main/java/net/momirealms/customfishing/compatibility/level/AureliumSkillsImpl.java (63%)
rename {src/main/java/net/momirealms/customfishing/integration/job => plugin/src/main/java/net/momirealms/customfishing/compatibility/level}/EcoJobsImpl.java (64%)
rename {src/main/java/net/momirealms/customfishing/integration/skill => plugin/src/main/java/net/momirealms/customfishing/compatibility/level}/EcoSkillsImpl.java (60%)
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/compatibility/level/JobsRebornImpl.java
rename {src/main/java/net/momirealms/customfishing/integration/skill => plugin/src/main/java/net/momirealms/customfishing/compatibility/level}/MMOCoreImpl.java (60%)
rename src/main/java/net/momirealms/customfishing/integration/skill/mcMMOImpl.java => plugin/src/main/java/net/momirealms/customfishing/compatibility/level/McMMOImpl.java (65%)
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/compatibility/mob/MythicMobsLibraryImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/compatibility/mob/VanillaMobImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/compatibility/papi/MiniPlaceholdersHook.java
rename src/main/java/net/momirealms/customfishing/integration/papi/ParseUtil.java => plugin/src/main/java/net/momirealms/customfishing/compatibility/papi/ParseUtils.java (92%)
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/compatibility/papi/PlaceholderAPIHook.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/compatibility/papi/PlaceholderManagerImpl.java
rename {src/main/java/net/momirealms/customfishing/integration => plugin/src/main/java/net/momirealms/customfishing/compatibility}/season/CustomCropsSeasonImpl.java (90%)
rename {src/main/java/net/momirealms/customfishing/integration => plugin/src/main/java/net/momirealms/customfishing/compatibility}/season/RealisticSeasonsImpl.java (90%)
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/libraries/inventorygui/DynamicGuiElement.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/libraries/inventorygui/GuiBackElement.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/libraries/inventorygui/GuiElement.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/libraries/inventorygui/GuiElementGroup.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/libraries/inventorygui/GuiPageElement.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/libraries/inventorygui/GuiStateElement.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/libraries/inventorygui/GuiStorageElement.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/libraries/inventorygui/InventoryGui.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/libraries/inventorygui/StaticGuiElement.java
rename {src/main/java/net/momirealms/customfishing/helper => plugin/src/main/java/net/momirealms/customfishing/libraries/libraryloader}/LibraryLoader.java (53%)
rename {src/main/java/net/momirealms/customfishing/helper => plugin/src/main/java/net/momirealms/customfishing/libraries/libraryloader}/MavenLibraries.java (96%)
rename {src/main/java/net/momirealms/customfishing/helper => plugin/src/main/java/net/momirealms/customfishing/libraries/libraryloader}/MavenLibrary.java (97%)
rename {src/main/java/net/momirealms/customfishing/helper => plugin/src/main/java/net/momirealms/customfishing/libraries/libraryloader}/Repository.java (96%)
rename {src/main/java/net/momirealms/customfishing/helper => plugin/src/main/java/net/momirealms/customfishing/libraries/libraryloader}/URLClassLoaderAccess.java (98%)
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/action/ActionManagerImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/bag/BagManagerImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/block/BlockManagerImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/Competition.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/CompetitionManagerImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/CompetitionSchedule.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/actionbar/ActionBarManager.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/actionbar/ActionBarSender.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/bossbar/BossBarManager.java
rename {src/main/java/net/momirealms/customfishing/fishing => plugin/src/main/java/net/momirealms/customfishing/mechanic}/competition/bossbar/BossBarSender.java (50%)
rename {src/main/java/net/momirealms/customfishing/fishing => plugin/src/main/java/net/momirealms/customfishing/mechanic}/competition/ranking/LocalRankingImpl.java (76%)
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/ranking/RedisRankingImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/effect/EffectManagerImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/fishing/BaitAnimationTask.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/fishing/FishingManagerImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/fishing/HookCheckTimerTask.java
rename src/main/java/net/momirealms/customfishing/fishing/LavaEffect.java => plugin/src/main/java/net/momirealms/customfishing/mechanic/fishing/LavaEffectTask.java (60%)
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/game/GameManagerImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/item/ItemManagerImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/loot/LootManagerImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/market/MarketManagerImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/mob/MobManagerImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/requirement/AbstractRequirement.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/requirement/ConditionalLoots.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/requirement/RequirementManagerImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/requirement/inbuilt/LogicRequirement.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/mechanic/totem/TotemManagerImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/scheduler/BukkitSchedulerImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/scheduler/FoliaSchedulerImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/scheduler/SchedulerImpl.java
rename src/main/java/net/momirealms/customfishing/scheduler/SchedulerPlatform.java => plugin/src/main/java/net/momirealms/customfishing/scheduler/SyncScheduler.java (68%)
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/setting/Config.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/setting/Locale.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/storage/StorageManagerImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/storage/method/AbstractStorage.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/storage/method/database/nosql/MongoDBImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/storage/method/database/nosql/RedisManager.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/storage/method/database/sql/AbstractHikariDatabase.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/storage/method/database/sql/AbstractSQLDatabase.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/storage/method/database/sql/H2Impl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/storage/method/database/sql/MariaDBImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/storage/method/database/sql/MySQLImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/storage/method/database/sql/SQLiteImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/storage/method/file/JsonImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/storage/method/file/YAMLImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/storage/user/OfflineUserImpl.java
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/storage/user/OnlineUserImpl.java
rename {src => plugin/src}/main/java/net/momirealms/customfishing/util/ArmorStandUtils.java (82%)
create mode 100644 plugin/src/main/java/net/momirealms/customfishing/util/ConfigUtils.java
rename {src/main/java/net/momirealms/customfishing/object => plugin/src/main/java/net/momirealms/customfishing/util}/DynamicText.java (63%)
rename {src => plugin/src}/main/java/net/momirealms/customfishing/util/FakeItemUtils.java (76%)
rename {src => plugin/src}/main/java/net/momirealms/customfishing/util/NBTUtils.java (79%)
rename src/main/java/net/momirealms/customfishing/helper/VersionHelper.java => plugin/src/main/java/net/momirealms/customfishing/version/VersionManagerImpl.java (51%)
create mode 100644 plugin/src/main/resources/config.yml
rename {src => plugin/src}/main/resources/contents/baits/default.yml (100%)
create mode 100644 plugin/src/main/resources/contents/blocks/default.yml
create mode 100644 plugin/src/main/resources/contents/competitions/default.yml
create mode 100644 plugin/src/main/resources/contents/enchants/default.yml
rename {src => plugin/src}/main/resources/contents/loots/default.yml (75%)
rename {src/main/resources/contents/bars => plugin/src/main/resources/contents/minigames}/default.yml (84%)
create mode 100644 plugin/src/main/resources/contents/mobs/default.yml
rename {src => plugin/src}/main/resources/contents/rods/default.yml (88%)
rename {src => plugin/src}/main/resources/contents/totems/default.yml (100%)
rename {src/main/resources/contents => plugin/src/main/resources/contents/totems}/totem_blocks/default.yml (100%)
rename src/main/resources/contents/utils/fisherman_talismans.yml => plugin/src/main/resources/contents/utils/default.yml (62%)
create mode 100644 plugin/src/main/resources/database.yml
create mode 100644 plugin/src/main/resources/game-groups.yml
create mode 100644 plugin/src/main/resources/loot-conditions.yml
create mode 100644 plugin/src/main/resources/market.yml
rename src/main/resources/messages/messages_chinese.yml => plugin/src/main/resources/messages/chinese.yml (100%)
create mode 100644 plugin/src/main/resources/messages/english.yml
rename src/main/resources/messages/messages_spanish.yml => plugin/src/main/resources/messages/spanish.yml (100%)
rename src/main/resources/messages/messages_turkish.yml => plugin/src/main/resources/messages/turkish.yml (100%)
create mode 100644 plugin/src/main/resources/plugin.yml
create mode 100644 plugin/src/main/resources/schema/h2.sql
create mode 100644 plugin/src/main/resources/schema/mariadb.sql
create mode 100644 plugin/src/main/resources/schema/mysql.sql
create mode 100644 plugin/src/main/resources/schema/sqlite.sql
delete mode 100644 settings.gradle
create mode 100644 settings.gradle.kts
delete mode 100644 src/main/java/net/momirealms/customfishing/CustomFishing.java
delete mode 100644 src/main/java/net/momirealms/customfishing/api/CustomFishingAPI.java
delete mode 100644 src/main/java/net/momirealms/customfishing/api/event/FishFinderEvent.java
delete mode 100644 src/main/java/net/momirealms/customfishing/api/event/FishResultEvent.java
delete mode 100644 src/main/java/net/momirealms/customfishing/api/event/MiniGameStartEvent.java
delete mode 100644 src/main/java/net/momirealms/customfishing/api/event/RodCastEvent.java
delete mode 100644 src/main/java/net/momirealms/customfishing/api/event/SellFishEvent.java
delete mode 100644 src/main/java/net/momirealms/customfishing/api/event/TotemActivationEvent.java
delete mode 100644 src/main/java/net/momirealms/customfishing/commands/AbstractMainCommand.java
delete mode 100644 src/main/java/net/momirealms/customfishing/commands/AbstractSubCommand.java
delete mode 100644 src/main/java/net/momirealms/customfishing/commands/FishingBagCommand.java
delete mode 100644 src/main/java/net/momirealms/customfishing/commands/MainCommand.java
delete mode 100644 src/main/java/net/momirealms/customfishing/commands/SellFishCommand.java
delete mode 100644 src/main/java/net/momirealms/customfishing/commands/subcmd/AboutCommand.java
delete mode 100644 src/main/java/net/momirealms/customfishing/commands/subcmd/CompetitionCommand.java
delete mode 100644 src/main/java/net/momirealms/customfishing/commands/subcmd/ConvertCommand.java
delete mode 100644 src/main/java/net/momirealms/customfishing/commands/subcmd/DebugCommand.java
delete mode 100644 src/main/java/net/momirealms/customfishing/commands/subcmd/HelpCommand.java
delete mode 100644 src/main/java/net/momirealms/customfishing/commands/subcmd/OpenBagCommand.java
delete mode 100644 src/main/java/net/momirealms/customfishing/commands/subcmd/ReloadCommand.java
delete mode 100644 src/main/java/net/momirealms/customfishing/commands/subcmd/SellShopCommand.java
delete mode 100644 src/main/java/net/momirealms/customfishing/commands/subcmd/StatisticsCommand.java
delete mode 100644 src/main/java/net/momirealms/customfishing/commands/subcmd/item/BaitCommand.java
delete mode 100644 src/main/java/net/momirealms/customfishing/commands/subcmd/item/ItemsCommand.java
delete mode 100644 src/main/java/net/momirealms/customfishing/commands/subcmd/item/LootCommand.java
delete mode 100644 src/main/java/net/momirealms/customfishing/commands/subcmd/item/RodCommand.java
delete mode 100644 src/main/java/net/momirealms/customfishing/commands/subcmd/item/UtilCommand.java
delete mode 100644 src/main/java/net/momirealms/customfishing/data/PlayerSellData.java
delete mode 100644 src/main/java/net/momirealms/customfishing/data/PlayerStatisticsData.java
delete mode 100644 src/main/java/net/momirealms/customfishing/data/storage/DataStorageInterface.java
delete mode 100644 src/main/java/net/momirealms/customfishing/data/storage/FileStorageImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/data/storage/MySQLStorageImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/data/storage/SqlConnection.java
delete mode 100644 src/main/java/net/momirealms/customfishing/data/storage/SqlConstants.java
delete mode 100644 src/main/java/net/momirealms/customfishing/data/storage/StorageType.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/BobberCheckTask.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/Effect.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/FishMeta.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/FishResult.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/FishingCondition.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/MiniGameConfig.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/action/Action.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/action/ChainImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/action/CommandActionImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/action/JobXPImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/action/MessageActionImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/action/SkillXPImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/action/SoundActionImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/action/VanillaXPImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/bar/FishingBar.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/bar/ModeOneBar.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/bar/ModeThreeBar.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/bar/ModeTwoBar.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/competition/Competition.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/competition/CompetitionConfig.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/competition/CompetitionGoal.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/competition/CompetitionSchedule.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/competition/bossbar/BossBarConfig.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/competition/bossbar/BossBarManager.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/competition/bossbar/BossBarOverlay.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/competition/ranking/RedisRankingImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/loot/DroppedItem.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/loot/Item.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/loot/Loot.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/loot/LootImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/loot/Mob.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/loot/MobVector.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/mode/FishingGame.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/mode/ModeOneGame.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/mode/ModeThreeGame.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/mode/ModeTwoGame.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/BaitImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/BiomeImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/CompetitionImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/CustomPapi.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/DateImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/JobLevelImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/PermissionImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/Requirement.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/RequirementInterface.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/RodImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/SeasonImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/SkillLevelImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/TimeImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/WeatherImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/WorldImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/YPosImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/papi/ExpressionAnd.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/papi/ExpressionOr.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/papi/PapiEquals.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/papi/PapiGreater.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/papi/PapiNoLarger.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/papi/PapiNoLess.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/papi/PapiNotEquals.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/papi/PapiRequirement.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/requirements/papi/PapiSmaller.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/totem/ActivatedTotem.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/totem/FinalModel.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/totem/OriginalModel.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/totem/TotemConfig.java
delete mode 100644 src/main/java/net/momirealms/customfishing/fishing/totem/TotemParticle.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/BlockInterface.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/JobInterface.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/MobInterface.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/SkillInterface.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/VaultHook.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/block/ItemsAdderBlockImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/block/OraxenBlockImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/block/VanillaBlockImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/item/CustomFishingItemImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/item/EcoItemRegister.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/item/ItemsAdderItemImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/item/MMOItemsItemImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/item/McMMOTreasure.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/item/NeigeItemsImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/item/OraxenItemImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/job/JobsRebornImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/mob/MythicMobsMobImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/papi/CompetitionPapi.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/papi/PlaceholderManager.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/papi/StatisticsPapi.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/quest/BattlePassCFQuest.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/quest/ClueScrollCFQuest.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/quest/NewBetonQuestCFQuest.java
delete mode 100644 src/main/java/net/momirealms/customfishing/integration/quest/OldBetonQuestCFQuest.java
delete mode 100644 src/main/java/net/momirealms/customfishing/listener/BreakBlockListener.java
delete mode 100644 src/main/java/net/momirealms/customfishing/listener/ConsumeItemListener.java
delete mode 100644 src/main/java/net/momirealms/customfishing/listener/InteractListener.java
delete mode 100644 src/main/java/net/momirealms/customfishing/listener/InventoryListener.java
delete mode 100644 src/main/java/net/momirealms/customfishing/listener/JobsRebornXPListener.java
delete mode 100644 src/main/java/net/momirealms/customfishing/listener/JoinQuitListener.java
delete mode 100644 src/main/java/net/momirealms/customfishing/listener/PickUpListener.java
delete mode 100644 src/main/java/net/momirealms/customfishing/listener/PlayerFishListener.java
delete mode 100644 src/main/java/net/momirealms/customfishing/listener/WindowPacketListener.java
delete mode 100644 src/main/java/net/momirealms/customfishing/manager/BagDataManager.java
delete mode 100644 src/main/java/net/momirealms/customfishing/manager/BarMechanicManager.java
delete mode 100644 src/main/java/net/momirealms/customfishing/manager/CompetitionManager.java
delete mode 100644 src/main/java/net/momirealms/customfishing/manager/ConfigManager.java
delete mode 100644 src/main/java/net/momirealms/customfishing/manager/DataManager.java
delete mode 100644 src/main/java/net/momirealms/customfishing/manager/EffectManager.java
delete mode 100644 src/main/java/net/momirealms/customfishing/manager/FishingManager.java
delete mode 100644 src/main/java/net/momirealms/customfishing/manager/IntegrationManager.java
delete mode 100644 src/main/java/net/momirealms/customfishing/manager/LootManager.java
delete mode 100644 src/main/java/net/momirealms/customfishing/manager/MessageManager.java
delete mode 100644 src/main/java/net/momirealms/customfishing/manager/OffsetManager.java
delete mode 100644 src/main/java/net/momirealms/customfishing/manager/SellManager.java
delete mode 100644 src/main/java/net/momirealms/customfishing/manager/StatisticsManager.java
delete mode 100644 src/main/java/net/momirealms/customfishing/manager/TotemManager.java
delete mode 100644 src/main/java/net/momirealms/customfishing/object/DataFunction.java
delete mode 100644 src/main/java/net/momirealms/customfishing/object/Function.java
delete mode 100644 src/main/java/net/momirealms/customfishing/object/InventoryFunction.java
delete mode 100644 src/main/java/net/momirealms/customfishing/object/LeveledEnchantment.java
delete mode 100644 src/main/java/net/momirealms/customfishing/object/SimpleLocation.java
delete mode 100644 src/main/java/net/momirealms/customfishing/scheduler/BukkitSchedulerImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/scheduler/BukkitTimerTask.java
delete mode 100644 src/main/java/net/momirealms/customfishing/scheduler/FoliaSchedulerImpl.java
delete mode 100644 src/main/java/net/momirealms/customfishing/scheduler/FoliaTimerTask.java
delete mode 100644 src/main/java/net/momirealms/customfishing/scheduler/Scheduler.java
delete mode 100644 src/main/java/net/momirealms/customfishing/scheduler/TimerTask.java
delete mode 100644 src/main/java/net/momirealms/customfishing/util/AdventureUtils.java
delete mode 100644 src/main/java/net/momirealms/customfishing/util/ConfigUtils.java
delete mode 100644 src/main/java/net/momirealms/customfishing/util/InventoryUtils.java
delete mode 100644 src/main/java/net/momirealms/customfishing/util/ItemStackUtils.java
delete mode 100644 src/main/java/net/momirealms/customfishing/util/JedisUtils.java
delete mode 100644 src/main/java/net/momirealms/customfishing/util/LocationUtils.java
delete mode 100644 src/main/resources/config.yml
delete mode 100644 src/main/resources/contents/categories/default.yml
delete mode 100644 src/main/resources/contents/competitions/default.yml
delete mode 100644 src/main/resources/contents/enchants/default.yml
delete mode 100644 src/main/resources/contents/loots/example.yml
delete mode 100644 src/main/resources/contents/minigames/default.yml
delete mode 100644 src/main/resources/contents/mobs/default.yml
delete mode 100644 src/main/resources/contents/utils/fish_finder.yml
delete mode 100644 src/main/resources/contents/utils/splash_items.yml
delete mode 100644 src/main/resources/contents/utils/totem_items.yml
delete mode 100644 src/main/resources/database.yml
delete mode 100644 src/main/resources/messages/messages_english.yml
delete mode 100644 src/main/resources/plugin.yml
delete mode 100644 src/main/resources/sell-fish.yml
diff --git a/.gitignore b/.gitignore
index f9e16241..8dc84b51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,8 @@
-# User-specific stuff
+# Folders
.idea/
-
-*.iml
-*.ipr
-*.iws
-
-# IntelliJ
-out/
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
+.gradle/
+build/
+target/
# Compiled class file
*.class
@@ -22,6 +13,9 @@ atlassian-ide-plugin.xml
# BlueJ files
*.ctxt
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
# Package Files #
*.war
*.nar
@@ -32,86 +26,4 @@ atlassian-ide-plugin.xml
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
-
-*~
-
-# temporary files which can be created if a process still has a handle open of a deleted file
-.fuse_hidden*
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
-
-# .nfs files are created when an open file is removed but is still being accessed
-.nfs*
-
-# General
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-# Windows thumbnail cache files
-Thumbs.db
-Thumbs.db:encryptable
-ehthumbs.db
-ehthumbs_vista.db
-
-# Dump file
-*.stackdump
-
-# Folder config file
-[Dd]esktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-.gradle
-build/
-
-# Ignore Gradle GUI config
-gradle-app.setting
-
-# Cache of project
-.gradletasknamecache
-
-**/build/
-
-# Common working directory
-run/
-
-# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
+replay_pid*
diff --git a/api/.gitignore b/api/.gitignore
new file mode 100644
index 00000000..b63da455
--- /dev/null
+++ b/api/.gitignore
@@ -0,0 +1,42 @@
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
\ No newline at end of file
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
new file mode 100644
index 00000000..bb54151d
--- /dev/null
+++ b/api/build.gradle.kts
@@ -0,0 +1,5 @@
+dependencies {
+ compileOnly("io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT")
+ compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0")
+ implementation("de.tr7zw:item-nbt-api:2.11.3")
+}
\ No newline at end of file
diff --git a/api/src/main/java/net/momirealms/customfishing/api/CustomFishingPlugin.java b/api/src/main/java/net/momirealms/customfishing/api/CustomFishingPlugin.java
new file mode 100644
index 00000000..0f0f4209
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/CustomFishingPlugin.java
@@ -0,0 +1,125 @@
+package net.momirealms.customfishing.api;
+
+import net.momirealms.customfishing.api.manager.*;
+import net.momirealms.customfishing.api.scheduler.Scheduler;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public abstract class CustomFishingPlugin extends JavaPlugin {
+
+ protected Scheduler scheduler;
+ protected CommandManager commandManager;
+ protected VersionManager versionManager;
+ protected ItemManager itemManager;
+ protected RequirementManager requirementManager;
+ protected ActionManager actionManager;
+ protected LootManager lootManager;
+ protected FishingManager fishingManager;
+ protected EffectManager effectManager;
+ protected MobManager mobManager;
+ protected BlockManager blockManager;
+ protected AdventureManager adventure;
+ protected BagManager bagManager;
+ protected GameManager gameManager;
+ protected MarketManager marketManager;
+ protected IntegrationManager integrationManager;
+ protected CompetitionManager competitionManager;
+ protected StorageManager storageManager;
+ protected PlaceholderManager placeholderManager;
+
+ private static CustomFishingPlugin instance;
+
+ public CustomFishingPlugin() {
+ instance = this;
+ }
+
+ public static CustomFishingPlugin get() {
+ return instance;
+ }
+
+ public static CustomFishingPlugin getInstance() {
+ return instance;
+ }
+
+ public Scheduler getScheduler() {
+ return scheduler;
+ }
+
+ public CommandManager getCommandManager() {
+ return commandManager;
+ }
+
+ public VersionManager getVersionManager() {
+ return versionManager;
+ }
+
+ public RequirementManager getRequirementManager() {
+ return requirementManager;
+ }
+
+ public ActionManager getActionManager() {
+ return actionManager;
+ }
+
+ public GameManager getGameManager() {
+ return gameManager;
+ }
+
+ public BlockManager getBlockManager() {
+ return blockManager;
+ }
+
+ public MobManager getMobManager() {
+ return mobManager;
+ }
+
+ public ItemManager getItemManager() {
+ return itemManager;
+ }
+
+ public EffectManager getEffectManager() {
+ return effectManager;
+ }
+
+ public MarketManager getMarketManager() {
+ return marketManager;
+ }
+
+ public FishingManager getFishingManager() {
+ return fishingManager;
+ }
+
+ public AdventureManager getAdventure() {
+ return adventure;
+ }
+
+ public BagManager getBagManager() {
+ return bagManager;
+ }
+
+ public LootManager getLootManager() {
+ return lootManager;
+ }
+
+ public StorageManager getStorageManager() {
+ return storageManager;
+ }
+
+ public IntegrationManager getIntegrationManager() {
+ return integrationManager;
+ }
+
+ public PlaceholderManager getPlaceholderManager() {
+ return placeholderManager;
+ }
+
+ public abstract void reload();
+
+ public abstract YamlConfiguration getConfig(String file);
+
+ public abstract boolean isHookedPluginEnabled(String plugin);
+
+ public CompetitionManager getCompetitionManager() {
+ return competitionManager;
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/common/Key.java b/api/src/main/java/net/momirealms/customfishing/api/common/Key.java
new file mode 100644
index 00000000..3c23f965
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/common/Key.java
@@ -0,0 +1,29 @@
+package net.momirealms.customfishing.api.common;
+
+public record Key(String namespace, String value) {
+
+ public static Key of(String namespace, String value) {
+ return new Key(namespace, value);
+ }
+
+ @Override
+ public int hashCode() {
+ int result = this.namespace.hashCode();
+ result = (31 * result) + this.value.hashCode();
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null) {
+ return false;
+ }
+ if (!(obj instanceof Key key)) return false;
+ return this.namespace.equals(key.namespace()) && this.value.equals(key.value());
+ }
+
+ @Override
+ public String toString() {
+ return namespace + ":" + value;
+ }
+}
diff --git a/src/main/java/net/momirealms/customfishing/object/Pair.java b/api/src/main/java/net/momirealms/customfishing/api/common/Pair.java
similarity index 94%
rename from src/main/java/net/momirealms/customfishing/object/Pair.java
rename to api/src/main/java/net/momirealms/customfishing/api/common/Pair.java
index ad4a71e6..2491adcd 100644
--- a/src/main/java/net/momirealms/customfishing/object/Pair.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/common/Pair.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package net.momirealms.customfishing.object;
+package net.momirealms.customfishing.api.common;
public record Pair(L left, R right) {
diff --git a/api/src/main/java/net/momirealms/customfishing/api/common/Tuple.java b/api/src/main/java/net/momirealms/customfishing/api/common/Tuple.java
new file mode 100644
index 00000000..a3e81b45
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/common/Tuple.java
@@ -0,0 +1,42 @@
+package net.momirealms.customfishing.api.common;
+
+public class Tuple {
+
+ private L left;
+ private M mid;
+ private R right;
+
+ public Tuple(L left, M mid, R right) {
+ this.left = left;
+ this.mid = mid;
+ this.right = right;
+ }
+
+ public static Tuple of(final L left, final M mid, final R right) {
+ return new Tuple<>(left, mid, right);
+ }
+
+ public L getLeft() {
+ return left;
+ }
+
+ public void setLeft(L left) {
+ this.left = left;
+ }
+
+ public M getMid() {
+ return mid;
+ }
+
+ public void setMid(M mid) {
+ this.mid = mid;
+ }
+
+ public R getRight() {
+ return right;
+ }
+
+ public void setRight(R right) {
+ this.right = right;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/net/momirealms/customfishing/fishing/totem/CorePos.java b/api/src/main/java/net/momirealms/customfishing/api/data/DataStorageInterface.java
similarity index 61%
rename from src/main/java/net/momirealms/customfishing/fishing/totem/CorePos.java
rename to api/src/main/java/net/momirealms/customfishing/api/data/DataStorageInterface.java
index b6ddccb4..8332bfe8 100644
--- a/src/main/java/net/momirealms/customfishing/fishing/totem/CorePos.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/data/DataStorageInterface.java
@@ -15,29 +15,20 @@
* along with this program. If not, see .
*/
-package net.momirealms.customfishing.fishing.totem;
+package net.momirealms.customfishing.api.data;
-public class CorePos {
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
- private final int x;
- private final int y;
- private final int z;
+public interface DataStorageInterface {
- public CorePos(int x, int z, int y) {
- this.x = x;
- this.z = z;
- this.y = y;
- }
+ void initialize();
+ void disable();
- public int getX() {
- return this.x;
- }
+ StorageType getStorageType();
- public int getY() {
- return this.y;
- }
+ CompletableFuture> getPlayerData(UUID uuid, boolean force);
- public int getZ() {
- return this.z;
- }
+ CompletableFuture setPlayData(UUID uuid, PlayerData playerData, boolean unlock);
}
diff --git a/src/main/java/net/momirealms/customfishing/fishing/VanillaLoot.java b/api/src/main/java/net/momirealms/customfishing/api/data/EarningData.java
similarity index 62%
rename from src/main/java/net/momirealms/customfishing/fishing/VanillaLoot.java
rename to api/src/main/java/net/momirealms/customfishing/api/data/EarningData.java
index 89ead047..38b4d3d6 100644
--- a/src/main/java/net/momirealms/customfishing/fishing/VanillaLoot.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/data/EarningData.java
@@ -15,25 +15,23 @@
* along with this program. If not, see .
*/
-package net.momirealms.customfishing.fishing;
+package net.momirealms.customfishing.api.data;
-import org.bukkit.inventory.ItemStack;
+import com.google.gson.annotations.SerializedName;
-public class VanillaLoot {
+public class EarningData {
- private final ItemStack itemStack;
- private final int xp;
+ @SerializedName("earnings")
+ public double earnings;
+ @SerializedName("date")
+ public int date;
- public VanillaLoot(ItemStack itemStack, int xp) {
- this.itemStack = itemStack;
- this.xp = xp;
+ public EarningData(double earnings, int date) {
+ this.earnings = earnings;
+ this.date = date;
}
- public ItemStack getItemStack() {
- return itemStack;
- }
-
- public int getXp() {
- return xp;
+ public static EarningData empty() {
+ return new EarningData(0d, 0);
}
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/data/InventoryData.java b/api/src/main/java/net/momirealms/customfishing/api/data/InventoryData.java
new file mode 100644
index 00000000..c5ca476f
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/data/InventoryData.java
@@ -0,0 +1,21 @@
+package net.momirealms.customfishing.api.data;
+
+import com.google.gson.annotations.SerializedName;
+
+public class InventoryData {
+
+ @SerializedName("inventory")
+ public String serialized;
+
+ @SerializedName("size")
+ public int size;
+
+ public static InventoryData empty() {
+ return new InventoryData("", 9);
+ }
+
+ public InventoryData(String serialized, int size) {
+ this.serialized = serialized;
+ this.size = size;
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/data/PlayerData.java b/api/src/main/java/net/momirealms/customfishing/api/data/PlayerData.java
new file mode 100644
index 00000000..5e9188dd
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/data/PlayerData.java
@@ -0,0 +1,81 @@
+package net.momirealms.customfishing.api.data;
+
+import com.google.gson.annotations.SerializedName;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class PlayerData {
+
+ @SerializedName("name")
+ protected String name;
+ @SerializedName("stats")
+ protected StatisticData statisticsData;
+ @SerializedName("bag")
+ protected InventoryData bagData;
+ @SerializedName("trade")
+ protected EarningData earningData;
+
+ public static PlayerData NEVER_PLAYED = empty();
+
+ public static PlayerData empty() {
+ return new Builder()
+ .setBagData(InventoryData.empty())
+ .setEarningData(EarningData.empty())
+ .setStats(StatisticData.empty())
+ .build();
+ }
+
+ public static class Builder {
+
+ private final PlayerData playerData;
+
+ public Builder() {
+ this.playerData = new PlayerData();
+ }
+
+ @NotNull
+ public Builder setName(@Nullable String name) {
+ this.playerData.name = name;
+ return this;
+ }
+
+ @NotNull
+ public Builder setStats(@Nullable StatisticData statisticsData) {
+ this.playerData.statisticsData = statisticsData;
+ return this;
+ }
+
+ @NotNull
+ public Builder setBagData(@Nullable InventoryData inventoryData) {
+ this.playerData.bagData = inventoryData;
+ return this;
+ }
+
+ @NotNull
+ public Builder setEarningData(@Nullable EarningData earningData) {
+ this.playerData.earningData = earningData;
+ return this;
+ }
+
+ @NotNull
+ public PlayerData build() {
+ return this.playerData;
+ }
+ }
+
+ public StatisticData getStatistics() {
+ return statisticsData;
+ }
+
+ public InventoryData getBagData() {
+ return bagData;
+ }
+
+ public EarningData getEarningData() {
+ return earningData;
+ }
+
+ public String getName() {
+ return name;
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/data/StatisticData.java b/api/src/main/java/net/momirealms/customfishing/api/data/StatisticData.java
new file mode 100644
index 00000000..c0c8771c
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/data/StatisticData.java
@@ -0,0 +1,21 @@
+package net.momirealms.customfishing.api.data;
+
+import com.google.gson.annotations.SerializedName;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class StatisticData {
+
+ @SerializedName("stats")
+ public Map statisticMap;
+
+ public StatisticData(@NotNull Map data) {
+ this.statisticMap = data;
+ }
+
+ public static StatisticData empty() {
+ return new StatisticData(new HashMap<>());
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/data/StorageType.java b/api/src/main/java/net/momirealms/customfishing/api/data/StorageType.java
new file mode 100644
index 00000000..5bff469c
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/data/StorageType.java
@@ -0,0 +1,14 @@
+package net.momirealms.customfishing.api.data;
+
+public enum StorageType {
+
+ JSON,
+ YAML,
+ H2,
+ SQLite,
+ MySQL,
+ MariaDB,
+ MongoDB,
+ Redis
+
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/data/user/OfflineUser.java b/api/src/main/java/net/momirealms/customfishing/api/data/user/OfflineUser.java
new file mode 100644
index 00000000..fcf5ce9c
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/data/user/OfflineUser.java
@@ -0,0 +1,24 @@
+package net.momirealms.customfishing.api.data.user;
+
+import net.momirealms.customfishing.api.data.EarningData;
+import net.momirealms.customfishing.api.data.PlayerData;
+import net.momirealms.customfishing.api.mechanic.bag.FishingBagHolder;
+import net.momirealms.customfishing.api.mechanic.statistic.Statistics;
+
+import java.util.UUID;
+
+public interface OfflineUser {
+ String getName();
+
+ UUID getUUID();
+
+ FishingBagHolder getHolder();
+
+ EarningData getEarningData();
+
+ Statistics getStatistics();
+
+ boolean isOnline();
+
+ PlayerData getPlayerData();
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/data/user/OnlineUser.java b/api/src/main/java/net/momirealms/customfishing/api/data/user/OnlineUser.java
new file mode 100644
index 00000000..bc49a85d
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/data/user/OnlineUser.java
@@ -0,0 +1,27 @@
+package net.momirealms.customfishing.api.data.user;
+
+import net.momirealms.customfishing.api.data.EarningData;
+import net.momirealms.customfishing.api.data.PlayerData;
+import net.momirealms.customfishing.api.mechanic.bag.FishingBagHolder;
+import net.momirealms.customfishing.api.mechanic.statistic.Statistics;
+import org.bukkit.entity.Player;
+
+import java.util.UUID;
+
+public interface OnlineUser {
+ Player getPlayer();
+
+ String getName();
+
+ UUID getUUID();
+
+ FishingBagHolder getHolder();
+
+ EarningData getEarningData();
+
+ Statistics getStatistics();
+
+ boolean isOnline();
+
+ PlayerData getPlayerData();
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/event/LavaFishingEvent.java b/api/src/main/java/net/momirealms/customfishing/api/event/LavaFishingEvent.java
new file mode 100644
index 00000000..c8a56759
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/event/LavaFishingEvent.java
@@ -0,0 +1,56 @@
+package net.momirealms.customfishing.api.event;
+
+import org.bukkit.entity.FishHook;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+import org.jetbrains.annotations.NotNull;
+
+public class LavaFishingEvent extends PlayerEvent implements Cancellable {
+
+ private static final HandlerList handlerList = new HandlerList();
+ private final State state;
+ private boolean isCancelled;
+ private final FishHook hook;
+
+ public LavaFishingEvent(@NotNull Player who, State state, FishHook hook) {
+ super(who);
+ this.state = state;
+ this.isCancelled = false;
+ this.hook = hook;
+ }
+
+ public State getState() {
+ return state;
+ }
+
+ public FishHook getHook() {
+ return hook;
+ }
+
+ public static HandlerList getHandlerList() {
+ return handlerList;
+ }
+
+ @NotNull
+ @Override
+ public HandlerList getHandlers() {
+ return getHandlerList();
+ }
+
+ @Override
+ public boolean isCancelled() {
+ return isCancelled;
+ }
+
+ @Override
+ public void setCancelled(boolean cancel) {
+ isCancelled = cancel;
+ }
+
+ public enum State {
+ REEL_IN,
+ CAUGHT_FISH, BITE
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/event/RodCastEvent.java b/api/src/main/java/net/momirealms/customfishing/api/event/RodCastEvent.java
new file mode 100644
index 00000000..eb659677
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/event/RodCastEvent.java
@@ -0,0 +1,50 @@
+package net.momirealms.customfishing.api.event;
+
+import net.momirealms.customfishing.api.mechanic.effect.Effect;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+import org.bukkit.event.player.PlayerFishEvent;
+import org.jetbrains.annotations.NotNull;
+
+public class RodCastEvent extends PlayerEvent implements Cancellable {
+
+ private final Effect effect;
+ private boolean isCancelled;
+ private final PlayerFishEvent event;
+ private static final HandlerList handlerList = new HandlerList();
+
+ public RodCastEvent(PlayerFishEvent event, Effect effect) {
+ super(event.getPlayer());
+ this.effect = effect;
+ this.event = event;
+ }
+
+ @Override
+ public boolean isCancelled() {
+ return this.isCancelled;
+ }
+
+ @Override
+ public void setCancelled(boolean cancel) {
+ this.isCancelled = cancel;
+ }
+
+ public static HandlerList getHandlerList() {
+ return handlerList;
+ }
+
+ @NotNull
+ @Override
+ public HandlerList getHandlers() {
+ return getHandlerList();
+ }
+
+ public Effect getEffect() {
+ return effect;
+ }
+
+ public PlayerFishEvent getBukkitPlayerFishEvent() {
+ return event;
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/event/TotemActivateEvent.java b/api/src/main/java/net/momirealms/customfishing/api/event/TotemActivateEvent.java
new file mode 100644
index 00000000..cab74eef
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/event/TotemActivateEvent.java
@@ -0,0 +1,4 @@
+package net.momirealms.customfishing.api.event;
+
+public class TotemActivateEvent {
+}
diff --git a/src/main/java/net/momirealms/customfishing/integration/EnchantmentInterface.java b/api/src/main/java/net/momirealms/customfishing/api/integration/EnchantmentInterface.java
similarity index 74%
rename from src/main/java/net/momirealms/customfishing/integration/EnchantmentInterface.java
rename to api/src/main/java/net/momirealms/customfishing/api/integration/EnchantmentInterface.java
index eb97f2a7..9afea4cf 100644
--- a/src/main/java/net/momirealms/customfishing/integration/EnchantmentInterface.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/integration/EnchantmentInterface.java
@@ -1,4 +1,4 @@
-package net.momirealms.customfishing.integration;
+package net.momirealms.customfishing.api.integration;
import org.bukkit.inventory.ItemStack;
diff --git a/api/src/main/java/net/momirealms/customfishing/api/integration/LevelInterface.java b/api/src/main/java/net/momirealms/customfishing/api/integration/LevelInterface.java
new file mode 100644
index 00000000..cdb41071
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/integration/LevelInterface.java
@@ -0,0 +1,9 @@
+package net.momirealms.customfishing.api.integration;
+
+import org.bukkit.entity.Player;
+
+public interface LevelInterface {
+
+ void addXp(Player player, String target, double amount);
+ int getLevel(Player player, String target);
+}
diff --git a/src/main/java/net/momirealms/customfishing/integration/SeasonInterface.java b/api/src/main/java/net/momirealms/customfishing/api/integration/SeasonInterface.java
similarity index 93%
rename from src/main/java/net/momirealms/customfishing/integration/SeasonInterface.java
rename to api/src/main/java/net/momirealms/customfishing/api/integration/SeasonInterface.java
index d784f00b..493ce396 100644
--- a/src/main/java/net/momirealms/customfishing/integration/SeasonInterface.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/integration/SeasonInterface.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package net.momirealms.customfishing.integration;
+package net.momirealms.customfishing.api.integration;
import org.bukkit.World;
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/ActionManager.java b/api/src/main/java/net/momirealms/customfishing/api/manager/ActionManager.java
new file mode 100644
index 00000000..7468c3ed
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/manager/ActionManager.java
@@ -0,0 +1,18 @@
+package net.momirealms.customfishing.api.manager;
+
+import net.momirealms.customfishing.api.mechanic.action.Action;
+import net.momirealms.customfishing.api.mechanic.action.ActionBuilder;
+import org.bukkit.configuration.ConfigurationSection;
+
+public interface ActionManager {
+
+ boolean registerAction(String type, ActionBuilder actionBuilder);
+
+ boolean unregisterAction(String type);
+
+ Action getAction(ConfigurationSection section);
+
+ Action[] getActions(ConfigurationSection section);
+
+ ActionBuilder getActionBuilder(String type);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/AdventureManager.java b/api/src/main/java/net/momirealms/customfishing/api/manager/AdventureManager.java
new file mode 100644
index 00000000..b2f97e1c
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/manager/AdventureManager.java
@@ -0,0 +1,116 @@
+package net.momirealms.customfishing.api.manager;
+
+import net.kyori.adventure.key.Key;
+import net.kyori.adventure.sound.Sound;
+import net.kyori.adventure.text.Component;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public interface AdventureManager {
+
+ /**
+ * Get component from text
+ * @param text text
+ * @return component
+ */
+ Component getComponentFromMiniMessage(String text);
+
+ /**
+ * Send a message to a command sender
+ * @param sender sender
+ * @param msg message
+ */
+ void sendMessage(CommandSender sender, String msg);
+
+ void sendMessageWithPrefix(CommandSender sender, String s);
+
+ /**
+ * Send a message to console
+ * @param msg message
+ */
+ void sendConsoleMessage(String msg);
+
+ /**
+ * Send a message to a player
+ * @param player player
+ * @param msg message
+ */
+ void sendPlayerMessage(Player player, String msg);
+
+ /**
+ * Send a title to a player
+ * @param player player
+ * @param title title
+ * @param subtitle subtitle
+ * @param in in (ms)
+ * @param duration duration (ms)
+ * @param out out (ms)
+ */
+ void sendTitle(Player player, String title, String subtitle, int in, int duration, int out);
+
+ /**
+ * Send a title to a player
+ * @param player player
+ * @param title title
+ * @param subtitle subtitle
+ * @param in in (ms)
+ * @param duration duration (ms)
+ * @param out out (ms)
+ */
+ void sendTitle(Player player, Component title, Component subtitle, int in, int duration, int out);
+
+ /**
+ * Send actionbar
+ * @param player player
+ * @param msg msg
+ */
+ void sendActionbar(Player player, String msg);
+
+ /**
+ * Play a sound to a player
+ * @param player player
+ * @param source sound source
+ * @param key sound key
+ * @param volume volume
+ * @param pitch pitch
+ */
+ void sendSound(Player player, Sound.Source source, Key key, float volume, float pitch);
+
+ void sendSound(Player player, Sound sound);
+
+ /**
+ * Replace legacy color codes to MiniMessage format
+ * @param legacy legacy text
+ * @return MiniMessage format text
+ */
+ String legacyToMiniMessage(String legacy);
+
+ /**
+ * if a char is legacy color code
+ * @param c char
+ * @return is legacy color
+ */
+ @SuppressWarnings("BooleanMethodIsAlwaysInverted")
+ boolean isColorCode(char c);
+
+ /**
+ * Get legacy format text
+ * @param component component
+ * @return legacy format text
+ */
+ String componentToLegacy(Component component);
+
+ /**
+ * Get json
+ * @param component component
+ * @return json
+ */
+ String componentToJson(Component component);
+
+ /**
+ * Get paper component
+ * @param component shaded component
+ * @return paper component
+ */
+ Object shadedComponentToPaperComponent(Component component);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/BagManager.java b/api/src/main/java/net/momirealms/customfishing/api/manager/BagManager.java
new file mode 100644
index 00000000..1a3f8f4e
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/manager/BagManager.java
@@ -0,0 +1,11 @@
+package net.momirealms.customfishing.api.manager;
+
+import org.bukkit.inventory.Inventory;
+
+import java.util.UUID;
+
+public interface BagManager {
+ boolean isBagEnabled();
+
+ Inventory getOnlineBagInventory(UUID uuid);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/BlockManager.java b/api/src/main/java/net/momirealms/customfishing/api/manager/BlockManager.java
new file mode 100644
index 00000000..e864d534
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/manager/BlockManager.java
@@ -0,0 +1,22 @@
+package net.momirealms.customfishing.api.manager;
+
+import net.momirealms.customfishing.api.mechanic.block.BlockLibrary;
+import net.momirealms.customfishing.api.mechanic.block.BlockDataModifierBuilder;
+import net.momirealms.customfishing.api.mechanic.block.BlockStateModifierBuilder;
+import net.momirealms.customfishing.api.mechanic.loot.Loot;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+
+public interface BlockManager {
+ boolean registerBlockLibrary(BlockLibrary library);
+
+ boolean unregisterBlockLibrary(BlockLibrary library);
+
+ boolean unregisterBlockLibrary(String library);
+
+ boolean registerBlockDataModifierBuilder(String type, BlockDataModifierBuilder builder);
+
+ boolean registerBlockStateModifierBuilder(String type, BlockStateModifierBuilder builder);
+
+ void summonBlock(Player player, Location hookLocation, Location playerLocation, Loot loot);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/CommandManager.java b/api/src/main/java/net/momirealms/customfishing/api/manager/CommandManager.java
new file mode 100644
index 00000000..9538f7b1
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/manager/CommandManager.java
@@ -0,0 +1,6 @@
+package net.momirealms.customfishing.api.manager;
+
+public interface CommandManager {
+
+ void loadCommands();
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/CompetitionManager.java b/api/src/main/java/net/momirealms/customfishing/api/manager/CompetitionManager.java
new file mode 100644
index 00000000..2a8a2930
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/manager/CompetitionManager.java
@@ -0,0 +1,26 @@
+package net.momirealms.customfishing.api.manager;
+
+import net.momirealms.customfishing.api.mechanic.competition.CompetitionConfig;
+import net.momirealms.customfishing.api.mechanic.competition.FishingCompetition;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+
+public interface CompetitionManager {
+ Set getAllCompetitions();
+
+ void startCompetition(String competition, boolean force, boolean allServers);
+
+ @Nullable
+ FishingCompetition getOnGoingCompetition();
+
+ void startCompetition(CompetitionConfig config, boolean force, boolean allServers);
+
+ int getNextCompetitionSeconds();
+
+ CompletableFuture getPlayerCount();
+
+ @Nullable
+ CompetitionConfig getConfig(String key);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/EffectManager.java b/api/src/main/java/net/momirealms/customfishing/api/manager/EffectManager.java
new file mode 100644
index 00000000..734ac8d2
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/manager/EffectManager.java
@@ -0,0 +1,15 @@
+package net.momirealms.customfishing.api.manager;
+
+import net.momirealms.customfishing.api.common.Key;
+import net.momirealms.customfishing.api.mechanic.effect.Effect;
+import org.jetbrains.annotations.Nullable;
+
+public interface EffectManager {
+ boolean registerEffect(Key key, Effect effect);
+
+ boolean unregisterEffect(Key key);
+
+ @Nullable Effect getEffect(String namespace, String id);
+
+ Effect getInitialEffect();
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/FishingManager.java b/api/src/main/java/net/momirealms/customfishing/api/manager/FishingManager.java
new file mode 100644
index 00000000..0c0b5197
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/manager/FishingManager.java
@@ -0,0 +1,27 @@
+package net.momirealms.customfishing.api.manager;
+
+import net.momirealms.customfishing.api.mechanic.TempFishingState;
+import net.momirealms.customfishing.api.mechanic.effect.Effect;
+import net.momirealms.customfishing.api.mechanic.game.Game;
+import net.momirealms.customfishing.api.mechanic.game.GameSettings;
+import net.momirealms.customfishing.api.mechanic.game.GamingPlayer;
+import net.momirealms.customfishing.api.mechanic.loot.Loot;
+import org.bukkit.entity.Player;
+
+import java.util.UUID;
+
+public interface FishingManager {
+ boolean removeHook(UUID uuid);
+
+ void setTempFishingState(Player player, TempFishingState tempFishingState);
+
+ void removeHookCheckTask(Player player);
+
+ void removeTempFishingState(Player player);
+
+ void processGameResult(GamingPlayer gamingPlayer);
+
+ void startFishingGame(Player player, Loot loot, Effect effect);
+
+ void startFishingGame(Player player, GameSettings settings, Game game);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/GameManager.java b/api/src/main/java/net/momirealms/customfishing/api/manager/GameManager.java
new file mode 100644
index 00000000..2e52d55f
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/manager/GameManager.java
@@ -0,0 +1,29 @@
+package net.momirealms.customfishing.api.manager;
+
+import net.momirealms.customfishing.api.mechanic.game.Game;
+import net.momirealms.customfishing.api.mechanic.game.GameConfig;
+import org.bukkit.configuration.ConfigurationSection;
+import org.jetbrains.annotations.Nullable;
+
+public interface GameManager {
+
+
+ boolean registerGameType(String type, GameCreator gameCreator);
+
+ boolean unregisterGameType(String type);
+
+ @Nullable GameCreator getGameCreator(String type);
+
+ @Nullable Game getGame(String key);
+
+ @Nullable GameConfig getGameConfig(String key);
+
+ Game getRandomGame();
+
+ GameConfig getRandomGameConfig();
+
+ public interface GameCreator {
+
+ Game setArgs(ConfigurationSection section);
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/IntegrationManager.java b/api/src/main/java/net/momirealms/customfishing/api/manager/IntegrationManager.java
new file mode 100644
index 00000000..7c728843
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/manager/IntegrationManager.java
@@ -0,0 +1,27 @@
+package net.momirealms.customfishing.api.manager;
+
+import net.momirealms.customfishing.api.integration.EnchantmentInterface;
+import net.momirealms.customfishing.api.integration.LevelInterface;
+import net.momirealms.customfishing.api.integration.SeasonInterface;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.List;
+
+public interface IntegrationManager {
+
+ boolean registerLevelPlugin(String plugin, LevelInterface level);
+
+ boolean unregisterLevelPlugin(String plugin);
+
+ boolean registerEnchantment(String plugin, EnchantmentInterface enchantment);
+
+ boolean unregisterEnchantment(String plugin);
+
+ LevelInterface getLevelHook(String plugin);
+
+ List getEnchantments(ItemStack rod);
+
+ SeasonInterface getSeasonInterface();
+
+ void setSeasonInterface(SeasonInterface season);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/ItemManager.java b/api/src/main/java/net/momirealms/customfishing/api/manager/ItemManager.java
new file mode 100644
index 00000000..013ddb1c
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/manager/ItemManager.java
@@ -0,0 +1,59 @@
+package net.momirealms.customfishing.api.manager;
+
+import net.momirealms.customfishing.api.common.Key;
+import net.momirealms.customfishing.api.mechanic.item.BuildableItem;
+import net.momirealms.customfishing.api.mechanic.item.ItemBuilder;
+import net.momirealms.customfishing.api.mechanic.item.ItemLibrary;
+import net.momirealms.customfishing.api.mechanic.loot.Loot;
+import org.bukkit.Location;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Map;
+import java.util.Set;
+
+public interface ItemManager {
+
+ @Nullable
+ ItemStack build(Player player, String namespace, String value);
+
+ @Nullable
+ ItemStack build(Player player, String namespace, String value, Map placeholders);
+
+ @NotNull
+ ItemStack build(Player player, ItemBuilder builder);
+
+ ItemStack buildAnyItemByID(Player player, String id);
+
+ @Nullable
+ String getItemID(ItemStack itemStack);
+
+ String getAnyItemID(ItemStack itemStack);
+
+ @Nullable
+ ItemBuilder getItemBuilder(ConfigurationSection section, String type, String id);
+
+ ItemStack build(Player player, ItemBuilder builder, Map placeholders);
+
+ Set getAllItemsKey();
+
+ boolean registerCustomItem(String namespace, String value, BuildableItem buildableItem);
+
+ boolean unregisterCustomItem(String namespace, String value);
+
+ @Nullable
+ BuildableItem getBuildableItem(String namespace, String value);
+
+ boolean registerItemLibrary(ItemLibrary itemLibrary);
+
+ boolean unRegisterItemLibrary(ItemLibrary itemLibrary);
+
+ boolean unRegisterItemLibrary(String itemLibrary);
+
+ void dropItem(Player player, Location hookLocation, Location playerLocation, Loot loot, Map args);
+
+ void dropItem(Location hookLocation, Location playerLocation, ItemStack itemStack);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/LootManager.java b/api/src/main/java/net/momirealms/customfishing/api/manager/LootManager.java
new file mode 100644
index 00000000..adcb6e52
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/manager/LootManager.java
@@ -0,0 +1,8 @@
+package net.momirealms.customfishing.api.manager;
+
+import net.momirealms.customfishing.api.mechanic.loot.Loot;
+import org.jetbrains.annotations.Nullable;
+
+public interface LootManager {
+ @Nullable Loot getLoot(String key);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/MarketManager.java b/api/src/main/java/net/momirealms/customfishing/api/manager/MarketManager.java
new file mode 100644
index 00000000..6ee01a97
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/manager/MarketManager.java
@@ -0,0 +1,13 @@
+package net.momirealms.customfishing.api.manager;
+
+import org.bukkit.inventory.ItemStack;
+
+public interface MarketManager {
+ int getDate();
+
+ double getItemPrice(ItemStack itemStack);
+
+ String getFormula();
+
+ double getPrice(float base, float bonus, float size);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/MobManager.java b/api/src/main/java/net/momirealms/customfishing/api/manager/MobManager.java
new file mode 100644
index 00000000..71329826
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/manager/MobManager.java
@@ -0,0 +1,15 @@
+package net.momirealms.customfishing.api.manager;
+
+import net.momirealms.customfishing.api.mechanic.loot.Loot;
+import net.momirealms.customfishing.api.mechanic.mob.MobLibrary;
+import org.bukkit.Location;
+
+public interface MobManager {
+ boolean registerMobLibrary(MobLibrary mobLibrary);
+
+ boolean unregisterMobLibrary(String lib);
+
+ boolean unregisterMobLibrary(MobLibrary mobLibrary);
+
+ void summonMob(Location hookLocation, Location playerLocation, Loot loot);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/PlaceholderManager.java b/api/src/main/java/net/momirealms/customfishing/api/manager/PlaceholderManager.java
new file mode 100644
index 00000000..fecf9aee
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/manager/PlaceholderManager.java
@@ -0,0 +1,23 @@
+package net.momirealms.customfishing.api.manager;
+
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.Map;
+
+public interface PlaceholderManager {
+
+ String setPlaceholders(Player player, String text);
+
+ String setPlaceholders(OfflinePlayer player, String text);
+
+ List detectPlaceholders(String text);
+
+ String getSingleValue(@Nullable Player player, String placeholder, Map placeholders);
+
+ String parse(@Nullable OfflinePlayer player, String text, Map placeholders);
+
+ List parse(@Nullable OfflinePlayer player, List list, Map replacements);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/RequirementManager.java b/api/src/main/java/net/momirealms/customfishing/api/manager/RequirementManager.java
new file mode 100644
index 00000000..447dea72
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/manager/RequirementManager.java
@@ -0,0 +1,41 @@
+package net.momirealms.customfishing.api.manager;
+
+import net.momirealms.customfishing.api.mechanic.condition.Condition;
+import net.momirealms.customfishing.api.mechanic.requirement.Requirement;
+import net.momirealms.customfishing.api.mechanic.requirement.RequirementBuilder;
+import org.bukkit.configuration.ConfigurationSection;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.HashMap;
+
+public interface RequirementManager {
+
+ boolean registerRequirement(String type, RequirementBuilder requirementBuilder);
+
+ boolean unregisterRequirement(String type);
+
+ HashMap getLootWithWeight(Condition condition);
+
+ @Nullable Requirement[] getRequirements(ConfigurationSection section, boolean advanced);
+
+ Requirement getRequirement(ConfigurationSection section, boolean checkAction);
+
+ Requirement getRequirement(String key, Object value);
+
+ RequirementBuilder getRequirementBuilder(String type);
+
+ static boolean isRequirementsMet(Requirement[] requirements, Condition condition) {
+ if (requirements == null) return true;
+ for (Requirement requirement : requirements) {
+ if (!requirement.isConditionMet(condition)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ static boolean isRequirementMet(Requirement requirement, Condition condition) {
+ if (requirement == null) return true;
+ return requirement.isConditionMet(condition);
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/StorageManager.java b/api/src/main/java/net/momirealms/customfishing/api/manager/StorageManager.java
new file mode 100644
index 00000000..3ac1a027
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/manager/StorageManager.java
@@ -0,0 +1,58 @@
+package net.momirealms.customfishing.api.manager;
+
+import net.momirealms.customfishing.api.data.DataStorageInterface;
+import net.momirealms.customfishing.api.data.PlayerData;
+import net.momirealms.customfishing.api.data.user.OfflineUser;
+import net.momirealms.customfishing.api.data.user.OnlineUser;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
+public interface StorageManager {
+
+ /**
+ * Get server unique id
+ * @return id
+ */
+ String getUniqueID();
+
+ /**
+ * Get online user's data
+ * @param uuid uuid
+ * @return online user data
+ */
+ OnlineUser getOnlineUser(UUID uuid);
+
+ /**
+ * Get an offline user's data
+ * force reading would ignore the database lock
+ * Otherwise it would return Optional.empty() if data is locked
+ * It an offline user never played the server, its name would equal "" (empty string)
+ * @param uuid uuid
+ * @param force force
+ * @return offline user data
+ */
+ CompletableFuture> getOfflineUser(UUID uuid, boolean force);
+
+ /**
+ * Get all the players in servers that connected to the same redis server
+ * @return amount
+ */
+ CompletableFuture getRedisPlayerCount();
+
+ /**
+ * Get plugin data source
+ * @return data source
+ */
+ DataStorageInterface getDataSource();
+
+ boolean isRedisEnabled();
+
+ byte[] toBytes(@NotNull PlayerData data);
+
+ @NotNull String toJson(@NotNull PlayerData data);
+
+ @NotNull PlayerData fromBytes(byte[] data);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/TotemManager.java b/api/src/main/java/net/momirealms/customfishing/api/manager/TotemManager.java
new file mode 100644
index 00000000..8cb4c91e
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/manager/TotemManager.java
@@ -0,0 +1,4 @@
+package net.momirealms.customfishing.api.manager;
+
+public interface TotemManager {
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/VersionManager.java b/api/src/main/java/net/momirealms/customfishing/api/manager/VersionManager.java
new file mode 100644
index 00000000..babcd421
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/manager/VersionManager.java
@@ -0,0 +1,18 @@
+package net.momirealms.customfishing.api.manager;
+
+import java.util.concurrent.CompletableFuture;
+
+public interface VersionManager {
+
+ boolean isVersionNewerThan1_19_R2();
+
+ CompletableFuture checkUpdate();
+
+ boolean isSpigot();
+
+ public boolean isFolia();
+
+ String getPluginVersion();
+
+ String getServerVersion();
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/TempFishingState.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/TempFishingState.java
new file mode 100644
index 00000000..d76a8ef8
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/TempFishingState.java
@@ -0,0 +1,30 @@
+package net.momirealms.customfishing.api.mechanic;
+
+import net.momirealms.customfishing.api.mechanic.condition.FishingPreparation;
+import net.momirealms.customfishing.api.mechanic.effect.Effect;
+import net.momirealms.customfishing.api.mechanic.loot.Loot;
+
+public class TempFishingState {
+
+ private final Effect effect;
+ private final FishingPreparation preparation;
+ private final Loot loot;
+
+ public TempFishingState(Effect effect, FishingPreparation preparation, Loot loot) {
+ this.effect = effect;
+ this.preparation = preparation;
+ this.loot = loot;
+ }
+
+ public Effect getEffect() {
+ return effect;
+ }
+
+ public FishingPreparation getPreparation() {
+ return preparation;
+ }
+
+ public Loot getLoot() {
+ return loot;
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/action/Action.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/action/Action.java
new file mode 100644
index 00000000..8295559d
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/action/Action.java
@@ -0,0 +1,9 @@
+package net.momirealms.customfishing.api.mechanic.action;
+
+import net.momirealms.customfishing.api.mechanic.condition.Condition;
+
+public interface Action {
+
+ void trigger(Condition condition);
+
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/action/ActionBuilder.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/action/ActionBuilder.java
new file mode 100644
index 00000000..5f79a367
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/action/ActionBuilder.java
@@ -0,0 +1,6 @@
+package net.momirealms.customfishing.api.mechanic.action;
+
+public interface ActionBuilder {
+
+ Action build(Object args, double chance);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/action/ActionTrigger.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/action/ActionTrigger.java
new file mode 100644
index 00000000..1c3c72aa
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/action/ActionTrigger.java
@@ -0,0 +1,9 @@
+package net.momirealms.customfishing.api.mechanic.action;
+
+public enum ActionTrigger {
+
+ SUCCESS,
+ FAILURE,
+ HOOK,
+ CONSUME
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/bag/FishingBagHolder.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/bag/FishingBagHolder.java
new file mode 100644
index 00000000..5ca2b465
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/bag/FishingBagHolder.java
@@ -0,0 +1,35 @@
+package net.momirealms.customfishing.api.mechanic.bag;
+
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+public class FishingBagHolder implements InventoryHolder {
+
+ private final UUID owner;
+ private Inventory inventory;
+
+ public FishingBagHolder(UUID owner) {
+ this.owner = owner;
+ }
+
+ @Override
+ public @NotNull Inventory getInventory() {
+ return inventory;
+ }
+
+ public void setItems(ItemStack[] itemStacks) {
+ this.inventory.setContents(itemStacks);
+ }
+
+ public UUID getOwner() {
+ return owner;
+ }
+
+ public void setInventory(Inventory inventory) {
+ this.inventory = inventory;
+ }
+}
\ No newline at end of file
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockConfig.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockConfig.java
new file mode 100644
index 00000000..dddc75cc
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockConfig.java
@@ -0,0 +1,86 @@
+package net.momirealms.customfishing.api.mechanic.block;
+
+import java.util.List;
+
+public class BlockConfig implements BlockSettings {
+
+ private String blockID;
+ private List dataModifierList;
+ private List stateModifierList;
+ private boolean persist;
+ private double horizontalVector;
+ private double verticalVector;
+
+ @Override
+ public String getBlockID() {
+ return blockID;
+ }
+
+ @Override
+ public List getDataModifier() {
+ return dataModifierList;
+ }
+
+ @Override
+ public List getStateModifierList() {
+ return stateModifierList;
+ }
+
+ @Override
+ public boolean isPersist() {
+ return persist;
+ }
+
+ @Override
+ public double getHorizontalVector() {
+ return horizontalVector;
+ }
+
+ @Override
+ public double getVerticalVector() {
+ return verticalVector;
+ }
+
+ public static class Builder {
+
+ private final BlockConfig config;
+
+ public Builder() {
+ this.config = new BlockConfig();
+ }
+
+ public Builder persist(boolean value) {
+ config.persist = value;
+ return this;
+ }
+
+ public Builder horizontalVector(double value) {
+ config.horizontalVector = value;
+ return this;
+ }
+
+ public Builder verticalVector(double value) {
+ config.verticalVector = value;
+ return this;
+ }
+
+ public Builder blockID(String value) {
+ config.blockID = value;
+ return this;
+ }
+
+ public Builder dataModifiers(List value) {
+ config.dataModifierList = value;
+ return this;
+ }
+
+ public Builder stateModifiers(List value) {
+ config.stateModifierList = value;
+ return this;
+ }
+
+ public BlockConfig build() {
+ return config;
+ }
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockDataModifier.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockDataModifier.java
new file mode 100644
index 00000000..b77a762e
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockDataModifier.java
@@ -0,0 +1,8 @@
+package net.momirealms.customfishing.api.mechanic.block;
+
+import org.bukkit.block.data.BlockData;
+import org.bukkit.entity.Player;
+
+public interface BlockDataModifier {
+ void apply(Player player, BlockData blockData);
+}
\ No newline at end of file
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockDataModifierBuilder.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockDataModifierBuilder.java
new file mode 100644
index 00000000..efcfe961
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockDataModifierBuilder.java
@@ -0,0 +1,8 @@
+package net.momirealms.customfishing.api.mechanic.block;
+
+import java.util.InvalidPropertiesFormatException;
+
+public interface BlockDataModifierBuilder {
+
+ BlockDataModifier build(Object args);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockLibrary.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockLibrary.java
new file mode 100644
index 00000000..c0f0e10e
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockLibrary.java
@@ -0,0 +1,14 @@
+package net.momirealms.customfishing.api.mechanic.block;
+
+import org.bukkit.block.data.BlockData;
+import org.bukkit.entity.Player;
+
+import java.util.HashMap;
+import java.util.List;
+
+public interface BlockLibrary {
+
+ String identification();
+
+ BlockData getBlockData(Player player, String id, List modifiers);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockSettings.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockSettings.java
new file mode 100644
index 00000000..270b6414
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockSettings.java
@@ -0,0 +1,17 @@
+package net.momirealms.customfishing.api.mechanic.block;
+
+import java.util.List;
+
+public interface BlockSettings {
+ String getBlockID();
+
+ List getDataModifier();
+
+ List getStateModifierList();
+
+ boolean isPersist();
+
+ double getHorizontalVector();
+
+ double getVerticalVector();
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockStateModifier.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockStateModifier.java
new file mode 100644
index 00000000..0aa6c511
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockStateModifier.java
@@ -0,0 +1,9 @@
+package net.momirealms.customfishing.api.mechanic.block;
+
+import org.bukkit.block.BlockState;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.entity.Player;
+
+public interface BlockStateModifier {
+ void apply(Player player, BlockState blockState);
+}
\ No newline at end of file
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockStateModifierBuilder.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockStateModifierBuilder.java
new file mode 100644
index 00000000..77ae41fb
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockStateModifierBuilder.java
@@ -0,0 +1,6 @@
+package net.momirealms.customfishing.api.mechanic.block;
+
+public interface BlockStateModifierBuilder {
+
+ BlockStateModifier build(Object args);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/AbstractCompetitionInfo.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/AbstractCompetitionInfo.java
new file mode 100644
index 00000000..7358f393
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/AbstractCompetitionInfo.java
@@ -0,0 +1,25 @@
+package net.momirealms.customfishing.api.mechanic.competition;
+
+public abstract class AbstractCompetitionInfo {
+
+ protected int refreshRate;
+ protected int switchInterval;
+ protected boolean showToAll;
+ protected String[] texts;
+
+ public int getRefreshRate() {
+ return refreshRate;
+ }
+
+ public int getSwitchInterval() {
+ return switchInterval;
+ }
+
+ public boolean isShowToAll() {
+ return showToAll;
+ }
+
+ public String[] getTexts() {
+ return texts;
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/ActionBarConfig.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/ActionBarConfig.java
new file mode 100644
index 00000000..f306aa38
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/ActionBarConfig.java
@@ -0,0 +1,37 @@
+package net.momirealms.customfishing.api.mechanic.competition;
+
+public class ActionBarConfig extends AbstractCompetitionInfo {
+
+ public static class Builder {
+
+ private final ActionBarConfig config;
+
+ public Builder() {
+ this.config = new ActionBarConfig();
+ }
+
+ public Builder showToAll(boolean showToAll) {
+ this.config.showToAll = showToAll;
+ return this;
+ }
+
+ public Builder refreshRate(int rate) {
+ this.config.refreshRate = rate;
+ return this;
+ }
+
+ public Builder switchInterval(int interval) {
+ this.config.switchInterval = interval;
+ return this;
+ }
+
+ public Builder text(String[] texts) {
+ this.config.texts = texts;
+ return this;
+ }
+
+ public ActionBarConfig build() {
+ return this.config;
+ }
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/BossBarConfig.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/BossBarConfig.java
new file mode 100644
index 00000000..9306cb66
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/BossBarConfig.java
@@ -0,0 +1,68 @@
+package net.momirealms.customfishing.api.mechanic.competition;
+
+import org.bukkit.boss.BarColor;
+
+public class BossBarConfig extends AbstractCompetitionInfo {
+
+ private BarColor color;
+ private Overlay overlay;
+
+ public BarColor getColor() {
+ return color;
+ }
+
+ public Overlay getOverlay() {
+ return overlay;
+ }
+
+ public static class Builder {
+
+ private final BossBarConfig config;
+
+ public Builder() {
+ this.config = new BossBarConfig();
+ }
+
+ public Builder showToAll(boolean showToAll) {
+ this.config.showToAll = showToAll;
+ return this;
+ }
+
+ public Builder refreshRate(int rate) {
+ this.config.refreshRate = rate;
+ return this;
+ }
+
+ public Builder switchInterval(int interval) {
+ this.config.switchInterval = interval;
+ return this;
+ }
+
+ public Builder text(String[] texts) {
+ this.config.texts = texts;
+ return this;
+ }
+
+ public Builder color(BarColor color) {
+ this.config.color = color;
+ return this;
+ }
+
+ public Builder overlay(Overlay overlay) {
+ this.config.overlay = overlay;
+ return this;
+ }
+
+ public BossBarConfig build() {
+ return this.config;
+ }
+ }
+
+ public enum Overlay {
+ NOTCHED_6,
+ NOTCHED_10,
+ NOTCHED_12,
+ NOTCHED_20,
+ PROGRESS
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionConfig.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionConfig.java
new file mode 100644
index 00000000..77119235
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionConfig.java
@@ -0,0 +1,131 @@
+package net.momirealms.customfishing.api.mechanic.competition;
+
+import net.momirealms.customfishing.api.mechanic.action.Action;
+
+import java.util.HashMap;
+
+public class CompetitionConfig {
+
+ private final String key;
+ private int duration;
+ private int minPlayers;
+ private BossBarConfig bossBarConfig;
+ private ActionBarConfig actionBarConfig;
+ private Action[] skipActions;
+ private Action[] startActions;
+ private Action[] endActions;
+ private Action[] joinActions;
+ private CompetitionGoal goal;
+ private HashMap rewards;
+
+ public CompetitionConfig(String key) {
+ this.key = key;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public int getDuration() {
+ return duration;
+ }
+
+ public int getMinPlayers() {
+ return minPlayers;
+ }
+
+ public Action[] getStartActions() {
+ return startActions;
+ }
+
+ public Action[] getEndActions() {
+ return endActions;
+ }
+
+ public Action[] getJoinActions() {
+ return joinActions;
+ }
+
+ public Action[] getSkipActions() {
+ return skipActions;
+ }
+
+ public CompetitionGoal getGoal() {
+ return goal;
+ }
+
+ public HashMap getRewards() {
+ return rewards;
+ }
+
+ public BossBarConfig getBossBarConfig() {
+ return bossBarConfig;
+ }
+
+ public ActionBarConfig getActionBarConfig() {
+ return actionBarConfig;
+ }
+
+ public static class Builder {
+
+ private final CompetitionConfig config;
+
+ public Builder(String key) {
+ this.config = new CompetitionConfig(key);
+ }
+
+ public Builder duration(int duration) {
+ config.duration = duration;
+ return this;
+ }
+
+ public Builder minPlayers(int min) {
+ config.minPlayers = min;
+ return this;
+ }
+
+ public Builder startActions(Action[] startActions) {
+ config.startActions = startActions;
+ return this;
+ }
+
+ public Builder endActions(Action[] endActions) {
+ config.endActions = endActions;
+ return this;
+ }
+
+ public Builder skipActions(Action[] skipActions) {
+ config.skipActions = skipActions;
+ return this;
+ }
+
+ public Builder joinActions(Action[] joinActions) {
+ config.joinActions = joinActions;
+ return this;
+ }
+
+ public Builder actionbar(ActionBarConfig actionBarConfig) {
+ config.actionBarConfig = actionBarConfig;
+ return this;
+ }
+
+ public Builder bossbar(BossBarConfig bossBarConfig) {
+ config.bossBarConfig = bossBarConfig;
+ return this;
+ }
+
+ public Builder goal(CompetitionGoal goal) {
+ config.goal = goal;
+ return this;
+ }
+
+ public Builder rewards(HashMap rewards) {
+ config.rewards = rewards;
+ return this;
+ }
+
+ public CompetitionConfig build() {
+ return config;
+ }
+ }
+}
diff --git a/src/main/java/net/momirealms/customfishing/fishing/action/AbstractAction.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionGoal.java
similarity index 64%
rename from src/main/java/net/momirealms/customfishing/fishing/action/AbstractAction.java
rename to api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionGoal.java
index 5dc18cf8..306471a9 100644
--- a/src/main/java/net/momirealms/customfishing/fishing/action/AbstractAction.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionGoal.java
@@ -15,21 +15,19 @@
* along with this program. If not, see .
*/
-package net.momirealms.customfishing.fishing.action;
+package net.momirealms.customfishing.api.mechanic.competition;
-public abstract class AbstractAction {
+import java.util.concurrent.ThreadLocalRandom;
- protected double chance;
+public enum CompetitionGoal {
- public AbstractAction(double chance) {
- this.chance = chance;
- }
+ CATCH_AMOUNT,
+ TOTAL_SCORE,
+ MAX_SIZE,
+ TOTAL_SIZE,
+ RANDOM;
- public double getChance() {
- return chance;
- }
-
- public boolean canExecute() {
- return Math.random() < chance;
+ public static CompetitionGoal getRandom() {
+ return CompetitionGoal.values()[ThreadLocalRandom.current().nextInt(CompetitionGoal.values().length - 1)];
}
}
diff --git a/src/main/java/net/momirealms/customfishing/fishing/competition/CompetitionPlayer.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionPlayer.java
similarity index 73%
rename from src/main/java/net/momirealms/customfishing/fishing/competition/CompetitionPlayer.java
rename to api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionPlayer.java
index 0c07d99d..5a18ef9e 100644
--- a/src/main/java/net/momirealms/customfishing/fishing/competition/CompetitionPlayer.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionPlayer.java
@@ -15,35 +15,38 @@
* along with this program. If not, see .
*/
-package net.momirealms.customfishing.fishing.competition;
+package net.momirealms.customfishing.api.mechanic.competition;
import org.jetbrains.annotations.NotNull;
public class CompetitionPlayer implements Comparable{
+ public static CompetitionPlayer empty = new CompetitionPlayer("", 0);
private long time;
private final String player;
- private float score;
+ private double score;
- public static CompetitionPlayer emptyPlayer = new CompetitionPlayer(null, 0);
-
- public CompetitionPlayer(String player, float score) {
+ public CompetitionPlayer(String player, double score) {
this.player = player;
this.score = score;
this.time = System.currentTimeMillis();
}
- public void addScore(float score){
+ public void addScore(double score){
this.score += score;
this.time = System.currentTimeMillis();
}
- public void setScore(float score){
+ public void setScore(double score){
this.score = score;
this.time = System.currentTimeMillis();
}
- public float getScore() {
+ public long getTime() {
+ return time;
+ }
+
+ public double getScore() {
return this.score;
}
@@ -55,17 +58,19 @@ public class CompetitionPlayer implements Comparable{
public int compareTo(@NotNull CompetitionPlayer competitionPlayer) {
if (competitionPlayer.getScore() != this.score) {
return (competitionPlayer.getScore() > this.score) ? 1 : -1;
+ } else if (competitionPlayer.getTime() != this.time) {
+ return (competitionPlayer.getTime() > this.time) ? 1 : -1;
} else {
- return (competitionPlayer.getScore() > this.time) ? 1 : -1;
+ return 0;
}
}
@Override
public String toString() {
- return "CompetitionPlayer{" +
+ return "CompetitionPlayer[" +
"time=" + time +
", player='" + player + '\'' +
", score=" + score +
- '}';
+ ']';
}
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/FishingCompetition.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/FishingCompetition.java
new file mode 100644
index 00000000..5c266844
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/FishingCompetition.java
@@ -0,0 +1,30 @@
+package net.momirealms.customfishing.api.mechanic.competition;
+
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+
+public interface FishingCompetition {
+ void start();
+
+ void stop();
+
+ void end();
+
+ boolean isOnGoing();
+
+ void refreshData(Player player, double score, boolean doubleScore);
+
+ boolean hasPlayerJoined(OfflinePlayer player);
+
+ float getProgress();
+
+ long getRemainingTime();
+
+ long getStartTime();
+
+ CompetitionConfig getConfig();
+
+ CompetitionGoal getGoal();
+
+ Ranking getRanking();
+}
diff --git a/src/main/java/net/momirealms/customfishing/fishing/competition/ranking/RankingInterface.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/Ranking.java
similarity index 68%
rename from src/main/java/net/momirealms/customfishing/fishing/competition/ranking/RankingInterface.java
rename to api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/Ranking.java
index 38a215f8..a4cca23d 100644
--- a/src/main/java/net/momirealms/customfishing/fishing/competition/ranking/RankingInterface.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/Ranking.java
@@ -15,24 +15,33 @@
* along with this program. If not, see .
*/
-package net.momirealms.customfishing.fishing.competition.ranking;
+package net.momirealms.customfishing.api.mechanic.competition;
-import net.momirealms.customfishing.fishing.competition.CompetitionPlayer;
+import net.momirealms.customfishing.api.common.Pair;
import org.jetbrains.annotations.Nullable;
import java.util.Iterator;
-public interface RankingInterface {
+public interface Ranking {
void clear();
+
CompetitionPlayer getCompetitionPlayer(String player);
- Iterator getIterator();
+
+ Iterator> getIterator();
+
int getSize();
- String getPlayerRank(String player);
- float getPlayerScore(String player);
- void refreshData(String player, float score);
- void setData(String player, float score);
+
+ int getPlayerRank(String player);
+
+ double getPlayerScore(String player);
+
+ void refreshData(String player, double score);
+
+ void setData(String player, double score);
+
@Nullable
String getPlayerAt(int rank);
- float getScoreAt(int rank);
+
+ double getScoreAt(int rank);
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/condition/Condition.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/condition/Condition.java
new file mode 100644
index 00000000..170a4383
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/condition/Condition.java
@@ -0,0 +1,72 @@
+package net.momirealms.customfishing.api.mechanic.condition;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.HashMap;
+
+public class Condition {
+
+ @Nullable
+ protected final Location location;
+ @Nullable
+ protected final Player player;
+ @NotNull
+ protected final HashMap args;
+
+ public Condition() {
+ this(null, null, new HashMap<>());
+ }
+
+ public Condition(HashMap args) {
+ this(null, null, args);
+ }
+
+ public Condition(Player player) {
+ this(player.getLocation(), player, new HashMap<>());
+ }
+
+ public Condition(Player player, HashMap args) {
+ this(player.getLocation(), player, args);
+ }
+
+ public Condition(@Nullable Location location, @Nullable Player player, @NotNull HashMap args) {
+ this.location = location;
+ this.player = player;
+ this.args = args;
+ if (player != null)
+ this.args.put("player", player.getName());
+ if (location != null) {
+ this.args.put("x", String.valueOf(location.getX()));
+ this.args.put("y", String.valueOf(location.getY()));
+ this.args.put("z", String.valueOf(location.getZ()));
+ this.args.put("world", location.getWorld().getName());
+ }
+ }
+
+ @Nullable
+ public Location getLocation() {
+ return location;
+ }
+
+ @Nullable
+ public Player getPlayer() {
+ return player;
+ }
+
+ @NotNull
+ public HashMap getArgs() {
+ return args;
+ }
+
+ @Nullable
+ public String getArg(String key) {
+ return args.get(key);
+ }
+
+ public void insertArg(String key, String value) {
+ args.put(key, value);
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/condition/FishingPreparation.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/condition/FishingPreparation.java
new file mode 100644
index 00000000..d7312947
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/condition/FishingPreparation.java
@@ -0,0 +1,143 @@
+package net.momirealms.customfishing.api.mechanic.condition;
+
+import net.momirealms.customfishing.api.CustomFishingPlugin;
+import net.momirealms.customfishing.api.mechanic.effect.Effect;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
+public class FishingPreparation extends Condition {
+
+ private final boolean rodOnMainHand;
+ private final @NotNull ItemStack rodItemStack;
+ private final @NotNull String rodItemID;
+ private final @Nullable Effect rodEffect;
+ private @Nullable ItemStack baitItemStack;
+ private @Nullable String baitItemID;
+ private @Nullable Effect baitEffect;
+ private final List utilEffects;
+ private boolean canFish = true;
+
+ public FishingPreparation(Player player, CustomFishingPlugin plugin) {
+ super(player);
+
+ PlayerInventory playerInventory = player.getInventory();
+ ItemStack mainHandItem = playerInventory.getItemInMainHand();
+ ItemStack offHandItem = playerInventory.getItemInOffHand();
+
+ this.utilEffects = new ArrayList<>();
+ this.rodOnMainHand = mainHandItem.getType() == Material.FISHING_ROD;
+ this.rodItemStack = this.rodOnMainHand ? mainHandItem : offHandItem;
+ this.rodItemID = plugin.getItemManager().getAnyItemID(this.rodItemStack);
+ this.rodEffect = plugin.getEffectManager().getEffect("rod", this.rodItemID);
+ super.insertArg("rod", this.rodItemID);
+
+ String baitItemID = plugin.getItemManager().getAnyItemID(this.rodOnMainHand ? offHandItem : mainHandItem);
+ Effect baitEffect = plugin.getEffectManager().getEffect("bait", baitItemID);
+ if (baitEffect != null) {
+ this.baitItemID = baitItemID;
+ this.baitItemStack = this.rodOnMainHand ? offHandItem : mainHandItem;
+ this.baitEffect = baitEffect;
+ } else if (plugin.getBagManager().isBagEnabled()) {
+ Inventory fishingBag = plugin.getBagManager().getOnlineBagInventory(player.getUniqueId());
+ HashSet uniqueUtils = new HashSet<>(4);
+ if (fishingBag != null) {
+ for (int i = 0; i < fishingBag.getSize(); i++) {
+ ItemStack itemInBag = fishingBag.getItem(i);
+ String bagItemID = plugin.getItemManager().getItemID(itemInBag);
+ if (bagItemID == null) continue;
+ if (this.baitEffect == null) {
+ Effect effect = plugin.getEffectManager().getEffect("bait", bagItemID);
+ if (effect != null) {
+ this.baitItemID = bagItemID;
+ this.baitItemStack = itemInBag;
+ this.baitEffect = effect;
+ continue;
+ }
+ }
+ Effect utilEffect = plugin.getEffectManager().getEffect("util", bagItemID);
+ if (utilEffect != null
+ && !uniqueUtils.contains(bagItemID)
+ && utilEffect.canMerge(this)) {
+ utilEffects.add(utilEffect);
+ uniqueUtils.add(bagItemID);
+ }
+ }
+ }
+ } else {
+ this.baitItemID = null;
+ this.baitItemStack = null;
+ this.baitEffect = null;
+ }
+
+ if (this.baitEffect != null) {
+ if (!this.baitEffect.canMerge(this)) {
+ this.canFish = false;
+ return;
+ }
+ super.insertArg("bait", this.baitItemID);
+ }
+
+ if (this.rodEffect != null) {
+ if (!this.rodEffect.canMerge(this)) {
+ this.canFish = false;
+ }
+ }
+ }
+
+ public boolean isRodOnMainHand() {
+ return rodOnMainHand;
+ }
+
+ @NotNull
+ public ItemStack getRodItemStack() {
+ return rodItemStack;
+ }
+
+ @NotNull
+ public String getRodItemID() {
+ return rodItemID;
+ }
+
+ @Nullable
+ public ItemStack getBaitItemStack() {
+ return baitItemStack;
+ }
+
+ @Nullable
+ public String getBaitItemID() {
+ return baitItemID;
+ }
+
+ @Nullable
+ public Effect getRodEffect() {
+ return rodEffect;
+ }
+
+ @Nullable
+ public Effect getBaitEffect() {
+ return baitEffect;
+ }
+
+ public boolean canFish() {
+ return this.canFish;
+ }
+
+ @Override
+ public @NotNull Player getPlayer() {
+ assert super.player != null;
+ return super.player;
+ }
+
+ public List getUtilEffects() {
+ return utilEffects;
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/AbstractEffect.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/AbstractEffect.java
new file mode 100644
index 00000000..22b12eca
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/AbstractEffect.java
@@ -0,0 +1,96 @@
+package net.momirealms.customfishing.api.mechanic.effect;
+
+import net.momirealms.customfishing.api.common.Pair;
+import net.momirealms.customfishing.api.mechanic.condition.Condition;
+import net.momirealms.customfishing.api.mechanic.loot.Modifier;
+import net.momirealms.customfishing.api.mechanic.requirement.Requirement;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AbstractEffect implements Effect {
+
+ protected boolean lavaFishing = false;
+ protected double multipleLootChance = 0;
+ protected double sizeMultiplier = 1;
+ protected double scoreMultiplier = 1;
+ protected double timeModifier = 1;
+ protected double difficultyModifier = 0;
+ protected double gameTimeModifier = 0;
+ protected Requirement[] requirements;
+ protected List> lootWeightModifier = new ArrayList<>();
+
+ @Override
+ public boolean persist() {
+ return false;
+ }
+
+ @Override
+ public Requirement[] getRequirements() {
+ return requirements;
+ }
+
+ @Override
+ public boolean canLavaFishing() {
+ return lavaFishing;
+ }
+
+ @Override
+ public double getMultipleLootChance() {
+ return multipleLootChance;
+ }
+
+ @Override
+ public double getSizeMultiplier() {
+ return sizeMultiplier;
+ }
+
+ @Override
+ public double getScoreMultiplier() {
+ return scoreMultiplier;
+ }
+
+ @Override
+ public double getTimeModifier() {
+ return timeModifier;
+ }
+
+ @Override
+ public double getGameTimeModifier() {
+ return gameTimeModifier;
+ }
+
+ @Override
+ public double getDifficultyModifier() {
+ return difficultyModifier;
+ }
+
+ @Override
+ public AbstractEffect merge(Effect another) {
+ if (another == null) return this;
+ if (another.canLavaFishing()) this.lavaFishing = true;
+ this.scoreMultiplier += (another.getScoreMultiplier() -1);
+ this.sizeMultiplier += (another.getSizeMultiplier() -1);
+ this.timeModifier += (another.getTimeModifier() -1);
+ this.multipleLootChance += another.getMultipleLootChance();
+ this.difficultyModifier += another.getDifficultyModifier();
+ this.gameTimeModifier += another.getGameTimeModifier();
+ return this;
+ }
+
+ @Override
+ public List> getLootWeightModifier() {
+ return lootWeightModifier;
+ }
+
+ @Override
+ public boolean canMerge(Condition condition) {
+ if (this.requirements == null) return true;
+ for (Requirement requirement : requirements) {
+ if (!requirement.isConditionMet(condition)) {
+ return false;
+ }
+ }
+ return true;
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/Effect.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/Effect.java
new file mode 100644
index 00000000..f71be5a1
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/Effect.java
@@ -0,0 +1,35 @@
+package net.momirealms.customfishing.api.mechanic.effect;
+
+import net.momirealms.customfishing.api.common.Pair;
+import net.momirealms.customfishing.api.mechanic.condition.Condition;
+import net.momirealms.customfishing.api.mechanic.loot.Modifier;
+import net.momirealms.customfishing.api.mechanic.requirement.Requirement;
+
+import java.util.List;
+
+public interface Effect {
+
+ boolean persist();
+
+ Requirement[] getRequirements();
+
+ boolean canLavaFishing();
+
+ double getMultipleLootChance();
+
+ double getSizeMultiplier();
+
+ double getScoreMultiplier();
+
+ double getTimeModifier();
+
+ double getGameTimeModifier();
+
+ double getDifficultyModifier();
+
+ Effect merge(Effect another);
+
+ List> getLootWeightModifier();
+
+ boolean canMerge(Condition condition);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/FishingEffect.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/FishingEffect.java
new file mode 100644
index 00000000..539f1717
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/FishingEffect.java
@@ -0,0 +1,68 @@
+package net.momirealms.customfishing.api.mechanic.effect;
+
+import net.momirealms.customfishing.api.common.Pair;
+import net.momirealms.customfishing.api.mechanic.loot.Modifier;
+import net.momirealms.customfishing.api.mechanic.requirement.Requirement;
+
+import java.util.List;
+
+public class FishingEffect extends AbstractEffect {
+
+ public static class Builder {
+
+ private final FishingEffect effect;
+
+ public Builder() {
+ this.effect = new FishingEffect();
+ }
+
+ public Builder lootWeightModifier(List> modifier) {
+ effect.lootWeightModifier = modifier;
+ return this;
+ }
+
+ public Builder multipleLootChance(double multipleLootChance) {
+ effect.multipleLootChance = multipleLootChance;
+ return this;
+ }
+
+ public Builder difficultyModifier(double difficultyModifier) {
+ effect.difficultyModifier = difficultyModifier;
+ return this;
+ }
+
+ public Builder sizeMultiplier(double sizeMultiplier) {
+ effect.sizeMultiplier = sizeMultiplier;
+ return this;
+ }
+
+ public Builder timeModifier(double timeModifier) {
+ effect.timeModifier = timeModifier;
+ return this;
+ }
+
+ public Builder scoreMultiplier(double scoreMultiplier) {
+ effect.scoreMultiplier = scoreMultiplier;
+ return this;
+ }
+
+ public Builder gameTimeModifier(double gameTimeModifier) {
+ effect.gameTimeModifier = gameTimeModifier;
+ return this;
+ }
+
+ public Builder lavaFishing(boolean lavaFishing) {
+ effect.lavaFishing = lavaFishing;
+ return this;
+ }
+
+ public Builder requirements(Requirement[] requirements) {
+ effect.requirements = requirements;
+ return this;
+ }
+
+ public FishingEffect build() {
+ return effect;
+ }
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/AbstractGame.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/AbstractGame.java
new file mode 100644
index 00000000..cd4c3bc6
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/AbstractGame.java
@@ -0,0 +1,14 @@
+package net.momirealms.customfishing.api.mechanic.game;
+
+import net.momirealms.customfishing.api.manager.FishingManager;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.Player;
+
+public abstract class AbstractGame implements Game {
+
+ public AbstractGame(ConfigurationSection config) {
+ }
+
+ @Override
+ public abstract GamingPlayer start(Player player, GameSettings settings, FishingManager manager);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/AbstractGamingPlayer.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/AbstractGamingPlayer.java
new file mode 100644
index 00000000..cf7dc4e6
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/AbstractGamingPlayer.java
@@ -0,0 +1,101 @@
+package net.momirealms.customfishing.api.mechanic.game;
+
+import net.momirealms.customfishing.api.CustomFishingPlugin;
+import net.momirealms.customfishing.api.manager.FishingManager;
+import net.momirealms.customfishing.api.mechanic.effect.Effect;
+import net.momirealms.customfishing.api.scheduler.CancellableTask;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.PlayerInventory;
+import org.bukkit.potion.PotionEffectType;
+
+import java.util.concurrent.TimeUnit;
+
+public abstract class AbstractGamingPlayer implements GamingPlayer, Runnable {
+
+ protected boolean succeeded;
+ protected CancellableTask task;
+ protected Player player;
+ protected GameSettings settings;
+ protected FishingManager manager;
+ private final long deadline;
+
+ public AbstractGamingPlayer(Player player, GameSettings settings, FishingManager manager) {
+ this.player = player;
+ this.settings = settings;
+ this.manager = manager;
+ this.deadline = System.currentTimeMillis() + settings.getTime() * 1000L;
+ this.arrangeTask();
+ }
+
+ public void arrangeTask() {
+ this.task = CustomFishingPlugin.get().getScheduler().runTaskAsyncTimer(this, 50, 50, TimeUnit.MILLISECONDS);
+ }
+
+ @Override
+ public void cancel() {
+ if (task != null && !task.isCancelled())
+ task.cancel();
+ }
+
+ @Override
+ public boolean isSucceeded() {
+ return succeeded;
+ }
+
+ @Override
+ public boolean onRightClick() {
+ manager.processGameResult(this);
+ return true;
+ }
+
+ @Override
+ public boolean onLeftClick() {
+ return false;
+ }
+
+ @Override
+ public boolean onSwapHand() {
+ return false;
+ }
+
+ @Override
+ public boolean onJump() {
+ return false;
+ }
+
+ @Override
+ public Player getPlayer() {
+ return player;
+ }
+
+ @Override
+ public Effect getEffectReward() {
+ return null;
+ }
+
+ @Override
+ public void run() {
+ timeOutCheck();
+ switchItemCheck();
+ }
+
+ protected void timeOutCheck() {
+ if (System.currentTimeMillis() > deadline) {
+ cancel();
+ if (manager.removeHook(player.getUniqueId())) {
+ manager.processGameResult(this);
+ }
+ }
+ }
+
+ protected void switchItemCheck() {
+ PlayerInventory playerInventory = player.getInventory();
+ if (playerInventory.getItemInMainHand().getType() != Material.FISHING_ROD
+ && playerInventory.getItemInOffHand().getType() != Material.FISHING_ROD) {
+ cancel();
+ manager.processGameResult(this);
+ player.removePotionEffect(PotionEffectType.SLOW);
+ }
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/Game.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/Game.java
new file mode 100644
index 00000000..0de14d0f
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/Game.java
@@ -0,0 +1,9 @@
+package net.momirealms.customfishing.api.mechanic.game;
+
+import net.momirealms.customfishing.api.manager.FishingManager;
+import org.bukkit.entity.Player;
+
+public interface Game {
+
+ GamingPlayer start(Player player, GameSettings settings, FishingManager manager);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/GameConfig.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/GameConfig.java
new file mode 100644
index 00000000..1888526e
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/GameConfig.java
@@ -0,0 +1,11 @@
+package net.momirealms.customfishing.api.mechanic.game;
+
+import net.momirealms.customfishing.api.common.Pair;
+import net.momirealms.customfishing.api.mechanic.effect.Effect;
+import org.jetbrains.annotations.Nullable;
+
+public interface GameConfig {
+
+ @Nullable
+ Pair getRandomGame(Effect effect);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/GameGroup.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/GameGroup.java
new file mode 100644
index 00000000..7e1c1e4f
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/GameGroup.java
@@ -0,0 +1,61 @@
+package net.momirealms.customfishing.api.mechanic.game;
+
+import net.momirealms.customfishing.api.CustomFishingPlugin;
+import net.momirealms.customfishing.api.common.Pair;
+import net.momirealms.customfishing.api.mechanic.effect.Effect;
+import net.momirealms.customfishing.api.util.WeightUtils;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
+
+public class GameGroup implements GameConfig {
+
+ private final List> gamePairs;
+ private int minTime;
+ private int maxTime;
+ private int minDifficulty;
+ private int maxDifficulty;
+
+ public GameGroup(List> gamePairs) {
+ this.gamePairs = gamePairs;
+ }
+
+ public GameGroup difficulty(int value) {
+ minDifficulty = (maxDifficulty = value);
+ return this;
+ }
+
+ public GameGroup time(int value) {
+ minTime = (maxTime = value);
+ return this;
+ }
+
+ public GameGroup difficulty(int min, int max) {
+ minDifficulty = min;
+ maxDifficulty = max;
+ return this;
+ }
+
+ public GameGroup time(int min, int max) {
+ minTime = min;
+ maxTime = max;
+ return this;
+ }
+
+ @Override
+ @Nullable
+ public Pair getRandomGame(Effect effect) {
+ String key = WeightUtils.getRandom(gamePairs);
+ Game game = CustomFishingPlugin.get().getGameManager().getGame(key);
+ if (game == null) {
+ CustomFishingPlugin.get().getLogger().warning(String.format("Game %s doesn't exist!", key));
+ return null;
+ }
+ GameSettings settings = new GameSettings(
+ ThreadLocalRandom.current().nextInt(minTime, maxTime + 1),
+ (int) (ThreadLocalRandom.current().nextInt(minDifficulty, maxDifficulty + 1) + effect.getDifficultyModifier())
+ );
+ return Pair.of(game, settings);
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/GameGroups.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/GameGroups.java
new file mode 100644
index 00000000..ec7ab18e
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/GameGroups.java
@@ -0,0 +1,33 @@
+package net.momirealms.customfishing.api.mechanic.game;
+
+import net.momirealms.customfishing.api.CustomFishingPlugin;
+import net.momirealms.customfishing.api.common.Pair;
+import net.momirealms.customfishing.api.mechanic.effect.Effect;
+import net.momirealms.customfishing.api.util.WeightUtils;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+public class GameGroups implements GameConfig {
+
+ private final List> gamesWithWeight;
+
+ public GameGroups(List> gamesWithWeight) {
+ this.gamesWithWeight = gamesWithWeight;
+ }
+
+ @Override
+ public @Nullable Pair getRandomGame(Effect effect) {
+ String group = WeightUtils.getRandom(gamesWithWeight);
+ GameConfig gameConfig = CustomFishingPlugin.get().getGameManager().getGameConfig(group);
+ if (gameConfig == null) {
+ CustomFishingPlugin.get().getLogger().warning(String.format("Game config %s doesn't exist!", group));
+ return null;
+ }
+ if (!(gameConfig instanceof GameGroup gameGroup)) {
+ CustomFishingPlugin.get().getLogger().warning(String.format("%s is not a game group!", group));
+ return null;
+ }
+ return gameGroup.getRandomGame(effect);
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/GameSettings.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/GameSettings.java
new file mode 100644
index 00000000..05c90ea7
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/GameSettings.java
@@ -0,0 +1,20 @@
+package net.momirealms.customfishing.api.mechanic.game;
+
+public class GameSettings {
+
+ private final int time;
+ private final int difficulty;
+
+ public GameSettings(int time, int difficulty) {
+ this.time = time;
+ this.difficulty = difficulty;
+ }
+
+ public int getTime() {
+ return time;
+ }
+
+ public int getDifficulty() {
+ return difficulty;
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/GamingPlayer.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/GamingPlayer.java
new file mode 100644
index 00000000..ec145138
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/GamingPlayer.java
@@ -0,0 +1,23 @@
+package net.momirealms.customfishing.api.mechanic.game;
+
+import net.momirealms.customfishing.api.mechanic.effect.Effect;
+import org.bukkit.entity.Player;
+
+public interface GamingPlayer {
+
+ void cancel();
+
+ boolean isSucceeded();
+
+ boolean onRightClick();
+
+ boolean onLeftClick();
+
+ boolean onSwapHand();
+
+ boolean onJump();
+
+ Player getPlayer();
+
+ Effect getEffectReward();
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/BuildableItem.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/BuildableItem.java
new file mode 100644
index 00000000..dd001b92
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/BuildableItem.java
@@ -0,0 +1,25 @@
+package net.momirealms.customfishing.api.mechanic.item;
+
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public interface BuildableItem {
+
+ default ItemStack build() {
+ return build(null, new HashMap<>());
+ }
+
+ default ItemStack build(Player player) {
+ return build(player, new HashMap<>());
+ }
+
+ ItemStack build(Player player, Map placeholders);
+
+ /**
+ * Whether the item would be removed from cache when reloading
+ */
+ boolean persist();
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/ItemBuilder.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/ItemBuilder.java
new file mode 100644
index 00000000..9d2ace7f
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/ItemBuilder.java
@@ -0,0 +1,72 @@
+package net.momirealms.customfishing.api.mechanic.item;
+
+import de.tr7zw.changeme.nbtapi.NBTItem;
+import net.momirealms.customfishing.api.common.Pair;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemFlag;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+public interface ItemBuilder {
+
+ ItemBuilder customModelData(int value);
+
+ ItemBuilder name(String name);
+
+ ItemBuilder amount(int amount);
+
+ ItemBuilder tag(boolean tag, String type, String id);
+
+ ItemBuilder unbreakable(boolean unbreakable);
+
+ ItemBuilder lore(List lore);
+
+ ItemBuilder nbt(Map nbt);
+
+ ItemBuilder itemFlag(List itemFlags);
+
+ ItemBuilder nbt(ConfigurationSection section);
+
+ ItemBuilder enchantment(List> enchantments, boolean store);
+
+ ItemBuilder maxDurability(int max);
+
+ ItemBuilder price(float base, float bonus);
+
+ ItemBuilder size(Pair size);
+
+ ItemBuilder stackable(boolean stackable);
+
+ ItemBuilder preventGrabbing(boolean prevent);
+
+ ItemBuilder head(String base64);
+
+ ItemBuilder randomDamage(boolean damage);
+
+ @NotNull
+ String getId();
+
+ @NotNull
+ String getLibrary();
+
+ int getAmount();
+
+ Collection getEditors();
+
+ ItemBuilder removeEditor(String type);
+
+ ItemBuilder registerCustomEditor(String type, ItemPropertyEditor editor);
+
+ interface ItemPropertyEditor {
+
+ void edit(Player player, NBTItem nbtItem, Map placeholders);
+
+ default void edit(Player player, NBTItem nbtItem) {
+ edit(player, nbtItem, null);
+ }
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/ItemLibrary.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/ItemLibrary.java
new file mode 100644
index 00000000..d6e07fce
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/ItemLibrary.java
@@ -0,0 +1,13 @@
+package net.momirealms.customfishing.api.mechanic.item;
+
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+public interface ItemLibrary {
+
+ String identification();
+
+ ItemStack buildItem(Player player, String id);
+
+ String getItemID(ItemStack itemStack);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/Loot.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/Loot.java
new file mode 100644
index 00000000..17e37932
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/Loot.java
@@ -0,0 +1,77 @@
+package net.momirealms.customfishing.api.mechanic.loot;
+
+import net.momirealms.customfishing.api.mechanic.action.Action;
+import net.momirealms.customfishing.api.mechanic.action.ActionTrigger;
+import net.momirealms.customfishing.api.mechanic.game.GameConfig;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashMap;
+
+public interface Loot {
+
+ boolean instanceGame();
+
+ /**
+ * get the loot id
+ * @return id
+ */
+ String getID();
+
+ /**
+ * get the loot type
+ * @return type
+ */
+ LootType getType();
+
+ /**
+ * nick would be display.name or key name if not set (MiniMessage format)
+ * @return nick
+ */
+ @NotNull
+ String getNick();
+
+ /**
+ * if the loot can be seen from the finder
+ * @return show in finder or not
+ */
+ boolean showInFinder();
+
+ /**
+ * get the score in competition
+ * @return score
+ */
+ double getScore();
+
+ /**
+ * if the game is disabled
+ * @return disabled or not
+ */
+ boolean disableGame();
+
+ /**
+ * if the statistics is disabled
+ * @return disabled or not
+ */
+ boolean disableStats();
+
+ /**
+ * Get the game config
+ * @return game config
+ */
+ GameConfig getGameConfig();
+
+ /**
+ * get actions triggered by certain events
+ * @return actions
+ */
+ Action[] getActions(ActionTrigger actionTrigger);
+
+ /**
+ * get actions when succeeding in fishing for certain times
+ * @param times times
+ * @return actions
+ */
+ Action[] getSuccessTimesActions(int times);
+
+ HashMap getSuccessTimesActionMap();
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/LootType.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/LootType.java
new file mode 100644
index 00000000..42fc6c7b
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/LootType.java
@@ -0,0 +1,9 @@
+package net.momirealms.customfishing.api.mechanic.loot;
+
+public enum LootType {
+
+ LOOT,
+ MOB,
+ BLOCK,
+ GLOBAL
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/Modifier.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/Modifier.java
new file mode 100644
index 00000000..305ca553
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/Modifier.java
@@ -0,0 +1,5 @@
+package net.momirealms.customfishing.api.mechanic.loot;
+
+public interface Modifier {
+ double modify(double weight);
+}
\ No newline at end of file
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/market/MarketGUI.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/market/MarketGUI.java
new file mode 100644
index 00000000..c45a70a2
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/market/MarketGUI.java
@@ -0,0 +1,19 @@
+package net.momirealms.customfishing.api.mechanic.market;
+
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
+import org.jetbrains.annotations.NotNull;
+
+public class MarketGUI implements InventoryHolder {
+
+ private Inventory inventory;
+
+ public void setInventory(Inventory inventory) {
+ this.inventory = inventory;
+ }
+
+ @Override
+ public @NotNull Inventory getInventory() {
+ return inventory;
+ }
+}
\ No newline at end of file
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/mob/MobConfig.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/mob/MobConfig.java
new file mode 100644
index 00000000..a35b6ada
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/mob/MobConfig.java
@@ -0,0 +1,75 @@
+package net.momirealms.customfishing.api.mechanic.mob;
+
+import java.util.Map;
+
+public class MobConfig implements MobSettings {
+
+ private String mob;
+ private double horizontalVector;
+ private double verticalVector;
+ private Map propertyMap;
+ private boolean persist;
+
+ @Override
+ public boolean isPersist() {
+ return persist;
+ }
+
+ @Override
+ public double getHorizontalVector() {
+ return horizontalVector;
+ }
+
+ @Override
+ public double getVerticalVector() {
+ return verticalVector;
+ }
+
+ @Override
+ public String getMobID() {
+ return mob;
+ }
+
+ @Override
+ public Map getPropertyMap() {
+ return propertyMap;
+ }
+
+ public static class Builder {
+
+ private final MobConfig config;
+
+ public Builder() {
+ this.config = new MobConfig();
+ }
+
+ public Builder mobID(String value) {
+ this.config.mob = value;
+ return this;
+ }
+
+ public Builder persist(boolean value) {
+ this.config.persist = value;
+ return this;
+ }
+
+ public Builder verticalVector(double value) {
+ this.config.verticalVector = value;
+ return this;
+ }
+
+ public Builder horizontalVector(double value) {
+ this.config.horizontalVector = value;
+ return this;
+ }
+
+ public Builder propertyMap(Map value) {
+ this.config.propertyMap = value;
+ return this;
+ }
+
+ public MobConfig build() {
+ return config;
+ }
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/mob/MobLibrary.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/mob/MobLibrary.java
new file mode 100644
index 00000000..b47072f1
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/mob/MobLibrary.java
@@ -0,0 +1,13 @@
+package net.momirealms.customfishing.api.mechanic.mob;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+
+import java.util.Map;
+
+public interface MobLibrary {
+
+ String identification();
+
+ Entity spawn(Location location, String id, Map mobPropertyMap);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/mob/MobSettings.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/mob/MobSettings.java
new file mode 100644
index 00000000..9d575da5
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/mob/MobSettings.java
@@ -0,0 +1,15 @@
+package net.momirealms.customfishing.api.mechanic.mob;
+
+import java.util.Map;
+
+public interface MobSettings {
+ boolean isPersist();
+
+ double getHorizontalVector();
+
+ double getVerticalVector();
+
+ String getMobID();
+
+ Map getPropertyMap();
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/requirement/Requirement.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/requirement/Requirement.java
new file mode 100644
index 00000000..6bcf31a8
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/requirement/Requirement.java
@@ -0,0 +1,8 @@
+package net.momirealms.customfishing.api.mechanic.requirement;
+
+import net.momirealms.customfishing.api.mechanic.condition.Condition;
+
+public interface Requirement {
+
+ boolean isConditionMet(Condition condition);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/requirement/RequirementBuilder.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/requirement/RequirementBuilder.java
new file mode 100644
index 00000000..130f7ea0
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/requirement/RequirementBuilder.java
@@ -0,0 +1,14 @@
+package net.momirealms.customfishing.api.mechanic.requirement;
+
+import net.momirealms.customfishing.api.mechanic.action.Action;
+
+import java.util.List;
+
+public interface RequirementBuilder {
+
+ Requirement build(Object args, List notMetActions, boolean checkAction);
+
+ default Requirement build(Object args) {
+ return build(args, null, false);
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/statistic/Statistics.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/statistic/Statistics.java
new file mode 100644
index 00000000..79aff324
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/statistic/Statistics.java
@@ -0,0 +1,85 @@
+package net.momirealms.customfishing.api.mechanic.statistic;
+
+import com.google.gson.annotations.SerializedName;
+import net.momirealms.customfishing.api.data.StatisticData;
+import net.momirealms.customfishing.api.mechanic.action.Action;
+import net.momirealms.customfishing.api.mechanic.condition.FishingPreparation;
+import net.momirealms.customfishing.api.mechanic.loot.Loot;
+import org.bukkit.configuration.ConfigurationSection;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Statistics {
+
+ @SerializedName("statistic_map")
+ private final HashMap statisticMap;
+ private int total;
+
+ public Statistics() {
+ this.statisticMap = new HashMap<>();
+ this.total = 0;
+ }
+
+ public Statistics(ConfigurationSection section) {
+ this.statisticMap = new HashMap<>();
+ this.total = 0;
+ for (String key : section.getKeys(false)) {
+ int amount = section.getInt(key);
+ total += amount;
+ statisticMap.put(key, amount);
+ }
+ }
+
+ public Statistics(StatisticData statisticData) {
+ this.statisticMap = new HashMap<>(statisticData.statisticMap);
+ this.total = statisticMap.values().stream().mapToInt(Integer::intValue).sum();
+ }
+
+ public void addLootAmount(Loot loot, FishingPreparation fishingPreparation, int amount) {
+ Integer previous = statisticMap.get(loot.getID());
+ if (previous == null) previous = 0;
+ int after = previous + amount;
+ statisticMap.put(loot.getID(), after);
+ total += amount;
+ doSuccessTimesAction(previous, after, fishingPreparation, loot);
+ }
+
+ private void doSuccessTimesAction(Integer previous, int after, FishingPreparation fishingPreparation, Loot loot) {
+ HashMap actionMap = loot.getSuccessTimesActionMap();
+ if (actionMap != null) {
+ for (Map.Entry entry : actionMap.entrySet()) {
+ if (entry.getKey() > previous && entry.getKey() <= after) {
+ for (Action action : entry.getValue()) {
+ action.trigger(fishingPreparation);
+ }
+ }
+ }
+ }
+ }
+
+ public int getFishAmount(String key) {
+ Integer amount = statisticMap.get(key);
+ return amount == null ? 0 : amount;
+ }
+
+ public boolean hasFished(String key) {
+ return statisticMap.containsKey(key);
+ }
+
+ public void reset() {
+ statisticMap.clear();
+ }
+
+ public HashMap getStatisticMap() {
+ return statisticMap;
+ }
+
+ public void setData(String key, int value) {
+ statisticMap.put(key, value);
+ }
+
+ public int getTotalCatchAmount() {
+ return total;
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/scheduler/CancellableTask.java b/api/src/main/java/net/momirealms/customfishing/api/scheduler/CancellableTask.java
new file mode 100644
index 00000000..5ec6454f
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/scheduler/CancellableTask.java
@@ -0,0 +1,8 @@
+package net.momirealms.customfishing.api.scheduler;
+
+public interface CancellableTask {
+
+ void cancel();
+
+ boolean isCancelled();
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/scheduler/Scheduler.java b/api/src/main/java/net/momirealms/customfishing/api/scheduler/Scheduler.java
new file mode 100644
index 00000000..f7617495
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/scheduler/Scheduler.java
@@ -0,0 +1,22 @@
+package net.momirealms.customfishing.api.scheduler;
+
+import org.bukkit.Location;
+
+import java.util.concurrent.TimeUnit;
+
+public interface Scheduler {
+
+ void runTaskSync(Runnable runnable, Location location);
+
+ CancellableTask runTaskSyncTimer(Runnable runnable, Location location, long delay, long period);
+
+ CancellableTask runTaskAsyncLater(Runnable runnable, long delay, TimeUnit timeUnit);
+
+ void runTaskAsync(Runnable runnable);
+
+ CancellableTask runTaskSyncLater(Runnable runnable, Location location, long delay, TimeUnit timeUnit);
+
+ CancellableTask runTaskSyncLater(Runnable runnable, Location location, long delay);
+
+ CancellableTask runTaskAsyncTimer(Runnable runnable, long delay, long period, TimeUnit timeUnit);
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/util/FontUtils.java b/api/src/main/java/net/momirealms/customfishing/api/util/FontUtils.java
new file mode 100644
index 00000000..bd8e95ba
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/util/FontUtils.java
@@ -0,0 +1,8 @@
+package net.momirealms.customfishing.api.util;
+
+public class FontUtils {
+
+ public static String surroundWithFont(String text, String font) {
+ return "" + text + "";
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/util/InventoryUtils.java b/api/src/main/java/net/momirealms/customfishing/api/util/InventoryUtils.java
new file mode 100644
index 00000000..ab6af613
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/util/InventoryUtils.java
@@ -0,0 +1,138 @@
+package net.momirealms.customfishing.api.util;
+
+import net.kyori.adventure.text.Component;
+import net.momirealms.customfishing.api.CustomFishingPlugin;
+import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.util.io.BukkitObjectInputStream;
+import org.bukkit.util.io.BukkitObjectOutputStream;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+public class InventoryUtils {
+
+ public static Inventory createInventory(InventoryHolder inventoryHolder, int size, Component component) {
+ try {
+ boolean isSpigot = CustomFishingPlugin.get().getVersionManager().isSpigot();
+ Method createInvMethod = ReflectionUtils.bukkitClass.getMethod(
+ "createInventory",
+ InventoryHolder.class,
+ int.class,
+ isSpigot ? String.class : ReflectionUtils.componentClass
+ );
+ return (Inventory) createInvMethod.invoke(
+ null,
+ inventoryHolder,
+ size,
+ isSpigot ? CustomFishingPlugin.get().getAdventure().componentToLegacy(component) : CustomFishingPlugin.get().getAdventure().shadedComponentToPaperComponent(component)
+ );
+ } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException exception) {
+ exception.printStackTrace();
+ return null;
+ }
+ }
+
+ public static Inventory createInventory(InventoryHolder inventoryHolder, InventoryType type, Component component) {
+ try {
+ boolean isSpigot = CustomFishingPlugin.get().getVersionManager().isSpigot();
+ Method createInvMethod = ReflectionUtils.bukkitClass.getMethod(
+ "createInventory",
+ InventoryHolder.class,
+ InventoryType.class,
+ isSpigot ? String.class : ReflectionUtils.componentClass
+ );
+ return (Inventory) createInvMethod.invoke(
+ null,
+ inventoryHolder,
+ type,
+ isSpigot ? CustomFishingPlugin.get().getAdventure().componentToLegacy(component) : CustomFishingPlugin.get().getAdventure().shadedComponentToPaperComponent(component)
+ );
+ } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException exception) {
+ exception.printStackTrace();
+ return null;
+ }
+ }
+
+ public static @NotNull String stacksToBase64(ItemStack[] contents) {
+ if (contents.length == 0) {
+ return "";
+ }
+ try {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ BukkitObjectOutputStream dataOutput = new BukkitObjectOutputStream(outputStream);
+ dataOutput.writeInt(contents.length);
+ for (ItemStack itemStack : contents) {
+ dataOutput.writeObject(itemStack);
+ }
+ dataOutput.close();
+ byte[] byteArr = outputStream.toByteArray();
+ outputStream.close();
+ return Base64Coder.encodeLines(byteArr);
+ } catch (IOException e) {
+ LogUtils.warn("Encoding error", e);
+ }
+ return "";
+ }
+
+ /**
+ * Get itemStacks from base64
+ * @param base64 base64
+ * @return itemStacks
+ */
+ @Nullable
+ public static ItemStack[] getInventoryItems(String base64) {
+ ItemStack[] itemStacks = null;
+ try {
+ itemStacks = stacksFromBase64(base64);
+ } catch (IllegalArgumentException exception) {
+ exception.printStackTrace();
+ }
+ return itemStacks;
+ }
+
+ private static ItemStack[] stacksFromBase64(String data) {
+ if (data == null || data.equals("")) return new ItemStack[]{};
+
+ ByteArrayInputStream inputStream;
+ try {
+ inputStream = new ByteArrayInputStream(Base64Coder.decodeLines(data));
+ } catch (IllegalArgumentException e) {
+ return new ItemStack[]{};
+ }
+ BukkitObjectInputStream dataInput = null;
+ ItemStack[] stacks = null;
+ try {
+ dataInput = new BukkitObjectInputStream(inputStream);
+ stacks = new ItemStack[dataInput.readInt()];
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ if (stacks == null) return new ItemStack[]{};
+ for (int i = 0; i < stacks.length; i++) {
+ try {
+ stacks[i] = (ItemStack) dataInput.readObject();
+ } catch (IOException | ClassNotFoundException | NullPointerException e) {
+ try {
+ dataInput.close();
+ } catch (IOException exception) {
+ LogUtils.severe("Failed to read fishing bag data");
+ }
+ return null;
+ }
+ }
+ try {
+ dataInput.close();
+ } catch (IOException ignored) {
+ }
+ return stacks;
+ }
+}
diff --git a/src/main/java/net/momirealms/customfishing/helper/Log.java b/api/src/main/java/net/momirealms/customfishing/api/util/LogUtils.java
similarity index 78%
rename from src/main/java/net/momirealms/customfishing/helper/Log.java
rename to api/src/main/java/net/momirealms/customfishing/api/util/LogUtils.java
index 81d1efde..239711a5 100644
--- a/src/main/java/net/momirealms/customfishing/helper/Log.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/util/LogUtils.java
@@ -23,9 +23,9 @@
* SOFTWARE.
*/
-package net.momirealms.customfishing.helper;
+package net.momirealms.customfishing.api.util;
-import net.momirealms.customfishing.CustomFishing;
+import net.momirealms.customfishing.api.CustomFishingPlugin;
import org.bukkit.Bukkit;
import org.jetbrains.annotations.NotNull;
@@ -34,29 +34,29 @@ import java.util.logging.Level;
/**
* Utility for quickly accessing a logger instance without using {@link Bukkit#getLogger()}
*/
-public final class Log {
+public final class LogUtils {
public static void info(@NotNull String s) {
- CustomFishing.getInstance().getLogger().info(s);
+ CustomFishingPlugin.getInstance().getLogger().info(s);
}
public static void warn(@NotNull String s) {
- CustomFishing.getInstance().getLogger().warning(s);
+ CustomFishingPlugin.getInstance().getLogger().warning(s);
}
public static void severe(@NotNull String s) {
- CustomFishing.getInstance().getLogger().severe(s);
+ CustomFishingPlugin.getInstance().getLogger().severe(s);
}
public static void warn(@NotNull String s, Throwable t) {
- CustomFishing.getInstance().getLogger().log(Level.WARNING, s, t);
+ CustomFishingPlugin.getInstance().getLogger().log(Level.WARNING, s, t);
}
public static void severe(@NotNull String s, Throwable t) {
- CustomFishing.getInstance().getLogger().log(Level.SEVERE, s, t);
+ CustomFishingPlugin.getInstance().getLogger().log(Level.SEVERE, s, t);
}
- private Log() {
+ private LogUtils() {
throw new UnsupportedOperationException("This class cannot be instantiated");
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/util/OffsetUtils.java b/api/src/main/java/net/momirealms/customfishing/api/util/OffsetUtils.java
new file mode 100644
index 00000000..1aabca3a
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/util/OffsetUtils.java
@@ -0,0 +1,126 @@
+package net.momirealms.customfishing.api.util;
+
+import org.bukkit.configuration.ConfigurationSection;
+
+public class OffsetUtils {
+
+ private static String font;
+ private static String negative_1;
+ private static String negative_2;
+ private static String negative_4;
+ private static String negative_8;
+ private static String negative_16;
+ private static String negative_32;
+ private static String negative_64;
+ private static String negative_128;
+ private static String positive_1;
+ private static String positive_2;
+ private static String positive_4;
+ private static String positive_8;
+ private static String positive_16;
+ private static String positive_32;
+ private static String positive_64;
+ private static String positive_128;
+
+ public static void loadConfig(ConfigurationSection section) {
+ if (section != null) {
+ font = section.getString("font", "customfishing:offset_chars");
+ positive_1 = section.getString("1");
+ positive_2 = section.getString("2");
+ positive_4 = section.getString("4");
+ positive_8 = section.getString("8");
+ positive_16 = section.getString("16");
+ positive_32 = section.getString("32");
+ positive_64 = section.getString("64");
+ positive_128 = section.getString("128");
+ negative_1 = section.getString("-1");
+ negative_2 = section.getString("-2");
+ negative_4 = section.getString("-4");
+ negative_8 = section.getString("-8");
+ negative_16 = section.getString("-16");
+ negative_32 = section.getString("-32");
+ negative_64 = section.getString("-64");
+ negative_128 = section.getString("-128");
+ }
+ }
+
+ public static String getShortestNegChars(int n) {
+ StringBuilder stringBuilder = new StringBuilder();
+ while (n >= 128) {
+ stringBuilder.append(negative_128);
+ n -= 128;
+ }
+ if (n - 64 >= 0) {
+ stringBuilder.append(negative_64);
+ n -= 64;
+ }
+ if (n - 32 >= 0) {
+ stringBuilder.append(negative_32);
+ n -= 32;
+ }
+ if (n - 16 >= 0) {
+ stringBuilder.append(negative_16);
+ n -= 16;
+ }
+ if (n - 8 >= 0) {
+ stringBuilder.append(negative_8);
+ n -= 8;
+ }
+ if (n - 4 >= 0) {
+ stringBuilder.append(negative_4);
+ n -= 4;
+ }
+ if (n - 2 >= 0) {
+ stringBuilder.append(negative_2);
+ n -= 2;
+ }
+ if (n - 1 >= 0) {
+ stringBuilder.append(negative_1);
+ }
+ return stringBuilder.toString();
+ }
+
+ public static String getShortestPosChars(int n) {
+ StringBuilder stringBuilder = new StringBuilder();
+ while (n >= 128) {
+ stringBuilder.append(positive_128);
+ n -= 128;
+ }
+ if (n - 64 >= 0) {
+ stringBuilder.append(positive_64);
+ n -= 64;
+ }
+ if (n - 32 >= 0) {
+ stringBuilder.append(positive_32);
+ n -= 32;
+ }
+ if (n - 16 >= 0) {
+ stringBuilder.append(positive_16);
+ n -= 16;
+ }
+ if (n - 8 >= 0) {
+ stringBuilder.append(positive_8);
+ n -= 8;
+ }
+ if (n - 4 >= 0) {
+ stringBuilder.append(positive_4);
+ n -= 4;
+ }
+ if (n - 2 >= 0) {
+ stringBuilder.append(positive_2);
+ n -= 2;
+ }
+ if (n - 1 >= 0) {
+ stringBuilder.append(positive_1);
+ }
+ return stringBuilder.toString();
+ }
+
+ public static String getOffsetChars(int n) {
+ if (n > 0) {
+ return "" + getShortestPosChars(n) + "";
+ } else {
+ return "" + getShortestNegChars(-n) + "";
+ }
+ }
+}
diff --git a/src/main/java/net/momirealms/customfishing/object/Reflection.java b/api/src/main/java/net/momirealms/customfishing/api/util/ReflectionUtils.java
similarity index 56%
rename from src/main/java/net/momirealms/customfishing/object/Reflection.java
rename to api/src/main/java/net/momirealms/customfishing/api/util/ReflectionUtils.java
index 760cab48..4fd1410e 100644
--- a/src/main/java/net/momirealms/customfishing/object/Reflection.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/util/ReflectionUtils.java
@@ -1,56 +1,58 @@
-package net.momirealms.customfishing.object;
+package net.momirealms.customfishing.api.util;
import com.comphenix.protocol.utility.MinecraftReflection;
-import net.momirealms.customfishing.CustomFishing;
-import net.momirealms.customfishing.util.AdventureUtils;
+import net.momirealms.customfishing.api.CustomFishingPlugin;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-public class Reflection {
+public class ReflectionUtils {
- public static Class textComponentClass;
- public static Class componentClass;
- public static Class bukkitClass;
- public static Class textColorClass;
- public static Class keyClass;
- public static Class textDecorationClass;
- public static Class textDecorationStateClass;
public static Object removeBossBarPacket;
public static Constructor progressConstructor;
public static Constructor updateConstructor;
public static Method iChatComponentMethod;
+ public static Method gsonDeserializeMethod;
+ public static Object gsonInstance;
+ public static Class componentClass;
+ public static Class bukkitClass;
public static void load() {
- if (CustomFishing.getInstance().getVersionHelper().isSpigot()) return;
try {
- textComponentClass = Class.forName("net;kyori;adventure;text;TextComponent".replace(";", "."));
- componentClass = Class.forName("net;kyori;adventure;text;Component".replace(";", "."));
- bukkitClass = Class.forName("org;bukkit;Bukkit".replace(";", "."));
- textColorClass = Class.forName("net;kyori;adventure;text;format;TextColor".replace(";", "."));
- keyClass = Class.forName("net;kyori;adventure;key;Key".replace(";", "."));
- textDecorationClass = Class.forName("net;kyori;adventure;text;format;TextDecoration".replace(";", "."));
- textDecorationStateClass = Class.forName("net;kyori;adventure;text;format;TextDecoration$State".replace(";", "."));
-
Class bar = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutBoss");
Field remove = bar.getDeclaredField("f");
remove.setAccessible(true);
removeBossBarPacket = remove.get(null);
-
Class packetBossClassF = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutBoss$f");
progressConstructor = packetBossClassF.getDeclaredConstructor(float.class);
progressConstructor.setAccessible(true);
-
Class packetBossClassE = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutBoss$e");
updateConstructor = packetBossClassE.getDeclaredConstructor(MinecraftReflection.getIChatBaseComponentClass());
updateConstructor.setAccessible(true);
-
iChatComponentMethod = MinecraftReflection.getChatSerializerClass().getMethod("a", String.class);
iChatComponentMethod.setAccessible(true);
} catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException | NoSuchMethodException exception) {
- AdventureUtils.consoleMessage("[CustomFishing] Error occurred when loading reflections");
+ LogUtils.severe("Error occurred when loading reflections", exception);
exception.printStackTrace();
+ return;
+ }
+ if (CustomFishingPlugin.get().getVersionManager().isSpigot()) return;
+ try {
+ componentClass = Class.forName("net;kyori;adventure;text;Component".replace(";", "."));
+ bukkitClass = Class.forName("org;bukkit;Bukkit".replace(";", "."));
+ Class gsonComponentSerializerClass = Class.forName("net;kyori;adventure;text;serializer;gson;GsonComponentSerializer".replace(";", "."));
+ Class gsonComponentSerializerImplClass = Class.forName("net;kyori;adventure;text;serializer;gson;GsonComponentSerializerImpl".replace(";", "."));
+ Method gsonMethod = gsonComponentSerializerClass.getMethod("gson");
+ gsonInstance = gsonMethod.invoke(null);
+ gsonDeserializeMethod = gsonComponentSerializerImplClass.getMethod("deserialize", String.class);
+ gsonDeserializeMethod.setAccessible(true);
+ } catch (ClassNotFoundException exception) {
+ LogUtils.severe("Error occurred when loading reflections", exception);
+ exception.printStackTrace();
+ } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
+ throw new RuntimeException(e);
}
}
}
\ No newline at end of file
diff --git a/api/src/main/java/net/momirealms/customfishing/api/util/WeightUtils.java b/api/src/main/java/net/momirealms/customfishing/api/util/WeightUtils.java
new file mode 100644
index 00000000..26a316dd
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/util/WeightUtils.java
@@ -0,0 +1,60 @@
+package net.momirealms.customfishing.api.util;
+
+import net.momirealms.customfishing.api.common.Pair;
+
+import java.util.*;
+
+public class WeightUtils {
+
+ public static T getRandom(List> pairs) {
+ List available = new ArrayList<>();
+ double[] weights = new double[pairs.size()];
+ int index = 0;
+ for (Pair pair : pairs){
+ double weight = pair.right();
+ T key = pair.left();
+ if (weight <= 0) continue;
+ available.add(key);
+ weights[index++] = weight;
+ }
+ return getRandom(weights, available, index);
+ }
+
+ public static T getRandom(HashMap map) {
+ List available = new ArrayList<>();
+ double[] weights = new double[map.size()];
+ int index = 0;
+ for (Map.Entry entry : map.entrySet()){
+ double weight = entry.getValue();
+ T key = entry.getKey();
+ if (weight <= 0) continue;
+ available.add(key);
+ weights[index++] = weight;
+ }
+ return getRandom(weights, available, index);
+ }
+
+ private static T getRandom(double[] weights, List available, int effectiveSize) {
+ double total = Arrays.stream(weights).sum();
+ double[] weightRatios = new double[effectiveSize];
+ for (int i = 0; i < effectiveSize; i++){
+ weightRatios[i] = weights[i]/total;
+ }
+ double[] weightRange = new double[effectiveSize];
+ double startPos = 0;
+ for (int i = 0; i < effectiveSize; i++) {
+ weightRange[i] = startPos + weightRatios[i];
+ startPos += weightRatios[i];
+ }
+ double random = Math.random();
+ int pos = Arrays.binarySearch(weightRange, random);
+
+ if (pos < 0) {
+ pos = -pos - 1;
+ }
+ if (pos < weightRange.length && random < weightRange[pos]) {
+ return available.get(pos);
+ }
+ return null;
+ }
+}
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 4c5a9b7f..00000000
--- a/build.gradle
+++ /dev/null
@@ -1,99 +0,0 @@
-plugins {
- id 'java'
- id 'com.github.johnrengelman.shadow' version '7.1.2'
-}
-
-group = 'net.momirealms'
-version = '1.3.2.5'
-
-repositories {
- maven {name = "aliyun-repo"; url = "https://maven.aliyun.com/repository/public/"}
- maven {name = 'papermc-repo'; url = 'https://papermc.io/repo/repository/maven-public/'}
- maven {name = 'sonatype-repo'; url = 'https://oss.sonatype.org/content/groups/public/'}
- maven {name = "dmulloy2-repo"; url = "https://repo.dmulloy2.net/repository/public/"}
- maven {name = "clip-repo"; url = 'https://repo.extendedclip.com/content/repositories/placeholderapi/'}
- maven {name = "codemc-repo"; url = "https://repo.codemc.org/repository/maven-public/"}
- maven {name = "sk89q-repo"; url = "https://maven.enginehub.org/repo/"}
- maven {name = "jitpack-repo"; url = "https://jitpack.io"}
- maven {name = "Lumine-repo"; url = "https://mvn.lumine.io/repository/maven-public"}
- maven {name = 'rapture-repo'; url = 'https://repo.rapture.pw/repository/maven-releases/'}
- maven {name = 'mmo-repo'; url = 'https://nexus.phoenixdevt.fr/repository/maven-public/'}
- maven {name = 'i-repo'; url = 'https://r.irepo.space/maven/'}
- maven {name = 'auxilor-repo'; url = 'https://repo.auxilor.io/repository/maven-public/'}
- maven {name = 'betonquest-repo'; url = 'https://betonquest.org/nexus/repository/betonquest/'}
- mavenCentral()
-}
-
-dependencies {
- compileOnly fileTree(dir:'libs',includes:['*.jar'])
- implementation fileTree(dir:'libs',includes:['BiomeAPI.jar'])
- compileOnly("io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT")
- compileOnly('dev.folia:folia-api:1.20.1-R0.1-SNAPSHOT')
- compileOnly('com.zaxxer:HikariCP:5.0.1')
- compileOnly('commons-io:commons-io:2.11.0')
- compileOnly('com.github.Archy-X:AureliumSkills:Beta1.3.6')
- compileOnly('redis.clients:jedis:4.4.3')
- compileOnly('me.clip:placeholderapi:2.11.3')
- compileOnly("com.github.oraxen:oraxen:1.158.0")
- compileOnly('io.lumine:Mythic-Dist:5.2.1')
- compileOnly('dev.dejvokep:boosted-yaml:1.3.1')
- compileOnly('com.github.LoneDev6:api-itemsadder:3.4.1-r4')
- compileOnly('net.objecthunter:exp4j:0.4.8')
- compileOnly('org.mariadb.jdbc:mariadb-java-client:3.1.4')
- compileOnly('com.google.code.gson:gson:2.10.1')
- compileOnly('com.willfp:EcoEnchants:10.13.0')
- compileOnly("pers.neige.neigeitems:NeigeItems:1.14.23")
- compileOnly('net.Indyuce:MMOItems-API:6.9.2-SNAPSHOT')
- compileOnly('io.lumine:MythicLib-dist:1.6-SNAPSHOT')
- compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0")
- compileOnly('net.Indyuce:MMOCore-API:1.12-SNAPSHOT')
- compileOnly('com.github.Zrips:Jobs:4.17.2')
- compileOnly("com.willfp:eco:6.65.1")
- compileOnly("com.willfp:EcoJobs:3.13.0")
- compileOnly("com.willfp:EcoSkills:3.8.1")
- compileOnly("pl.betoncraft:betonquest:1.12.10")
- compileOnly("com.github.MilkBowl:VaultAPI:1.7")
- compileOnly("com.github.Archy-X:AureliumSkills:Beta1.3.21")
- implementation('net.kyori:adventure-api:4.14.0')
- implementation('net.kyori:adventure-platform-bukkit:4.3.0')
- implementation('net.kyori:adventure-text-minimessage:4.14.0')
- implementation('net.kyori:adventure-text-serializer-legacy:4.14.0')
- implementation('de.tr7zw:item-nbt-api:2.11.3')
- implementation('org.bstats:bstats-bukkit:3.0.1')
-}
-
-def targetJavaVersion = 17
-java {
- def javaVersion = JavaVersion.toVersion(targetJavaVersion)
- sourceCompatibility = javaVersion
- targetCompatibility = javaVersion
- if (JavaVersion.current() < javaVersion) {
- toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
- }
-}
-
-tasks.withType(JavaCompile).configureEach {
- options.release = targetJavaVersion
- options.encoding = "UTF-8"
-}
-
-processResources {
- def props = [version: version]
- inputs.properties props
- filteringCharset 'UTF-8'
- filesMatching('plugin.yml') {
- expand props
- }
-}
-
-shadowJar {
- relocate 'de.tr7zw', 'net.momirealms.customfishing.libs.de.tr7zw'
- relocate 'net.kyori', 'net.momirealms.customfishing.libs.net.kyori'
- relocate 'org.bstats', 'net.momirealms.customfishing.libs.org.bstats'
- relocate 'net.momirealms.biomeapi', 'net.momirealms.customfishing.libs.net.momirealms.biomeapi'
-}
-
-tasks.register("delete", Delete).get().delete("build/libs/"+project.name+"-"+project.version+".jar")
-tasks.named("build").get().dependsOn("shadowJar").finalizedBy("delete").doLast {
- println("Deleting: "+ "build/libs/"+project.name+"-"+project.version+".jar")
-}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 00000000..6dcd2a8e
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,73 @@
+plugins {
+ id("java")
+ id("application")
+ id("maven-publish")
+ id("com.github.johnrengelman.shadow") version "8.1.1"
+}
+
+allprojects {
+
+ version = "2.0-beta"
+
+ apply()
+ apply(plugin = "java")
+ apply(plugin = "application")
+ apply(plugin = "com.github.johnrengelman.shadow")
+ apply(plugin = "org.gradle.maven-publish")
+
+ application {
+ mainClass.set("")
+ }
+
+ repositories {
+ maven("https://maven.aliyun.com/repository/public/")
+ mavenCentral()
+ maven("https://papermc.io/repo/repository/maven-public/")
+ maven("https://oss.sonatype.org/content/groups/public/")
+ maven("https://repo.dmulloy2.net/repository/public/")
+ maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
+ maven("https://repo.codemc.org/repository/maven-public/")
+ maven("https://maven.enginehub.org/repo/")
+ maven("https://jitpack.io/")
+ maven("https://mvn.lumine.io/repository/maven-public/")
+ maven("https://repo.rapture.pw/repository/maven-releases/")
+ maven("https://nexus.phoenixdevt.fr/repository/maven-public/")
+ maven("https://r.irepo.space/maven/")
+ maven("https://repo.auxilor.io/repository/maven-public/")
+ maven("https://betonquest.org/nexus/repository/betonquest/")
+ maven("https://repo.william278.net/releases/")
+ maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+ }
+}
+
+subprojects {
+ tasks.processResources {
+ val props = mapOf("version" to version)
+ inputs.properties(props)
+ filteringCharset = "UTF-8"
+ filesMatching("plugin.yml") {
+ expand(props)
+ }
+ }
+
+ tasks.withType {
+ options.encoding = "UTF-8"
+ }
+
+ tasks.shadowJar {
+ destinationDirectory.set(file("$rootDir/target"))
+ archiveClassifier.set("")
+ archiveFileName.set("CustomFishing-" + project.name + "-" + project.version + ".jar")
+ }
+
+// tasks.javadoc.configure {
+// options.quiet()
+// }
+//
+// if ("api" == project.name) {
+// java {
+// withSourcesJar()
+// withJavadocJar()
+// }
+// }
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index e69de29b..7b26f395 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -0,0 +1,8 @@
+systemProp.socks.proxyHost=127.0.0.1
+systemProp.socks.proxyPort=7890
+
+systemProp.http.proxyHost=127.0.0.1
+systemProp.http.proxyPort=7890
+
+systemProp.https.proxyHost=127.0.0.1
+systemProp.https.proxyPort=7890
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 41d9927a4d4fb3f96a785543079b8df6723c946b..249e5832f090a2944b7473328c07c9755baa3196 100644
GIT binary patch
delta 10197
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
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fae08049..26aca3b0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,3 +1,4 @@
+#Sat Jul 29 00:16:20 SGT 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
diff --git a/gradlew b/gradlew
index 535fb9f7..1b6c7873 100644
--- a/gradlew
+++ b/gradlew
@@ -86,7 +86,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=${0##*/}
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx128m" "-Xms128m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
diff --git a/libs/BetonQuest2.0.0-dev-668.jar b/libs/BetonQuest2.0.0-dev-668.jar
deleted file mode 100644
index c8de2b85c29a0dbc5a01f2857f42fbca9703e02c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4778428
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