From a5a521ecde9048ac17adbadf9bd4848487b1b84c Mon Sep 17 00:00:00 2001 From: Farmeurimmo Date: Mon, 1 Aug 2022 17:26:00 +0200 Subject: [PATCH] Ajout partie Velocity + TAB dans le velocity --- .gitignore | 1 + pom.xml | 23 +++ .../fr/verymc/core/scoreboard/TABManager.java | 36 ----- .../java/fr/verymc/{ => spigot}/Main.java | 143 +++++++++--------- .../core/PluginMessageManager.java | 6 +- .../{ => spigot}/core/ServersManager.java | 10 +- .../{ => spigot}/core/antiafk/AntiAfk.java | 12 +- .../{ => spigot}/core/atout/AtoutCmd.java | 2 +- .../{ => spigot}/core/atout/AtoutGui.java | 10 +- .../{ => spigot}/core/atout/BuyAtoutGui.java | 16 +- .../{ => spigot}/core/auctions/AhCmd.java | 2 +- .../core/auctions/AuctionGui.java | 4 +- .../core/auctions/AuctionsManager.java | 10 +- .../{ => spigot}/core/cmd/base/BaltopCmd.java | 6 +- .../{ => spigot}/core/cmd/base/BarCmd.java | 4 +- .../{ => spigot}/core/cmd/base/ClaimCmd.java | 8 +- .../core/cmd/base/ClaimCmdSaver.java | 4 +- .../{ => spigot}/core/cmd/base/CraftCmd.java | 2 +- .../core/cmd/base/EnchantementCmd.java | 4 +- .../core/cmd/base/Farm2WinCmd.java | 4 +- .../{ => spigot}/core/cmd/base/FeedCmd.java | 4 +- .../{ => spigot}/core/cmd/base/FlyCmd.java | 6 +- .../{ => spigot}/core/cmd/base/HatCmd.java | 2 +- .../{ => spigot}/core/cmd/base/IslandCmd.java | 26 ++-- .../{ => spigot}/core/cmd/base/MenuCmd.java | 4 +- .../{ => spigot}/core/cmd/base/MoneyCmd.java | 4 +- .../{ => spigot}/core/cmd/base/PayCmd.java | 4 +- .../{ => spigot}/core/cmd/base/SpawnCmd.java | 8 +- .../{ => spigot}/core/cmd/base/TpNoCmd.java | 4 +- .../{ => spigot}/core/cmd/base/TpYesCmd.java | 6 +- .../core/cmd/base/TpaCancelCmd.java | 4 +- .../{ => spigot}/core/cmd/base/TpaCmd.java | 6 +- .../core/cmd/base/TradeCancelCmd.java | 4 +- .../{ => spigot}/core/cmd/base/TradeCmd.java | 6 +- .../core/cmd/base/TradeNoCmd.java | 4 +- .../core/cmd/base/TradeYesCmd.java | 6 +- .../{ => spigot}/core/cmd/base/WarpCmd.java | 12 +- .../{ => spigot}/core/cmd/base/WarpsCmd.java | 4 +- .../core/cmd/moderation/AdminCmd.java | 6 +- .../core/cmd/moderation/AntiAfkMineCmd.java | 6 +- .../core/cmd/moderation/BuildCmd.java | 2 +- .../core/cmd/moderation/CheckFlyCmd.java | 6 +- .../core/cmd/moderation/DataCmd.java | 4 +- .../core/cmd/moderation/EventsCmd.java | 6 +- .../core/cmd/moderation/GmCmd.java | 4 +- .../core/cmd/moderation/GmLCmd.java | 4 +- .../core/cmd/moderation/RebootCmd.java | 4 +- .../{ => spigot}/core/cmd/utils/UtilsCmd.java | 2 +- .../{ => spigot}/core/eco/BaltopManager.java | 8 +- .../core/eco/EcoAccountsManager.java | 6 +- .../core/evenement/BlocBreakerContest.java | 10 +- .../core/evenement/ChatReaction.java | 6 +- .../core/evenement/DailyBonus.java | 10 +- .../core/evenement/EventManager.java | 2 +- .../{ => spigot}/core/events/JoinLeave.java | 30 ++-- .../core/events/ServerCoreMicellanous.java | 8 +- .../{ => spigot}/core/events/Tabulation.java | 2 +- .../core/events/TchatManager.java | 32 ++-- .../core/gui/AfkMineCaptchaGui.java | 6 +- .../{ => spigot}/core/gui/CommandBuyGui.java | 8 +- .../{ => spigot}/core/gui/Farm2WinGui.java | 12 +- .../{ => spigot}/core/gui/MakeItemGui.java | 6 +- .../verymc/{ => spigot}/core/gui/MenuGui.java | 16 +- .../{ => spigot}/core/gui/MoneyTradeGui.java | 8 +- .../{ => spigot}/core/gui/RankBuyGui.java | 8 +- .../{ => spigot}/core/gui/TradeGui.java | 6 +- .../{ => spigot}/core/gui/TradeManager.java | 6 +- .../verymc/{ => spigot}/core/gui/WarpGui.java | 2 +- .../core/holos/HoloBlocManager.java | 2 +- .../{ => spigot}/core/holos/HolosSetup.java | 8 +- .../{ => spigot}/core/items/FarmHoeCmd.java | 2 +- .../{ => spigot}/core/items/FarmHoeGui.java | 6 +- .../core/items/FarmHoeManager.java | 16 +- .../{ => spigot}/core/items/ItemLegCmd.java | 2 +- .../{ => spigot}/core/items/PickaxeCmd.java | 4 +- .../{ => spigot}/core/items/PickaxeGui.java | 6 +- .../core/items/PickaxeManager.java | 12 +- .../core/scoreboard/ScoreBoard.java | 18 +-- .../core/shopgui/AmountGuiManager.java | 2 +- .../core/shopgui/BuyShopItem.java | 6 +- .../core/shopgui/CateSelectGui.java | 2 +- .../core/shopgui/GenAmoutShopGui.java | 4 +- .../core/shopgui/GenMultiStacksBuyGui.java | 4 +- .../core/shopgui/GenShopPage.java | 6 +- .../core/shopgui/MainShopGui.java | 6 +- .../shopgui/MultiStacksShopGuiManager.java | 2 +- .../{ => spigot}/core/shopgui/SellAllCmd.java | 4 +- .../{ => spigot}/core/shopgui/ShopGuiCmd.java | 2 +- .../core/storage/AsyncConfig.java | 2 +- .../core/storage/ConfigManager.java | 4 +- .../core/storage/SkyblockUser.java | 4 +- .../core/storage/SkyblockUserManager.java | 2 +- .../core/storage/StorageJSONManager.java | 40 ++--- .../verymc/{ => spigot}/dungeon/dungeon.txt | 0 .../hub/crates/ChallengeCrateManager.java | 4 +- .../hub/crates/CratesKeyManager.java | 4 +- .../hub/crates/CratesManager.java | 6 +- .../{ => spigot}/hub/crates/KeyCmd.java | 2 +- .../hub/crates/LegCrateManager.java | 4 +- .../hub/crates/VoteCrateManager.java | 2 +- .../{ => spigot}/hub/events/AntiExplo.java | 4 +- .../{ => spigot}/hub/events/Interact.java | 4 +- .../{ => spigot}/hub/invest/InvestCmd.java | 4 +- .../hub/invest/InvestManager.java | 16 +- .../hub/winelottery/BuyWinePotion.java | 2 +- .../{ => spigot}/hub/winelottery/WineGui.java | 6 +- .../hub/winelottery/WineSpawn.java | 2 +- .../fr/verymc/{ => spigot}/island/Island.java | 32 ++-- .../island/IslandBlocsValues.java | 2 +- .../{ => spigot}/island/IslandManager.java | 54 +++---- .../island/IslandValueCalcManager.java | 8 +- .../{ => spigot}/island/bank/IslandBank.java | 2 +- .../{ => spigot}/island/blocks/Chest.java | 4 +- .../island/blocks/ChestListener.java | 30 ++-- .../island/blocks/ChestManager.java | 32 ++-- .../{ => spigot}/island/blocks/ChestsCmd.java | 2 +- .../island/blocks/PlayerShopGuis.java | 2 +- .../island/blocks/StackerGui.java | 2 +- .../island/challenges/ChallengesCmd.java | 2 +- .../island/challenges/IslandChallenge.java | 6 +- .../challenges/IslandChallengesGuis.java | 10 +- .../challenges/IslandChallengesListener.java | 12 +- .../challenges/IslandChallengesReset.java | 10 +- .../island/events/IslandGeneratorForm.java | 6 +- .../island/events/IslandInteractManager.java | 8 +- .../island/events/IslandPlayerMove.java | 6 +- .../island}/featherfly/CountdownFly.java | 10 +- .../island}/featherfly/DailyFlyCmd.java | 2 +- .../island}/featherfly/FeatherFlyCmd.java | 2 +- .../featherfly/FeatherFlyInteract.java | 2 +- .../island/generator/EmptyChunkGenerator.java | 2 +- .../island/guis/IslandBankGui.java | 6 +- .../island/guis/IslandBlocsValueGui.java | 4 +- .../island/guis/IslandBorderGui.java | 8 +- .../island/guis/IslandConfirmationGui.java | 4 +- .../island/guis/IslandCoopGui.java | 6 +- .../island/guis/IslandGuiManager.java | 20 +-- .../island/guis/IslandMainGui.java | 4 +- .../island/guis/IslandMemberGui.java | 8 +- .../island/guis/IslandRankEditGui.java | 10 +- .../island/guis/IslandSettingsGui.java | 8 +- .../island/guis/IslandTopGui.java | 8 +- .../island/guis/IslandUpgradeGui.java | 12 +- .../{ => spigot}/island/minions/Minion.java | 4 +- .../island/minions/MinionHarvest.java | 12 +- .../island/minions/MinionManager.java | 16 +- .../island/minions/MinionType.java | 2 +- .../island/minions/MinionsCmd.java | 10 +- .../island/minions/MinionsGui.java | 4 +- .../island/minions/MinionsListener.java | 22 +-- .../island/perms/IslandPerms.java | 2 +- .../{ => spigot}/island/perms/IslandRank.java | 4 +- .../island/perms/IslandRanks.java | 2 +- .../island}/playerwarps/PlayerWarp.java | 4 +- .../playerwarps/PlayerWarpBrowserGui.java | 2 +- .../island}/playerwarps/PlayerWarpCmd.java | 2 +- .../playerwarps/PlayerWarpGuiManager.java | 14 +- .../playerwarps/PlayerWarpManager.java | 8 +- .../playerwarps/PlayerWarpManagingGui.java | 2 +- .../playerwarps/PlayerWarpNotationGui.java | 2 +- .../island/protections/BlockListener.java | 6 +- .../island/protections/EntityListener.java | 6 +- .../island/protections/IslandSettings.java | 2 +- .../upgrade/IslandUpgradeGenerator.java | 8 +- .../island/upgrade/IslandUpgradeMember.java | 8 +- .../island/upgrade/IslandUpgradeSize.java | 8 +- .../fr/verymc/{ => spigot}/utils/BossBar.java | 6 +- .../{ => spigot}/utils/DiscordUtils.java | 2 +- .../{ => spigot}/utils/InventoryUtils.java | 2 +- .../{ => spigot}/utils/ItemStackBuilder.java | 2 +- .../{ => spigot}/utils/ObjectConverter.java | 4 +- .../{ => spigot}/utils/PlayerUtils.java | 12 +- .../{ => spigot}/utils/PreGenItems.java | 4 +- .../{ => spigot}/utils/UtilsManager.java | 2 +- .../{ => spigot}/utils/WorldBorderUtil.java | 2 +- .../fr/verymc/velocity/ChannelsManager.java | 89 +++++++++++ src/main/java/fr/verymc/velocity/Main.java | 68 +++++++++ .../java/fr/verymc/velocity/TABManager.java | 43 ++++++ .../velocity/events/ConnectionListener.java | 6 + src/main/resources/plugin.yml | 2 +- 180 files changed, 907 insertions(+), 716 deletions(-) delete mode 100644 src/main/java/fr/verymc/core/scoreboard/TABManager.java rename src/main/java/fr/verymc/{ => spigot}/Main.java (81%) rename src/main/java/fr/verymc/{ => spigot}/core/PluginMessageManager.java (93%) rename src/main/java/fr/verymc/{ => spigot}/core/ServersManager.java (93%) rename src/main/java/fr/verymc/{ => spigot}/core/antiafk/AntiAfk.java (92%) rename src/main/java/fr/verymc/{ => spigot}/core/atout/AtoutCmd.java (96%) rename src/main/java/fr/verymc/{ => spigot}/core/atout/AtoutGui.java (97%) rename src/main/java/fr/verymc/{ => spigot}/core/atout/BuyAtoutGui.java (94%) rename src/main/java/fr/verymc/{ => spigot}/core/auctions/AhCmd.java (98%) rename src/main/java/fr/verymc/{ => spigot}/core/auctions/AuctionGui.java (98%) rename src/main/java/fr/verymc/{ => spigot}/core/auctions/AuctionsManager.java (98%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/BaltopCmd.java (91%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/BarCmd.java (95%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/ClaimCmd.java (97%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/ClaimCmdSaver.java (97%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/CraftCmd.java (95%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/EnchantementCmd.java (92%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/Farm2WinCmd.java (90%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/FeedCmd.java (96%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/FlyCmd.java (92%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/HatCmd.java (97%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/IslandCmd.java (97%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/MenuCmd.java (90%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/MoneyCmd.java (98%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/PayCmd.java (97%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/SpawnCmd.java (94%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/TpNoCmd.java (95%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/TpYesCmd.java (92%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/TpaCancelCmd.java (94%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/TpaCmd.java (96%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/TradeCancelCmd.java (95%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/TradeCmd.java (96%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/TradeNoCmd.java (96%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/TradeYesCmd.java (94%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/WarpCmd.java (94%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/base/WarpsCmd.java (90%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/moderation/AdminCmd.java (83%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/moderation/AntiAfkMineCmd.java (89%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/moderation/BuildCmd.java (96%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/moderation/CheckFlyCmd.java (91%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/moderation/DataCmd.java (93%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/moderation/EventsCmd.java (84%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/moderation/GmCmd.java (96%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/moderation/GmLCmd.java (96%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/moderation/RebootCmd.java (96%) rename src/main/java/fr/verymc/{ => spigot}/core/cmd/utils/UtilsCmd.java (95%) rename src/main/java/fr/verymc/{ => spigot}/core/eco/BaltopManager.java (91%) rename src/main/java/fr/verymc/{ => spigot}/core/eco/EcoAccountsManager.java (96%) rename src/main/java/fr/verymc/{ => spigot}/core/evenement/BlocBreakerContest.java (94%) rename src/main/java/fr/verymc/{ => spigot}/core/evenement/ChatReaction.java (94%) rename src/main/java/fr/verymc/{ => spigot}/core/evenement/DailyBonus.java (87%) rename src/main/java/fr/verymc/{ => spigot}/core/evenement/EventManager.java (98%) rename src/main/java/fr/verymc/{ => spigot}/core/events/JoinLeave.java (86%) rename src/main/java/fr/verymc/{ => spigot}/core/events/ServerCoreMicellanous.java (76%) rename src/main/java/fr/verymc/{ => spigot}/core/events/Tabulation.java (94%) rename src/main/java/fr/verymc/{ => spigot}/core/events/TchatManager.java (95%) rename src/main/java/fr/verymc/{ => spigot}/core/gui/AfkMineCaptchaGui.java (97%) rename src/main/java/fr/verymc/{ => spigot}/core/gui/CommandBuyGui.java (98%) rename src/main/java/fr/verymc/{ => spigot}/core/gui/Farm2WinGui.java (98%) rename src/main/java/fr/verymc/{ => spigot}/core/gui/MakeItemGui.java (94%) rename src/main/java/fr/verymc/{ => spigot}/core/gui/MenuGui.java (91%) rename src/main/java/fr/verymc/{ => spigot}/core/gui/MoneyTradeGui.java (97%) rename src/main/java/fr/verymc/{ => spigot}/core/gui/RankBuyGui.java (95%) rename src/main/java/fr/verymc/{ => spigot}/core/gui/TradeGui.java (98%) rename src/main/java/fr/verymc/{ => spigot}/core/gui/TradeManager.java (94%) rename src/main/java/fr/verymc/{ => spigot}/core/gui/WarpGui.java (98%) rename src/main/java/fr/verymc/{ => spigot}/core/holos/HoloBlocManager.java (97%) rename src/main/java/fr/verymc/{ => spigot}/core/holos/HolosSetup.java (96%) rename src/main/java/fr/verymc/{ => spigot}/core/items/FarmHoeCmd.java (96%) rename src/main/java/fr/verymc/{ => spigot}/core/items/FarmHoeGui.java (97%) rename src/main/java/fr/verymc/{ => spigot}/core/items/FarmHoeManager.java (95%) rename src/main/java/fr/verymc/{ => spigot}/core/items/ItemLegCmd.java (99%) rename src/main/java/fr/verymc/{ => spigot}/core/items/PickaxeCmd.java (90%) rename src/main/java/fr/verymc/{ => spigot}/core/items/PickaxeGui.java (98%) rename src/main/java/fr/verymc/{ => spigot}/core/items/PickaxeManager.java (92%) rename src/main/java/fr/verymc/{ => spigot}/core/scoreboard/ScoreBoard.java (94%) rename src/main/java/fr/verymc/{ => spigot}/core/shopgui/AmountGuiManager.java (99%) rename src/main/java/fr/verymc/{ => spigot}/core/shopgui/BuyShopItem.java (98%) rename src/main/java/fr/verymc/{ => spigot}/core/shopgui/CateSelectGui.java (99%) rename src/main/java/fr/verymc/{ => spigot}/core/shopgui/GenAmoutShopGui.java (98%) rename src/main/java/fr/verymc/{ => spigot}/core/shopgui/GenMultiStacksBuyGui.java (98%) rename src/main/java/fr/verymc/{ => spigot}/core/shopgui/GenShopPage.java (98%) rename src/main/java/fr/verymc/{ => spigot}/core/shopgui/MainShopGui.java (97%) rename src/main/java/fr/verymc/{ => spigot}/core/shopgui/MultiStacksShopGuiManager.java (98%) rename src/main/java/fr/verymc/{ => spigot}/core/shopgui/SellAllCmd.java (93%) rename src/main/java/fr/verymc/{ => spigot}/core/shopgui/ShopGuiCmd.java (91%) rename src/main/java/fr/verymc/{ => spigot}/core/storage/AsyncConfig.java (96%) rename src/main/java/fr/verymc/{ => spigot}/core/storage/ConfigManager.java (97%) rename src/main/java/fr/verymc/{ => spigot}/core/storage/SkyblockUser.java (97%) rename src/main/java/fr/verymc/{ => spigot}/core/storage/SkyblockUserManager.java (96%) rename src/main/java/fr/verymc/{ => spigot}/core/storage/StorageJSONManager.java (93%) rename src/main/java/fr/verymc/{ => spigot}/dungeon/dungeon.txt (100%) rename src/main/java/fr/verymc/{ => spigot}/hub/crates/ChallengeCrateManager.java (98%) rename src/main/java/fr/verymc/{ => spigot}/hub/crates/CratesKeyManager.java (94%) rename src/main/java/fr/verymc/{ => spigot}/hub/crates/CratesManager.java (98%) rename src/main/java/fr/verymc/{ => spigot}/hub/crates/KeyCmd.java (98%) rename src/main/java/fr/verymc/{ => spigot}/hub/crates/LegCrateManager.java (99%) rename src/main/java/fr/verymc/{ => spigot}/hub/crates/VoteCrateManager.java (94%) rename src/main/java/fr/verymc/{ => spigot}/hub/events/AntiExplo.java (91%) rename src/main/java/fr/verymc/{ => spigot}/hub/events/Interact.java (96%) rename src/main/java/fr/verymc/{ => spigot}/hub/invest/InvestCmd.java (93%) rename src/main/java/fr/verymc/{ => spigot}/hub/invest/InvestManager.java (90%) rename src/main/java/fr/verymc/{ => spigot}/hub/winelottery/BuyWinePotion.java (98%) rename src/main/java/fr/verymc/{ => spigot}/hub/winelottery/WineGui.java (99%) rename src/main/java/fr/verymc/{ => spigot}/hub/winelottery/WineSpawn.java (92%) rename src/main/java/fr/verymc/{ => spigot}/island/Island.java (95%) rename src/main/java/fr/verymc/{ => spigot}/island/IslandBlocsValues.java (96%) rename src/main/java/fr/verymc/{ => spigot}/island/IslandManager.java (95%) rename src/main/java/fr/verymc/{ => spigot}/island/IslandValueCalcManager.java (97%) rename src/main/java/fr/verymc/{ => spigot}/island/bank/IslandBank.java (95%) rename src/main/java/fr/verymc/{ => spigot}/island/blocks/Chest.java (97%) rename src/main/java/fr/verymc/{ => spigot}/island/blocks/ChestListener.java (96%) rename src/main/java/fr/verymc/{ => spigot}/island/blocks/ChestManager.java (81%) rename src/main/java/fr/verymc/{ => spigot}/island/blocks/ChestsCmd.java (97%) rename src/main/java/fr/verymc/{ => spigot}/island/blocks/PlayerShopGuis.java (99%) rename src/main/java/fr/verymc/{ => spigot}/island/blocks/StackerGui.java (98%) rename src/main/java/fr/verymc/{ => spigot}/island/challenges/ChallengesCmd.java (95%) rename src/main/java/fr/verymc/{ => spigot}/island/challenges/IslandChallenge.java (93%) rename src/main/java/fr/verymc/{ => spigot}/island/challenges/IslandChallengesGuis.java (94%) rename src/main/java/fr/verymc/{ => spigot}/island/challenges/IslandChallengesListener.java (92%) rename src/main/java/fr/verymc/{ => spigot}/island/challenges/IslandChallengesReset.java (88%) rename src/main/java/fr/verymc/{ => spigot}/island/events/IslandGeneratorForm.java (87%) rename src/main/java/fr/verymc/{ => spigot}/island/events/IslandInteractManager.java (94%) rename src/main/java/fr/verymc/{ => spigot}/island/events/IslandPlayerMove.java (90%) rename src/main/java/fr/verymc/{core => spigot/island}/featherfly/CountdownFly.java (95%) rename src/main/java/fr/verymc/{core => spigot/island}/featherfly/DailyFlyCmd.java (97%) rename src/main/java/fr/verymc/{core => spigot/island}/featherfly/FeatherFlyCmd.java (98%) rename src/main/java/fr/verymc/{core => spigot/island}/featherfly/FeatherFlyInteract.java (97%) rename src/main/java/fr/verymc/{ => spigot}/island/generator/EmptyChunkGenerator.java (85%) rename src/main/java/fr/verymc/{ => spigot}/island/guis/IslandBankGui.java (94%) rename src/main/java/fr/verymc/{ => spigot}/island/guis/IslandBlocsValueGui.java (93%) rename src/main/java/fr/verymc/{ => spigot}/island/guis/IslandBorderGui.java (92%) rename src/main/java/fr/verymc/{ => spigot}/island/guis/IslandConfirmationGui.java (95%) rename src/main/java/fr/verymc/{ => spigot}/island/guis/IslandCoopGui.java (91%) rename src/main/java/fr/verymc/{ => spigot}/island/guis/IslandGuiManager.java (97%) rename src/main/java/fr/verymc/{ => spigot}/island/guis/IslandMainGui.java (97%) rename src/main/java/fr/verymc/{ => spigot}/island/guis/IslandMemberGui.java (92%) rename src/main/java/fr/verymc/{ => spigot}/island/guis/IslandRankEditGui.java (92%) rename src/main/java/fr/verymc/{ => spigot}/island/guis/IslandSettingsGui.java (92%) rename src/main/java/fr/verymc/{ => spigot}/island/guis/IslandTopGui.java (95%) rename src/main/java/fr/verymc/{ => spigot}/island/guis/IslandUpgradeGui.java (93%) rename src/main/java/fr/verymc/{ => spigot}/island/minions/Minion.java (96%) rename src/main/java/fr/verymc/{ => spigot}/island/minions/MinionHarvest.java (96%) rename src/main/java/fr/verymc/{ => spigot}/island/minions/MinionManager.java (94%) rename src/main/java/fr/verymc/{ => spigot}/island/minions/MinionType.java (87%) rename src/main/java/fr/verymc/{ => spigot}/island/minions/MinionsCmd.java (96%) rename src/main/java/fr/verymc/{ => spigot}/island/minions/MinionsGui.java (98%) rename src/main/java/fr/verymc/{ => spigot}/island/minions/MinionsListener.java (95%) rename src/main/java/fr/verymc/{ => spigot}/island/perms/IslandPerms.java (99%) rename src/main/java/fr/verymc/{ => spigot}/island/perms/IslandRank.java (97%) rename src/main/java/fr/verymc/{ => spigot}/island/perms/IslandRanks.java (92%) rename src/main/java/fr/verymc/{core => spigot/island}/playerwarps/PlayerWarp.java (96%) rename src/main/java/fr/verymc/{core => spigot/island}/playerwarps/PlayerWarpBrowserGui.java (98%) rename src/main/java/fr/verymc/{core => spigot/island}/playerwarps/PlayerWarpCmd.java (97%) rename src/main/java/fr/verymc/{core => spigot/island}/playerwarps/PlayerWarpGuiManager.java (95%) rename src/main/java/fr/verymc/{core => spigot/island}/playerwarps/PlayerWarpManager.java (94%) rename src/main/java/fr/verymc/{core => spigot/island}/playerwarps/PlayerWarpManagingGui.java (98%) rename src/main/java/fr/verymc/{core => spigot/island}/playerwarps/PlayerWarpNotationGui.java (96%) rename src/main/java/fr/verymc/{ => spigot}/island/protections/BlockListener.java (84%) rename src/main/java/fr/verymc/{ => spigot}/island/protections/EntityListener.java (93%) rename src/main/java/fr/verymc/{ => spigot}/island/protections/IslandSettings.java (98%) rename src/main/java/fr/verymc/{ => spigot}/island/upgrade/IslandUpgradeGenerator.java (95%) rename src/main/java/fr/verymc/{ => spigot}/island/upgrade/IslandUpgradeMember.java (91%) rename src/main/java/fr/verymc/{ => spigot}/island/upgrade/IslandUpgradeSize.java (90%) rename src/main/java/fr/verymc/{ => spigot}/utils/BossBar.java (96%) rename src/main/java/fr/verymc/{ => spigot}/utils/DiscordUtils.java (99%) rename src/main/java/fr/verymc/{ => spigot}/utils/InventoryUtils.java (98%) rename src/main/java/fr/verymc/{ => spigot}/utils/ItemStackBuilder.java (98%) rename src/main/java/fr/verymc/{ => spigot}/utils/ObjectConverter.java (96%) rename src/main/java/fr/verymc/{ => spigot}/utils/PlayerUtils.java (97%) rename src/main/java/fr/verymc/{ => spigot}/utils/PreGenItems.java (95%) rename src/main/java/fr/verymc/{ => spigot}/utils/UtilsManager.java (81%) rename src/main/java/fr/verymc/{ => spigot}/utils/WorldBorderUtil.java (99%) create mode 100644 src/main/java/fr/verymc/velocity/ChannelsManager.java create mode 100644 src/main/java/fr/verymc/velocity/Main.java create mode 100644 src/main/java/fr/verymc/velocity/TABManager.java create mode 100644 src/main/java/fr/verymc/velocity/events/ConnectionListener.java diff --git a/.gitignore b/.gitignore index 9d393606..b209435e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /target/ /.idea/ /Commons/ +/dependency-reduced-pom.xml diff --git a/pom.xml b/pom.xml index d34fa8b4..41683d10 100644 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,10 @@ codemc-repo https://repo.codemc.io/repository/maven-public/ + + papermc + https://repo.papermc.io/repository/maven-public/ + @@ -78,6 +82,12 @@ httpclient 4.5.13 + + com.velocitypowered + velocity-api + 3.0.1 + provided + src @@ -90,6 +100,19 @@ 16 + + org.apache.maven.plugins + maven-shade-plugin + 3.2.4 + + + package + + shade + + + + \ No newline at end of file diff --git a/src/main/java/fr/verymc/core/scoreboard/TABManager.java b/src/main/java/fr/verymc/core/scoreboard/TABManager.java deleted file mode 100644 index c53a7901..00000000 --- a/src/main/java/fr/verymc/core/scoreboard/TABManager.java +++ /dev/null @@ -1,36 +0,0 @@ -package main.java.fr.verymc.core.scoreboard; - -import main.java.fr.verymc.Main; -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; - -import java.util.ArrayList; - -public class TABManager { - - public static ArrayList Vanished = new ArrayList(); - - public TABManager() { - SendTab(); - } - - public void SendTab() { - Bukkit.getServer().getScheduler().scheduleAsyncDelayedTask(Main.instance, new Runnable() { - public void run() { - Vanished.clear(); - for (Player p : Bukkit.getOnlinePlayers()) { - if (!p.getMetadata("vanished").isEmpty()) { - Vanished.add(p.getName()); - } - } - int online = Bukkit.getOnlinePlayers().size() - Vanished.size(); - for (Player player : Bukkit.getOnlinePlayers()) { - player.setPlayerListHeaderFooter("\n§f• §6§lVery§f§lMc §f•\n\n§7" + Main.instance.serverName + " §7▸ §a" + online + - "\n§7Une question/problème ? contacte un §9§lSTAFF §7!\n", - "\n§7Serveur Mini-Jeux Francophone\n§7Vous êtes sur ▸ §fplay.§6§lvery§f§lmc§f.fr §7◂"); - } - SendTab(); - } - }, 20); - } -} diff --git a/src/main/java/fr/verymc/Main.java b/src/main/java/fr/verymc/spigot/Main.java similarity index 81% rename from src/main/java/fr/verymc/Main.java rename to src/main/java/fr/verymc/spigot/Main.java index a998166d..b55d7e6b 100644 --- a/src/main/java/fr/verymc/Main.java +++ b/src/main/java/fr/verymc/spigot/Main.java @@ -1,71 +1,70 @@ -package main.java.fr.verymc; +package main.java.fr.verymc.spigot; import com.gmail.filoghost.holographicdisplays.api.Hologram; import com.gmail.filoghost.holographicdisplays.api.HologramsAPI; import main.java.fr.verymc.commons.enums.ServerType; import main.java.fr.verymc.commons.utils.HTTPUtils; -import main.java.fr.verymc.core.PluginMessageManager; -import main.java.fr.verymc.core.ServersManager; -import main.java.fr.verymc.core.antiafk.AntiAfk; -import main.java.fr.verymc.core.atout.AtoutCmd; -import main.java.fr.verymc.core.atout.AtoutGui; -import main.java.fr.verymc.core.atout.BuyAtoutGui; -import main.java.fr.verymc.core.auctions.AhCmd; -import main.java.fr.verymc.core.auctions.AuctionGui; -import main.java.fr.verymc.core.auctions.AuctionsManager; -import main.java.fr.verymc.core.cmd.base.*; -import main.java.fr.verymc.core.cmd.moderation.*; -import main.java.fr.verymc.core.eco.EcoAccountsManager; -import main.java.fr.verymc.core.evenement.ChatReaction; -import main.java.fr.verymc.core.evenement.EventManager; -import main.java.fr.verymc.core.events.JoinLeave; -import main.java.fr.verymc.core.events.ServerCoreMicellanous; -import main.java.fr.verymc.core.events.Tabulation; -import main.java.fr.verymc.core.events.TchatManager; -import main.java.fr.verymc.core.featherfly.CountdownFly; -import main.java.fr.verymc.core.featherfly.DailyFlyCmd; -import main.java.fr.verymc.core.featherfly.FeatherFlyCmd; -import main.java.fr.verymc.core.featherfly.FeatherFlyInteract; -import main.java.fr.verymc.core.gui.*; -import main.java.fr.verymc.core.holos.HolosSetup; -import main.java.fr.verymc.core.items.*; -import main.java.fr.verymc.core.playerwarps.PlayerWarpCmd; -import main.java.fr.verymc.core.playerwarps.PlayerWarpGuiManager; -import main.java.fr.verymc.core.playerwarps.PlayerWarpManager; -import main.java.fr.verymc.core.scoreboard.ScoreBoard; -import main.java.fr.verymc.core.scoreboard.TABManager; -import main.java.fr.verymc.core.shopgui.*; -import main.java.fr.verymc.core.storage.ConfigManager; -import main.java.fr.verymc.core.storage.SkyblockUser; -import main.java.fr.verymc.core.storage.SkyblockUserManager; -import main.java.fr.verymc.core.storage.StorageJSONManager; -import main.java.fr.verymc.hub.crates.CratesManager; -import main.java.fr.verymc.hub.crates.KeyCmd; -import main.java.fr.verymc.hub.events.AntiExplo; -import main.java.fr.verymc.hub.events.Interact; -import main.java.fr.verymc.hub.invest.InvestCmd; -import main.java.fr.verymc.hub.invest.InvestManager; -import main.java.fr.verymc.hub.winelottery.WineGui; -import main.java.fr.verymc.hub.winelottery.WineSpawn; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.island.blocks.ChestListener; -import main.java.fr.verymc.island.blocks.ChestManager; -import main.java.fr.verymc.island.blocks.ChestsCmd; -import main.java.fr.verymc.island.challenges.ChallengesCmd; -import main.java.fr.verymc.island.challenges.IslandChallengesGuis; -import main.java.fr.verymc.island.challenges.IslandChallengesListener; -import main.java.fr.verymc.island.events.IslandGeneratorForm; -import main.java.fr.verymc.island.events.IslandInteractManager; -import main.java.fr.verymc.island.events.IslandPlayerMove; -import main.java.fr.verymc.island.generator.EmptyChunkGenerator; -import main.java.fr.verymc.island.guis.IslandGuiManager; -import main.java.fr.verymc.island.minions.MinionManager; -import main.java.fr.verymc.island.minions.MinionsCmd; -import main.java.fr.verymc.island.minions.MinionsListener; -import main.java.fr.verymc.island.protections.BlockListener; -import main.java.fr.verymc.island.protections.EntityListener; -import main.java.fr.verymc.utils.UtilsManager; +import main.java.fr.verymc.spigot.core.PluginMessageManager; +import main.java.fr.verymc.spigot.core.ServersManager; +import main.java.fr.verymc.spigot.core.antiafk.AntiAfk; +import main.java.fr.verymc.spigot.core.atout.AtoutCmd; +import main.java.fr.verymc.spigot.core.atout.AtoutGui; +import main.java.fr.verymc.spigot.core.atout.BuyAtoutGui; +import main.java.fr.verymc.spigot.core.auctions.AhCmd; +import main.java.fr.verymc.spigot.core.auctions.AuctionGui; +import main.java.fr.verymc.spigot.core.auctions.AuctionsManager; +import main.java.fr.verymc.spigot.core.cmd.base.*; +import main.java.fr.verymc.spigot.core.cmd.moderation.*; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.core.evenement.ChatReaction; +import main.java.fr.verymc.spigot.core.evenement.EventManager; +import main.java.fr.verymc.spigot.core.events.JoinLeave; +import main.java.fr.verymc.spigot.core.events.ServerCoreMicellanous; +import main.java.fr.verymc.spigot.core.events.Tabulation; +import main.java.fr.verymc.spigot.core.events.TchatManager; +import main.java.fr.verymc.spigot.core.gui.*; +import main.java.fr.verymc.spigot.core.holos.HolosSetup; +import main.java.fr.verymc.spigot.core.items.*; +import main.java.fr.verymc.spigot.core.scoreboard.ScoreBoard; +import main.java.fr.verymc.spigot.core.shopgui.*; +import main.java.fr.verymc.spigot.core.storage.ConfigManager; +import main.java.fr.verymc.spigot.core.storage.SkyblockUser; +import main.java.fr.verymc.spigot.core.storage.SkyblockUserManager; +import main.java.fr.verymc.spigot.core.storage.StorageJSONManager; +import main.java.fr.verymc.spigot.hub.crates.CratesManager; +import main.java.fr.verymc.spigot.hub.crates.KeyCmd; +import main.java.fr.verymc.spigot.hub.events.AntiExplo; +import main.java.fr.verymc.spigot.hub.events.Interact; +import main.java.fr.verymc.spigot.hub.invest.InvestCmd; +import main.java.fr.verymc.spigot.hub.invest.InvestManager; +import main.java.fr.verymc.spigot.hub.winelottery.WineGui; +import main.java.fr.verymc.spigot.hub.winelottery.WineSpawn; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.island.blocks.ChestListener; +import main.java.fr.verymc.spigot.island.blocks.ChestManager; +import main.java.fr.verymc.spigot.island.blocks.ChestsCmd; +import main.java.fr.verymc.spigot.island.challenges.ChallengesCmd; +import main.java.fr.verymc.spigot.island.challenges.IslandChallengesGuis; +import main.java.fr.verymc.spigot.island.challenges.IslandChallengesListener; +import main.java.fr.verymc.spigot.island.events.IslandGeneratorForm; +import main.java.fr.verymc.spigot.island.events.IslandInteractManager; +import main.java.fr.verymc.spigot.island.events.IslandPlayerMove; +import main.java.fr.verymc.spigot.island.featherfly.CountdownFly; +import main.java.fr.verymc.spigot.island.featherfly.DailyFlyCmd; +import main.java.fr.verymc.spigot.island.featherfly.FeatherFlyCmd; +import main.java.fr.verymc.spigot.island.featherfly.FeatherFlyInteract; +import main.java.fr.verymc.spigot.island.generator.EmptyChunkGenerator; +import main.java.fr.verymc.spigot.island.guis.IslandGuiManager; +import main.java.fr.verymc.spigot.island.minions.MinionManager; +import main.java.fr.verymc.spigot.island.minions.MinionsCmd; +import main.java.fr.verymc.spigot.island.minions.MinionsListener; +import main.java.fr.verymc.spigot.island.playerwarps.PlayerWarpCmd; +import main.java.fr.verymc.spigot.island.playerwarps.PlayerWarpGuiManager; +import main.java.fr.verymc.spigot.island.playerwarps.PlayerWarpManager; +import main.java.fr.verymc.spigot.island.protections.BlockListener; +import main.java.fr.verymc.spigot.island.protections.EntityListener; +import main.java.fr.verymc.spigot.utils.UtilsManager; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; import net.luckperms.api.LuckPerms; @@ -222,8 +221,6 @@ public void onEnable() { startCommandModule(); - new TABManager(); - new EventManager(); new ChestManager(); @@ -242,7 +239,7 @@ public void onEnable() { //ISLAND ADDITIONNAL STARTUP - if (serverType == ServerType.ISLAND) { + if (serverType == ServerType.SKYBLOCK_ISLAND) { System.out.println("Starting Island ADDITIONNAL module..."); IslandManager.instance.load(); for (Island island : IslandManager.instance.islands) { @@ -254,7 +251,7 @@ public void onEnable() { } //HUB ADDITIONNAL STARTUP - if (serverType == ServerType.HUB) { + if (serverType == ServerType.SKYBLOCK_HUB) { System.out.println("Starting Hub ADDITIONNAL module..."); Bukkit.getScheduler().scheduleSyncDelayedTask(this, new Runnable() { @Override @@ -272,7 +269,7 @@ public void run() { //Dungeon ADDITIONNAL STARTUP - if (serverType == ServerType.DUNGEON) { + if (serverType == ServerType.SKYBLOCk_DUNGEON) { System.out.println("Starting Dungeon ADDITIONNAL module..."); System.out.println("Starting Dungeon ADDITIONNAL module FINISHED"); @@ -306,7 +303,7 @@ public void run() { @Override public void onDisable() { - if (serverType == ServerType.ISLAND) { + if (serverType == ServerType.SKYBLOCK_ISLAND) { IslandManager.instance.saveAllIslands(); } for (SkyblockUser user : SkyblockUserManager.instance.users) { @@ -372,7 +369,7 @@ public void startListenerModule() { //ISLAND LISTENER - if (serverType == ServerType.ISLAND) { + if (serverType == ServerType.SKYBLOCK_ISLAND) { getServer().getPluginManager().registerEvents(new Farm2WinGui(), this); getServer().getPluginManager().registerEvents(new WineGui(), this); getServer().getPluginManager().registerEvents(new WarpGui(), this); @@ -389,7 +386,7 @@ public void startListenerModule() { //HUB LISTENER - if (serverType == ServerType.HUB) { + if (serverType == ServerType.SKYBLOCK_HUB) { getServer().getPluginManager().registerEvents(new Interact(), this); getServer().getPluginManager().registerEvents(new AntiExplo(), this); getServer().getPluginManager().registerEvents(new CratesManager(), this); @@ -398,7 +395,7 @@ public void startListenerModule() { //DUNGEON LISTENER - if (serverType == ServerType.DUNGEON) { + if (serverType == ServerType.SKYBLOCk_DUNGEON) { } @@ -471,7 +468,7 @@ public void createMainWorld() { WorldCreator wc = new WorldCreator(serverType.getDisplayName()); wc.generator(new EmptyChunkGenerator()); mainWorld = wc.createWorld(); - if (serverType == ServerType.HUB) { + if (serverType == ServerType.SKYBLOCK_HUB) { for (File file : Main.instance.getDataFolder().listFiles()) { if (file.getName().contains("spawn")) { IslandManager.instance.pasteIsland(file, SpawnCmd.Spawn.clone().add(0, -1, 0)); diff --git a/src/main/java/fr/verymc/core/PluginMessageManager.java b/src/main/java/fr/verymc/spigot/core/PluginMessageManager.java similarity index 93% rename from src/main/java/fr/verymc/core/PluginMessageManager.java rename to src/main/java/fr/verymc/spigot/core/PluginMessageManager.java index ade88699..4279d02b 100644 --- a/src/main/java/fr/verymc/core/PluginMessageManager.java +++ b/src/main/java/fr/verymc/spigot/core/PluginMessageManager.java @@ -1,10 +1,10 @@ -package main.java.fr.verymc.core; +package main.java.fr.verymc.spigot.core; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.utils.ObjectConverter; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.utils.ObjectConverter; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.plugin.messaging.PluginMessageListener; diff --git a/src/main/java/fr/verymc/core/ServersManager.java b/src/main/java/fr/verymc/spigot/core/ServersManager.java similarity index 93% rename from src/main/java/fr/verymc/core/ServersManager.java rename to src/main/java/fr/verymc/spigot/core/ServersManager.java index 43c5143b..d7cfe39d 100644 --- a/src/main/java/fr/verymc/core/ServersManager.java +++ b/src/main/java/fr/verymc/spigot/core/ServersManager.java @@ -1,12 +1,12 @@ -package main.java.fr.verymc.core; +package main.java.fr.verymc.spigot.core; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; -import main.java.fr.verymc.Main; import main.java.fr.verymc.commons.enums.ServerType; import main.java.fr.verymc.commons.utils.HTTPUtils; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.utils.ObjectConverter; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.utils.ObjectConverter; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Player; @@ -32,7 +32,7 @@ public ServersManager() { @Override public void run() { try { - if (Main.instance.serverType == ServerType.ISLAND) { + if (Main.instance.serverType == ServerType.SKYBLOCK_ISLAND) { autoSendPlayers(); } autoReadServers(); diff --git a/src/main/java/fr/verymc/core/antiafk/AntiAfk.java b/src/main/java/fr/verymc/spigot/core/antiafk/AntiAfk.java similarity index 92% rename from src/main/java/fr/verymc/core/antiafk/AntiAfk.java rename to src/main/java/fr/verymc/spigot/core/antiafk/AntiAfk.java index 5089e466..1d49ea66 100644 --- a/src/main/java/fr/verymc/core/antiafk/AntiAfk.java +++ b/src/main/java/fr/verymc/spigot/core/antiafk/AntiAfk.java @@ -1,10 +1,10 @@ -package main.java.fr.verymc.core.antiafk; +package main.java.fr.verymc.spigot.core.antiafk; -import main.java.fr.verymc.Main; import main.java.fr.verymc.commons.enums.ServerType; -import main.java.fr.verymc.core.cmd.base.SpawnCmd; -import main.java.fr.verymc.core.gui.AfkMineCaptchaGui; -import main.java.fr.verymc.utils.PlayerUtils; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.cmd.base.SpawnCmd; +import main.java.fr.verymc.spigot.core.gui.AfkMineCaptchaGui; +import main.java.fr.verymc.spigot.utils.PlayerUtils; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -57,7 +57,7 @@ public void run() { Bukkit.getScheduler().scheduleSyncDelayedTask(Main.instance, new Runnable() { @Override public void run() { - PlayerUtils.instance.teleportPlayerFromRequest(p, SpawnCmd.Spawn, 0, ServerType.HUB); + PlayerUtils.instance.teleportPlayerFromRequest(p, SpawnCmd.Spawn, 0, ServerType.SKYBLOCK_HUB); } }, 0); countHashMap.remove(entry.getKey()); diff --git a/src/main/java/fr/verymc/core/atout/AtoutCmd.java b/src/main/java/fr/verymc/spigot/core/atout/AtoutCmd.java similarity index 96% rename from src/main/java/fr/verymc/core/atout/AtoutCmd.java rename to src/main/java/fr/verymc/spigot/core/atout/AtoutCmd.java index 97182c9c..939ca54d 100644 --- a/src/main/java/fr/verymc/core/atout/AtoutCmd.java +++ b/src/main/java/fr/verymc/spigot/core/atout/AtoutCmd.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.atout; +package main.java.fr.verymc.spigot.core.atout; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/fr/verymc/core/atout/AtoutGui.java b/src/main/java/fr/verymc/spigot/core/atout/AtoutGui.java similarity index 97% rename from src/main/java/fr/verymc/core/atout/AtoutGui.java rename to src/main/java/fr/verymc/spigot/core/atout/AtoutGui.java index 3aaa8f48..6ef3698e 100644 --- a/src/main/java/fr/verymc/core/atout/AtoutGui.java +++ b/src/main/java/fr/verymc/spigot/core/atout/AtoutGui.java @@ -1,9 +1,9 @@ -package main.java.fr.verymc.core.atout; +package main.java.fr.verymc.spigot.core.atout; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.core.gui.MenuGui; -import main.java.fr.verymc.core.storage.SkyblockUser; -import main.java.fr.verymc.core.storage.SkyblockUserManager; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.gui.MenuGui; +import main.java.fr.verymc.spigot.core.storage.SkyblockUser; +import main.java.fr.verymc.spigot.core.storage.SkyblockUserManager; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; diff --git a/src/main/java/fr/verymc/core/atout/BuyAtoutGui.java b/src/main/java/fr/verymc/spigot/core/atout/BuyAtoutGui.java similarity index 94% rename from src/main/java/fr/verymc/core/atout/BuyAtoutGui.java rename to src/main/java/fr/verymc/spigot/core/atout/BuyAtoutGui.java index 0f87aff6..e00be781 100644 --- a/src/main/java/fr/verymc/core/atout/BuyAtoutGui.java +++ b/src/main/java/fr/verymc/spigot/core/atout/BuyAtoutGui.java @@ -1,11 +1,11 @@ -package main.java.fr.verymc.core.atout; - -import main.java.fr.verymc.Main; -import main.java.fr.verymc.core.eco.EcoAccountsManager; -import main.java.fr.verymc.core.gui.Farm2WinGui; -import main.java.fr.verymc.core.storage.SkyblockUser; -import main.java.fr.verymc.core.storage.SkyblockUserManager; -import main.java.fr.verymc.utils.PreGenItems; +package main.java.fr.verymc.spigot.core.atout; + +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.core.gui.Farm2WinGui; +import main.java.fr.verymc.spigot.core.storage.SkyblockUser; +import main.java.fr.verymc.spigot.core.storage.SkyblockUserManager; +import main.java.fr.verymc.spigot.utils.PreGenItems; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/core/auctions/AhCmd.java b/src/main/java/fr/verymc/spigot/core/auctions/AhCmd.java similarity index 98% rename from src/main/java/fr/verymc/core/auctions/AhCmd.java rename to src/main/java/fr/verymc/spigot/core/auctions/AhCmd.java index 68220ea9..ccfd7cba 100644 --- a/src/main/java/fr/verymc/core/auctions/AhCmd.java +++ b/src/main/java/fr/verymc/spigot/core/auctions/AhCmd.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.auctions; +package main.java.fr.verymc.spigot.core.auctions; import org.bukkit.Material; import org.bukkit.command.Command; diff --git a/src/main/java/fr/verymc/core/auctions/AuctionGui.java b/src/main/java/fr/verymc/spigot/core/auctions/AuctionGui.java similarity index 98% rename from src/main/java/fr/verymc/core/auctions/AuctionGui.java rename to src/main/java/fr/verymc/spigot/core/auctions/AuctionGui.java index 56a31a81..44412d36 100644 --- a/src/main/java/fr/verymc/core/auctions/AuctionGui.java +++ b/src/main/java/fr/verymc/spigot/core/auctions/AuctionGui.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.auctions; +package main.java.fr.verymc.spigot.core.auctions; -import main.java.fr.verymc.core.gui.MenuGui; +import main.java.fr.verymc.spigot.core.gui.MenuGui; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/fr/verymc/core/auctions/AuctionsManager.java b/src/main/java/fr/verymc/spigot/core/auctions/AuctionsManager.java similarity index 98% rename from src/main/java/fr/verymc/core/auctions/AuctionsManager.java rename to src/main/java/fr/verymc/spigot/core/auctions/AuctionsManager.java index d545e184..823a03b1 100644 --- a/src/main/java/fr/verymc/core/auctions/AuctionsManager.java +++ b/src/main/java/fr/verymc/spigot/core/auctions/AuctionsManager.java @@ -1,9 +1,9 @@ -package main.java.fr.verymc.core.auctions; +package main.java.fr.verymc.spigot.core.auctions; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.core.eco.EcoAccountsManager; -import main.java.fr.verymc.core.storage.AsyncConfig; -import main.java.fr.verymc.core.storage.ConfigManager; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.core.storage.AsyncConfig; +import main.java.fr.verymc.spigot.core.storage.ConfigManager; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/core/cmd/base/BaltopCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/BaltopCmd.java similarity index 91% rename from src/main/java/fr/verymc/core/cmd/base/BaltopCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/BaltopCmd.java index adcfcab6..9a68bbd7 100644 --- a/src/main/java/fr/verymc/core/cmd/base/BaltopCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/BaltopCmd.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; -import main.java.fr.verymc.core.eco.BaltopManager; -import main.java.fr.verymc.core.storage.SkyblockUserManager; +import main.java.fr.verymc.spigot.core.eco.BaltopManager; +import main.java.fr.verymc.spigot.core.storage.SkyblockUserManager; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/fr/verymc/core/cmd/base/BarCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/BarCmd.java similarity index 95% rename from src/main/java/fr/verymc/core/cmd/base/BarCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/BarCmd.java index 10e46c9a..65be0ba8 100644 --- a/src/main/java/fr/verymc/core/cmd/base/BarCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/BarCmd.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; -import main.java.fr.verymc.Main; +import main.java.fr.verymc.spigot.Main; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/fr/verymc/core/cmd/base/ClaimCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/ClaimCmd.java similarity index 97% rename from src/main/java/fr/verymc/core/cmd/base/ClaimCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/ClaimCmd.java index 3eb46a7b..b2c65021 100644 --- a/src/main/java/fr/verymc/core/cmd/base/ClaimCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/ClaimCmd.java @@ -1,8 +1,8 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; -import main.java.fr.verymc.core.eco.EcoAccountsManager; -import main.java.fr.verymc.hub.crates.CratesKeyManager; -import main.java.fr.verymc.utils.ItemStackBuilder; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.hub.crates.CratesKeyManager; +import main.java.fr.verymc.spigot.utils.ItemStackBuilder; import org.bukkit.Material; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/fr/verymc/core/cmd/base/ClaimCmdSaver.java b/src/main/java/fr/verymc/spigot/core/cmd/base/ClaimCmdSaver.java similarity index 97% rename from src/main/java/fr/verymc/core/cmd/base/ClaimCmdSaver.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/ClaimCmdSaver.java index 827632f0..7d733a39 100644 --- a/src/main/java/fr/verymc/core/cmd/base/ClaimCmdSaver.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/ClaimCmdSaver.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; -import main.java.fr.verymc.Main; +import main.java.fr.verymc.spigot.Main; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/main/java/fr/verymc/core/cmd/base/CraftCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/CraftCmd.java similarity index 95% rename from src/main/java/fr/verymc/core/cmd/base/CraftCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/CraftCmd.java index 25a8d7a4..3e103908 100644 --- a/src/main/java/fr/verymc/core/cmd/base/CraftCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/CraftCmd.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/fr/verymc/core/cmd/base/EnchantementCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/EnchantementCmd.java similarity index 92% rename from src/main/java/fr/verymc/core/cmd/base/EnchantementCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/EnchantementCmd.java index 92d4a03d..33498d82 100644 --- a/src/main/java/fr/verymc/core/cmd/base/EnchantementCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/EnchantementCmd.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; -import main.java.fr.verymc.Main; +import main.java.fr.verymc.spigot.Main; import org.bukkit.Location; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/fr/verymc/core/cmd/base/Farm2WinCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/Farm2WinCmd.java similarity index 90% rename from src/main/java/fr/verymc/core/cmd/base/Farm2WinCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/Farm2WinCmd.java index 86dbd540..18053c43 100644 --- a/src/main/java/fr/verymc/core/cmd/base/Farm2WinCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/Farm2WinCmd.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; -import main.java.fr.verymc.core.gui.Farm2WinGui; +import main.java.fr.verymc.spigot.core.gui.Farm2WinGui; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/fr/verymc/core/cmd/base/FeedCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/FeedCmd.java similarity index 96% rename from src/main/java/fr/verymc/core/cmd/base/FeedCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/FeedCmd.java index 1b269c9f..250a6ac5 100644 --- a/src/main/java/fr/verymc/core/cmd/base/FeedCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/FeedCmd.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; -import main.java.fr.verymc.Main; +import main.java.fr.verymc.spigot.Main; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/fr/verymc/core/cmd/base/FlyCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/FlyCmd.java similarity index 92% rename from src/main/java/fr/verymc/core/cmd/base/FlyCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/FlyCmd.java index 4aecf8ea..1a1400ec 100644 --- a/src/main/java/fr/verymc/core/cmd/base/FlyCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/FlyCmd.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; -import main.java.fr.verymc.Main; import main.java.fr.verymc.commons.enums.ServerType; +import main.java.fr.verymc.spigot.Main; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; @@ -39,7 +39,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String switch_fly_player(Bukkit.getPlayer(args[0])); return false; } - if (Main.instance.serverType == ServerType.ISLAND) { + if (Main.instance.serverType == ServerType.SKYBLOCK_ISLAND) { switch_fly_player(player); return false; } else { diff --git a/src/main/java/fr/verymc/core/cmd/base/HatCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/HatCmd.java similarity index 97% rename from src/main/java/fr/verymc/core/cmd/base/HatCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/HatCmd.java index 670fc745..d45b7f47 100644 --- a/src/main/java/fr/verymc/core/cmd/base/HatCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/HatCmd.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; import org.bukkit.Material; import org.bukkit.command.Command; diff --git a/src/main/java/fr/verymc/core/cmd/base/IslandCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/IslandCmd.java similarity index 97% rename from src/main/java/fr/verymc/core/cmd/base/IslandCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/IslandCmd.java index d446c2e0..a90ad958 100644 --- a/src/main/java/fr/verymc/core/cmd/base/IslandCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/IslandCmd.java @@ -1,16 +1,16 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; -import main.java.fr.verymc.Main; import main.java.fr.verymc.commons.enums.ServerType; -import main.java.fr.verymc.core.ServersManager; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.island.IslandValueCalcManager; -import main.java.fr.verymc.island.guis.*; -import main.java.fr.verymc.island.perms.IslandPerms; -import main.java.fr.verymc.utils.PlayerUtils; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.ServersManager; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.island.IslandValueCalcManager; +import main.java.fr.verymc.spigot.island.guis.*; +import main.java.fr.verymc.spigot.island.perms.IslandPerms; +import main.java.fr.verymc.spigot.utils.PlayerUtils; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; @@ -30,7 +30,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St if (sender instanceof Player) { Player p = (Player) sender; - if (Main.instance.serverType != ServerType.ISLAND) { + if (Main.instance.serverType != ServerType.SKYBLOCK_ISLAND) { final ByteArrayDataOutput out = ByteStreams.newDataOutput(); Bukkit.getServer().getMessenger().registerOutgoingPluginChannel(Main.instance, "BungeeCord"); for (Map.Entry entry : ServersManager.instance.stringJSONArrayHashMap.entrySet()) { @@ -42,7 +42,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St } } for (Map.Entry entry : ServersManager.instance.stringJSONArrayHashMap.entrySet()) { - if (entry.getKey().contains(ServerType.ISLAND.getDisplayName())) { + if (entry.getKey().contains(ServerType.SKYBLOCK_ISLAND.getDisplayName())) { out.writeUTF("Connect"); out.writeUTF(entry.getKey()); p.sendPluginMessage(Main.instance, "BungeeCord", out.toByteArray()); @@ -321,7 +321,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St if (!playerIsland.isBanned(target.getUniqueId())) { if (playerIsland.addBanned(target.getUniqueId())) { if (IslandManager.instance.getIslandByLoc(target.getLocation()) == playerIsland) { - PlayerUtils.instance.teleportPlayerFromRequest(target, SpawnCmd.Spawn, 0, ServerType.HUB); + PlayerUtils.instance.teleportPlayerFromRequest(target, SpawnCmd.Spawn, 0, ServerType.SKYBLOCK_HUB); } playerIsland.sendMessageToEveryMember("§6§lIles §8» §f" + target.getName() + " vient d'être banni de l'île par " + p.getName() + "."); @@ -356,7 +356,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St return true; } if (IslandManager.instance.getIslandByLoc(target.getLocation()) == playerIsland) { - PlayerUtils.instance.teleportPlayerFromRequest(target, SpawnCmd.Spawn, 0, ServerType.HUB); + PlayerUtils.instance.teleportPlayerFromRequest(target, SpawnCmd.Spawn, 0, ServerType.SKYBLOCK_HUB); target.sendMessage("§6§lIles §8» §fVous avez été expulsé de l'île par " + p.getName() + "."); playerIsland.sendMessageToEveryMember("§6§lIles §8» §f" + target.getName() + " vient d'être expulsé de l'île par " + p.getName() + "."); diff --git a/src/main/java/fr/verymc/core/cmd/base/MenuCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/MenuCmd.java similarity index 90% rename from src/main/java/fr/verymc/core/cmd/base/MenuCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/MenuCmd.java index c8928c32..44ca68c1 100644 --- a/src/main/java/fr/verymc/core/cmd/base/MenuCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/MenuCmd.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; -import main.java.fr.verymc.core.gui.MenuGui; +import main.java.fr.verymc.spigot.core.gui.MenuGui; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/fr/verymc/core/cmd/base/MoneyCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/MoneyCmd.java similarity index 98% rename from src/main/java/fr/verymc/core/cmd/base/MoneyCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/MoneyCmd.java index 53a7ac31..0b219ac1 100644 --- a/src/main/java/fr/verymc/core/cmd/base/MoneyCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/MoneyCmd.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; -import main.java.fr.verymc.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/fr/verymc/core/cmd/base/PayCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/PayCmd.java similarity index 97% rename from src/main/java/fr/verymc/core/cmd/base/PayCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/PayCmd.java index 6bd9480c..07fd1b8e 100644 --- a/src/main/java/fr/verymc/core/cmd/base/PayCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/PayCmd.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; -import main.java.fr.verymc.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/fr/verymc/core/cmd/base/SpawnCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/SpawnCmd.java similarity index 94% rename from src/main/java/fr/verymc/core/cmd/base/SpawnCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/SpawnCmd.java index fd773eca..b647b2ea 100644 --- a/src/main/java/fr/verymc/core/cmd/base/SpawnCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/SpawnCmd.java @@ -1,8 +1,8 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; -import main.java.fr.verymc.Main; import main.java.fr.verymc.commons.enums.ServerType; -import main.java.fr.verymc.utils.PlayerUtils; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.utils.PlayerUtils; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.command.Command; @@ -31,7 +31,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String case 0 -> { final int timeLeft = Main.instance.getCooldown(player.getName()); if (timeLeft == 0) { - PlayerUtils.instance.teleportPlayerFromRequest(player, Spawn, PlayerUtils.instance.getPlayerTeleportingdelay(player), ServerType.HUB); + PlayerUtils.instance.teleportPlayerFromRequest(player, Spawn, PlayerUtils.instance.getPlayerTeleportingdelay(player), ServerType.SKYBLOCK_HUB); } } case 1 -> { diff --git a/src/main/java/fr/verymc/core/cmd/base/TpNoCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/TpNoCmd.java similarity index 95% rename from src/main/java/fr/verymc/core/cmd/base/TpNoCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/TpNoCmd.java index 937483f8..f76338da 100644 --- a/src/main/java/fr/verymc/core/cmd/base/TpNoCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/TpNoCmd.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; -import main.java.fr.verymc.Main; +import main.java.fr.verymc.spigot.Main; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/fr/verymc/core/cmd/base/TpYesCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/TpYesCmd.java similarity index 92% rename from src/main/java/fr/verymc/core/cmd/base/TpYesCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/TpYesCmd.java index 3ac275ca..9bd50902 100644 --- a/src/main/java/fr/verymc/core/cmd/base/TpYesCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/TpYesCmd.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.utils.PlayerUtils; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.utils.PlayerUtils; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/fr/verymc/core/cmd/base/TpaCancelCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/TpaCancelCmd.java similarity index 94% rename from src/main/java/fr/verymc/core/cmd/base/TpaCancelCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/TpaCancelCmd.java index edf5b8cf..0fd0a656 100644 --- a/src/main/java/fr/verymc/core/cmd/base/TpaCancelCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/TpaCancelCmd.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; -import main.java.fr.verymc.Main; +import main.java.fr.verymc.spigot.Main; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/fr/verymc/core/cmd/base/TpaCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/TpaCmd.java similarity index 96% rename from src/main/java/fr/verymc/core/cmd/base/TpaCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/TpaCmd.java index ba2bfa4d..01c682fa 100644 --- a/src/main/java/fr/verymc/core/cmd/base/TpaCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/TpaCmd.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.core.cmd.utils.UtilsCmd; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.cmd.utils.UtilsCmd; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/fr/verymc/core/cmd/base/TradeCancelCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/TradeCancelCmd.java similarity index 95% rename from src/main/java/fr/verymc/core/cmd/base/TradeCancelCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/TradeCancelCmd.java index 480f8c96..c07f9850 100644 --- a/src/main/java/fr/verymc/core/cmd/base/TradeCancelCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/TradeCancelCmd.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; -import main.java.fr.verymc.Main; +import main.java.fr.verymc.spigot.Main; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/fr/verymc/core/cmd/base/TradeCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/TradeCmd.java similarity index 96% rename from src/main/java/fr/verymc/core/cmd/base/TradeCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/TradeCmd.java index d313b5cf..88da653c 100644 --- a/src/main/java/fr/verymc/core/cmd/base/TradeCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/TradeCmd.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.core.cmd.utils.UtilsCmd; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.cmd.utils.UtilsCmd; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/fr/verymc/core/cmd/base/TradeNoCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/TradeNoCmd.java similarity index 96% rename from src/main/java/fr/verymc/core/cmd/base/TradeNoCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/TradeNoCmd.java index af6605c4..9a3db146 100644 --- a/src/main/java/fr/verymc/core/cmd/base/TradeNoCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/TradeNoCmd.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; -import main.java.fr.verymc.Main; +import main.java.fr.verymc.spigot.Main; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/fr/verymc/core/cmd/base/TradeYesCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/TradeYesCmd.java similarity index 94% rename from src/main/java/fr/verymc/core/cmd/base/TradeYesCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/TradeYesCmd.java index e254ad19..50a5bf1d 100644 --- a/src/main/java/fr/verymc/core/cmd/base/TradeYesCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/TradeYesCmd.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.core.gui.TradeManager; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.gui.TradeManager; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/fr/verymc/core/cmd/base/WarpCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/WarpCmd.java similarity index 94% rename from src/main/java/fr/verymc/core/cmd/base/WarpCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/WarpCmd.java index 6a5333f2..b6b7d7c5 100644 --- a/src/main/java/fr/verymc/core/cmd/base/WarpCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/WarpCmd.java @@ -1,8 +1,8 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; -import main.java.fr.verymc.Main; import main.java.fr.verymc.commons.enums.ServerType; -import main.java.fr.verymc.utils.PlayerUtils; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.utils.PlayerUtils; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.command.Command; @@ -29,13 +29,13 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String String str = args[0].toLowerCase(); switch (str) { case "boxes": - PlayerUtils.instance.teleportPlayerFromRequest(player, Crates, PlayerUtils.instance.getPlayerTeleportingdelay(player), ServerType.HUB); + PlayerUtils.instance.teleportPlayerFromRequest(player, Crates, PlayerUtils.instance.getPlayerTeleportingdelay(player), ServerType.SKYBLOCK_HUB); break; case "enchantement": - PlayerUtils.instance.teleportPlayerFromRequest(player, Enchantement, PlayerUtils.instance.getPlayerTeleportingdelay(player), ServerType.HUB); + PlayerUtils.instance.teleportPlayerFromRequest(player, Enchantement, PlayerUtils.instance.getPlayerTeleportingdelay(player), ServerType.SKYBLOCK_HUB); break; case "bar": - PlayerUtils.instance.teleportPlayerFromRequest(player, Bar, PlayerUtils.instance.getPlayerTeleportingdelay(player), ServerType.HUB); + PlayerUtils.instance.teleportPlayerFromRequest(player, Bar, PlayerUtils.instance.getPlayerTeleportingdelay(player), ServerType.SKYBLOCK_HUB); default: break; } diff --git a/src/main/java/fr/verymc/core/cmd/base/WarpsCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/base/WarpsCmd.java similarity index 90% rename from src/main/java/fr/verymc/core/cmd/base/WarpsCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/base/WarpsCmd.java index 0f18240a..53061bfa 100644 --- a/src/main/java/fr/verymc/core/cmd/base/WarpsCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/base/WarpsCmd.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.cmd.base; +package main.java.fr.verymc.spigot.core.cmd.base; -import main.java.fr.verymc.core.gui.WarpGui; +import main.java.fr.verymc.spigot.core.gui.WarpGui; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/fr/verymc/core/cmd/moderation/AdminCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/moderation/AdminCmd.java similarity index 83% rename from src/main/java/fr/verymc/core/cmd/moderation/AdminCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/moderation/AdminCmd.java index 3a7bba86..273a6431 100644 --- a/src/main/java/fr/verymc/core/cmd/moderation/AdminCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/moderation/AdminCmd.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.core.cmd.moderation; +package main.java.fr.verymc.spigot.core.cmd.moderation; -import main.java.fr.verymc.island.IslandValueCalcManager; -import main.java.fr.verymc.island.challenges.IslandChallengesReset; +import main.java.fr.verymc.spigot.island.IslandValueCalcManager; +import main.java.fr.verymc.spigot.island.challenges.IslandChallengesReset; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/fr/verymc/core/cmd/moderation/AntiAfkMineCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/moderation/AntiAfkMineCmd.java similarity index 89% rename from src/main/java/fr/verymc/core/cmd/moderation/AntiAfkMineCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/moderation/AntiAfkMineCmd.java index 45f2e604..d11b9a5b 100644 --- a/src/main/java/fr/verymc/core/cmd/moderation/AntiAfkMineCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/moderation/AntiAfkMineCmd.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.core.cmd.moderation; +package main.java.fr.verymc.spigot.core.cmd.moderation; -import main.java.fr.verymc.core.cmd.utils.UtilsCmd; -import main.java.fr.verymc.core.gui.AfkMineCaptchaGui; +import main.java.fr.verymc.spigot.core.cmd.utils.UtilsCmd; +import main.java.fr.verymc.spigot.core.gui.AfkMineCaptchaGui; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/fr/verymc/core/cmd/moderation/BuildCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/moderation/BuildCmd.java similarity index 96% rename from src/main/java/fr/verymc/core/cmd/moderation/BuildCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/moderation/BuildCmd.java index f855fa3b..5bc6f05c 100644 --- a/src/main/java/fr/verymc/core/cmd/moderation/BuildCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/moderation/BuildCmd.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.cmd.moderation; +package main.java.fr.verymc.spigot.core.cmd.moderation; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/fr/verymc/core/cmd/moderation/CheckFlyCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/moderation/CheckFlyCmd.java similarity index 91% rename from src/main/java/fr/verymc/core/cmd/moderation/CheckFlyCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/moderation/CheckFlyCmd.java index 09a1b219..7b1e366b 100644 --- a/src/main/java/fr/verymc/core/cmd/moderation/CheckFlyCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/moderation/CheckFlyCmd.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.core.cmd.moderation; +package main.java.fr.verymc.spigot.core.cmd.moderation; -import main.java.fr.verymc.core.cmd.utils.UtilsCmd; -import main.java.fr.verymc.core.storage.SkyblockUserManager; +import main.java.fr.verymc.spigot.core.cmd.utils.UtilsCmd; +import main.java.fr.verymc.spigot.core.storage.SkyblockUserManager; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/fr/verymc/core/cmd/moderation/DataCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/moderation/DataCmd.java similarity index 93% rename from src/main/java/fr/verymc/core/cmd/moderation/DataCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/moderation/DataCmd.java index 2c16b0bb..e693507d 100644 --- a/src/main/java/fr/verymc/core/cmd/moderation/DataCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/moderation/DataCmd.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.cmd.moderation; +package main.java.fr.verymc.spigot.core.cmd.moderation; -import main.java.fr.verymc.core.storage.ConfigManager; +import main.java.fr.verymc.spigot.core.storage.ConfigManager; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/fr/verymc/core/cmd/moderation/EventsCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/moderation/EventsCmd.java similarity index 84% rename from src/main/java/fr/verymc/core/cmd/moderation/EventsCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/moderation/EventsCmd.java index b391960d..1efd5416 100644 --- a/src/main/java/fr/verymc/core/cmd/moderation/EventsCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/moderation/EventsCmd.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.core.cmd.moderation; +package main.java.fr.verymc.spigot.core.cmd.moderation; -import main.java.fr.verymc.core.evenement.BlocBreakerContest; -import main.java.fr.verymc.core.evenement.DailyBonus; +import main.java.fr.verymc.spigot.core.evenement.BlocBreakerContest; +import main.java.fr.verymc.spigot.core.evenement.DailyBonus; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/fr/verymc/core/cmd/moderation/GmCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/moderation/GmCmd.java similarity index 96% rename from src/main/java/fr/verymc/core/cmd/moderation/GmCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/moderation/GmCmd.java index 4727956b..9849be31 100644 --- a/src/main/java/fr/verymc/core/cmd/moderation/GmCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/moderation/GmCmd.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.cmd.moderation; +package main.java.fr.verymc.spigot.core.cmd.moderation; -import main.java.fr.verymc.core.cmd.utils.UtilsCmd; +import main.java.fr.verymc.spigot.core.cmd.utils.UtilsCmd; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.command.Command; diff --git a/src/main/java/fr/verymc/core/cmd/moderation/GmLCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/moderation/GmLCmd.java similarity index 96% rename from src/main/java/fr/verymc/core/cmd/moderation/GmLCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/moderation/GmLCmd.java index f6b688b8..9dbc95a1 100644 --- a/src/main/java/fr/verymc/core/cmd/moderation/GmLCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/moderation/GmLCmd.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.cmd.moderation; +package main.java.fr.verymc.spigot.core.cmd.moderation; -import main.java.fr.verymc.core.cmd.utils.UtilsCmd; +import main.java.fr.verymc.spigot.core.cmd.utils.UtilsCmd; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.command.Command; diff --git a/src/main/java/fr/verymc/core/cmd/moderation/RebootCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/moderation/RebootCmd.java similarity index 96% rename from src/main/java/fr/verymc/core/cmd/moderation/RebootCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/moderation/RebootCmd.java index 6f8d2258..51514f0a 100644 --- a/src/main/java/fr/verymc/core/cmd/moderation/RebootCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/moderation/RebootCmd.java @@ -1,8 +1,8 @@ -package main.java.fr.verymc.core.cmd.moderation; +package main.java.fr.verymc.spigot.core.cmd.moderation; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; -import main.java.fr.verymc.Main; +import main.java.fr.verymc.spigot.Main; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/fr/verymc/core/cmd/utils/UtilsCmd.java b/src/main/java/fr/verymc/spigot/core/cmd/utils/UtilsCmd.java similarity index 95% rename from src/main/java/fr/verymc/core/cmd/utils/UtilsCmd.java rename to src/main/java/fr/verymc/spigot/core/cmd/utils/UtilsCmd.java index 99a8d29a..955f055d 100644 --- a/src/main/java/fr/verymc/core/cmd/utils/UtilsCmd.java +++ b/src/main/java/fr/verymc/spigot/core/cmd/utils/UtilsCmd.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.cmd.utils; +package main.java.fr.verymc.spigot.core.cmd.utils; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; diff --git a/src/main/java/fr/verymc/core/eco/BaltopManager.java b/src/main/java/fr/verymc/spigot/core/eco/BaltopManager.java similarity index 91% rename from src/main/java/fr/verymc/core/eco/BaltopManager.java rename to src/main/java/fr/verymc/spigot/core/eco/BaltopManager.java index 4a10b872..82ade87e 100644 --- a/src/main/java/fr/verymc/core/eco/BaltopManager.java +++ b/src/main/java/fr/verymc/spigot/core/eco/BaltopManager.java @@ -1,8 +1,8 @@ -package main.java.fr.verymc.core.eco; +package main.java.fr.verymc.spigot.core.eco; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.core.storage.SkyblockUser; -import main.java.fr.verymc.core.storage.SkyblockUserManager; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.storage.SkyblockUser; +import main.java.fr.verymc.spigot.core.storage.SkyblockUserManager; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/core/eco/EcoAccountsManager.java b/src/main/java/fr/verymc/spigot/core/eco/EcoAccountsManager.java similarity index 96% rename from src/main/java/fr/verymc/core/eco/EcoAccountsManager.java rename to src/main/java/fr/verymc/spigot/core/eco/EcoAccountsManager.java index 0fd6633e..0e04feb9 100644 --- a/src/main/java/fr/verymc/core/eco/EcoAccountsManager.java +++ b/src/main/java/fr/verymc/spigot/core/eco/EcoAccountsManager.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.core.eco; +package main.java.fr.verymc.spigot.core.eco; -import main.java.fr.verymc.core.storage.SkyblockUser; -import main.java.fr.verymc.core.storage.SkyblockUserManager; +import main.java.fr.verymc.spigot.core.storage.SkyblockUser; +import main.java.fr.verymc.spigot.core.storage.SkyblockUserManager; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/core/evenement/BlocBreakerContest.java b/src/main/java/fr/verymc/spigot/core/evenement/BlocBreakerContest.java similarity index 94% rename from src/main/java/fr/verymc/core/evenement/BlocBreakerContest.java rename to src/main/java/fr/verymc/spigot/core/evenement/BlocBreakerContest.java index 22ddd965..afd78e20 100644 --- a/src/main/java/fr/verymc/core/evenement/BlocBreakerContest.java +++ b/src/main/java/fr/verymc/spigot/core/evenement/BlocBreakerContest.java @@ -1,8 +1,8 @@ -package main.java.fr.verymc.core.evenement; +package main.java.fr.verymc.spigot.core.evenement; -import main.java.fr.verymc.Main; import main.java.fr.verymc.commons.enums.ServerType; -import main.java.fr.verymc.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -49,7 +49,7 @@ public void startContest() { material = materialArrayList.get(random.nextInt(materialArrayList.size())); timeStarting = System.currentTimeMillis(); - if (Main.instance.serverType == ServerType.ISLAND) { + if (Main.instance.serverType == ServerType.SKYBLOCK_ISLAND) { Bukkit.broadcastMessage("§6§lBlocBreakerContest §8» §fLe concours de cassage blocs a commencé, le bloc choisit est §e" + material.toString() + "§f. Minez en le plus possible et obtenez des récompenses en fonction de votre position " + "dans le classement. Il se terminera dans §e" + duration / 60 + " minutes§f."); @@ -77,7 +77,7 @@ public void addBlock(UUID uuid) { } public void makeTopAndGiveReward() { - if (Main.instance.serverType != ServerType.ISLAND) { + if (Main.instance.serverType != ServerType.SKYBLOCK_ISLAND) { return; } HashMap position = new HashMap<>(); diff --git a/src/main/java/fr/verymc/core/evenement/ChatReaction.java b/src/main/java/fr/verymc/spigot/core/evenement/ChatReaction.java similarity index 94% rename from src/main/java/fr/verymc/core/evenement/ChatReaction.java rename to src/main/java/fr/verymc/spigot/core/evenement/ChatReaction.java index 5929fd1e..2bfeada5 100644 --- a/src/main/java/fr/verymc/core/evenement/ChatReaction.java +++ b/src/main/java/fr/verymc/spigot/core/evenement/ChatReaction.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.core.evenement; +package main.java.fr.verymc.spigot.core.evenement; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.TextComponent; diff --git a/src/main/java/fr/verymc/core/evenement/DailyBonus.java b/src/main/java/fr/verymc/spigot/core/evenement/DailyBonus.java similarity index 87% rename from src/main/java/fr/verymc/core/evenement/DailyBonus.java rename to src/main/java/fr/verymc/spigot/core/evenement/DailyBonus.java index 909ce107..579e200d 100644 --- a/src/main/java/fr/verymc/core/evenement/DailyBonus.java +++ b/src/main/java/fr/verymc/spigot/core/evenement/DailyBonus.java @@ -1,8 +1,8 @@ -package main.java.fr.verymc.core.evenement; +package main.java.fr.verymc.spigot.core.evenement; -import main.java.fr.verymc.Main; import main.java.fr.verymc.commons.enums.ServerType; -import main.java.fr.verymc.island.challenges.IslandChallengesGuis; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.island.challenges.IslandChallengesGuis; import org.bukkit.Bukkit; import java.util.ArrayList; @@ -40,7 +40,7 @@ public void run() { public void startBonus() { lastAct = System.currentTimeMillis(); active = true; - if (Main.instance.serverType == ServerType.ISLAND) { + if (Main.instance.serverType == ServerType.SKYBLOCK_ISLAND) { IslandChallengesGuis.instance.boost = 2; Bukkit.broadcastMessage("§6§lBonus §8» §fUn bonus x2 a été activé pour les challenges. " + "Il se termine dans §e" + duration / 60 + " minutes§f."); @@ -52,7 +52,7 @@ public void startBonus() { Bukkit.getScheduler().scheduleSyncDelayedTask(Main.instance, new Runnable() { @Override public void run() { - if (Main.instance.serverType == ServerType.ISLAND) { + if (Main.instance.serverType == ServerType.SKYBLOCK_ISLAND) { IslandChallengesGuis.instance.boost = 1; } active = false; diff --git a/src/main/java/fr/verymc/core/evenement/EventManager.java b/src/main/java/fr/verymc/spigot/core/evenement/EventManager.java similarity index 98% rename from src/main/java/fr/verymc/core/evenement/EventManager.java rename to src/main/java/fr/verymc/spigot/core/evenement/EventManager.java index 3f2c82ca..51623233 100644 --- a/src/main/java/fr/verymc/core/evenement/EventManager.java +++ b/src/main/java/fr/verymc/spigot/core/evenement/EventManager.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.evenement; +package main.java.fr.verymc.spigot.core.evenement; import java.util.Calendar; import java.util.TimeZone; diff --git a/src/main/java/fr/verymc/core/events/JoinLeave.java b/src/main/java/fr/verymc/spigot/core/events/JoinLeave.java similarity index 86% rename from src/main/java/fr/verymc/core/events/JoinLeave.java rename to src/main/java/fr/verymc/spigot/core/events/JoinLeave.java index 0bd3434a..913e540e 100644 --- a/src/main/java/fr/verymc/core/events/JoinLeave.java +++ b/src/main/java/fr/verymc/spigot/core/events/JoinLeave.java @@ -1,17 +1,17 @@ -package main.java.fr.verymc.core.events; +package main.java.fr.verymc.spigot.core.events; -import main.java.fr.verymc.Main; import main.java.fr.verymc.commons.enums.ServerType; -import main.java.fr.verymc.core.cmd.base.SpawnCmd; -import main.java.fr.verymc.core.scoreboard.ScoreBoard; -import main.java.fr.verymc.core.storage.SkyblockUser; -import main.java.fr.verymc.core.storage.SkyblockUserManager; -import main.java.fr.verymc.core.storage.StorageJSONManager; -import main.java.fr.verymc.hub.invest.InvestManager; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.island.guis.IslandTopGui; -import main.java.fr.verymc.island.perms.IslandRanks; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.cmd.base.SpawnCmd; +import main.java.fr.verymc.spigot.core.scoreboard.ScoreBoard; +import main.java.fr.verymc.spigot.core.storage.SkyblockUser; +import main.java.fr.verymc.spigot.core.storage.SkyblockUserManager; +import main.java.fr.verymc.spigot.core.storage.StorageJSONManager; +import main.java.fr.verymc.spigot.hub.invest.InvestManager; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.island.guis.IslandTopGui; +import main.java.fr.verymc.spigot.island.perms.IslandRanks; import net.luckperms.api.LuckPermsProvider; import net.luckperms.api.model.user.User; import org.bukkit.Bukkit; @@ -49,12 +49,12 @@ public void OnJoin(PlayerJoinEvent event) { player.setGameMode(GameMode.SURVIVAL); - if (Main.instance.serverType == ServerType.HUB) { + if (Main.instance.serverType == ServerType.SKYBLOCK_HUB) { player.teleport(SpawnCmd.Spawn); } Island playerIsland = null; - if (Main.instance.serverType == ServerType.ISLAND) { + if (Main.instance.serverType == ServerType.SKYBLOCK_ISLAND) { playerIsland = IslandManager.instance.getPlayerIsland(player); IslandManager.instance.setWorldBorder(player); if (playerIsland != null) { @@ -102,7 +102,7 @@ public void OnLeave(PlayerQuitEvent event) { Player player = event.getPlayer(); SkyblockUser skyblockUser = SkyblockUserManager.instance.getUser(player.getUniqueId()); Island playerIsland = null; - if (Main.instance.serverType == ServerType.ISLAND) { + if (Main.instance.serverType == ServerType.SKYBLOCK_ISLAND) { playerIsland = IslandManager.instance.getPlayerIsland(player); if (playerIsland != null) { int onlineIs = 0; diff --git a/src/main/java/fr/verymc/core/events/ServerCoreMicellanous.java b/src/main/java/fr/verymc/spigot/core/events/ServerCoreMicellanous.java similarity index 76% rename from src/main/java/fr/verymc/core/events/ServerCoreMicellanous.java rename to src/main/java/fr/verymc/spigot/core/events/ServerCoreMicellanous.java index 682e8290..57a1fb19 100644 --- a/src/main/java/fr/verymc/core/events/ServerCoreMicellanous.java +++ b/src/main/java/fr/verymc/spigot/core/events/ServerCoreMicellanous.java @@ -1,8 +1,8 @@ -package main.java.fr.verymc.core.events; +package main.java.fr.verymc.spigot.core.events; import main.java.fr.verymc.commons.enums.ServerType; -import main.java.fr.verymc.core.cmd.base.SpawnCmd; -import main.java.fr.verymc.utils.PlayerUtils; +import main.java.fr.verymc.spigot.core.cmd.base.SpawnCmd; +import main.java.fr.verymc.spigot.utils.PlayerUtils; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerMoveEvent; @@ -19,7 +19,7 @@ public void portal(PlayerPortalEvent e) { @EventHandler public void playerMove(PlayerMoveEvent e) { if (e.getTo().getY() < -1) { - PlayerUtils.instance.teleportPlayerFromRequest(e.getPlayer(), SpawnCmd.Spawn, 0, ServerType.HUB); + PlayerUtils.instance.teleportPlayerFromRequest(e.getPlayer(), SpawnCmd.Spawn, 0, ServerType.SKYBLOCK_HUB); e.setCancelled(true); return; } diff --git a/src/main/java/fr/verymc/core/events/Tabulation.java b/src/main/java/fr/verymc/spigot/core/events/Tabulation.java similarity index 94% rename from src/main/java/fr/verymc/core/events/Tabulation.java rename to src/main/java/fr/verymc/spigot/core/events/Tabulation.java index 74bc091a..835d9d3e 100644 --- a/src/main/java/fr/verymc/core/events/Tabulation.java +++ b/src/main/java/fr/verymc/spigot/core/events/Tabulation.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.events; +package main.java.fr.verymc.spigot.core.events; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/src/main/java/fr/verymc/core/events/TchatManager.java b/src/main/java/fr/verymc/spigot/core/events/TchatManager.java similarity index 95% rename from src/main/java/fr/verymc/core/events/TchatManager.java rename to src/main/java/fr/verymc/spigot/core/events/TchatManager.java index 60c1f672..908b862e 100644 --- a/src/main/java/fr/verymc/core/events/TchatManager.java +++ b/src/main/java/fr/verymc/spigot/core/events/TchatManager.java @@ -1,20 +1,20 @@ -package main.java.fr.verymc.core.events; +package main.java.fr.verymc.spigot.core.events; -import main.java.fr.verymc.Main; import main.java.fr.verymc.commons.enums.ServerType; -import main.java.fr.verymc.core.eco.EcoAccountsManager; -import main.java.fr.verymc.core.playerwarps.PlayerWarp; -import main.java.fr.verymc.core.playerwarps.PlayerWarpManager; -import main.java.fr.verymc.core.playerwarps.PlayerWarpManagingGui; -import main.java.fr.verymc.core.storage.SkyblockUserManager; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.island.blocks.PlayerShopGuis; -import main.java.fr.verymc.island.guis.IslandBankGui; -import main.java.fr.verymc.island.guis.IslandGuiManager; -import main.java.fr.verymc.island.guis.IslandTopGui; -import main.java.fr.verymc.island.perms.IslandPerms; -import main.java.fr.verymc.utils.PlayerUtils; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.core.storage.SkyblockUserManager; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.island.blocks.PlayerShopGuis; +import main.java.fr.verymc.spigot.island.guis.IslandBankGui; +import main.java.fr.verymc.spigot.island.guis.IslandGuiManager; +import main.java.fr.verymc.spigot.island.guis.IslandTopGui; +import main.java.fr.verymc.spigot.island.perms.IslandPerms; +import main.java.fr.verymc.spigot.island.playerwarps.PlayerWarp; +import main.java.fr.verymc.spigot.island.playerwarps.PlayerWarpManager; +import main.java.fr.verymc.spigot.island.playerwarps.PlayerWarpManagingGui; +import main.java.fr.verymc.spigot.utils.PlayerUtils; import net.luckperms.api.LuckPermsProvider; import net.luckperms.api.model.user.User; import net.md_5.bungee.api.chat.ComponentBuilder; @@ -44,7 +44,7 @@ public void onAsyncChat(PlayerChatEvent e) { boolean isIslandChat = false; - if (Main.instance.serverType == ServerType.ISLAND) { + if (Main.instance.serverType == ServerType.SKYBLOCK_ISLAND) { playerIsland = IslandManager.instance.getPlayerIsland(player); if (playerIsland != null) { diff --git a/src/main/java/fr/verymc/core/gui/AfkMineCaptchaGui.java b/src/main/java/fr/verymc/spigot/core/gui/AfkMineCaptchaGui.java similarity index 97% rename from src/main/java/fr/verymc/core/gui/AfkMineCaptchaGui.java rename to src/main/java/fr/verymc/spigot/core/gui/AfkMineCaptchaGui.java index cdaa6e53..f7255fab 100644 --- a/src/main/java/fr/verymc/core/gui/AfkMineCaptchaGui.java +++ b/src/main/java/fr/verymc/spigot/core/gui/AfkMineCaptchaGui.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.core.gui; +package main.java.fr.verymc.spigot.core.gui; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.core.cmd.base.SpawnCmd; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.cmd.base.SpawnCmd; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/core/gui/CommandBuyGui.java b/src/main/java/fr/verymc/spigot/core/gui/CommandBuyGui.java similarity index 98% rename from src/main/java/fr/verymc/core/gui/CommandBuyGui.java rename to src/main/java/fr/verymc/spigot/core/gui/CommandBuyGui.java index f6922c8a..e87733a2 100644 --- a/src/main/java/fr/verymc/core/gui/CommandBuyGui.java +++ b/src/main/java/fr/verymc/spigot/core/gui/CommandBuyGui.java @@ -1,8 +1,8 @@ -package main.java.fr.verymc.core.gui; +package main.java.fr.verymc.spigot.core.gui; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.core.eco.EcoAccountsManager; -import main.java.fr.verymc.utils.PreGenItems; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.utils.PreGenItems; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/core/gui/Farm2WinGui.java b/src/main/java/fr/verymc/spigot/core/gui/Farm2WinGui.java similarity index 98% rename from src/main/java/fr/verymc/core/gui/Farm2WinGui.java rename to src/main/java/fr/verymc/spigot/core/gui/Farm2WinGui.java index aadaebca..998a13d0 100644 --- a/src/main/java/fr/verymc/core/gui/Farm2WinGui.java +++ b/src/main/java/fr/verymc/spigot/core/gui/Farm2WinGui.java @@ -1,10 +1,10 @@ -package main.java.fr.verymc.core.gui; +package main.java.fr.verymc.spigot.core.gui; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.core.atout.BuyAtoutGui; -import main.java.fr.verymc.core.eco.EcoAccountsManager; -import main.java.fr.verymc.island.minions.MinionManager; -import main.java.fr.verymc.island.minions.MinionType; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.atout.BuyAtoutGui; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.island.minions.MinionManager; +import main.java.fr.verymc.spigot.island.minions.MinionType; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/core/gui/MakeItemGui.java b/src/main/java/fr/verymc/spigot/core/gui/MakeItemGui.java similarity index 94% rename from src/main/java/fr/verymc/core/gui/MakeItemGui.java rename to src/main/java/fr/verymc/spigot/core/gui/MakeItemGui.java index 4fec7b36..59949cb9 100644 --- a/src/main/java/fr/verymc/core/gui/MakeItemGui.java +++ b/src/main/java/fr/verymc/spigot/core/gui/MakeItemGui.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.core.gui; +package main.java.fr.verymc.spigot.core.gui; -import main.java.fr.verymc.utils.ItemStackBuilder; -import main.java.fr.verymc.utils.PreGenItems; +import main.java.fr.verymc.spigot.utils.ItemStackBuilder; +import main.java.fr.verymc.spigot.utils.PreGenItems; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/core/gui/MenuGui.java b/src/main/java/fr/verymc/spigot/core/gui/MenuGui.java similarity index 91% rename from src/main/java/fr/verymc/core/gui/MenuGui.java rename to src/main/java/fr/verymc/spigot/core/gui/MenuGui.java index 242180f2..d886500c 100644 --- a/src/main/java/fr/verymc/core/gui/MenuGui.java +++ b/src/main/java/fr/verymc/spigot/core/gui/MenuGui.java @@ -1,11 +1,11 @@ -package main.java.fr.verymc.core.gui; - -import main.java.fr.verymc.core.atout.AtoutGui; -import main.java.fr.verymc.core.auctions.AuctionsManager; -import main.java.fr.verymc.core.shopgui.MainShopGui; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.island.challenges.IslandChallengesGuis; -import main.java.fr.verymc.island.guis.IslandMainGui; +package main.java.fr.verymc.spigot.core.gui; + +import main.java.fr.verymc.spigot.core.atout.AtoutGui; +import main.java.fr.verymc.spigot.core.auctions.AuctionsManager; +import main.java.fr.verymc.spigot.core.shopgui.MainShopGui; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.island.challenges.IslandChallengesGuis; +import main.java.fr.verymc.spigot.island.guis.IslandMainGui; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/core/gui/MoneyTradeGui.java b/src/main/java/fr/verymc/spigot/core/gui/MoneyTradeGui.java similarity index 97% rename from src/main/java/fr/verymc/core/gui/MoneyTradeGui.java rename to src/main/java/fr/verymc/spigot/core/gui/MoneyTradeGui.java index 89cd2bbe..1560a59f 100644 --- a/src/main/java/fr/verymc/core/gui/MoneyTradeGui.java +++ b/src/main/java/fr/verymc/spigot/core/gui/MoneyTradeGui.java @@ -1,8 +1,8 @@ -package main.java.fr.verymc.core.gui; +package main.java.fr.verymc.spigot.core.gui; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.core.eco.EcoAccountsManager; -import main.java.fr.verymc.utils.ItemStackBuilder; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.utils.ItemStackBuilder; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/core/gui/RankBuyGui.java b/src/main/java/fr/verymc/spigot/core/gui/RankBuyGui.java similarity index 95% rename from src/main/java/fr/verymc/core/gui/RankBuyGui.java rename to src/main/java/fr/verymc/spigot/core/gui/RankBuyGui.java index 2f718c33..a120c06d 100644 --- a/src/main/java/fr/verymc/core/gui/RankBuyGui.java +++ b/src/main/java/fr/verymc/spigot/core/gui/RankBuyGui.java @@ -1,8 +1,8 @@ -package main.java.fr.verymc.core.gui; +package main.java.fr.verymc.spigot.core.gui; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.core.eco.EcoAccountsManager; -import main.java.fr.verymc.utils.PreGenItems; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.utils.PreGenItems; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/core/gui/TradeGui.java b/src/main/java/fr/verymc/spigot/core/gui/TradeGui.java similarity index 98% rename from src/main/java/fr/verymc/core/gui/TradeGui.java rename to src/main/java/fr/verymc/spigot/core/gui/TradeGui.java index 064532a8..fe5849c5 100644 --- a/src/main/java/fr/verymc/core/gui/TradeGui.java +++ b/src/main/java/fr/verymc/spigot/core/gui/TradeGui.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.core.gui; +package main.java.fr.verymc.spigot.core.gui; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/core/gui/TradeManager.java b/src/main/java/fr/verymc/spigot/core/gui/TradeManager.java similarity index 94% rename from src/main/java/fr/verymc/core/gui/TradeManager.java rename to src/main/java/fr/verymc/spigot/core/gui/TradeManager.java index 16d7a5b2..99cbbd35 100644 --- a/src/main/java/fr/verymc/core/gui/TradeManager.java +++ b/src/main/java/fr/verymc/spigot/core/gui/TradeManager.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.core.gui; +package main.java.fr.verymc.spigot.core.gui; -import main.java.fr.verymc.utils.ItemStackBuilder; -import main.java.fr.verymc.utils.PreGenItems; +import main.java.fr.verymc.spigot.utils.ItemStackBuilder; +import main.java.fr.verymc.spigot.utils.PreGenItems; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/core/gui/WarpGui.java b/src/main/java/fr/verymc/spigot/core/gui/WarpGui.java similarity index 98% rename from src/main/java/fr/verymc/core/gui/WarpGui.java rename to src/main/java/fr/verymc/spigot/core/gui/WarpGui.java index 60ecf079..4064af54 100644 --- a/src/main/java/fr/verymc/core/gui/WarpGui.java +++ b/src/main/java/fr/verymc/spigot/core/gui/WarpGui.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.gui; +package main.java.fr.verymc.spigot.core.gui; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/src/main/java/fr/verymc/core/holos/HoloBlocManager.java b/src/main/java/fr/verymc/spigot/core/holos/HoloBlocManager.java similarity index 97% rename from src/main/java/fr/verymc/core/holos/HoloBlocManager.java rename to src/main/java/fr/verymc/spigot/core/holos/HoloBlocManager.java index 2f8675e2..587ffa37 100644 --- a/src/main/java/fr/verymc/core/holos/HoloBlocManager.java +++ b/src/main/java/fr/verymc/spigot/core/holos/HoloBlocManager.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.holos; +package main.java.fr.verymc.spigot.core.holos; import com.gmail.filoghost.holographicdisplays.api.Hologram; import org.bukkit.Location; diff --git a/src/main/java/fr/verymc/core/holos/HolosSetup.java b/src/main/java/fr/verymc/spigot/core/holos/HolosSetup.java similarity index 96% rename from src/main/java/fr/verymc/core/holos/HolosSetup.java rename to src/main/java/fr/verymc/spigot/core/holos/HolosSetup.java index 153690a6..49657f86 100644 --- a/src/main/java/fr/verymc/core/holos/HolosSetup.java +++ b/src/main/java/fr/verymc/spigot/core/holos/HolosSetup.java @@ -1,10 +1,10 @@ -package main.java.fr.verymc.core.holos; +package main.java.fr.verymc.spigot.core.holos; import com.gmail.filoghost.holographicdisplays.api.Hologram; import com.gmail.filoghost.holographicdisplays.api.HologramsAPI; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.core.gui.MenuGui; -import main.java.fr.verymc.core.shopgui.MainShopGui; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.gui.MenuGui; +import main.java.fr.verymc.spigot.core.shopgui.MainShopGui; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.event.NPCRightClickEvent; import net.citizensnpcs.api.npc.NPC; diff --git a/src/main/java/fr/verymc/core/items/FarmHoeCmd.java b/src/main/java/fr/verymc/spigot/core/items/FarmHoeCmd.java similarity index 96% rename from src/main/java/fr/verymc/core/items/FarmHoeCmd.java rename to src/main/java/fr/verymc/spigot/core/items/FarmHoeCmd.java index 52390e81..f5e19840 100644 --- a/src/main/java/fr/verymc/core/items/FarmHoeCmd.java +++ b/src/main/java/fr/verymc/spigot/core/items/FarmHoeCmd.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.items; +package main.java.fr.verymc.spigot.core.items; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/src/main/java/fr/verymc/core/items/FarmHoeGui.java b/src/main/java/fr/verymc/spigot/core/items/FarmHoeGui.java similarity index 97% rename from src/main/java/fr/verymc/core/items/FarmHoeGui.java rename to src/main/java/fr/verymc/spigot/core/items/FarmHoeGui.java index fbd630d2..f9e917b7 100644 --- a/src/main/java/fr/verymc/core/items/FarmHoeGui.java +++ b/src/main/java/fr/verymc/spigot/core/items/FarmHoeGui.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.core.items; +package main.java.fr.verymc.spigot.core.items; -import main.java.fr.verymc.core.eco.EcoAccountsManager; -import main.java.fr.verymc.utils.PreGenItems; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.utils.PreGenItems; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/core/items/FarmHoeManager.java b/src/main/java/fr/verymc/spigot/core/items/FarmHoeManager.java similarity index 95% rename from src/main/java/fr/verymc/core/items/FarmHoeManager.java rename to src/main/java/fr/verymc/spigot/core/items/FarmHoeManager.java index af6775e0..d4215923 100644 --- a/src/main/java/fr/verymc/core/items/FarmHoeManager.java +++ b/src/main/java/fr/verymc/spigot/core/items/FarmHoeManager.java @@ -1,11 +1,11 @@ -package main.java.fr.verymc.core.items; - -import main.java.fr.verymc.core.evenement.BlocBreakerContest; -import main.java.fr.verymc.core.shopgui.BuyShopItem; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.island.challenges.IslandChallenge; -import main.java.fr.verymc.island.challenges.IslandChallengesGuis; +package main.java.fr.verymc.spigot.core.items; + +import main.java.fr.verymc.spigot.core.evenement.BlocBreakerContest; +import main.java.fr.verymc.spigot.core.shopgui.BuyShopItem; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.island.challenges.IslandChallenge; +import main.java.fr.verymc.spigot.island.challenges.IslandChallengesGuis; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/main/java/fr/verymc/core/items/ItemLegCmd.java b/src/main/java/fr/verymc/spigot/core/items/ItemLegCmd.java similarity index 99% rename from src/main/java/fr/verymc/core/items/ItemLegCmd.java rename to src/main/java/fr/verymc/spigot/core/items/ItemLegCmd.java index 275fe5f0..c27d0549 100644 --- a/src/main/java/fr/verymc/core/items/ItemLegCmd.java +++ b/src/main/java/fr/verymc/spigot/core/items/ItemLegCmd.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.items; +package main.java.fr.verymc.spigot.core.items; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/src/main/java/fr/verymc/core/items/PickaxeCmd.java b/src/main/java/fr/verymc/spigot/core/items/PickaxeCmd.java similarity index 90% rename from src/main/java/fr/verymc/core/items/PickaxeCmd.java rename to src/main/java/fr/verymc/spigot/core/items/PickaxeCmd.java index f4eef6c3..e58f8c14 100644 --- a/src/main/java/fr/verymc/core/items/PickaxeCmd.java +++ b/src/main/java/fr/verymc/spigot/core/items/PickaxeCmd.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.items; +package main.java.fr.verymc.spigot.core.items; -import main.java.fr.verymc.utils.PreGenItems; +import main.java.fr.verymc.spigot.utils.PreGenItems; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/fr/verymc/core/items/PickaxeGui.java b/src/main/java/fr/verymc/spigot/core/items/PickaxeGui.java similarity index 98% rename from src/main/java/fr/verymc/core/items/PickaxeGui.java rename to src/main/java/fr/verymc/spigot/core/items/PickaxeGui.java index 297ecf8b..bf5f4d3e 100644 --- a/src/main/java/fr/verymc/core/items/PickaxeGui.java +++ b/src/main/java/fr/verymc/spigot/core/items/PickaxeGui.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.core.items; +package main.java.fr.verymc.spigot.core.items; -import main.java.fr.verymc.utils.ItemStackBuilder; -import main.java.fr.verymc.utils.PreGenItems; +import main.java.fr.verymc.spigot.utils.ItemStackBuilder; +import main.java.fr.verymc.spigot.utils.PreGenItems; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; diff --git a/src/main/java/fr/verymc/core/items/PickaxeManager.java b/src/main/java/fr/verymc/spigot/core/items/PickaxeManager.java similarity index 92% rename from src/main/java/fr/verymc/core/items/PickaxeManager.java rename to src/main/java/fr/verymc/spigot/core/items/PickaxeManager.java index b80c0f57..f7bd7e4c 100644 --- a/src/main/java/fr/verymc/core/items/PickaxeManager.java +++ b/src/main/java/fr/verymc/spigot/core/items/PickaxeManager.java @@ -1,10 +1,10 @@ -package main.java.fr.verymc.core.items; +package main.java.fr.verymc.spigot.core.items; -import main.java.fr.verymc.core.evenement.BlocBreakerContest; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.island.challenges.IslandChallenge; -import main.java.fr.verymc.island.challenges.IslandChallengesGuis; +import main.java.fr.verymc.spigot.core.evenement.BlocBreakerContest; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.island.challenges.IslandChallenge; +import main.java.fr.verymc.spigot.island.challenges.IslandChallengesGuis; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/core/scoreboard/ScoreBoard.java b/src/main/java/fr/verymc/spigot/core/scoreboard/ScoreBoard.java similarity index 94% rename from src/main/java/fr/verymc/core/scoreboard/ScoreBoard.java rename to src/main/java/fr/verymc/spigot/core/scoreboard/ScoreBoard.java index f8fa982a..2a796bf3 100644 --- a/src/main/java/fr/verymc/core/scoreboard/ScoreBoard.java +++ b/src/main/java/fr/verymc/spigot/core/scoreboard/ScoreBoard.java @@ -1,13 +1,13 @@ -package main.java.fr.verymc.core.scoreboard; +package main.java.fr.verymc.spigot.core.scoreboard; -import main.java.fr.verymc.Main; import main.java.fr.verymc.commons.enums.ServerType; -import main.java.fr.verymc.core.eco.EcoAccountsManager; -import main.java.fr.verymc.core.evenement.EventManager; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.island.challenges.IslandChallengesReset; -import main.java.fr.verymc.island.guis.IslandTopGui; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.core.evenement.EventManager; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.island.challenges.IslandChallengesReset; +import main.java.fr.verymc.spigot.island.guis.IslandTopGui; import net.luckperms.api.LuckPermsProvider; import net.luckperms.api.model.user.User; import org.bukkit.Bukkit; @@ -138,7 +138,7 @@ public void updateScoreBoard() { Objects.requireNonNull(board.getTeam("event")).setPrefix("§7" + nextEvent); } - if (Main.instance.serverType == ServerType.ISLAND) { + if (Main.instance.serverType == ServerType.SKYBLOCK_ISLAND) { Island island = IslandManager.instance.getPlayerIsland(player); if (island != null) { String Gradeis = island.getIslandRankFromUUID(player.getUniqueId()).getName(); diff --git a/src/main/java/fr/verymc/core/shopgui/AmountGuiManager.java b/src/main/java/fr/verymc/spigot/core/shopgui/AmountGuiManager.java similarity index 99% rename from src/main/java/fr/verymc/core/shopgui/AmountGuiManager.java rename to src/main/java/fr/verymc/spigot/core/shopgui/AmountGuiManager.java index ab267c63..94f62072 100644 --- a/src/main/java/fr/verymc/core/shopgui/AmountGuiManager.java +++ b/src/main/java/fr/verymc/spigot/core/shopgui/AmountGuiManager.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.shopgui; +package main.java.fr.verymc.spigot.core.shopgui; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/core/shopgui/BuyShopItem.java b/src/main/java/fr/verymc/spigot/core/shopgui/BuyShopItem.java similarity index 98% rename from src/main/java/fr/verymc/core/shopgui/BuyShopItem.java rename to src/main/java/fr/verymc/spigot/core/shopgui/BuyShopItem.java index facff4f6..5b7a7867 100644 --- a/src/main/java/fr/verymc/core/shopgui/BuyShopItem.java +++ b/src/main/java/fr/verymc/spigot/core/shopgui/BuyShopItem.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.core.shopgui; +package main.java.fr.verymc.spigot.core.shopgui; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/src/main/java/fr/verymc/core/shopgui/CateSelectGui.java b/src/main/java/fr/verymc/spigot/core/shopgui/CateSelectGui.java similarity index 99% rename from src/main/java/fr/verymc/core/shopgui/CateSelectGui.java rename to src/main/java/fr/verymc/spigot/core/shopgui/CateSelectGui.java index fe70cc96..ecb61f9b 100644 --- a/src/main/java/fr/verymc/core/shopgui/CateSelectGui.java +++ b/src/main/java/fr/verymc/spigot/core/shopgui/CateSelectGui.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.shopgui; +package main.java.fr.verymc.spigot.core.shopgui; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/core/shopgui/GenAmoutShopGui.java b/src/main/java/fr/verymc/spigot/core/shopgui/GenAmoutShopGui.java similarity index 98% rename from src/main/java/fr/verymc/core/shopgui/GenAmoutShopGui.java rename to src/main/java/fr/verymc/spigot/core/shopgui/GenAmoutShopGui.java index 907b3530..97c7e44d 100644 --- a/src/main/java/fr/verymc/core/shopgui/GenAmoutShopGui.java +++ b/src/main/java/fr/verymc/spigot/core/shopgui/GenAmoutShopGui.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.shopgui; +package main.java.fr.verymc.spigot.core.shopgui; -import main.java.fr.verymc.utils.PreGenItems; +import main.java.fr.verymc.spigot.utils.PreGenItems; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/core/shopgui/GenMultiStacksBuyGui.java b/src/main/java/fr/verymc/spigot/core/shopgui/GenMultiStacksBuyGui.java similarity index 98% rename from src/main/java/fr/verymc/core/shopgui/GenMultiStacksBuyGui.java rename to src/main/java/fr/verymc/spigot/core/shopgui/GenMultiStacksBuyGui.java index 8f37c98f..905fbd78 100644 --- a/src/main/java/fr/verymc/core/shopgui/GenMultiStacksBuyGui.java +++ b/src/main/java/fr/verymc/spigot/core/shopgui/GenMultiStacksBuyGui.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.shopgui; +package main.java.fr.verymc.spigot.core.shopgui; -import main.java.fr.verymc.utils.PreGenItems; +import main.java.fr.verymc.spigot.utils.PreGenItems; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/core/shopgui/GenShopPage.java b/src/main/java/fr/verymc/spigot/core/shopgui/GenShopPage.java similarity index 98% rename from src/main/java/fr/verymc/core/shopgui/GenShopPage.java rename to src/main/java/fr/verymc/spigot/core/shopgui/GenShopPage.java index 056c4a79..7f6a9466 100644 --- a/src/main/java/fr/verymc/core/shopgui/GenShopPage.java +++ b/src/main/java/fr/verymc/spigot/core/shopgui/GenShopPage.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.core.shopgui; +package main.java.fr.verymc.spigot.core.shopgui; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.utils.PreGenItems; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.utils.PreGenItems; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/src/main/java/fr/verymc/core/shopgui/MainShopGui.java b/src/main/java/fr/verymc/spigot/core/shopgui/MainShopGui.java similarity index 97% rename from src/main/java/fr/verymc/core/shopgui/MainShopGui.java rename to src/main/java/fr/verymc/spigot/core/shopgui/MainShopGui.java index 21a88d0c..54f7d56a 100644 --- a/src/main/java/fr/verymc/core/shopgui/MainShopGui.java +++ b/src/main/java/fr/verymc/spigot/core/shopgui/MainShopGui.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.core.shopgui; +package main.java.fr.verymc.spigot.core.shopgui; -import main.java.fr.verymc.core.gui.MenuGui; -import main.java.fr.verymc.utils.PreGenItems; +import main.java.fr.verymc.spigot.core.gui.MenuGui; +import main.java.fr.verymc.spigot.utils.PreGenItems; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/core/shopgui/MultiStacksShopGuiManager.java b/src/main/java/fr/verymc/spigot/core/shopgui/MultiStacksShopGuiManager.java similarity index 98% rename from src/main/java/fr/verymc/core/shopgui/MultiStacksShopGuiManager.java rename to src/main/java/fr/verymc/spigot/core/shopgui/MultiStacksShopGuiManager.java index cff319c7..a7443619 100644 --- a/src/main/java/fr/verymc/core/shopgui/MultiStacksShopGuiManager.java +++ b/src/main/java/fr/verymc/spigot/core/shopgui/MultiStacksShopGuiManager.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.shopgui; +package main.java.fr.verymc.spigot.core.shopgui; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/core/shopgui/SellAllCmd.java b/src/main/java/fr/verymc/spigot/core/shopgui/SellAllCmd.java similarity index 93% rename from src/main/java/fr/verymc/core/shopgui/SellAllCmd.java rename to src/main/java/fr/verymc/spigot/core/shopgui/SellAllCmd.java index 7392f5da..3d895c13 100644 --- a/src/main/java/fr/verymc/core/shopgui/SellAllCmd.java +++ b/src/main/java/fr/verymc/spigot/core/shopgui/SellAllCmd.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.shopgui; +package main.java.fr.verymc.spigot.core.shopgui; -import main.java.fr.verymc.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/fr/verymc/core/shopgui/ShopGuiCmd.java b/src/main/java/fr/verymc/spigot/core/shopgui/ShopGuiCmd.java similarity index 91% rename from src/main/java/fr/verymc/core/shopgui/ShopGuiCmd.java rename to src/main/java/fr/verymc/spigot/core/shopgui/ShopGuiCmd.java index 9c2ab27d..f8c865d5 100644 --- a/src/main/java/fr/verymc/core/shopgui/ShopGuiCmd.java +++ b/src/main/java/fr/verymc/spigot/core/shopgui/ShopGuiCmd.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.shopgui; +package main.java.fr.verymc.spigot.core.shopgui; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/fr/verymc/core/storage/AsyncConfig.java b/src/main/java/fr/verymc/spigot/core/storage/AsyncConfig.java similarity index 96% rename from src/main/java/fr/verymc/core/storage/AsyncConfig.java rename to src/main/java/fr/verymc/spigot/core/storage/AsyncConfig.java index 0b16c254..0a969398 100644 --- a/src/main/java/fr/verymc/core/storage/AsyncConfig.java +++ b/src/main/java/fr/verymc/spigot/core/storage/AsyncConfig.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.storage; +package main.java.fr.verymc.spigot.core.storage; import org.bukkit.configuration.file.FileConfiguration; diff --git a/src/main/java/fr/verymc/core/storage/ConfigManager.java b/src/main/java/fr/verymc/spigot/core/storage/ConfigManager.java similarity index 97% rename from src/main/java/fr/verymc/core/storage/ConfigManager.java rename to src/main/java/fr/verymc/spigot/core/storage/ConfigManager.java index ea634b0e..f83e6a24 100644 --- a/src/main/java/fr/verymc/core/storage/ConfigManager.java +++ b/src/main/java/fr/verymc/spigot/core/storage/ConfigManager.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.storage; +package main.java.fr.verymc.spigot.core.storage; -import main.java.fr.verymc.Main; +import main.java.fr.verymc.spigot.Main; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/main/java/fr/verymc/core/storage/SkyblockUser.java b/src/main/java/fr/verymc/spigot/core/storage/SkyblockUser.java similarity index 97% rename from src/main/java/fr/verymc/core/storage/SkyblockUser.java rename to src/main/java/fr/verymc/spigot/core/storage/SkyblockUser.java index 6dc6cac1..9707e286 100644 --- a/src/main/java/fr/verymc/core/storage/SkyblockUser.java +++ b/src/main/java/fr/verymc/spigot/core/storage/SkyblockUser.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.storage; +package main.java.fr.verymc.spigot.core.storage; -import main.java.fr.verymc.core.playerwarps.PlayerWarp; +import main.java.fr.verymc.spigot.island.playerwarps.PlayerWarp; import java.util.UUID; diff --git a/src/main/java/fr/verymc/core/storage/SkyblockUserManager.java b/src/main/java/fr/verymc/spigot/core/storage/SkyblockUserManager.java similarity index 96% rename from src/main/java/fr/verymc/core/storage/SkyblockUserManager.java rename to src/main/java/fr/verymc/spigot/core/storage/SkyblockUserManager.java index c3766ee8..e804b0e3 100644 --- a/src/main/java/fr/verymc/core/storage/SkyblockUserManager.java +++ b/src/main/java/fr/verymc/spigot/core/storage/SkyblockUserManager.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.storage; +package main.java.fr.verymc.spigot.core.storage; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/core/storage/StorageJSONManager.java b/src/main/java/fr/verymc/spigot/core/storage/StorageJSONManager.java similarity index 93% rename from src/main/java/fr/verymc/core/storage/StorageJSONManager.java rename to src/main/java/fr/verymc/spigot/core/storage/StorageJSONManager.java index d2624d51..e3b4986c 100644 --- a/src/main/java/fr/verymc/core/storage/StorageJSONManager.java +++ b/src/main/java/fr/verymc/spigot/core/storage/StorageJSONManager.java @@ -1,23 +1,23 @@ -package main.java.fr.verymc.core.storage; +package main.java.fr.verymc.spigot.core.storage; -import main.java.fr.verymc.Main; import main.java.fr.verymc.commons.enums.ServerType; -import main.java.fr.verymc.core.playerwarps.PlayerWarp; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.island.bank.IslandBank; -import main.java.fr.verymc.island.blocks.Chest; -import main.java.fr.verymc.island.challenges.IslandChallenge; -import main.java.fr.verymc.island.minions.Minion; -import main.java.fr.verymc.island.perms.IslandPerms; -import main.java.fr.verymc.island.perms.IslandRank; -import main.java.fr.verymc.island.perms.IslandRanks; -import main.java.fr.verymc.island.protections.IslandSettings; -import main.java.fr.verymc.island.upgrade.IslandUpgradeGenerator; -import main.java.fr.verymc.island.upgrade.IslandUpgradeMember; -import main.java.fr.verymc.island.upgrade.IslandUpgradeSize; -import main.java.fr.verymc.utils.ObjectConverter; -import main.java.fr.verymc.utils.WorldBorderUtil; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.island.bank.IslandBank; +import main.java.fr.verymc.spigot.island.blocks.Chest; +import main.java.fr.verymc.spigot.island.challenges.IslandChallenge; +import main.java.fr.verymc.spigot.island.minions.Minion; +import main.java.fr.verymc.spigot.island.perms.IslandPerms; +import main.java.fr.verymc.spigot.island.perms.IslandRank; +import main.java.fr.verymc.spigot.island.perms.IslandRanks; +import main.java.fr.verymc.spigot.island.playerwarps.PlayerWarp; +import main.java.fr.verymc.spigot.island.protections.IslandSettings; +import main.java.fr.verymc.spigot.island.upgrade.IslandUpgradeGenerator; +import main.java.fr.verymc.spigot.island.upgrade.IslandUpgradeMember; +import main.java.fr.verymc.spigot.island.upgrade.IslandUpgradeSize; +import main.java.fr.verymc.spigot.utils.ObjectConverter; +import main.java.fr.verymc.spigot.utils.WorldBorderUtil; import org.bukkit.Bukkit; import org.bukkit.Location; import org.json.simple.JSONObject; @@ -95,7 +95,7 @@ public void getDataFromAPI() { @Override public void run() { //SEND Islands to -> IslandManager.instance.islands - if (Main.instance.serverType == ServerType.ISLAND) { + if (Main.instance.serverType == ServerType.SKYBLOCK_ISLAND) { IslandManager.instance.islands = islands; } @@ -108,7 +108,7 @@ public void run() { public void sendDataToAPIAuto(boolean stop) { long start = System.currentTimeMillis(); - if (Main.instance.serverType == ServerType.ISLAND) { + if (Main.instance.serverType == ServerType.SKYBLOCK_ISLAND) { HashMap toSendIslands = new HashMap<>(); HashMap toRemoveIslands = new HashMap<>(); // NEED TO NULL Island id because yaml don't support override data ArrayList islands = IslandManager.instance.islands; diff --git a/src/main/java/fr/verymc/dungeon/dungeon.txt b/src/main/java/fr/verymc/spigot/dungeon/dungeon.txt similarity index 100% rename from src/main/java/fr/verymc/dungeon/dungeon.txt rename to src/main/java/fr/verymc/spigot/dungeon/dungeon.txt diff --git a/src/main/java/fr/verymc/hub/crates/ChallengeCrateManager.java b/src/main/java/fr/verymc/spigot/hub/crates/ChallengeCrateManager.java similarity index 98% rename from src/main/java/fr/verymc/hub/crates/ChallengeCrateManager.java rename to src/main/java/fr/verymc/spigot/hub/crates/ChallengeCrateManager.java index 96c612f8..fade0172 100644 --- a/src/main/java/fr/verymc/hub/crates/ChallengeCrateManager.java +++ b/src/main/java/fr/verymc/spigot/hub/crates/ChallengeCrateManager.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.hub.crates; +package main.java.fr.verymc.spigot.hub.crates; -import main.java.fr.verymc.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; diff --git a/src/main/java/fr/verymc/hub/crates/CratesKeyManager.java b/src/main/java/fr/verymc/spigot/hub/crates/CratesKeyManager.java similarity index 94% rename from src/main/java/fr/verymc/hub/crates/CratesKeyManager.java rename to src/main/java/fr/verymc/spigot/hub/crates/CratesKeyManager.java index e1e7a580..0efbd531 100644 --- a/src/main/java/fr/verymc/hub/crates/CratesKeyManager.java +++ b/src/main/java/fr/verymc/spigot/hub/crates/CratesKeyManager.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.hub.crates; +package main.java.fr.verymc.spigot.hub.crates; -import main.java.fr.verymc.utils.InventoryUtils; +import main.java.fr.verymc.spigot.utils.InventoryUtils; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/hub/crates/CratesManager.java b/src/main/java/fr/verymc/spigot/hub/crates/CratesManager.java similarity index 98% rename from src/main/java/fr/verymc/hub/crates/CratesManager.java rename to src/main/java/fr/verymc/spigot/hub/crates/CratesManager.java index 82aaf8d4..dee080b9 100644 --- a/src/main/java/fr/verymc/hub/crates/CratesManager.java +++ b/src/main/java/fr/verymc/spigot/hub/crates/CratesManager.java @@ -1,9 +1,9 @@ -package main.java.fr.verymc.hub.crates; +package main.java.fr.verymc.spigot.hub.crates; import com.gmail.filoghost.holographicdisplays.api.Hologram; import com.gmail.filoghost.holographicdisplays.api.HologramsAPI; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.utils.InventoryUtils; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.utils.InventoryUtils; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/main/java/fr/verymc/hub/crates/KeyCmd.java b/src/main/java/fr/verymc/spigot/hub/crates/KeyCmd.java similarity index 98% rename from src/main/java/fr/verymc/hub/crates/KeyCmd.java rename to src/main/java/fr/verymc/spigot/hub/crates/KeyCmd.java index c0fbcd38..2af9febc 100644 --- a/src/main/java/fr/verymc/hub/crates/KeyCmd.java +++ b/src/main/java/fr/verymc/spigot/hub/crates/KeyCmd.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.hub.crates; +package main.java.fr.verymc.spigot.hub.crates; import org.bukkit.Bukkit; import org.bukkit.command.Command; diff --git a/src/main/java/fr/verymc/hub/crates/LegCrateManager.java b/src/main/java/fr/verymc/spigot/hub/crates/LegCrateManager.java similarity index 99% rename from src/main/java/fr/verymc/hub/crates/LegCrateManager.java rename to src/main/java/fr/verymc/spigot/hub/crates/LegCrateManager.java index b3cac766..0b1fa4d1 100644 --- a/src/main/java/fr/verymc/hub/crates/LegCrateManager.java +++ b/src/main/java/fr/verymc/spigot/hub/crates/LegCrateManager.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.hub.crates; +package main.java.fr.verymc.spigot.hub.crates; -import main.java.fr.verymc.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; diff --git a/src/main/java/fr/verymc/hub/crates/VoteCrateManager.java b/src/main/java/fr/verymc/spigot/hub/crates/VoteCrateManager.java similarity index 94% rename from src/main/java/fr/verymc/hub/crates/VoteCrateManager.java rename to src/main/java/fr/verymc/spigot/hub/crates/VoteCrateManager.java index 483a610a..17601258 100644 --- a/src/main/java/fr/verymc/hub/crates/VoteCrateManager.java +++ b/src/main/java/fr/verymc/spigot/hub/crates/VoteCrateManager.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.hub.crates; +package main.java.fr.verymc.spigot.hub.crates; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/src/main/java/fr/verymc/hub/events/AntiExplo.java b/src/main/java/fr/verymc/spigot/hub/events/AntiExplo.java similarity index 91% rename from src/main/java/fr/verymc/hub/events/AntiExplo.java rename to src/main/java/fr/verymc/spigot/hub/events/AntiExplo.java index 759f1ae8..11d603a8 100644 --- a/src/main/java/fr/verymc/hub/events/AntiExplo.java +++ b/src/main/java/fr/verymc/spigot/hub/events/AntiExplo.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.hub.events; +package main.java.fr.verymc.spigot.hub.events; -import main.java.fr.verymc.core.cmd.base.SpawnCmd; +import main.java.fr.verymc.spigot.core.cmd.base.SpawnCmd; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/fr/verymc/hub/events/Interact.java b/src/main/java/fr/verymc/spigot/hub/events/Interact.java similarity index 96% rename from src/main/java/fr/verymc/hub/events/Interact.java rename to src/main/java/fr/verymc/spigot/hub/events/Interact.java index 667e0b3d..04b6d5e4 100644 --- a/src/main/java/fr/verymc/hub/events/Interact.java +++ b/src/main/java/fr/verymc/spigot/hub/events/Interact.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.hub.events; +package main.java.fr.verymc.spigot.hub.events; -import main.java.fr.verymc.core.cmd.moderation.BuildCmd; +import main.java.fr.verymc.spigot.core.cmd.moderation.BuildCmd; import org.bukkit.Material; import org.bukkit.entity.Item; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/hub/invest/InvestCmd.java b/src/main/java/fr/verymc/spigot/hub/invest/InvestCmd.java similarity index 93% rename from src/main/java/fr/verymc/hub/invest/InvestCmd.java rename to src/main/java/fr/verymc/spigot/hub/invest/InvestCmd.java index 2a7f5d42..ad5a1b66 100644 --- a/src/main/java/fr/verymc/hub/invest/InvestCmd.java +++ b/src/main/java/fr/verymc/spigot/hub/invest/InvestCmd.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.hub.invest; +package main.java.fr.verymc.spigot.hub.invest; -import main.java.fr.verymc.core.storage.SkyblockUserManager; +import main.java.fr.verymc.spigot.core.storage.SkyblockUserManager; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/fr/verymc/hub/invest/InvestManager.java b/src/main/java/fr/verymc/spigot/hub/invest/InvestManager.java similarity index 90% rename from src/main/java/fr/verymc/hub/invest/InvestManager.java rename to src/main/java/fr/verymc/spigot/hub/invest/InvestManager.java index 90c65363..cef518f9 100644 --- a/src/main/java/fr/verymc/hub/invest/InvestManager.java +++ b/src/main/java/fr/verymc/spigot/hub/invest/InvestManager.java @@ -1,12 +1,12 @@ -package main.java.fr.verymc.hub.invest; +package main.java.fr.verymc.spigot.hub.invest; -import main.java.fr.verymc.Main; import main.java.fr.verymc.commons.enums.ServerType; -import main.java.fr.verymc.core.cmd.base.SpawnCmd; -import main.java.fr.verymc.core.eco.EcoAccountsManager; -import main.java.fr.verymc.core.storage.SkyblockUser; -import main.java.fr.verymc.core.storage.SkyblockUserManager; -import main.java.fr.verymc.utils.PlayerUtils; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.cmd.base.SpawnCmd; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.core.storage.SkyblockUser; +import main.java.fr.verymc.spigot.core.storage.SkyblockUserManager; +import main.java.fr.verymc.spigot.utils.PlayerUtils; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -25,7 +25,7 @@ public void toggleInvestMode(Player player) { SkyblockUserManager.instance.checkForAccount(player); SkyblockUser skyblockUser = SkyblockUserManager.instance.getUser(player.getUniqueId()); if (!skyblockUser.isInInvestMode()) { - PlayerUtils.instance.teleportPlayerFromRequest(player, SpawnCmd.Spawn, 0, ServerType.HUB); + PlayerUtils.instance.teleportPlayerFromRequest(player, SpawnCmd.Spawn, 0, ServerType.SKYBLOCK_HUB); skyblockUser.setInInvestMode(true); } else { giveReward(skyblockUser); diff --git a/src/main/java/fr/verymc/hub/winelottery/BuyWinePotion.java b/src/main/java/fr/verymc/spigot/hub/winelottery/BuyWinePotion.java similarity index 98% rename from src/main/java/fr/verymc/hub/winelottery/BuyWinePotion.java rename to src/main/java/fr/verymc/spigot/hub/winelottery/BuyWinePotion.java index 169dc413..fe85d30d 100644 --- a/src/main/java/fr/verymc/hub/winelottery/BuyWinePotion.java +++ b/src/main/java/fr/verymc/spigot/hub/winelottery/BuyWinePotion.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.hub.winelottery; +package main.java.fr.verymc.spigot.hub.winelottery; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/src/main/java/fr/verymc/hub/winelottery/WineGui.java b/src/main/java/fr/verymc/spigot/hub/winelottery/WineGui.java similarity index 99% rename from src/main/java/fr/verymc/hub/winelottery/WineGui.java rename to src/main/java/fr/verymc/spigot/hub/winelottery/WineGui.java index 2f838b26..51bc183e 100644 --- a/src/main/java/fr/verymc/hub/winelottery/WineGui.java +++ b/src/main/java/fr/verymc/spigot/hub/winelottery/WineGui.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.hub.winelottery; +package main.java.fr.verymc.spigot.hub.winelottery; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; import net.citizensnpcs.api.event.NPCRightClickEvent; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/src/main/java/fr/verymc/hub/winelottery/WineSpawn.java b/src/main/java/fr/verymc/spigot/hub/winelottery/WineSpawn.java similarity index 92% rename from src/main/java/fr/verymc/hub/winelottery/WineSpawn.java rename to src/main/java/fr/verymc/spigot/hub/winelottery/WineSpawn.java index 7b4bda3d..b3c227fa 100644 --- a/src/main/java/fr/verymc/hub/winelottery/WineSpawn.java +++ b/src/main/java/fr/verymc/spigot/hub/winelottery/WineSpawn.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.hub.winelottery; +package main.java.fr.verymc.spigot.hub.winelottery; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; diff --git a/src/main/java/fr/verymc/island/Island.java b/src/main/java/fr/verymc/spigot/island/Island.java similarity index 95% rename from src/main/java/fr/verymc/island/Island.java rename to src/main/java/fr/verymc/spigot/island/Island.java index ceb31821..721a58d2 100644 --- a/src/main/java/fr/verymc/island/Island.java +++ b/src/main/java/fr/verymc/spigot/island/Island.java @@ -1,18 +1,18 @@ -package main.java.fr.verymc.island; - -import main.java.fr.verymc.Main; -import main.java.fr.verymc.island.bank.IslandBank; -import main.java.fr.verymc.island.blocks.Chest; -import main.java.fr.verymc.island.challenges.IslandChallenge; -import main.java.fr.verymc.island.minions.Minion; -import main.java.fr.verymc.island.perms.IslandPerms; -import main.java.fr.verymc.island.perms.IslandRank; -import main.java.fr.verymc.island.perms.IslandRanks; -import main.java.fr.verymc.island.protections.IslandSettings; -import main.java.fr.verymc.island.upgrade.IslandUpgradeGenerator; -import main.java.fr.verymc.island.upgrade.IslandUpgradeMember; -import main.java.fr.verymc.island.upgrade.IslandUpgradeSize; -import main.java.fr.verymc.utils.WorldBorderUtil; +package main.java.fr.verymc.spigot.island; + +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.island.bank.IslandBank; +import main.java.fr.verymc.spigot.island.blocks.Chest; +import main.java.fr.verymc.spigot.island.challenges.IslandChallenge; +import main.java.fr.verymc.spigot.island.minions.Minion; +import main.java.fr.verymc.spigot.island.perms.IslandPerms; +import main.java.fr.verymc.spigot.island.perms.IslandRank; +import main.java.fr.verymc.spigot.island.perms.IslandRanks; +import main.java.fr.verymc.spigot.island.protections.IslandSettings; +import main.java.fr.verymc.spigot.island.upgrade.IslandUpgradeGenerator; +import main.java.fr.verymc.spigot.island.upgrade.IslandUpgradeMember; +import main.java.fr.verymc.spigot.island.upgrade.IslandUpgradeSize; +import main.java.fr.verymc.spigot.utils.WorldBorderUtil; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.WeatherType; @@ -38,7 +38,7 @@ public class Island { private boolean isPublic; private ArrayList challenges; private ArrayList activatedSettings; - private ArrayList chests; + private ArrayList chests; private ArrayList minions; diff --git a/src/main/java/fr/verymc/island/IslandBlocsValues.java b/src/main/java/fr/verymc/spigot/island/IslandBlocsValues.java similarity index 96% rename from src/main/java/fr/verymc/island/IslandBlocsValues.java rename to src/main/java/fr/verymc/spigot/island/IslandBlocsValues.java index 1f6ed07c..6bd298f0 100644 --- a/src/main/java/fr/verymc/island/IslandBlocsValues.java +++ b/src/main/java/fr/verymc/spigot/island/IslandBlocsValues.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.island; +package main.java.fr.verymc.spigot.island; import org.bukkit.Material; diff --git a/src/main/java/fr/verymc/island/IslandManager.java b/src/main/java/fr/verymc/spigot/island/IslandManager.java similarity index 95% rename from src/main/java/fr/verymc/island/IslandManager.java rename to src/main/java/fr/verymc/spigot/island/IslandManager.java index 5d58d053..b484a7e1 100644 --- a/src/main/java/fr/verymc/island/IslandManager.java +++ b/src/main/java/fr/verymc/spigot/island/IslandManager.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.island; +package main.java.fr.verymc.spigot.island; import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.WorldEdit; @@ -12,30 +12,30 @@ import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.session.ClipboardHolder; -import main.java.fr.verymc.Main; import main.java.fr.verymc.commons.enums.ServerType; import main.java.fr.verymc.commons.utils.HTTPUtils; -import main.java.fr.verymc.core.cmd.base.SpawnCmd; -import main.java.fr.verymc.core.holos.HoloBlocManager; -import main.java.fr.verymc.core.storage.AsyncConfig; -import main.java.fr.verymc.core.storage.ConfigManager; -import main.java.fr.verymc.island.bank.IslandBank; -import main.java.fr.verymc.island.blocks.Chest; -import main.java.fr.verymc.island.blocks.ChestManager; -import main.java.fr.verymc.island.challenges.IslandChallenge; -import main.java.fr.verymc.island.challenges.IslandChallengesListener; -import main.java.fr.verymc.island.challenges.IslandChallengesReset; -import main.java.fr.verymc.island.guis.*; -import main.java.fr.verymc.island.minions.Minion; -import main.java.fr.verymc.island.minions.MinionManager; -import main.java.fr.verymc.island.perms.IslandPerms; -import main.java.fr.verymc.island.perms.IslandRank; -import main.java.fr.verymc.island.perms.IslandRanks; -import main.java.fr.verymc.island.upgrade.IslandUpgradeGenerator; -import main.java.fr.verymc.island.upgrade.IslandUpgradeMember; -import main.java.fr.verymc.island.upgrade.IslandUpgradeSize; -import main.java.fr.verymc.utils.PlayerUtils; -import main.java.fr.verymc.utils.WorldBorderUtil; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.cmd.base.SpawnCmd; +import main.java.fr.verymc.spigot.core.holos.HoloBlocManager; +import main.java.fr.verymc.spigot.core.storage.AsyncConfig; +import main.java.fr.verymc.spigot.core.storage.ConfigManager; +import main.java.fr.verymc.spigot.island.bank.IslandBank; +import main.java.fr.verymc.spigot.island.blocks.Chest; +import main.java.fr.verymc.spigot.island.blocks.ChestManager; +import main.java.fr.verymc.spigot.island.challenges.IslandChallenge; +import main.java.fr.verymc.spigot.island.challenges.IslandChallengesListener; +import main.java.fr.verymc.spigot.island.challenges.IslandChallengesReset; +import main.java.fr.verymc.spigot.island.guis.*; +import main.java.fr.verymc.spigot.island.minions.Minion; +import main.java.fr.verymc.spigot.island.minions.MinionManager; +import main.java.fr.verymc.spigot.island.perms.IslandPerms; +import main.java.fr.verymc.spigot.island.perms.IslandRank; +import main.java.fr.verymc.spigot.island.perms.IslandRanks; +import main.java.fr.verymc.spigot.island.upgrade.IslandUpgradeGenerator; +import main.java.fr.verymc.spigot.island.upgrade.IslandUpgradeMember; +import main.java.fr.verymc.spigot.island.upgrade.IslandUpgradeSize; +import main.java.fr.verymc.spigot.utils.PlayerUtils; +import main.java.fr.verymc.spigot.utils.WorldBorderUtil; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; @@ -267,7 +267,7 @@ public void removeSpying(UUID uuid) { } public void setWorldBorder(Player p) { - if (Main.instance.serverType != ServerType.ISLAND) return; + if (Main.instance.serverType != ServerType.SKYBLOCK_ISLAND) return; Island i = getIslandByLoc(p.getLocation()); if (i != null) { WorldBorderUtil.instanceClass.sendWorldBorder(p, i.getBorderColor(), @@ -276,7 +276,7 @@ public void setWorldBorder(Player p) { } public void setWorldBorder(Player p, Location loc) { - if (Main.instance.serverType != ServerType.ISLAND) return; + if (Main.instance.serverType != ServerType.SKYBLOCK_ISLAND) return; Island i = getIslandByLoc(loc); if (i != null) { WorldBorderUtil.instanceClass.sendWorldBorder(p, i.getBorderColor(), @@ -366,7 +366,7 @@ public void run() { if (member == null) { member = Bukkit.getOfflinePlayer(entry.getKey()).getPlayer(); } - PlayerUtils.instance.teleportPlayerFromRequest(member, SpawnCmd.Spawn, 0, ServerType.HUB); + PlayerUtils.instance.teleportPlayerFromRequest(member, SpawnCmd.Spawn, 0, ServerType.SKYBLOCK_HUB); } playerIsland.getMembers().clear(); HashMap toEdit = new HashMap<>(); @@ -394,7 +394,7 @@ public void leaveIsland(Player p) { i.getMembers().get(p.getUniqueId()).name() + "."); i.getMembers().remove(p.getUniqueId()); p.sendMessage("§6§lIles §8» §fVous avez quitté l'île."); - PlayerUtils.instance.teleportPlayerFromRequest(p, SpawnCmd.Spawn, 0, ServerType.HUB); + PlayerUtils.instance.teleportPlayerFromRequest(p, SpawnCmd.Spawn, 0, ServerType.SKYBLOCK_HUB); break; } } diff --git a/src/main/java/fr/verymc/island/IslandValueCalcManager.java b/src/main/java/fr/verymc/spigot/island/IslandValueCalcManager.java similarity index 97% rename from src/main/java/fr/verymc/island/IslandValueCalcManager.java rename to src/main/java/fr/verymc/spigot/island/IslandValueCalcManager.java index 4eee38e3..e437220f 100644 --- a/src/main/java/fr/verymc/island/IslandValueCalcManager.java +++ b/src/main/java/fr/verymc/spigot/island/IslandValueCalcManager.java @@ -1,8 +1,8 @@ -package main.java.fr.verymc.island; +package main.java.fr.verymc.spigot.island; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.island.guis.IslandTopGui; -import main.java.fr.verymc.utils.DiscordUtils; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.island.guis.IslandTopGui; +import main.java.fr.verymc.spigot.utils.DiscordUtils; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/src/main/java/fr/verymc/island/bank/IslandBank.java b/src/main/java/fr/verymc/spigot/island/bank/IslandBank.java similarity index 95% rename from src/main/java/fr/verymc/island/bank/IslandBank.java rename to src/main/java/fr/verymc/spigot/island/bank/IslandBank.java index 2fd0d657..e242de94 100644 --- a/src/main/java/fr/verymc/island/bank/IslandBank.java +++ b/src/main/java/fr/verymc/spigot/island/bank/IslandBank.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.island.bank; +package main.java.fr.verymc.spigot.island.bank; public class IslandBank { diff --git a/src/main/java/fr/verymc/island/blocks/Chest.java b/src/main/java/fr/verymc/spigot/island/blocks/Chest.java similarity index 97% rename from src/main/java/fr/verymc/island/blocks/Chest.java rename to src/main/java/fr/verymc/spigot/island/blocks/Chest.java index c7ab51bd..4e9388bd 100644 --- a/src/main/java/fr/verymc/island/blocks/Chest.java +++ b/src/main/java/fr/verymc/spigot/island/blocks/Chest.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.island.blocks; +package main.java.fr.verymc.spigot.island.blocks; -import main.java.fr.verymc.utils.ObjectConverter; +import main.java.fr.verymc.spigot.utils.ObjectConverter; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/main/java/fr/verymc/island/blocks/ChestListener.java b/src/main/java/fr/verymc/spigot/island/blocks/ChestListener.java similarity index 96% rename from src/main/java/fr/verymc/island/blocks/ChestListener.java rename to src/main/java/fr/verymc/spigot/island/blocks/ChestListener.java index 40b3da4a..6cf5d0a4 100644 --- a/src/main/java/fr/verymc/island/blocks/ChestListener.java +++ b/src/main/java/fr/verymc/spigot/island/blocks/ChestListener.java @@ -1,11 +1,11 @@ -package main.java.fr.verymc.island.blocks; +package main.java.fr.verymc.spigot.island.blocks; -import main.java.fr.verymc.Main; import main.java.fr.verymc.commons.enums.ServerType; -import main.java.fr.verymc.core.eco.EcoAccountsManager; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.utils.InventoryUtils; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.utils.InventoryUtils; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockState; @@ -29,7 +29,7 @@ public class ChestListener implements Listener { @EventHandler public void playerInteract(PlayerInteractEvent e) { - if (Main.instance.serverType != ServerType.ISLAND) return; + if (Main.instance.serverType != ServerType.SKYBLOCK_ISLAND) return; if (e.getClickedBlock() == null) { return; } @@ -62,7 +62,7 @@ public void playerInteract(PlayerInteractEvent e) { @EventHandler public void checkForItem(ItemSpawnEvent e) { - if (Main.instance.serverType != ServerType.ISLAND) return; + if (Main.instance.serverType != ServerType.SKYBLOCK_ISLAND) return; if (!(e.getEntity() instanceof Item)) { return; } @@ -99,7 +99,7 @@ public void checkForItem(ItemSpawnEvent e) { @EventHandler public void inventoryClicEvent(InventoryClickEvent e) { - if (Main.instance.serverType != ServerType.ISLAND) return; + if (Main.instance.serverType != ServerType.SKYBLOCK_ISLAND) return; if (e.getCurrentItem() == null) { return; } @@ -429,7 +429,7 @@ public void inventoryClicEvent(InventoryClickEvent e) { @EventHandler public void onBlockForm(BlockFormEvent e) { - if (Main.instance.serverType != ServerType.ISLAND) return; + if (Main.instance.serverType != ServerType.SKYBLOCK_ISLAND) return; Chest chest = ChestManager.instance.getChestFromLoc(e.getBlock().getLocation()); if (chest != null) { e.setCancelled(true); @@ -438,7 +438,7 @@ public void onBlockForm(BlockFormEvent e) { @EventHandler public void pistonExtend(BlockPistonExtendEvent e) { - if (Main.instance.serverType != ServerType.ISLAND) return; + if (Main.instance.serverType != ServerType.SKYBLOCK_ISLAND) return; for (Block b : e.getBlocks()) { Chest chest = ChestManager.instance.getChestFromLoc(b.getLocation()); if (chest != null) { @@ -449,7 +449,7 @@ public void pistonExtend(BlockPistonExtendEvent e) { @EventHandler public void pistonRetract(BlockPistonRetractEvent e) { - if (Main.instance.serverType != ServerType.ISLAND) return; + if (Main.instance.serverType != ServerType.SKYBLOCK_ISLAND) return; for (Block b : e.getBlocks()) { Chest chest = ChestManager.instance.getChestFromLoc(b.getLocation()); if (chest != null) { @@ -460,7 +460,7 @@ public void pistonRetract(BlockPistonRetractEvent e) { @EventHandler public void blocExplode(EntityExplodeEvent e) { - if (Main.instance.serverType != ServerType.ISLAND) return; + if (Main.instance.serverType != ServerType.SKYBLOCK_ISLAND) return; for (Block b : e.blockList()) { Chest chest = ChestManager.instance.getChestFromLoc(b.getLocation()); if (chest != null) { @@ -472,7 +472,7 @@ public void blocExplode(EntityExplodeEvent e) { @EventHandler public void breakEvent(BlockBreakEvent e) { - if (Main.instance.serverType != ServerType.ISLAND) return; + if (Main.instance.serverType != ServerType.SKYBLOCK_ISLAND) return; if (e.isCancelled()) return; int type = -1; if (e.isCancelled()) { @@ -543,7 +543,7 @@ public void placeEvent(BlockPlaceEvent e) { ChestManager.instance.placeChest(e.getPlayer(), e.getBlock().getLocation(), type, null, 0.0); } catch (Exception ex) { - if (taked && Main.instance.serverType != ServerType.ISLAND) { + if (taked && Main.instance.serverType != ServerType.SKYBLOCK_ISLAND) { e.getPlayer().sendMessage("§6§lChests §8» §cLes chests sont désactivés sur ce serveur."); e.setCancelled(true); } diff --git a/src/main/java/fr/verymc/island/blocks/ChestManager.java b/src/main/java/fr/verymc/spigot/island/blocks/ChestManager.java similarity index 81% rename from src/main/java/fr/verymc/island/blocks/ChestManager.java rename to src/main/java/fr/verymc/spigot/island/blocks/ChestManager.java index 14f727b9..fc2fd4f9 100644 --- a/src/main/java/fr/verymc/island/blocks/ChestManager.java +++ b/src/main/java/fr/verymc/spigot/island/blocks/ChestManager.java @@ -1,12 +1,12 @@ -package main.java.fr.verymc.island.blocks; +package main.java.fr.verymc.spigot.island.blocks; -import main.java.fr.verymc.Main; import main.java.fr.verymc.commons.enums.ServerType; -import main.java.fr.verymc.core.shopgui.BuyShopItem; -import main.java.fr.verymc.core.storage.AsyncConfig; -import main.java.fr.verymc.core.storage.ConfigManager; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.shopgui.BuyShopItem; +import main.java.fr.verymc.spigot.core.storage.AsyncConfig; +import main.java.fr.verymc.spigot.core.storage.ConfigManager; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; @@ -28,7 +28,7 @@ public class ChestManager { public ChestManager() { instance = this; - if (Main.instance.serverType == ServerType.ISLAND) { + if (Main.instance.serverType == ServerType.SKYBLOCK_ISLAND) { new PlayerShopGuis(); new StackerGui(); @@ -37,9 +37,9 @@ public ChestManager() { } public void autoSellForVeryChest() { - HashMap reward = new HashMap<>(); + HashMap reward = new HashMap<>(); for (Island island : IslandManager.instance.islands) { - for (main.java.fr.verymc.island.blocks.Chest chest : island.getChests()) { + for (main.java.fr.verymc.spigot.island.blocks.Chest chest : island.getChests()) { try { BlockState e = chest.getBlock().getBlock().getState(); if (e.getType() != Material.CHEST) { @@ -76,7 +76,7 @@ public void autoSellForVeryChest() { } } } - for (Entry tosend : reward.entrySet()) { + for (Entry tosend : reward.entrySet()) { Island island = IslandManager.instance.getIslandByLoc(tosend.getKey().getBlock()); if (island == null) continue; island.getBank().addMoney(tosend.getValue()); @@ -121,13 +121,13 @@ public void giveChest(Player player, int type) { } public void placeChest(Player player, Location block, int type, ItemStack item, double price) { - IslandManager.instance.getPlayerIsland(player).addChest(new main.java.fr.verymc.island.blocks.Chest(type, block, player.getUniqueId(), block.getChunk().getChunkKey(), + IslandManager.instance.getPlayerIsland(player).addChest(new main.java.fr.verymc.spigot.island.blocks.Chest(type, block, player.getUniqueId(), block.getChunk().getChunkKey(), item, price, false, false, System.currentTimeMillis())); } public void removeChestFromLoc(Location block) { for (Island island : IslandManager.instance.islands) { - for (main.java.fr.verymc.island.blocks.Chest chest : island.getChests()) { + for (main.java.fr.verymc.spigot.island.blocks.Chest chest : island.getChests()) { if (chest.getBlock().getBlock().getLocation().equals(block)) { island.removeChest(chest); HashMap toEdit = new HashMap<>(); @@ -139,9 +139,9 @@ public void removeChestFromLoc(Location block) { } } - public main.java.fr.verymc.island.blocks.Chest getChestFromLoc(Location block) { + public main.java.fr.verymc.spigot.island.blocks.Chest getChestFromLoc(Location block) { for (Island island : IslandManager.instance.islands) { - for (main.java.fr.verymc.island.blocks.Chest chest : island.getChests()) { + for (main.java.fr.verymc.spigot.island.blocks.Chest chest : island.getChests()) { if (chest.getBlock().getBlock().getLocation().equals(block)) { return chest; } @@ -152,7 +152,7 @@ public main.java.fr.verymc.island.blocks.Chest getChestFromLoc(Location block) { public UUID getOwner(Location loc) { for (Island island : IslandManager.instance.islands) { - for (main.java.fr.verymc.island.blocks.Chest chest : island.getChests()) { + for (main.java.fr.verymc.spigot.island.blocks.Chest chest : island.getChests()) { if (chest.getBlock().getBlock().getLocation().equals(loc)) { return chest.getOwner(); } diff --git a/src/main/java/fr/verymc/island/blocks/ChestsCmd.java b/src/main/java/fr/verymc/spigot/island/blocks/ChestsCmd.java similarity index 97% rename from src/main/java/fr/verymc/island/blocks/ChestsCmd.java rename to src/main/java/fr/verymc/spigot/island/blocks/ChestsCmd.java index efa65d34..eda1c56a 100644 --- a/src/main/java/fr/verymc/island/blocks/ChestsCmd.java +++ b/src/main/java/fr/verymc/spigot/island/blocks/ChestsCmd.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.island.blocks; +package main.java.fr.verymc.spigot.island.blocks; import org.bukkit.Bukkit; import org.bukkit.command.Command; diff --git a/src/main/java/fr/verymc/island/blocks/PlayerShopGuis.java b/src/main/java/fr/verymc/spigot/island/blocks/PlayerShopGuis.java similarity index 99% rename from src/main/java/fr/verymc/island/blocks/PlayerShopGuis.java rename to src/main/java/fr/verymc/spigot/island/blocks/PlayerShopGuis.java index 5d2d500c..d4245dd6 100644 --- a/src/main/java/fr/verymc/island/blocks/PlayerShopGuis.java +++ b/src/main/java/fr/verymc/spigot/island/blocks/PlayerShopGuis.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.island.blocks; +package main.java.fr.verymc.spigot.island.blocks; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/src/main/java/fr/verymc/island/blocks/StackerGui.java b/src/main/java/fr/verymc/spigot/island/blocks/StackerGui.java similarity index 98% rename from src/main/java/fr/verymc/island/blocks/StackerGui.java rename to src/main/java/fr/verymc/spigot/island/blocks/StackerGui.java index 0bee4f50..493cbd4e 100644 --- a/src/main/java/fr/verymc/island/blocks/StackerGui.java +++ b/src/main/java/fr/verymc/spigot/island/blocks/StackerGui.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.island.blocks; +package main.java.fr.verymc.spigot.island.blocks; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/island/challenges/ChallengesCmd.java b/src/main/java/fr/verymc/spigot/island/challenges/ChallengesCmd.java similarity index 95% rename from src/main/java/fr/verymc/island/challenges/ChallengesCmd.java rename to src/main/java/fr/verymc/spigot/island/challenges/ChallengesCmd.java index e571e432..c06cdb78 100644 --- a/src/main/java/fr/verymc/island/challenges/ChallengesCmd.java +++ b/src/main/java/fr/verymc/spigot/island/challenges/ChallengesCmd.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.island.challenges; +package main.java.fr.verymc.spigot.island.challenges; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/fr/verymc/island/challenges/IslandChallenge.java b/src/main/java/fr/verymc/spigot/island/challenges/IslandChallenge.java similarity index 93% rename from src/main/java/fr/verymc/island/challenges/IslandChallenge.java rename to src/main/java/fr/verymc/spigot/island/challenges/IslandChallenge.java index 79eeba64..20be18e8 100644 --- a/src/main/java/fr/verymc/island/challenges/IslandChallenge.java +++ b/src/main/java/fr/verymc/spigot/island/challenges/IslandChallenge.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.island.challenges; +package main.java.fr.verymc.spigot.island.challenges; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.utils.ObjectConverter; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.utils.ObjectConverter; import org.bukkit.Material; public class IslandChallenge { diff --git a/src/main/java/fr/verymc/island/challenges/IslandChallengesGuis.java b/src/main/java/fr/verymc/spigot/island/challenges/IslandChallengesGuis.java similarity index 94% rename from src/main/java/fr/verymc/island/challenges/IslandChallengesGuis.java rename to src/main/java/fr/verymc/spigot/island/challenges/IslandChallengesGuis.java index b6f576c3..04240299 100644 --- a/src/main/java/fr/verymc/island/challenges/IslandChallengesGuis.java +++ b/src/main/java/fr/verymc/spigot/island/challenges/IslandChallengesGuis.java @@ -1,9 +1,9 @@ -package main.java.fr.verymc.island.challenges; +package main.java.fr.verymc.spigot.island.challenges; -import main.java.fr.verymc.hub.crates.CratesKeyManager; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.island.guis.IslandMainGui; +import main.java.fr.verymc.spigot.hub.crates.CratesKeyManager; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.island.guis.IslandMainGui; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.Sound; diff --git a/src/main/java/fr/verymc/island/challenges/IslandChallengesListener.java b/src/main/java/fr/verymc/spigot/island/challenges/IslandChallengesListener.java similarity index 92% rename from src/main/java/fr/verymc/island/challenges/IslandChallengesListener.java rename to src/main/java/fr/verymc/spigot/island/challenges/IslandChallengesListener.java index 4f9afec1..4a138332 100644 --- a/src/main/java/fr/verymc/island/challenges/IslandChallengesListener.java +++ b/src/main/java/fr/verymc/spigot/island/challenges/IslandChallengesListener.java @@ -1,10 +1,10 @@ -package main.java.fr.verymc.island.challenges; +package main.java.fr.verymc.spigot.island.challenges; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.core.cmd.moderation.BuildCmd; -import main.java.fr.verymc.core.evenement.BlocBreakerContest; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.cmd.moderation.BuildCmd; +import main.java.fr.verymc.spigot.core.evenement.BlocBreakerContest; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.data.Ageable; diff --git a/src/main/java/fr/verymc/island/challenges/IslandChallengesReset.java b/src/main/java/fr/verymc/spigot/island/challenges/IslandChallengesReset.java similarity index 88% rename from src/main/java/fr/verymc/island/challenges/IslandChallengesReset.java rename to src/main/java/fr/verymc/spigot/island/challenges/IslandChallengesReset.java index f507fbb5..f9e6cb99 100644 --- a/src/main/java/fr/verymc/island/challenges/IslandChallengesReset.java +++ b/src/main/java/fr/verymc/spigot/island/challenges/IslandChallengesReset.java @@ -1,9 +1,9 @@ -package main.java.fr.verymc.island.challenges; +package main.java.fr.verymc.spigot.island.challenges; -import main.java.fr.verymc.Main; import main.java.fr.verymc.commons.enums.ServerType; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; import org.bukkit.Bukkit; import java.util.Calendar; @@ -53,7 +53,7 @@ public long getTimeBeforeReset() { } public void resetAllChallenges() { - if (Main.instance.serverType == ServerType.ISLAND) { + if (Main.instance.serverType == ServerType.SKYBLOCK_ISLAND) { for (Island island : IslandManager.instance.islands) { island.getChallenges().clear(); island.addDefaultChallenges(); diff --git a/src/main/java/fr/verymc/island/events/IslandGeneratorForm.java b/src/main/java/fr/verymc/spigot/island/events/IslandGeneratorForm.java similarity index 87% rename from src/main/java/fr/verymc/island/events/IslandGeneratorForm.java rename to src/main/java/fr/verymc/spigot/island/events/IslandGeneratorForm.java index 951f8564..c074ae5e 100644 --- a/src/main/java/fr/verymc/island/events/IslandGeneratorForm.java +++ b/src/main/java/fr/verymc/spigot/island/events/IslandGeneratorForm.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.island.events; +package main.java.fr.verymc.spigot.island.events; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; import org.bukkit.Material; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/fr/verymc/island/events/IslandInteractManager.java b/src/main/java/fr/verymc/spigot/island/events/IslandInteractManager.java similarity index 94% rename from src/main/java/fr/verymc/island/events/IslandInteractManager.java rename to src/main/java/fr/verymc/spigot/island/events/IslandInteractManager.java index fe85df67..abdf9c20 100644 --- a/src/main/java/fr/verymc/island/events/IslandInteractManager.java +++ b/src/main/java/fr/verymc/spigot/island/events/IslandInteractManager.java @@ -1,8 +1,8 @@ -package main.java.fr.verymc.island.events; +package main.java.fr.verymc.spigot.island.events; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.island.perms.IslandPerms; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.island.perms.IslandPerms; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/fr/verymc/island/events/IslandPlayerMove.java b/src/main/java/fr/verymc/spigot/island/events/IslandPlayerMove.java similarity index 90% rename from src/main/java/fr/verymc/island/events/IslandPlayerMove.java rename to src/main/java/fr/verymc/spigot/island/events/IslandPlayerMove.java index 6af3ec8c..b235697f 100644 --- a/src/main/java/fr/verymc/island/events/IslandPlayerMove.java +++ b/src/main/java/fr/verymc/spigot/island/events/IslandPlayerMove.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.island.events; +package main.java.fr.verymc.spigot.island.events; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerTeleportEvent; diff --git a/src/main/java/fr/verymc/core/featherfly/CountdownFly.java b/src/main/java/fr/verymc/spigot/island/featherfly/CountdownFly.java similarity index 95% rename from src/main/java/fr/verymc/core/featherfly/CountdownFly.java rename to src/main/java/fr/verymc/spigot/island/featherfly/CountdownFly.java index d9fa10f1..0c9dde04 100644 --- a/src/main/java/fr/verymc/core/featherfly/CountdownFly.java +++ b/src/main/java/fr/verymc/spigot/island/featherfly/CountdownFly.java @@ -1,9 +1,9 @@ -package main.java.fr.verymc.core.featherfly; +package main.java.fr.verymc.spigot.island.featherfly; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.core.cmd.base.SpawnCmd; -import main.java.fr.verymc.core.storage.SkyblockUser; -import main.java.fr.verymc.core.storage.SkyblockUserManager; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.cmd.base.SpawnCmd; +import main.java.fr.verymc.spigot.core.storage.SkyblockUser; +import main.java.fr.verymc.spigot.core.storage.SkyblockUserManager; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.Listener; diff --git a/src/main/java/fr/verymc/core/featherfly/DailyFlyCmd.java b/src/main/java/fr/verymc/spigot/island/featherfly/DailyFlyCmd.java similarity index 97% rename from src/main/java/fr/verymc/core/featherfly/DailyFlyCmd.java rename to src/main/java/fr/verymc/spigot/island/featherfly/DailyFlyCmd.java index a9b8ecba..fe6c6a01 100644 --- a/src/main/java/fr/verymc/core/featherfly/DailyFlyCmd.java +++ b/src/main/java/fr/verymc/spigot/island/featherfly/DailyFlyCmd.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.featherfly; +package main.java.fr.verymc.spigot.island.featherfly; import org.bukkit.Bukkit; import org.bukkit.command.Command; diff --git a/src/main/java/fr/verymc/core/featherfly/FeatherFlyCmd.java b/src/main/java/fr/verymc/spigot/island/featherfly/FeatherFlyCmd.java similarity index 98% rename from src/main/java/fr/verymc/core/featherfly/FeatherFlyCmd.java rename to src/main/java/fr/verymc/spigot/island/featherfly/FeatherFlyCmd.java index 8b3086fb..3d8246fa 100644 --- a/src/main/java/fr/verymc/core/featherfly/FeatherFlyCmd.java +++ b/src/main/java/fr/verymc/spigot/island/featherfly/FeatherFlyCmd.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.featherfly; +package main.java.fr.verymc.spigot.island.featherfly; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/src/main/java/fr/verymc/core/featherfly/FeatherFlyInteract.java b/src/main/java/fr/verymc/spigot/island/featherfly/FeatherFlyInteract.java similarity index 97% rename from src/main/java/fr/verymc/core/featherfly/FeatherFlyInteract.java rename to src/main/java/fr/verymc/spigot/island/featherfly/FeatherFlyInteract.java index 409ca3d1..4f2a70ef 100644 --- a/src/main/java/fr/verymc/core/featherfly/FeatherFlyInteract.java +++ b/src/main/java/fr/verymc/spigot/island/featherfly/FeatherFlyInteract.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.featherfly; +package main.java.fr.verymc.spigot.island.featherfly; import org.bukkit.GameMode; import org.bukkit.Material; diff --git a/src/main/java/fr/verymc/island/generator/EmptyChunkGenerator.java b/src/main/java/fr/verymc/spigot/island/generator/EmptyChunkGenerator.java similarity index 85% rename from src/main/java/fr/verymc/island/generator/EmptyChunkGenerator.java rename to src/main/java/fr/verymc/spigot/island/generator/EmptyChunkGenerator.java index 5f4b4ca0..454e3ffa 100644 --- a/src/main/java/fr/verymc/island/generator/EmptyChunkGenerator.java +++ b/src/main/java/fr/verymc/spigot/island/generator/EmptyChunkGenerator.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.island.generator; +package main.java.fr.verymc.spigot.island.generator; import org.bukkit.World; import org.bukkit.generator.ChunkGenerator; diff --git a/src/main/java/fr/verymc/island/guis/IslandBankGui.java b/src/main/java/fr/verymc/spigot/island/guis/IslandBankGui.java similarity index 94% rename from src/main/java/fr/verymc/island/guis/IslandBankGui.java rename to src/main/java/fr/verymc/spigot/island/guis/IslandBankGui.java index fe34f008..e8511122 100644 --- a/src/main/java/fr/verymc/island/guis/IslandBankGui.java +++ b/src/main/java/fr/verymc/spigot/island/guis/IslandBankGui.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.island.guis; +package main.java.fr.verymc.spigot.island.guis; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/island/guis/IslandBlocsValueGui.java b/src/main/java/fr/verymc/spigot/island/guis/IslandBlocsValueGui.java similarity index 93% rename from src/main/java/fr/verymc/island/guis/IslandBlocsValueGui.java rename to src/main/java/fr/verymc/spigot/island/guis/IslandBlocsValueGui.java index 41817f70..3e484b0c 100644 --- a/src/main/java/fr/verymc/island/guis/IslandBlocsValueGui.java +++ b/src/main/java/fr/verymc/spigot/island/guis/IslandBlocsValueGui.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.island.guis; +package main.java.fr.verymc.spigot.island.guis; -import main.java.fr.verymc.island.IslandManager; +import main.java.fr.verymc.spigot.island.IslandManager; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/island/guis/IslandBorderGui.java b/src/main/java/fr/verymc/spigot/island/guis/IslandBorderGui.java similarity index 92% rename from src/main/java/fr/verymc/island/guis/IslandBorderGui.java rename to src/main/java/fr/verymc/spigot/island/guis/IslandBorderGui.java index dc64cae9..fe9bcb8b 100644 --- a/src/main/java/fr/verymc/island/guis/IslandBorderGui.java +++ b/src/main/java/fr/verymc/spigot/island/guis/IslandBorderGui.java @@ -1,8 +1,8 @@ -package main.java.fr.verymc.island.guis; +package main.java.fr.verymc.spigot.island.guis; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.utils.WorldBorderUtil; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.utils.WorldBorderUtil; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/island/guis/IslandConfirmationGui.java b/src/main/java/fr/verymc/spigot/island/guis/IslandConfirmationGui.java similarity index 95% rename from src/main/java/fr/verymc/island/guis/IslandConfirmationGui.java rename to src/main/java/fr/verymc/spigot/island/guis/IslandConfirmationGui.java index 2f14e391..acebac2e 100644 --- a/src/main/java/fr/verymc/island/guis/IslandConfirmationGui.java +++ b/src/main/java/fr/verymc/spigot/island/guis/IslandConfirmationGui.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.island.guis; +package main.java.fr.verymc.spigot.island.guis; -import main.java.fr.verymc.Main; +import main.java.fr.verymc.spigot.Main; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/island/guis/IslandCoopGui.java b/src/main/java/fr/verymc/spigot/island/guis/IslandCoopGui.java similarity index 91% rename from src/main/java/fr/verymc/island/guis/IslandCoopGui.java rename to src/main/java/fr/verymc/spigot/island/guis/IslandCoopGui.java index 0cea7418..56785ca0 100644 --- a/src/main/java/fr/verymc/island/guis/IslandCoopGui.java +++ b/src/main/java/fr/verymc/spigot/island/guis/IslandCoopGui.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.island.guis; +package main.java.fr.verymc.spigot.island.guis; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/island/guis/IslandGuiManager.java b/src/main/java/fr/verymc/spigot/island/guis/IslandGuiManager.java similarity index 97% rename from src/main/java/fr/verymc/island/guis/IslandGuiManager.java rename to src/main/java/fr/verymc/spigot/island/guis/IslandGuiManager.java index c2aba820..a445885c 100644 --- a/src/main/java/fr/verymc/island/guis/IslandGuiManager.java +++ b/src/main/java/fr/verymc/spigot/island/guis/IslandGuiManager.java @@ -1,14 +1,14 @@ -package main.java.fr.verymc.island.guis; +package main.java.fr.verymc.spigot.island.guis; -import main.java.fr.verymc.core.gui.MenuGui; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.island.challenges.IslandChallengesGuis; -import main.java.fr.verymc.island.perms.IslandPerms; -import main.java.fr.verymc.island.perms.IslandRank; -import main.java.fr.verymc.island.protections.IslandSettings; -import main.java.fr.verymc.island.upgrade.IslandUpgradeSize; -import main.java.fr.verymc.utils.WorldBorderUtil; +import main.java.fr.verymc.spigot.core.gui.MenuGui; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.island.challenges.IslandChallengesGuis; +import main.java.fr.verymc.spigot.island.perms.IslandPerms; +import main.java.fr.verymc.spigot.island.perms.IslandRank; +import main.java.fr.verymc.spigot.island.protections.IslandSettings; +import main.java.fr.verymc.spigot.island.upgrade.IslandUpgradeSize; +import main.java.fr.verymc.spigot.utils.WorldBorderUtil; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/island/guis/IslandMainGui.java b/src/main/java/fr/verymc/spigot/island/guis/IslandMainGui.java similarity index 97% rename from src/main/java/fr/verymc/island/guis/IslandMainGui.java rename to src/main/java/fr/verymc/spigot/island/guis/IslandMainGui.java index aa3e5069..4fffee55 100644 --- a/src/main/java/fr/verymc/island/guis/IslandMainGui.java +++ b/src/main/java/fr/verymc/spigot/island/guis/IslandMainGui.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.island.guis; +package main.java.fr.verymc.spigot.island.guis; -import main.java.fr.verymc.island.IslandManager; +import main.java.fr.verymc.spigot.island.IslandManager; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/island/guis/IslandMemberGui.java b/src/main/java/fr/verymc/spigot/island/guis/IslandMemberGui.java similarity index 92% rename from src/main/java/fr/verymc/island/guis/IslandMemberGui.java rename to src/main/java/fr/verymc/spigot/island/guis/IslandMemberGui.java index 4a0ebc3d..3d9e067d 100644 --- a/src/main/java/fr/verymc/island/guis/IslandMemberGui.java +++ b/src/main/java/fr/verymc/spigot/island/guis/IslandMemberGui.java @@ -1,8 +1,8 @@ -package main.java.fr.verymc.island.guis; +package main.java.fr.verymc.spigot.island.guis; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.island.perms.IslandRank; -import main.java.fr.verymc.island.perms.IslandRanks; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.island.perms.IslandRank; +import main.java.fr.verymc.spigot.island.perms.IslandRanks; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/island/guis/IslandRankEditGui.java b/src/main/java/fr/verymc/spigot/island/guis/IslandRankEditGui.java similarity index 92% rename from src/main/java/fr/verymc/island/guis/IslandRankEditGui.java rename to src/main/java/fr/verymc/spigot/island/guis/IslandRankEditGui.java index cb2c3267..8af57d72 100644 --- a/src/main/java/fr/verymc/island/guis/IslandRankEditGui.java +++ b/src/main/java/fr/verymc/spigot/island/guis/IslandRankEditGui.java @@ -1,9 +1,9 @@ -package main.java.fr.verymc.island.guis; +package main.java.fr.verymc.spigot.island.guis; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.island.perms.IslandPerms; -import main.java.fr.verymc.island.perms.IslandRanks; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.island.perms.IslandPerms; +import main.java.fr.verymc.spigot.island.perms.IslandRanks; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/island/guis/IslandSettingsGui.java b/src/main/java/fr/verymc/spigot/island/guis/IslandSettingsGui.java similarity index 92% rename from src/main/java/fr/verymc/island/guis/IslandSettingsGui.java rename to src/main/java/fr/verymc/spigot/island/guis/IslandSettingsGui.java index c171dcdb..9c9e88a6 100644 --- a/src/main/java/fr/verymc/island/guis/IslandSettingsGui.java +++ b/src/main/java/fr/verymc/spigot/island/guis/IslandSettingsGui.java @@ -1,8 +1,8 @@ -package main.java.fr.verymc.island.guis; +package main.java.fr.verymc.spigot.island.guis; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.island.protections.IslandSettings; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.island.protections.IslandSettings; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/island/guis/IslandTopGui.java b/src/main/java/fr/verymc/spigot/island/guis/IslandTopGui.java similarity index 95% rename from src/main/java/fr/verymc/island/guis/IslandTopGui.java rename to src/main/java/fr/verymc/spigot/island/guis/IslandTopGui.java index 561170d0..74262d92 100644 --- a/src/main/java/fr/verymc/island/guis/IslandTopGui.java +++ b/src/main/java/fr/verymc/spigot/island/guis/IslandTopGui.java @@ -1,8 +1,8 @@ -package main.java.fr.verymc.island.guis; +package main.java.fr.verymc.spigot.island.guis; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/island/guis/IslandUpgradeGui.java b/src/main/java/fr/verymc/spigot/island/guis/IslandUpgradeGui.java similarity index 93% rename from src/main/java/fr/verymc/island/guis/IslandUpgradeGui.java rename to src/main/java/fr/verymc/spigot/island/guis/IslandUpgradeGui.java index f5d83342..9881dd02 100644 --- a/src/main/java/fr/verymc/island/guis/IslandUpgradeGui.java +++ b/src/main/java/fr/verymc/spigot/island/guis/IslandUpgradeGui.java @@ -1,10 +1,10 @@ -package main.java.fr.verymc.island.guis; +package main.java.fr.verymc.spigot.island.guis; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.island.upgrade.IslandUpgradeGenerator; -import main.java.fr.verymc.island.upgrade.IslandUpgradeMember; -import main.java.fr.verymc.island.upgrade.IslandUpgradeSize; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.island.upgrade.IslandUpgradeGenerator; +import main.java.fr.verymc.spigot.island.upgrade.IslandUpgradeMember; +import main.java.fr.verymc.spigot.island.upgrade.IslandUpgradeSize; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/island/minions/Minion.java b/src/main/java/fr/verymc/spigot/island/minions/Minion.java similarity index 96% rename from src/main/java/fr/verymc/island/minions/Minion.java rename to src/main/java/fr/verymc/spigot/island/minions/Minion.java index 16ef74da..b8dc01d0 100644 --- a/src/main/java/fr/verymc/island/minions/Minion.java +++ b/src/main/java/fr/verymc/spigot/island/minions/Minion.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.island.minions; +package main.java.fr.verymc.spigot.island.minions; -import main.java.fr.verymc.utils.ObjectConverter; +import main.java.fr.verymc.spigot.utils.ObjectConverter; import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; diff --git a/src/main/java/fr/verymc/island/minions/MinionHarvest.java b/src/main/java/fr/verymc/spigot/island/minions/MinionHarvest.java similarity index 96% rename from src/main/java/fr/verymc/island/minions/MinionHarvest.java rename to src/main/java/fr/verymc/spigot/island/minions/MinionHarvest.java index d2c07782..b412775d 100644 --- a/src/main/java/fr/verymc/island/minions/MinionHarvest.java +++ b/src/main/java/fr/verymc/spigot/island/minions/MinionHarvest.java @@ -1,10 +1,10 @@ -package main.java.fr.verymc.island.minions; +package main.java.fr.verymc.spigot.island.minions; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.island.perms.IslandRanks; -import main.java.fr.verymc.utils.InventoryUtils; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.island.perms.IslandRanks; +import main.java.fr.verymc.spigot.utils.InventoryUtils; import org.bukkit.Bukkit; import org.bukkit.Effect; import org.bukkit.Location; diff --git a/src/main/java/fr/verymc/island/minions/MinionManager.java b/src/main/java/fr/verymc/spigot/island/minions/MinionManager.java similarity index 94% rename from src/main/java/fr/verymc/island/minions/MinionManager.java rename to src/main/java/fr/verymc/spigot/island/minions/MinionManager.java index 0a812389..390673c5 100644 --- a/src/main/java/fr/verymc/island/minions/MinionManager.java +++ b/src/main/java/fr/verymc/spigot/island/minions/MinionManager.java @@ -1,12 +1,12 @@ -package main.java.fr.verymc.island.minions; +package main.java.fr.verymc.spigot.island.minions; -import main.java.fr.verymc.Main; import main.java.fr.verymc.commons.enums.ServerType; -import main.java.fr.verymc.core.storage.AsyncConfig; -import main.java.fr.verymc.core.storage.ConfigManager; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.utils.PreGenItems; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.storage.AsyncConfig; +import main.java.fr.verymc.spigot.core.storage.ConfigManager; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.utils.PreGenItems; import org.bukkit.Bukkit; import org.bukkit.Color; import org.bukkit.Location; @@ -43,7 +43,7 @@ public MinionManager() { instance = this; faceBloc.addAll(Arrays.asList(BlockFace.EAST, BlockFace.NORTH, BlockFace.SOUTH, BlockFace.WEST)); - if (Main.instance.serverType == ServerType.ISLAND) { + if (Main.instance.serverType == ServerType.SKYBLOCK_ISLAND) { new MinionsGui(); new MinionHarvest(); } diff --git a/src/main/java/fr/verymc/island/minions/MinionType.java b/src/main/java/fr/verymc/spigot/island/minions/MinionType.java similarity index 87% rename from src/main/java/fr/verymc/island/minions/MinionType.java rename to src/main/java/fr/verymc/spigot/island/minions/MinionType.java index 4ac7aed4..56520ae9 100644 --- a/src/main/java/fr/verymc/island/minions/MinionType.java +++ b/src/main/java/fr/verymc/spigot/island/minions/MinionType.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.island.minions; +package main.java.fr.verymc.spigot.island.minions; public enum MinionType { diff --git a/src/main/java/fr/verymc/island/minions/MinionsCmd.java b/src/main/java/fr/verymc/spigot/island/minions/MinionsCmd.java similarity index 96% rename from src/main/java/fr/verymc/island/minions/MinionsCmd.java rename to src/main/java/fr/verymc/spigot/island/minions/MinionsCmd.java index 1894aaf5..a6c1523f 100644 --- a/src/main/java/fr/verymc/island/minions/MinionsCmd.java +++ b/src/main/java/fr/verymc/spigot/island/minions/MinionsCmd.java @@ -1,9 +1,9 @@ -package main.java.fr.verymc.island.minions; +package main.java.fr.verymc.spigot.island.minions; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.utils.PreGenItems; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.utils.PreGenItems; import org.bukkit.Bukkit; import org.bukkit.Color; import org.bukkit.Material; diff --git a/src/main/java/fr/verymc/island/minions/MinionsGui.java b/src/main/java/fr/verymc/spigot/island/minions/MinionsGui.java similarity index 98% rename from src/main/java/fr/verymc/island/minions/MinionsGui.java rename to src/main/java/fr/verymc/spigot/island/minions/MinionsGui.java index 6cd641c0..d9f2f544 100644 --- a/src/main/java/fr/verymc/island/minions/MinionsGui.java +++ b/src/main/java/fr/verymc/spigot/island/minions/MinionsGui.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.island.minions; +package main.java.fr.verymc.spigot.island.minions; -import main.java.fr.verymc.Main; +import main.java.fr.verymc.spigot.Main; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/island/minions/MinionsListener.java b/src/main/java/fr/verymc/spigot/island/minions/MinionsListener.java similarity index 95% rename from src/main/java/fr/verymc/island/minions/MinionsListener.java rename to src/main/java/fr/verymc/spigot/island/minions/MinionsListener.java index 4040e340..ba26ee58 100644 --- a/src/main/java/fr/verymc/island/minions/MinionsListener.java +++ b/src/main/java/fr/verymc/spigot/island/minions/MinionsListener.java @@ -1,11 +1,11 @@ -package main.java.fr.verymc.island.minions; +package main.java.fr.verymc.spigot.island.minions; -import main.java.fr.verymc.Main; import main.java.fr.verymc.commons.enums.ServerType; -import main.java.fr.verymc.core.eco.EcoAccountsManager; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.island.perms.IslandPerms; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.island.perms.IslandPerms; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; @@ -27,11 +27,11 @@ public class MinionsListener implements Listener { @EventHandler public void onInventoryClicEvent(InventoryClickEvent e) { - if (Main.instance.serverType != ServerType.ISLAND) return; + if (Main.instance.serverType != ServerType.SKYBLOCK_ISLAND) return; ItemStack current = e.getCurrentItem(); if (current == null) return; Material currentType = current.getType(); - if (Main.instance.serverType != ServerType.ISLAND) return; + if (Main.instance.serverType != ServerType.SKYBLOCK_ISLAND) return; Player player = (Player) e.getWhoClicked(); Island island = IslandManager.instance.getPlayerIsland(player); if (e.getView().getTitle().contains("§6Menu du minion " + MinionType.PIOCHEUR.getName(MinionType.PIOCHEUR))) { @@ -135,7 +135,7 @@ public void interactMinion(PlayerInteractEvent e) { if (e.getClickedBlock().getLocation() == null) return; Location locBloc = e.getClickedBlock().getLocation(); Player player = e.getPlayer(); - if (Main.instance.serverType != ServerType.ISLAND) return; + if (Main.instance.serverType != ServerType.SKYBLOCK_ISLAND) return; if (MinionsGui.instance.linking.contains(player) && MinionsGui.instance.minionOpened.containsKey(player.getName()) && player.isSneaking()) { if (e.getPlayer().getLocation().getWorld().getName().equalsIgnoreCase("world")) { return; @@ -180,7 +180,7 @@ public void placeMinion(PlayerInteractEvent e) { if (e.isCancelled()) { return; } - if (Main.instance.serverType != ServerType.ISLAND) { + if (Main.instance.serverType != ServerType.SKYBLOCK_ISLAND) { player.sendMessage("§6§lMinions §8» §cLes minions sont désactivés sur ce serveur."); e.setCancelled(true); return; @@ -240,7 +240,7 @@ public void exploOnMinion(EntityDamageEvent e) { @EventHandler public void onPlayerClick(PlayerInteractAtEntityEvent e) { Player player = e.getPlayer(); - if (Main.instance.serverType != ServerType.ISLAND) return; + if (Main.instance.serverType != ServerType.SKYBLOCK_ISLAND) return; if (e.getRightClicked().getType().equals(EntityType.ARMOR_STAND)) { Entity clicked = e.getRightClicked(); if (clicked.isInvulnerable()) { diff --git a/src/main/java/fr/verymc/island/perms/IslandPerms.java b/src/main/java/fr/verymc/spigot/island/perms/IslandPerms.java similarity index 99% rename from src/main/java/fr/verymc/island/perms/IslandPerms.java rename to src/main/java/fr/verymc/spigot/island/perms/IslandPerms.java index 8b2bc1d7..96b073f8 100644 --- a/src/main/java/fr/verymc/island/perms/IslandPerms.java +++ b/src/main/java/fr/verymc/spigot/island/perms/IslandPerms.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.island.perms; +package main.java.fr.verymc.spigot.island.perms; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/fr/verymc/island/perms/IslandRank.java b/src/main/java/fr/verymc/spigot/island/perms/IslandRank.java similarity index 97% rename from src/main/java/fr/verymc/island/perms/IslandRank.java rename to src/main/java/fr/verymc/spigot/island/perms/IslandRank.java index 02f00713..5bc5d03e 100644 --- a/src/main/java/fr/verymc/island/perms/IslandRank.java +++ b/src/main/java/fr/verymc/spigot/island/perms/IslandRank.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.island.perms; +package main.java.fr.verymc.spigot.island.perms; -import main.java.fr.verymc.island.Island; +import main.java.fr.verymc.spigot.island.Island; import java.util.HashMap; diff --git a/src/main/java/fr/verymc/island/perms/IslandRanks.java b/src/main/java/fr/verymc/spigot/island/perms/IslandRanks.java similarity index 92% rename from src/main/java/fr/verymc/island/perms/IslandRanks.java rename to src/main/java/fr/verymc/spigot/island/perms/IslandRanks.java index 1bd7a4c9..a62ba89f 100644 --- a/src/main/java/fr/verymc/island/perms/IslandRanks.java +++ b/src/main/java/fr/verymc/spigot/island/perms/IslandRanks.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.island.perms; +package main.java.fr.verymc.spigot.island.perms; public enum IslandRanks { diff --git a/src/main/java/fr/verymc/core/playerwarps/PlayerWarp.java b/src/main/java/fr/verymc/spigot/island/playerwarps/PlayerWarp.java similarity index 96% rename from src/main/java/fr/verymc/core/playerwarps/PlayerWarp.java rename to src/main/java/fr/verymc/spigot/island/playerwarps/PlayerWarp.java index 1d523599..2c2f25ec 100644 --- a/src/main/java/fr/verymc/core/playerwarps/PlayerWarp.java +++ b/src/main/java/fr/verymc/spigot/island/playerwarps/PlayerWarp.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.core.playerwarps; +package main.java.fr.verymc.spigot.island.playerwarps; -import main.java.fr.verymc.utils.ObjectConverter; +import main.java.fr.verymc.spigot.utils.ObjectConverter; import org.bukkit.Location; import java.util.ArrayList; diff --git a/src/main/java/fr/verymc/core/playerwarps/PlayerWarpBrowserGui.java b/src/main/java/fr/verymc/spigot/island/playerwarps/PlayerWarpBrowserGui.java similarity index 98% rename from src/main/java/fr/verymc/core/playerwarps/PlayerWarpBrowserGui.java rename to src/main/java/fr/verymc/spigot/island/playerwarps/PlayerWarpBrowserGui.java index acd879c5..54a049de 100644 --- a/src/main/java/fr/verymc/core/playerwarps/PlayerWarpBrowserGui.java +++ b/src/main/java/fr/verymc/spigot/island/playerwarps/PlayerWarpBrowserGui.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.playerwarps; +package main.java.fr.verymc.spigot.island.playerwarps; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/src/main/java/fr/verymc/core/playerwarps/PlayerWarpCmd.java b/src/main/java/fr/verymc/spigot/island/playerwarps/PlayerWarpCmd.java similarity index 97% rename from src/main/java/fr/verymc/core/playerwarps/PlayerWarpCmd.java rename to src/main/java/fr/verymc/spigot/island/playerwarps/PlayerWarpCmd.java index aef2714b..6891ef85 100644 --- a/src/main/java/fr/verymc/core/playerwarps/PlayerWarpCmd.java +++ b/src/main/java/fr/verymc/spigot/island/playerwarps/PlayerWarpCmd.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.playerwarps; +package main.java.fr.verymc.spigot.island.playerwarps; import org.bukkit.Bukkit; import org.bukkit.command.Command; diff --git a/src/main/java/fr/verymc/core/playerwarps/PlayerWarpGuiManager.java b/src/main/java/fr/verymc/spigot/island/playerwarps/PlayerWarpGuiManager.java similarity index 95% rename from src/main/java/fr/verymc/core/playerwarps/PlayerWarpGuiManager.java rename to src/main/java/fr/verymc/spigot/island/playerwarps/PlayerWarpGuiManager.java index 3f399ec1..50d46091 100644 --- a/src/main/java/fr/verymc/core/playerwarps/PlayerWarpGuiManager.java +++ b/src/main/java/fr/verymc/spigot/island/playerwarps/PlayerWarpGuiManager.java @@ -1,9 +1,9 @@ -package main.java.fr.verymc.core.playerwarps; +package main.java.fr.verymc.spigot.island.playerwarps; import main.java.fr.verymc.commons.enums.ServerType; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; -import main.java.fr.verymc.utils.PlayerUtils; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; +import main.java.fr.verymc.spigot.utils.PlayerUtils; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -55,7 +55,7 @@ public void inventoryClicEvent(InventoryClickEvent e) { } if (current.getType() == Material.ENDER_PEARL) { if (pw.getLocation() != null) { - PlayerUtils.instance.teleportPlayerFromRequest(p, pw.getLocation(), PlayerUtils.instance.getPlayerTeleportingdelay(p), ServerType.ISLAND); + PlayerUtils.instance.teleportPlayerFromRequest(p, pw.getLocation(), PlayerUtils.instance.getPlayerTeleportingdelay(p), ServerType.SKYBLOCK_ISLAND); } else { p.sendMessage("§6§lPlayerWarp §8» §fCe warp n'a pas de localisation valide."); } @@ -133,14 +133,14 @@ public void inventoryClicEvent(InventoryClickEvent e) { if (island.getMembers().containsKey(PlayerWarpManager.instance.getOwnerUUIDFromPlayerWarp(pw))) { if (island.isPublic()) { if (!island.getBanneds().contains(p.getUniqueId())) { - PlayerUtils.instance.teleportPlayerFromRequest(p, pw.getLocation(), 0, ServerType.ISLAND); + PlayerUtils.instance.teleportPlayerFromRequest(p, pw.getLocation(), 0, ServerType.SKYBLOCK_ISLAND); pw.addVue(); } else { p.sendMessage("§6§lPlayerWarp §8» §fVous êtes banni de cette île."); } } else { if (island.getMembers().containsKey(p.getUniqueId())) { - PlayerUtils.instance.teleportPlayerFromRequest(p, pw.getLocation(), 0, ServerType.ISLAND); + PlayerUtils.instance.teleportPlayerFromRequest(p, pw.getLocation(), 0, ServerType.SKYBLOCK_ISLAND); pw.addVue(); } else { p.sendMessage("§6§lPlayerWarp §8» §fVous n'avez pas accès à ce warp car l'île est privée."); diff --git a/src/main/java/fr/verymc/core/playerwarps/PlayerWarpManager.java b/src/main/java/fr/verymc/spigot/island/playerwarps/PlayerWarpManager.java similarity index 94% rename from src/main/java/fr/verymc/core/playerwarps/PlayerWarpManager.java rename to src/main/java/fr/verymc/spigot/island/playerwarps/PlayerWarpManager.java index 5190b2fe..d46b0d34 100644 --- a/src/main/java/fr/verymc/core/playerwarps/PlayerWarpManager.java +++ b/src/main/java/fr/verymc/spigot/island/playerwarps/PlayerWarpManager.java @@ -1,8 +1,8 @@ -package main.java.fr.verymc.core.playerwarps; +package main.java.fr.verymc.spigot.island.playerwarps; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.core.storage.SkyblockUser; -import main.java.fr.verymc.core.storage.SkyblockUserManager; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.storage.SkyblockUser; +import main.java.fr.verymc.spigot.core.storage.SkyblockUserManager; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/core/playerwarps/PlayerWarpManagingGui.java b/src/main/java/fr/verymc/spigot/island/playerwarps/PlayerWarpManagingGui.java similarity index 98% rename from src/main/java/fr/verymc/core/playerwarps/PlayerWarpManagingGui.java rename to src/main/java/fr/verymc/spigot/island/playerwarps/PlayerWarpManagingGui.java index f615c9de..69b50e97 100644 --- a/src/main/java/fr/verymc/core/playerwarps/PlayerWarpManagingGui.java +++ b/src/main/java/fr/verymc/spigot/island/playerwarps/PlayerWarpManagingGui.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.playerwarps; +package main.java.fr.verymc.spigot.island.playerwarps; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/src/main/java/fr/verymc/core/playerwarps/PlayerWarpNotationGui.java b/src/main/java/fr/verymc/spigot/island/playerwarps/PlayerWarpNotationGui.java similarity index 96% rename from src/main/java/fr/verymc/core/playerwarps/PlayerWarpNotationGui.java rename to src/main/java/fr/verymc/spigot/island/playerwarps/PlayerWarpNotationGui.java index bef67da7..e142db7d 100644 --- a/src/main/java/fr/verymc/core/playerwarps/PlayerWarpNotationGui.java +++ b/src/main/java/fr/verymc/spigot/island/playerwarps/PlayerWarpNotationGui.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.core.playerwarps; +package main.java.fr.verymc.spigot.island.playerwarps; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/src/main/java/fr/verymc/island/protections/BlockListener.java b/src/main/java/fr/verymc/spigot/island/protections/BlockListener.java similarity index 84% rename from src/main/java/fr/verymc/island/protections/BlockListener.java rename to src/main/java/fr/verymc/spigot/island/protections/BlockListener.java index b3117e03..0d74d910 100644 --- a/src/main/java/fr/verymc/island/protections/BlockListener.java +++ b/src/main/java/fr/verymc/spigot/island/protections/BlockListener.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.island.protections; +package main.java.fr.verymc.spigot.island.protections; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.block.BlockBurnEvent; diff --git a/src/main/java/fr/verymc/island/protections/EntityListener.java b/src/main/java/fr/verymc/spigot/island/protections/EntityListener.java similarity index 93% rename from src/main/java/fr/verymc/island/protections/EntityListener.java rename to src/main/java/fr/verymc/spigot/island/protections/EntityListener.java index 86d7e535..73ce8a97 100644 --- a/src/main/java/fr/verymc/island/protections/EntityListener.java +++ b/src/main/java/fr/verymc/spigot/island/protections/EntityListener.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.island.protections; +package main.java.fr.verymc.spigot.island.protections; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/island/protections/IslandSettings.java b/src/main/java/fr/verymc/spigot/island/protections/IslandSettings.java similarity index 98% rename from src/main/java/fr/verymc/island/protections/IslandSettings.java rename to src/main/java/fr/verymc/spigot/island/protections/IslandSettings.java index dc488d1d..372284cf 100644 --- a/src/main/java/fr/verymc/island/protections/IslandSettings.java +++ b/src/main/java/fr/verymc/spigot/island/protections/IslandSettings.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.island.protections; +package main.java.fr.verymc.spigot.island.protections; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/fr/verymc/island/upgrade/IslandUpgradeGenerator.java b/src/main/java/fr/verymc/spigot/island/upgrade/IslandUpgradeGenerator.java similarity index 95% rename from src/main/java/fr/verymc/island/upgrade/IslandUpgradeGenerator.java rename to src/main/java/fr/verymc/spigot/island/upgrade/IslandUpgradeGenerator.java index a58321df..1379ddd3 100644 --- a/src/main/java/fr/verymc/island/upgrade/IslandUpgradeGenerator.java +++ b/src/main/java/fr/verymc/spigot/island/upgrade/IslandUpgradeGenerator.java @@ -1,8 +1,8 @@ -package main.java.fr.verymc.island.upgrade; +package main.java.fr.verymc.spigot.island.upgrade; -import main.java.fr.verymc.core.eco.EcoAccountsManager; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/island/upgrade/IslandUpgradeMember.java b/src/main/java/fr/verymc/spigot/island/upgrade/IslandUpgradeMember.java similarity index 91% rename from src/main/java/fr/verymc/island/upgrade/IslandUpgradeMember.java rename to src/main/java/fr/verymc/spigot/island/upgrade/IslandUpgradeMember.java index a1cb24d1..9f2c7c90 100644 --- a/src/main/java/fr/verymc/island/upgrade/IslandUpgradeMember.java +++ b/src/main/java/fr/verymc/spigot/island/upgrade/IslandUpgradeMember.java @@ -1,8 +1,8 @@ -package main.java.fr.verymc.island.upgrade; +package main.java.fr.verymc.spigot.island.upgrade; -import main.java.fr.verymc.core.eco.EcoAccountsManager; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; import org.bukkit.entity.Player; public class IslandUpgradeMember { diff --git a/src/main/java/fr/verymc/island/upgrade/IslandUpgradeSize.java b/src/main/java/fr/verymc/spigot/island/upgrade/IslandUpgradeSize.java similarity index 90% rename from src/main/java/fr/verymc/island/upgrade/IslandUpgradeSize.java rename to src/main/java/fr/verymc/spigot/island/upgrade/IslandUpgradeSize.java index 986676e5..8fab7515 100644 --- a/src/main/java/fr/verymc/island/upgrade/IslandUpgradeSize.java +++ b/src/main/java/fr/verymc/spigot/island/upgrade/IslandUpgradeSize.java @@ -1,8 +1,8 @@ -package main.java.fr.verymc.island.upgrade; +package main.java.fr.verymc.spigot.island.upgrade; -import main.java.fr.verymc.core.eco.EcoAccountsManager; -import main.java.fr.verymc.island.Island; -import main.java.fr.verymc.island.IslandManager; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.island.Island; +import main.java.fr.verymc.spigot.island.IslandManager; import org.bukkit.entity.Player; public class IslandUpgradeSize { diff --git a/src/main/java/fr/verymc/utils/BossBar.java b/src/main/java/fr/verymc/spigot/utils/BossBar.java similarity index 96% rename from src/main/java/fr/verymc/utils/BossBar.java rename to src/main/java/fr/verymc/spigot/utils/BossBar.java index adce2e88..9198e2d7 100644 --- a/src/main/java/fr/verymc/utils/BossBar.java +++ b/src/main/java/fr/verymc/spigot/utils/BossBar.java @@ -1,7 +1,7 @@ -package main.java.fr.verymc.utils; +package main.java.fr.verymc.spigot.utils; -import main.java.fr.verymc.Main; -import main.java.fr.verymc.core.cmd.base.BarCmd; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.cmd.base.BarCmd; import org.bukkit.Bukkit; import org.bukkit.boss.BarColor; import org.bukkit.boss.BarFlag; diff --git a/src/main/java/fr/verymc/utils/DiscordUtils.java b/src/main/java/fr/verymc/spigot/utils/DiscordUtils.java similarity index 99% rename from src/main/java/fr/verymc/utils/DiscordUtils.java rename to src/main/java/fr/verymc/spigot/utils/DiscordUtils.java index 83b1fd16..c27be007 100644 --- a/src/main/java/fr/verymc/utils/DiscordUtils.java +++ b/src/main/java/fr/verymc/spigot/utils/DiscordUtils.java @@ -2,7 +2,7 @@ // Decompiled by Procyon v0.5.36 // -package main.java.fr.verymc.utils; +package main.java.fr.verymc.spigot.utils; import javax.net.ssl.HttpsURLConnection; import java.awt.*; diff --git a/src/main/java/fr/verymc/utils/InventoryUtils.java b/src/main/java/fr/verymc/spigot/utils/InventoryUtils.java similarity index 98% rename from src/main/java/fr/verymc/utils/InventoryUtils.java rename to src/main/java/fr/verymc/spigot/utils/InventoryUtils.java index 5f4dd74a..7edf9809 100644 --- a/src/main/java/fr/verymc/utils/InventoryUtils.java +++ b/src/main/java/fr/verymc/spigot/utils/InventoryUtils.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.utils; +package main.java.fr.verymc.spigot.utils; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/utils/ItemStackBuilder.java b/src/main/java/fr/verymc/spigot/utils/ItemStackBuilder.java similarity index 98% rename from src/main/java/fr/verymc/utils/ItemStackBuilder.java rename to src/main/java/fr/verymc/spigot/utils/ItemStackBuilder.java index 65f3f08a..a65b3b82 100644 --- a/src/main/java/fr/verymc/utils/ItemStackBuilder.java +++ b/src/main/java/fr/verymc/spigot/utils/ItemStackBuilder.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.utils; +package main.java.fr.verymc.spigot.utils; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/fr/verymc/utils/ObjectConverter.java b/src/main/java/fr/verymc/spigot/utils/ObjectConverter.java similarity index 96% rename from src/main/java/fr/verymc/utils/ObjectConverter.java rename to src/main/java/fr/verymc/spigot/utils/ObjectConverter.java index 7cfbab1a..6ced8402 100644 --- a/src/main/java/fr/verymc/utils/ObjectConverter.java +++ b/src/main/java/fr/verymc/spigot/utils/ObjectConverter.java @@ -1,9 +1,9 @@ -package main.java.fr.verymc.utils; +package main.java.fr.verymc.spigot.utils; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import main.java.fr.verymc.Main; +import main.java.fr.verymc.spigot.Main; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/src/main/java/fr/verymc/utils/PlayerUtils.java b/src/main/java/fr/verymc/spigot/utils/PlayerUtils.java similarity index 97% rename from src/main/java/fr/verymc/utils/PlayerUtils.java rename to src/main/java/fr/verymc/spigot/utils/PlayerUtils.java index fa1c075c..734c7c89 100644 --- a/src/main/java/fr/verymc/utils/PlayerUtils.java +++ b/src/main/java/fr/verymc/spigot/utils/PlayerUtils.java @@ -1,8 +1,8 @@ -package main.java.fr.verymc.utils; +package main.java.fr.verymc.spigot.utils; -import main.java.fr.verymc.Main; import main.java.fr.verymc.commons.enums.ServerType; -import main.java.fr.verymc.core.ServersManager; +import main.java.fr.verymc.spigot.Main; +import main.java.fr.verymc.spigot.core.ServersManager; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Player; @@ -35,7 +35,7 @@ public void teleportPlayerFromRequest(Player player, Location loc, int temp, Ser if (timeLeft == 0) { if (temp == 0) { player.sendActionBar("§6Téléportation effectuée !"); - if (Main.instance.serverType != ServerType.HUB) { + if (Main.instance.serverType != ServerType.SKYBLOCK_HUB) { ServersManager.instance.sendToServer(ServersManager.instance.getServerOfType(serverType), player, loc); return; } @@ -47,7 +47,7 @@ public void teleportPlayerFromRequest(Player player, Location loc, int temp, Ser Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Main.instance, new Runnable() { public void run() { player.sendActionBar("§6Téléportation effectuée !"); - if (Main.instance.serverType != ServerType.HUB) { + if (Main.instance.serverType != ServerType.SKYBLOCK_HUB) { ServersManager.instance.sendToServer(ServersManager.instance.getServerOfType(serverType), player, loc); return; } @@ -66,7 +66,7 @@ public void run() { if (timeLeft <= 0) { Main.instance.setCooldown(player.getName(), 0); player.sendActionBar("§6Téléportation effectuée !"); - if (Main.instance.serverType != ServerType.HUB) { + if (Main.instance.serverType != ServerType.SKYBLOCK_HUB) { ServersManager.instance.sendToServer(ServersManager.instance.getServerOfType(serverType), player, loc); return; } diff --git a/src/main/java/fr/verymc/utils/PreGenItems.java b/src/main/java/fr/verymc/spigot/utils/PreGenItems.java similarity index 95% rename from src/main/java/fr/verymc/utils/PreGenItems.java rename to src/main/java/fr/verymc/spigot/utils/PreGenItems.java index d0bcbf5b..c5065add 100644 --- a/src/main/java/fr/verymc/utils/PreGenItems.java +++ b/src/main/java/fr/verymc/spigot/utils/PreGenItems.java @@ -1,6 +1,6 @@ -package main.java.fr.verymc.utils; +package main.java.fr.verymc.spigot.utils; -import main.java.fr.verymc.core.eco.EcoAccountsManager; +import main.java.fr.verymc.spigot.core.eco.EcoAccountsManager; import net.luckperms.api.LuckPermsProvider; import net.luckperms.api.model.user.User; import org.bukkit.Material; diff --git a/src/main/java/fr/verymc/utils/UtilsManager.java b/src/main/java/fr/verymc/spigot/utils/UtilsManager.java similarity index 81% rename from src/main/java/fr/verymc/utils/UtilsManager.java rename to src/main/java/fr/verymc/spigot/utils/UtilsManager.java index 97c37af2..a98d6857 100644 --- a/src/main/java/fr/verymc/utils/UtilsManager.java +++ b/src/main/java/fr/verymc/spigot/utils/UtilsManager.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.utils; +package main.java.fr.verymc.spigot.utils; public class UtilsManager { diff --git a/src/main/java/fr/verymc/utils/WorldBorderUtil.java b/src/main/java/fr/verymc/spigot/utils/WorldBorderUtil.java similarity index 99% rename from src/main/java/fr/verymc/utils/WorldBorderUtil.java rename to src/main/java/fr/verymc/spigot/utils/WorldBorderUtil.java index e8246ae6..ef46c499 100644 --- a/src/main/java/fr/verymc/utils/WorldBorderUtil.java +++ b/src/main/java/fr/verymc/spigot/utils/WorldBorderUtil.java @@ -1,4 +1,4 @@ -package main.java.fr.verymc.utils; +package main.java.fr.verymc.spigot.utils; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/verymc/velocity/ChannelsManager.java b/src/main/java/fr/verymc/velocity/ChannelsManager.java new file mode 100644 index 00000000..fa199448 --- /dev/null +++ b/src/main/java/fr/verymc/velocity/ChannelsManager.java @@ -0,0 +1,89 @@ +package main.java.fr.verymc.velocity; + +import com.google.common.io.ByteArrayDataOutput; +import com.google.common.io.ByteStreams; +import com.velocitypowered.api.event.Subscribe; +import com.velocitypowered.api.event.connection.PluginMessageEvent; +import com.velocitypowered.api.proxy.Player; +import com.velocitypowered.api.proxy.ProxyServer; +import com.velocitypowered.api.proxy.ServerConnection; +import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier; +import org.slf4j.Logger; + +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; +import java.util.Optional; +import java.util.concurrent.TimeUnit; + +public class ChannelsManager { + + public static ChannelsManager instance; + + private final ProxyServer server; + private final Logger logger; + + public ChannelsManager(ProxyServer server, Logger logger) { + instance = this; + this.server = server; + this.logger = logger; + + server.getChannelRegistrar().register(MinecraftChannelIdentifier.create("skyblock", "tospigot")); + server.getChannelRegistrar().register(MinecraftChannelIdentifier.from("skyblock:toproxy")); + } + + @Subscribe + public void onPluginMessage(PluginMessageEvent e) { + + if(e.getIdentifier().getId().equals("skyblock:tospigot")) { + e.setResult(PluginMessageEvent.ForwardResult.handled()); + return; + } + if(!e.getIdentifier().getId().equals("skyblock:toproxy")) return; + e.setResult(PluginMessageEvent.ForwardResult.handled()); + + if(!(e.getTarget() instanceof Player)) return; + + handleMessage((Player) e.getTarget(), e.getData()); + + + } + + public void handleMessage(Player player, byte[] data) { + DataInputStream in = new DataInputStream(new ByteArrayInputStream(data)); + try { + String subchannel = in.readUTF(); + + if (subchannel.equals("subtp")) { + String rawData = in.readUTF(); + System.out.println("raw: " + rawData); + sendPluginMessage(player, "subtp", null, rawData); + } + } catch (Exception e) { + logger.error("Error while handling message", e); + } + } + + //Usage sendPluginMessage(player, "island", nameofserver); + + public void sendPluginMessage(Player player, String channel, String serverName, String... data) { + if (player == null) return; + ByteArrayDataOutput out = ByteStreams.newDataOutput(); + out.writeUTF(channel); + for (String s : data) { + out.writeUTF(s); + } + Optional serverOp = player.getCurrentServer(); + if (!serverOp.isPresent()) { + throw new IllegalStateException("No server to send data to"); + } + if (serverName == null) { + serverOp.get().sendPluginMessage(MinecraftChannelIdentifier.from("skyblock:topigot"), out.toByteArray()); + } + server.getScheduler() + .buildTask(Main.instance, () -> { + player.getCurrentServer().get().sendPluginMessage(MinecraftChannelIdentifier.from("skyblock:tospigot"), out.toByteArray()); + }) + .delay(1L, TimeUnit.SECONDS) + .schedule(); + } +} diff --git a/src/main/java/fr/verymc/velocity/Main.java b/src/main/java/fr/verymc/velocity/Main.java new file mode 100644 index 00000000..006c8941 --- /dev/null +++ b/src/main/java/fr/verymc/velocity/Main.java @@ -0,0 +1,68 @@ +package main.java.fr.verymc.velocity; + +import com.google.inject.Inject; +import com.velocitypowered.api.event.Subscribe; +import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; +import com.velocitypowered.api.plugin.Plugin; +import com.velocitypowered.api.proxy.ProxyServer; +import com.velocitypowered.api.proxy.server.RegisteredServer; +import main.java.fr.verymc.commons.enums.ServerType; +import main.java.fr.verymc.velocity.events.ConnectionListener; +import net.kyori.adventure.text.Component; +import org.slf4j.Logger; + +@Plugin(id = "skyblockcore", name = "SkyblockCoreVelocity", version = "0.1.0-SNAPSHOT", + url = "https://verymc.fr", description = "Owned by VeryMc", authors = {"Farmeurimmo"}) +public class Main { + + public static Main instance; + private final ProxyServer server; + private final Logger logger; + + @Inject + public Main(ProxyServer server, Logger logger) { + this.server = server; + this.logger = logger; + + logger.info("Loading velocity plugin..."); + + instance = this; + } + + @Subscribe + public void onProxyInitialization(ProxyInitializeEvent e) { + server.getEventManager().register(this, new ConnectionListener()); + server.getEventManager().register(this, new ChannelsManager(server, logger)); + + new TABManager(server, logger); + + logger.info("§aLoading completed !"); + } + + public int playerCountOfSkyblock() { + int count = 0; + for (RegisteredServer server : server.getAllServers()) { + if (isSkyblockServer(server)) { + count += server.getPlayersConnected().size(); + } + } + return count; + } + + public boolean isSkyblockServer(RegisteredServer registeredServer) { + if (registeredServer.getServerInfo().getName().contains(ServerType.SKYBLOCK_HUB.getDisplayName())) return true; + if (registeredServer.getServerInfo().getName().contains(ServerType.SKYBLOCK_ISLAND.getDisplayName())) + return true; + if (registeredServer.getServerInfo().getName().contains(ServerType.SKYBLOCk_DUNGEON.getDisplayName())) + return true; + return false; + } + + public void sendMessageToSkyblock(String message) { + for (RegisteredServer registeredServer : server.getAllServers()) { + if (isSkyblockServer(registeredServer)) { + registeredServer.getPlayersConnected().forEach(player -> player.sendMessage(Component.text(message))); + } + } + } +} diff --git a/src/main/java/fr/verymc/velocity/TABManager.java b/src/main/java/fr/verymc/velocity/TABManager.java new file mode 100644 index 00000000..0377cd25 --- /dev/null +++ b/src/main/java/fr/verymc/velocity/TABManager.java @@ -0,0 +1,43 @@ +package main.java.fr.verymc.velocity; + +import com.velocitypowered.api.proxy.Player; +import com.velocitypowered.api.proxy.ProxyServer; +import net.kyori.adventure.text.Component; +import org.slf4j.Logger; + +import java.util.concurrent.TimeUnit; + +public class TABManager { + + public static TABManager instance; + + private final ProxyServer server; + private final Logger logger; + + public TABManager(ProxyServer server, Logger logger) { + instance = this; + + this.server = server; + this.logger = logger; + + autoTABForPlayer(); + } + + public void sendTabToPlayer(Player player) { + player.sendPlayerListHeaderAndFooter(Component.text("\n§f• §6§lVery§f§lMc §f•\n\n§7Global §7▸ §a" + + server.getAllPlayers().size() + "\n§7En Skyblock §7▸ §a" + player.getCurrentServer().get().getServer().getPlayersConnected().size() + + "\n\n§7Une question/problème ? contacte un §9§lSTAFF §7!\n"), + Component.text("\n§7Serveur Mini-Jeux Francophone\n§7Vous êtes sur ▸ §fplay.§6§lvery§f§lmc§f.fr §7◂")); + } + + public void autoTABForPlayer() { + server.getScheduler() + .buildTask(Main.instance, () -> { + for (Player player : server.getAllPlayers()) { + sendTabToPlayer(player); + } + }) + .repeat(1L, TimeUnit.SECONDS) + .schedule(); + } +} diff --git a/src/main/java/fr/verymc/velocity/events/ConnectionListener.java b/src/main/java/fr/verymc/velocity/events/ConnectionListener.java new file mode 100644 index 00000000..3d316926 --- /dev/null +++ b/src/main/java/fr/verymc/velocity/events/ConnectionListener.java @@ -0,0 +1,6 @@ +package main.java.fr.verymc.velocity.events; + +public class ConnectionListener { + + +} diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index bd57a05b..de520f3c 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -3,7 +3,7 @@ version: 1.0 author: Farmeurimmo authors: - Farmeurimmo -main: main.java.fr.verymc.Main +main: main.java.fr.verymc.spigot.Main depend: [ Citizens, HolographicDisplays, LuckPerms ] api-version: 1.16 commands: