From 8469eb5f08ff13ef7cbb0d6ff4cee11be5ae131c Mon Sep 17 00:00:00 2001 From: Bierque Jason Date: Thu, 18 Jan 2024 21:00:41 +0100 Subject: [PATCH] =?UTF-8?q?Rename=20Project=20SkyFolia=20->=20Skyllia=20(S?= =?UTF-8?q?kyblock=20+=20Euphyllia)=20=E2=99=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test-build.yml | 6 +- .idea/sonarlint/issuestore/index.pb | 74 ++++++++++++++++++- .idea/sonarlint/securityhotspotstore/index.pb | 74 ++++++++++++++++++- .../api/annotation/Experimental.java | 2 +- .../api/annotation/Information.java | 2 +- .../api/configuration/WorldConfig.java | 2 +- ...PlayerPrepareChangeWorldSkyblockEvent.java | 4 +- .../api/event/SkyblockChangeAccessEvent.java | 4 +- .../event/SkyblockChangePermissionEvent.java | 8 +- .../api/event/SkyblockCreateEvent.java | 4 +- .../api/event/SkyblockCreateWarpEvent.java | 4 +- .../api/event/SkyblockDeleteEvent.java | 4 +- .../api/event/SkyblockDeleteWarpEvent.java | 4 +- .../api/event/SkyblockLoadEvent.java | 4 +- .../api/exceptions/DatabaseException.java | 2 +- .../MaxIslandSizeExceedException.java | 2 +- .../UnsupportedMinecraftVersionException.java | 2 +- .../api/skyblock/Island.java | 16 ++-- .../api/skyblock/Players.java | 4 +- .../api/skyblock/model/IslandType.java | 2 +- .../skyblock/model/PermissionRoleIsland.java | 4 +- .../api/skyblock/model/Position.java | 2 +- .../api/skyblock/model/RoleType.java | 2 +- .../api/skyblock/model/SchematicWorld.java | 2 +- .../api/skyblock/model/WarpIsland.java | 2 +- .../model/gamerule/GameRuleIsland.java | 4 +- .../model/permissions/Permissions.java | 2 +- .../permissions/PermissionsCommandIsland.java | 2 +- .../permissions/PermissionsInventory.java | 2 +- .../model/permissions/PermissionsIsland.java | 2 +- .../model/permissions/PermissionsType.java | 2 +- .../api/utils/BitwiseFlag.java | 2 +- .../api/world/WorldFeedback.java | 2 +- .../utils/nms/v1_19_R3/PlayerNMS.java | 2 +- .../utils/nms/v1_19_R3/WorldNMS.java | 4 +- .../utils/nms/v1_20_R1/PlayerNMS.java | 2 +- .../utils/nms/v1_20_R1/WorldNMS.java | 4 +- .../utils/nms/v1_20_R2/PlayerNMS.java | 2 +- .../utils/nms/v1_20_R2/WorldNMS.java | 4 +- .../euphyllia/{skyfolia => skyllia}/Main.java | 20 ++--- .../{skyfolia => skyllia}/api/InterneAPI.java | 30 ++++---- .../cache/CacheManager.java | 18 ++--- .../cache/CommandCacheExecution.java | 2 +- .../cache/InviteCacheExecution.java | 2 +- .../cache/PermissionRoleInIslandCache.java | 8 +- .../cache/PlayersInIslandCache.java | 6 +- .../cache/PositionIslandCache.java | 6 +- .../commands/SkylliaCommand.java} | 8 +- .../commands/SubCommandInterface.java | 4 +- .../commands/SubCommands.java | 4 +- .../subcommands/AccessSubCommand.java | 34 ++++----- .../subcommands/CreateSubCommand.java | 36 ++++----- .../subcommands/DelWarpSubCommand.java | 28 +++---- .../subcommands/DeleteSubCommand.java | 26 +++---- .../subcommands/DemoteSubCommand.java | 26 +++---- .../commands/subcommands/ExpelSubCommand.java | 38 +++++----- .../commands/subcommands/HomeSubCommand.java | 24 +++--- .../subcommands/InviteSubCommand.java | 28 +++---- .../commands/subcommands/KickSubCommand.java | 26 +++---- .../commands/subcommands/LeaveSubCommand.java | 18 ++--- .../subcommands/PermissionSubCommand.java | 28 +++---- .../subcommands/PromoteSubCommand.java | 26 +++---- .../subcommands/SetBiomeSubCommand.java | 40 +++++----- .../subcommands/SetHomeSubCommand.java | 30 ++++---- .../subcommands/SetWarpSubCommand.java | 34 ++++----- .../subcommands/TransferSubCommand.java | 16 ++-- .../commands/subcommands/VisitSubCommand.java | 26 +++---- .../commands/subcommands/WarpSubCommand.java | 28 +++---- .../configuration/ConfigToml.java | 12 +-- .../configuration/LanguageToml.java | 28 +++---- .../configuration/section/MariaDBConfig.java | 2 +- .../database/DatabaseLoader.java | 10 +-- .../database/execute/MariaDBExecute.java | 14 ++-- .../database/model/DBCallback.java | 2 +- .../database/model/DBCallbackInt.java | 2 +- .../database/model/DBConnect.java | 2 +- .../database/model/DBInterface.java | 2 +- .../database/model/DBWork.java | 2 +- .../database/query/MariaDBCreateTable.java | 16 ++-- .../query/MariaDBTransactionQuery.java | 4 +- .../database/query/exec/IslandDataQuery.java | 18 ++--- .../query/exec/IslandMemberQuery.java | 12 +-- .../query/exec/IslandPermissionQuery.java | 14 ++-- .../database/query/exec/IslandQuery.java | 4 +- .../query/exec/IslandUpdateQuery.java | 8 +- .../database/query/exec/IslandWarpQuery.java | 10 +-- .../database/sgbd/MariaDB.java | 10 +-- .../database/stream/AsciiStream.java | 2 +- .../database/stream/BinaryStream.java | 2 +- .../listeners/ListenersUtils.java | 26 +++---- .../listeners/bukkitevents/BlockEvent.java | 8 +- .../bukkitevents/InventoryEvent.java | 8 +- .../listeners/bukkitevents/JoinEvent.java | 18 ++--- .../listeners/bukkitevents/PlayerEvent.java | 8 +- .../PortailAlternativeFoliaEvent.java | 10 +-- .../skyblockevents/SkyblockEvent.java | 18 ++--- .../managers/Managers.java | 6 +- .../managers/skyblock/IslandHook.java | 34 ++++----- .../managers/skyblock/PermissionManager.java | 8 +- .../managers/skyblock/SkyblockManager.java | 22 +++--- .../managers/world/WorldsManager.java | 18 ++--- .../utils/IslandUtils.java | 8 +- .../utils/PlayerUtils.java | 19 ++--- .../utils/RegionUtils.java | 10 +-- .../utils/WorldEditUtils.java | 12 +-- .../utils/WorldUtils.java | 17 +++-- .../utils/generators/VoidWorldGen.java | 2 +- .../utils/models/CallbackEntity.java | 2 +- .../utils/models/CallbackLocation.java | 2 +- plugin/src/main/resources/plugin.yml | 7 +- readme.md | 24 +++--- settings.gradle.kts | 2 +- 112 files changed, 752 insertions(+), 605 deletions(-) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/annotation/Experimental.java (65%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/annotation/Information.java (69%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/configuration/WorldConfig.java (75%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/event/PlayerPrepareChangeWorldSkyblockEvent.java (94%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/event/SkyblockChangeAccessEvent.java (94%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/event/SkyblockChangePermissionEvent.java (84%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/event/SkyblockCreateEvent.java (88%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/event/SkyblockCreateWarpEvent.java (95%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/event/SkyblockDeleteEvent.java (94%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/event/SkyblockDeleteWarpEvent.java (94%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/event/SkyblockLoadEvent.java (87%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/exceptions/DatabaseException.java (87%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/exceptions/MaxIslandSizeExceedException.java (88%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/exceptions/UnsupportedMinecraftVersionException.java (89%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/skyblock/Island.java (78%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/skyblock/Players.java (88%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/skyblock/model/IslandType.java (59%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/skyblock/model/PermissionRoleIsland.java (53%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/skyblock/model/Position.java (51%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/skyblock/model/RoleType.java (90%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/skyblock/model/SchematicWorld.java (63%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/skyblock/model/WarpIsland.java (72%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/skyblock/model/gamerule/GameRuleIsland.java (89%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/skyblock/model/permissions/Permissions.java (63%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/skyblock/model/permissions/PermissionsCommandIsland.java (95%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/skyblock/model/permissions/PermissionsInventory.java (96%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/skyblock/model/permissions/PermissionsIsland.java (95%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/skyblock/model/permissions/PermissionsType.java (51%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/utils/BitwiseFlag.java (89%) rename api/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/world/WorldFeedback.java (96%) rename nms/v1_19_R3/src/main/java/fr/euphyllia/{skyfolia => skyllia}/utils/nms/v1_19_R3/PlayerNMS.java (98%) rename nms/v1_19_R3/src/main/java/fr/euphyllia/{skyfolia => skyllia}/utils/nms/v1_19_R3/WorldNMS.java (98%) rename nms/v1_20_R1/src/main/java/fr/euphyllia/{skyfolia => skyllia}/utils/nms/v1_20_R1/PlayerNMS.java (98%) rename nms/v1_20_R1/src/main/java/fr/euphyllia/{skyfolia => skyllia}/utils/nms/v1_20_R1/WorldNMS.java (98%) rename nms/v1_20_R2/src/main/java/fr/euphyllia/{skyfolia => skyllia}/utils/nms/v1_20_R2/PlayerNMS.java (98%) rename nms/v1_20_R2/src/main/java/fr/euphyllia/{skyfolia => skyllia}/utils/nms/v1_20_R2/WorldNMS.java (98%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/Main.java (88%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/api/InterneAPI.java (83%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/cache/CacheManager.java (85%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/cache/CommandCacheExecution.java (96%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/cache/InviteCacheExecution.java (97%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/cache/PermissionRoleInIslandCache.java (85%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/cache/PlayersInIslandCache.java (91%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/cache/PositionIslandCache.java (81%) rename plugin/src/main/java/fr/euphyllia/{skyfolia/commands/SkyFoliaCommand.java => skyllia/commands/SkylliaCommand.java} (90%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/commands/SubCommandInterface.java (87%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/commands/SubCommands.java (93%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/commands/subcommands/AccessSubCommand.java (81%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/commands/subcommands/CreateSubCommand.java (85%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/commands/subcommands/DelWarpSubCommand.java (81%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/commands/subcommands/DeleteSubCommand.java (85%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/commands/subcommands/DemoteSubCommand.java (84%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/commands/subcommands/ExpelSubCommand.java (81%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/commands/subcommands/HomeSubCommand.java (83%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/commands/subcommands/InviteSubCommand.java (90%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/commands/subcommands/KickSubCommand.java (82%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/commands/subcommands/LeaveSubCommand.java (83%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/commands/subcommands/PermissionSubCommand.java (90%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/commands/subcommands/PromoteSubCommand.java (84%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/commands/subcommands/SetBiomeSubCommand.java (84%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/commands/subcommands/SetHomeSubCommand.java (81%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/commands/subcommands/SetWarpSubCommand.java (81%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/commands/subcommands/TransferSubCommand.java (88%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/commands/subcommands/VisitSubCommand.java (84%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/commands/subcommands/WarpSubCommand.java (80%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/configuration/ConfigToml.java (96%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/configuration/LanguageToml.java (95%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/configuration/section/MariaDBConfig.java (77%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/database/DatabaseLoader.java (94%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/database/execute/MariaDBExecute.java (88%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/database/model/DBCallback.java (62%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/database/model/DBCallbackInt.java (56%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/database/model/DBConnect.java (69%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/database/model/DBInterface.java (71%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/database/model/DBWork.java (61%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/database/query/MariaDBCreateTable.java (93%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/database/query/MariaDBTransactionQuery.java (81%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/database/query/exec/IslandDataQuery.java (91%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/database/query/exec/IslandMemberQuery.java (96%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/database/query/exec/IslandPermissionQuery.java (88%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/database/query/exec/IslandQuery.java (94%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/database/query/exec/IslandUpdateQuery.java (94%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/database/query/exec/IslandWarpQuery.java (96%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/database/sgbd/MariaDB.java (86%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/database/stream/AsciiStream.java (58%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/database/stream/BinaryStream.java (58%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/listeners/ListenersUtils.java (66%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/listeners/bukkitevents/BlockEvent.java (82%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/listeners/bukkitevents/InventoryEvent.java (95%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/listeners/bukkitevents/JoinEvent.java (87%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/listeners/bukkitevents/PlayerEvent.java (89%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/listeners/bukkitevents/PortailAlternativeFoliaEvent.java (92%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/listeners/skyblockevents/SkyblockEvent.java (88%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/managers/Managers.java (76%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/managers/skyblock/IslandHook.java (86%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/managers/skyblock/PermissionManager.java (73%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/managers/skyblock/SkyblockManager.java (91%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/managers/world/WorldsManager.java (77%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/utils/IslandUtils.java (80%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/utils/PlayerUtils.java (70%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/utils/RegionUtils.java (95%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/utils/WorldEditUtils.java (97%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/utils/WorldUtils.java (79%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/utils/generators/VoidWorldGen.java (95%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/utils/models/CallbackEntity.java (69%) rename plugin/src/main/java/fr/euphyllia/{skyfolia => skyllia}/utils/models/CallbackLocation.java (68%) diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index 89fdb44..bf964b3 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/test-build.yml @@ -1,7 +1,7 @@ -name: Build SkyFolia +name: Build Skyllia on: [ push ] jobs: - skyfolia-testbuild: + skyllia-testbuild: runs-on: ubuntu-22.04 if: "!contains(github.event.commits[0].message, '[ci-skip]')" steps: @@ -17,5 +17,5 @@ jobs: run: git config --global user.email "actions@github.com" && git config --global user.name "Github Actions" - name: Permission gradlew run: chmod +x gradlew - - name: Build SkyFolia jar + - name: Build Skyllia jar run: ./gradlew shadowJar \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb index b5155e6..52eeb1a 100644 --- a/.idea/sonarlint/issuestore/index.pb +++ b/.idea/sonarlint/issuestore/index.pb @@ -215,4 +215,76 @@ Tapi/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockChangePermissionEvent  `api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/permissions/PermissionsInventory.java,6\3\63bbcd6f5671ef4d4a6cbc9c74f81ff999d5405d x -Hapi/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockLoadEvent.java,0\f\0fc91538691413500e8bb337f40fcddb347892af \ No newline at end of file +Hapi/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockLoadEvent.java,0\f\0fc91538691413500e8bb337f40fcddb347892af + +Qnms/v1_19_R3/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_19_R3/PlayerNMS.java,0\c\0ce53f96393a171d71a87ba05ec541260cfcca8b +w +Gapi/src/main/java/fr/euphyllia/skyllia/api/annotation/Experimental.java,b\8\b8ce65c08b9dd7e37de264e283b3ebf8481da128 +v +Fapi/src/main/java/fr/euphyllia/skyllia/api/annotation/Information.java,c\b\cbe408f78ed32bc530d98a7aaa3a27621cbaa741 +y +Iapi/src/main/java/fr/euphyllia/skyllia/api/configuration/WorldConfig.java,c\3\c3278e222ccf68f0796d5af47ca189701eb4bf9a + +[api/src/main/java/fr/euphyllia/skyllia/api/event/PlayerPrepareChangeWorldSkyblockEvent.java,5\0\502dc727de2b84a401a8420867386d64a2ea14bf + +Sapi/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockChangePermissionEvent.java,5\8\58b51dc646ec87a0e7c0374ec73406a6cc774c37 +y +Iapi/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockCreateEvent.java,5\c\5c8c2f4a659c5748e8f8d8d7792bfa61390ec4b8 +w +Gapi/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockLoadEvent.java,3\e\3e8ca92b5f01939a81cc5a6cfc8a98fb30ad6298 +} +Mapi/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockDeleteWarpEvent.java,8\2\82366ebc68690648a090095038e255f49174ffb9 +} +Mapi/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockCreateWarpEvent.java,3\5\35cc71a1101e4d285381f94f54a1040a69763d44 +| +Lapi/src/main/java/fr/euphyllia/skyllia/api/exceptions/DatabaseException.java,7\e\7e25b152368ac830e61e021268693e6e127378dd + +_api/src/main/java/fr/euphyllia/skyllia/api/exceptions/UnsupportedMinecraftVersionException.java,c\7\c75310ea2c36dcd3ec2ce715d99ddd8870546a44 + +Wapi/src/main/java/fr/euphyllia/skyllia/api/exceptions/MaxIslandSizeExceedException.java,9\e\9ebb1b8cf1795a1031721e993a0ae7c933357ab9 + +Vapi/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/gamerule/GameRuleIsland.java,d\2\d2eb0070e3f93658e08c954a858e593e043a1267 + +Vapi/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/Permissions.java,b\a\ba9cff5ef49ddccf5334b34cddfa198a149377ac + +capi/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/PermissionsCommandIsland.java,7\4\742e8da5bf2501b1e20951ca9d9d7ba4e7e540da + +_api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/PermissionsInventory.java,e\f\ef4233fdd5e5a4e6db673c5ee8bbbdc8115b8163 + +\api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/PermissionsIsland.java,a\8\a86a238e258a567ad2280497ee624361490ac60b + +Zapi/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/PermissionsType.java,8\2\82f2b260bb3d5db3a584aecd9299cc2c2b6597fd +y +Iapi/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/IslandType.java,7\2\72bc8423a5b8e3c6bd759d24c5d926e6295d2aba +w +Gapi/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/Position.java,a\4\a466889a816e088109316910e24e34da9f3a6f06 + +Sapi/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/PermissionRoleIsland.java,b\5\b5183b4d671ff3af46dcf5cedb159a6ba78c792d +w +Gapi/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/RoleType.java,7\2\729d6ad975e003588822628143977acce1607d39 +} +Mapi/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/SchematicWorld.java,d\1\d142f01eacebd140047d626be23ed2df3127fe5c +y +Iapi/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/WarpIsland.java,7\f\7f4f409c55fe9284d61022d0c579b1aaddf268ce +o +?api/src/main/java/fr/euphyllia/skyllia/api/skyblock/Island.java,6\5\655b5c1a3e4ef57495a1250efc5f903b434bb74b +p +@api/src/main/java/fr/euphyllia/skyllia/api/skyblock/Players.java,b\9\b916a083036a4e2c84d4d5d78d8bd5dc4731d98d + +Pnms/v1_20_R2/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_20_R2/WorldNMS.java,7\5\75c752c3e71ec5473dedcaa1483a470845d2d0e0 + +Qnms/v1_20_R2/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_20_R2/PlayerNMS.java,6\1\6154806ae012f905b86c24af42d5ba2c478cc772 +c +3plugin/src/main/java/fr/euphyllia/skyllia/Main.java,e\a\ead4958fe37ca9e55fe6421b6bd44385daeb81d3 + +Oapi/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockChangeAccessEvent.java,b\b\bb703912be5cb7f4e177f6528bb732d81918ba46 +y +Iapi/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockDeleteEvent.java,1\2\12ea606f6bc3a5d4dc14647256c783c9ddb9879d +w +Gplugin/src/main/java/fr/euphyllia/skyllia/commands/SkyFoliaCommand.java,c\7\c7fb5cbeff003b6f93306dd343cb68df076f469a +{ +Kplugin/src/main/java/fr/euphyllia/skyllia/managers/world/WorldsManager.java,b\6\b643ae5bb9fd61af886554f19b1ff8e7cda7b82a +s +Capi/src/main/java/fr/euphyllia/skyllia/api/world/WorldFeedback.java,9\f\9f407b917e537abb0108779cc8867932284da340 + +Pnms/v1_19_R3/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_19_R3/WorldNMS.java,6\8\68f3e2d99dfbb07b6b604bd5e0eb6048ea7c4a4a \ No newline at end of file diff --git a/.idea/sonarlint/securityhotspotstore/index.pb b/.idea/sonarlint/securityhotspotstore/index.pb index b5155e6..52eeb1a 100644 --- a/.idea/sonarlint/securityhotspotstore/index.pb +++ b/.idea/sonarlint/securityhotspotstore/index.pb @@ -215,4 +215,76 @@ Tapi/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockChangePermissionEvent  `api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/permissions/PermissionsInventory.java,6\3\63bbcd6f5671ef4d4a6cbc9c74f81ff999d5405d x -Hapi/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockLoadEvent.java,0\f\0fc91538691413500e8bb337f40fcddb347892af \ No newline at end of file +Hapi/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockLoadEvent.java,0\f\0fc91538691413500e8bb337f40fcddb347892af + +Qnms/v1_19_R3/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_19_R3/PlayerNMS.java,0\c\0ce53f96393a171d71a87ba05ec541260cfcca8b +w +Gapi/src/main/java/fr/euphyllia/skyllia/api/annotation/Experimental.java,b\8\b8ce65c08b9dd7e37de264e283b3ebf8481da128 +v +Fapi/src/main/java/fr/euphyllia/skyllia/api/annotation/Information.java,c\b\cbe408f78ed32bc530d98a7aaa3a27621cbaa741 +y +Iapi/src/main/java/fr/euphyllia/skyllia/api/configuration/WorldConfig.java,c\3\c3278e222ccf68f0796d5af47ca189701eb4bf9a + +[api/src/main/java/fr/euphyllia/skyllia/api/event/PlayerPrepareChangeWorldSkyblockEvent.java,5\0\502dc727de2b84a401a8420867386d64a2ea14bf + +Sapi/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockChangePermissionEvent.java,5\8\58b51dc646ec87a0e7c0374ec73406a6cc774c37 +y +Iapi/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockCreateEvent.java,5\c\5c8c2f4a659c5748e8f8d8d7792bfa61390ec4b8 +w +Gapi/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockLoadEvent.java,3\e\3e8ca92b5f01939a81cc5a6cfc8a98fb30ad6298 +} +Mapi/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockDeleteWarpEvent.java,8\2\82366ebc68690648a090095038e255f49174ffb9 +} +Mapi/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockCreateWarpEvent.java,3\5\35cc71a1101e4d285381f94f54a1040a69763d44 +| +Lapi/src/main/java/fr/euphyllia/skyllia/api/exceptions/DatabaseException.java,7\e\7e25b152368ac830e61e021268693e6e127378dd + +_api/src/main/java/fr/euphyllia/skyllia/api/exceptions/UnsupportedMinecraftVersionException.java,c\7\c75310ea2c36dcd3ec2ce715d99ddd8870546a44 + +Wapi/src/main/java/fr/euphyllia/skyllia/api/exceptions/MaxIslandSizeExceedException.java,9\e\9ebb1b8cf1795a1031721e993a0ae7c933357ab9 + +Vapi/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/gamerule/GameRuleIsland.java,d\2\d2eb0070e3f93658e08c954a858e593e043a1267 + +Vapi/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/Permissions.java,b\a\ba9cff5ef49ddccf5334b34cddfa198a149377ac + +capi/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/PermissionsCommandIsland.java,7\4\742e8da5bf2501b1e20951ca9d9d7ba4e7e540da + +_api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/PermissionsInventory.java,e\f\ef4233fdd5e5a4e6db673c5ee8bbbdc8115b8163 + +\api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/PermissionsIsland.java,a\8\a86a238e258a567ad2280497ee624361490ac60b + +Zapi/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/PermissionsType.java,8\2\82f2b260bb3d5db3a584aecd9299cc2c2b6597fd +y +Iapi/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/IslandType.java,7\2\72bc8423a5b8e3c6bd759d24c5d926e6295d2aba +w +Gapi/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/Position.java,a\4\a466889a816e088109316910e24e34da9f3a6f06 + +Sapi/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/PermissionRoleIsland.java,b\5\b5183b4d671ff3af46dcf5cedb159a6ba78c792d +w +Gapi/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/RoleType.java,7\2\729d6ad975e003588822628143977acce1607d39 +} +Mapi/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/SchematicWorld.java,d\1\d142f01eacebd140047d626be23ed2df3127fe5c +y +Iapi/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/WarpIsland.java,7\f\7f4f409c55fe9284d61022d0c579b1aaddf268ce +o +?api/src/main/java/fr/euphyllia/skyllia/api/skyblock/Island.java,6\5\655b5c1a3e4ef57495a1250efc5f903b434bb74b +p +@api/src/main/java/fr/euphyllia/skyllia/api/skyblock/Players.java,b\9\b916a083036a4e2c84d4d5d78d8bd5dc4731d98d + +Pnms/v1_20_R2/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_20_R2/WorldNMS.java,7\5\75c752c3e71ec5473dedcaa1483a470845d2d0e0 + +Qnms/v1_20_R2/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_20_R2/PlayerNMS.java,6\1\6154806ae012f905b86c24af42d5ba2c478cc772 +c +3plugin/src/main/java/fr/euphyllia/skyllia/Main.java,e\a\ead4958fe37ca9e55fe6421b6bd44385daeb81d3 + +Oapi/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockChangeAccessEvent.java,b\b\bb703912be5cb7f4e177f6528bb732d81918ba46 +y +Iapi/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockDeleteEvent.java,1\2\12ea606f6bc3a5d4dc14647256c783c9ddb9879d +w +Gplugin/src/main/java/fr/euphyllia/skyllia/commands/SkyFoliaCommand.java,c\7\c7fb5cbeff003b6f93306dd343cb68df076f469a +{ +Kplugin/src/main/java/fr/euphyllia/skyllia/managers/world/WorldsManager.java,b\6\b643ae5bb9fd61af886554f19b1ff8e7cda7b82a +s +Capi/src/main/java/fr/euphyllia/skyllia/api/world/WorldFeedback.java,9\f\9f407b917e537abb0108779cc8867932284da340 + +Pnms/v1_19_R3/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_19_R3/WorldNMS.java,6\8\68f3e2d99dfbb07b6b604bd5e0eb6048ea7c4a4a \ No newline at end of file diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/annotation/Experimental.java b/api/src/main/java/fr/euphyllia/skyllia/api/annotation/Experimental.java similarity index 65% rename from api/src/main/java/fr/euphyllia/skyfolia/api/annotation/Experimental.java rename to api/src/main/java/fr/euphyllia/skyllia/api/annotation/Experimental.java index ab54646..bc2ab0c 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/annotation/Experimental.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/annotation/Experimental.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.api.annotation; +package fr.euphyllia.skyllia.api.annotation; import java.lang.annotation.Inherited; diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/annotation/Information.java b/api/src/main/java/fr/euphyllia/skyllia/api/annotation/Information.java similarity index 69% rename from api/src/main/java/fr/euphyllia/skyfolia/api/annotation/Information.java rename to api/src/main/java/fr/euphyllia/skyllia/api/annotation/Information.java index 1aa0792..511ee42 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/annotation/Information.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/annotation/Information.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.api.annotation; +package fr.euphyllia.skyllia.api.annotation; import java.lang.annotation.Inherited; diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/configuration/WorldConfig.java b/api/src/main/java/fr/euphyllia/skyllia/api/configuration/WorldConfig.java similarity index 75% rename from api/src/main/java/fr/euphyllia/skyfolia/api/configuration/WorldConfig.java rename to api/src/main/java/fr/euphyllia/skyllia/api/configuration/WorldConfig.java index 94cb259..d3db6c5 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/configuration/WorldConfig.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/configuration/WorldConfig.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.api.configuration; +package fr.euphyllia.skyllia.api.configuration; public record WorldConfig(String name, String environment, String netherPortalDestination, String endPortalDestination) { diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/event/PlayerPrepareChangeWorldSkyblockEvent.java b/api/src/main/java/fr/euphyllia/skyllia/api/event/PlayerPrepareChangeWorldSkyblockEvent.java similarity index 94% rename from api/src/main/java/fr/euphyllia/skyfolia/api/event/PlayerPrepareChangeWorldSkyblockEvent.java rename to api/src/main/java/fr/euphyllia/skyllia/api/event/PlayerPrepareChangeWorldSkyblockEvent.java index 67b6585..d72fd9d 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/event/PlayerPrepareChangeWorldSkyblockEvent.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/event/PlayerPrepareChangeWorldSkyblockEvent.java @@ -1,6 +1,6 @@ -package fr.euphyllia.skyfolia.api.event; +package fr.euphyllia.skyllia.api.event; -import fr.euphyllia.skyfolia.api.configuration.WorldConfig; +import fr.euphyllia.skyllia.api.configuration.WorldConfig; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockChangeAccessEvent.java b/api/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockChangeAccessEvent.java similarity index 94% rename from api/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockChangeAccessEvent.java rename to api/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockChangeAccessEvent.java index 34822a0..92a3009 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockChangeAccessEvent.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockChangeAccessEvent.java @@ -1,6 +1,6 @@ -package fr.euphyllia.skyfolia.api.event; +package fr.euphyllia.skyllia.api.event; -import fr.euphyllia.skyfolia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Island; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockChangePermissionEvent.java b/api/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockChangePermissionEvent.java similarity index 84% rename from api/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockChangePermissionEvent.java rename to api/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockChangePermissionEvent.java index 66362e1..3580bd2 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockChangePermissionEvent.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockChangePermissionEvent.java @@ -1,8 +1,8 @@ -package fr.euphyllia.skyfolia.api.event; +package fr.euphyllia.skyllia.api.event; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsType; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsType; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockCreateEvent.java b/api/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockCreateEvent.java similarity index 88% rename from api/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockCreateEvent.java rename to api/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockCreateEvent.java index f2d3a40..0b01e0b 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockCreateEvent.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockCreateEvent.java @@ -1,6 +1,6 @@ -package fr.euphyllia.skyfolia.api.event; +package fr.euphyllia.skyllia.api.event; -import fr.euphyllia.skyfolia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Island; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockCreateWarpEvent.java b/api/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockCreateWarpEvent.java similarity index 95% rename from api/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockCreateWarpEvent.java rename to api/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockCreateWarpEvent.java index 02795ab..39cc3a9 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockCreateWarpEvent.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockCreateWarpEvent.java @@ -1,6 +1,6 @@ -package fr.euphyllia.skyfolia.api.event; +package fr.euphyllia.skyllia.api.event; -import fr.euphyllia.skyfolia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Island; import org.bukkit.Location; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockDeleteEvent.java b/api/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockDeleteEvent.java similarity index 94% rename from api/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockDeleteEvent.java rename to api/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockDeleteEvent.java index 6d8095d..c98620d 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockDeleteEvent.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockDeleteEvent.java @@ -1,6 +1,6 @@ -package fr.euphyllia.skyfolia.api.event; +package fr.euphyllia.skyllia.api.event; -import fr.euphyllia.skyfolia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Island; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockDeleteWarpEvent.java b/api/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockDeleteWarpEvent.java similarity index 94% rename from api/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockDeleteWarpEvent.java rename to api/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockDeleteWarpEvent.java index b3ec645..401b274 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockDeleteWarpEvent.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockDeleteWarpEvent.java @@ -1,6 +1,6 @@ -package fr.euphyllia.skyfolia.api.event; +package fr.euphyllia.skyllia.api.event; -import fr.euphyllia.skyfolia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Island; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockLoadEvent.java b/api/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockLoadEvent.java similarity index 87% rename from api/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockLoadEvent.java rename to api/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockLoadEvent.java index 29bec75..a24356c 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/event/SkyblockLoadEvent.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/event/SkyblockLoadEvent.java @@ -1,6 +1,6 @@ -package fr.euphyllia.skyfolia.api.event; +package fr.euphyllia.skyllia.api.event; -import fr.euphyllia.skyfolia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Island; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/exceptions/DatabaseException.java b/api/src/main/java/fr/euphyllia/skyllia/api/exceptions/DatabaseException.java similarity index 87% rename from api/src/main/java/fr/euphyllia/skyfolia/api/exceptions/DatabaseException.java rename to api/src/main/java/fr/euphyllia/skyllia/api/exceptions/DatabaseException.java index 87d35a7..c02ffae 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/exceptions/DatabaseException.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/exceptions/DatabaseException.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.api.exceptions; +package fr.euphyllia.skyllia.api.exceptions; public class DatabaseException extends Exception { diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/exceptions/MaxIslandSizeExceedException.java b/api/src/main/java/fr/euphyllia/skyllia/api/exceptions/MaxIslandSizeExceedException.java similarity index 88% rename from api/src/main/java/fr/euphyllia/skyfolia/api/exceptions/MaxIslandSizeExceedException.java rename to api/src/main/java/fr/euphyllia/skyllia/api/exceptions/MaxIslandSizeExceedException.java index 264c39e..acacaf2 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/exceptions/MaxIslandSizeExceedException.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/exceptions/MaxIslandSizeExceedException.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.api.exceptions; +package fr.euphyllia.skyllia.api.exceptions; public class MaxIslandSizeExceedException extends Exception { diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/exceptions/UnsupportedMinecraftVersionException.java b/api/src/main/java/fr/euphyllia/skyllia/api/exceptions/UnsupportedMinecraftVersionException.java similarity index 89% rename from api/src/main/java/fr/euphyllia/skyfolia/api/exceptions/UnsupportedMinecraftVersionException.java rename to api/src/main/java/fr/euphyllia/skyllia/api/exceptions/UnsupportedMinecraftVersionException.java index eebb358..658f802 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/exceptions/UnsupportedMinecraftVersionException.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/exceptions/UnsupportedMinecraftVersionException.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.api.exceptions; +package fr.euphyllia.skyllia.api.exceptions; public class UnsupportedMinecraftVersionException extends Exception { diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/Island.java b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/Island.java similarity index 78% rename from api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/Island.java rename to api/src/main/java/fr/euphyllia/skyllia/api/skyblock/Island.java index f858a5f..adbd3ad 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/Island.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/Island.java @@ -1,11 +1,11 @@ -package fr.euphyllia.skyfolia.api.skyblock; - -import fr.euphyllia.skyfolia.api.exceptions.MaxIslandSizeExceedException; -import fr.euphyllia.skyfolia.api.skyblock.model.IslandType; -import fr.euphyllia.skyfolia.api.skyblock.model.Position; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.api.skyblock.model.WarpIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsType; +package fr.euphyllia.skyllia.api.skyblock; + +import fr.euphyllia.skyllia.api.exceptions.MaxIslandSizeExceedException; +import fr.euphyllia.skyllia.api.skyblock.model.IslandType; +import fr.euphyllia.skyllia.api.skyblock.model.Position; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.api.skyblock.model.WarpIsland; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsType; import org.bukkit.Location; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/Players.java b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/Players.java similarity index 88% rename from api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/Players.java rename to api/src/main/java/fr/euphyllia/skyllia/api/skyblock/Players.java index 2b8da81..f169213 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/Players.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/Players.java @@ -1,6 +1,6 @@ -package fr.euphyllia.skyfolia.api.skyblock; +package fr.euphyllia.skyllia.api.skyblock; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; import java.util.UUID; diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/IslandType.java b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/IslandType.java similarity index 59% rename from api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/IslandType.java rename to api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/IslandType.java index 962c899..b2b7b24 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/IslandType.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/IslandType.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.api.skyblock.model; +package fr.euphyllia.skyllia.api.skyblock.model; public record IslandType(String name, int maxMembers, double rayon) { } diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/PermissionRoleIsland.java b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/PermissionRoleIsland.java similarity index 53% rename from api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/PermissionRoleIsland.java rename to api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/PermissionRoleIsland.java index 55dd901..f6291bf 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/PermissionRoleIsland.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/PermissionRoleIsland.java @@ -1,6 +1,6 @@ -package fr.euphyllia.skyfolia.api.skyblock.model; +package fr.euphyllia.skyllia.api.skyblock.model; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsType; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsType; import java.util.UUID; diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/Position.java b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/Position.java similarity index 51% rename from api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/Position.java rename to api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/Position.java index aabf133..5c75083 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/Position.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/Position.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.api.skyblock.model; +package fr.euphyllia.skyllia.api.skyblock.model; public record Position(int regionX, int regionZ) { } diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/RoleType.java b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/RoleType.java similarity index 90% rename from api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/RoleType.java rename to api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/RoleType.java index 2d66e21..9368c66 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/RoleType.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/RoleType.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.api.skyblock.model; +package fr.euphyllia.skyllia.api.skyblock.model; public enum RoleType { diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/SchematicWorld.java b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/SchematicWorld.java similarity index 63% rename from api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/SchematicWorld.java rename to api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/SchematicWorld.java index 0122e4e..4e7a871 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/SchematicWorld.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/SchematicWorld.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.api.skyblock.model; +package fr.euphyllia.skyllia.api.skyblock.model; public record SchematicWorld(String key, String worldName, String schematicFile) { } diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/WarpIsland.java b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/WarpIsland.java similarity index 72% rename from api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/WarpIsland.java rename to api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/WarpIsland.java index d439705..bac07fc 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/WarpIsland.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/WarpIsland.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.api.skyblock.model; +package fr.euphyllia.skyllia.api.skyblock.model; import org.bukkit.Location; diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/gamerule/GameRuleIsland.java b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/gamerule/GameRuleIsland.java similarity index 89% rename from api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/gamerule/GameRuleIsland.java rename to api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/gamerule/GameRuleIsland.java index f952ecd..31f110b 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/gamerule/GameRuleIsland.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/gamerule/GameRuleIsland.java @@ -1,6 +1,6 @@ -package fr.euphyllia.skyfolia.api.skyblock.model.gamerule; +package fr.euphyllia.skyllia.api.skyblock.model.gamerule; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsIsland; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsIsland; import java.util.ArrayList; import java.util.Arrays; diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/permissions/Permissions.java b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/Permissions.java similarity index 63% rename from api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/permissions/Permissions.java rename to api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/Permissions.java index bc8572b..5609f6b 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/permissions/Permissions.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/Permissions.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.api.skyblock.model.permissions; +package fr.euphyllia.skyllia.api.skyblock.model.permissions; public interface Permissions { diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/permissions/PermissionsCommandIsland.java b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/PermissionsCommandIsland.java similarity index 95% rename from api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/permissions/PermissionsCommandIsland.java rename to api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/PermissionsCommandIsland.java index 1b34d87..cc4f2a0 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/permissions/PermissionsCommandIsland.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/PermissionsCommandIsland.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.api.skyblock.model.permissions; +package fr.euphyllia.skyllia.api.skyblock.model.permissions; import java.util.ArrayList; import java.util.Arrays; diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/permissions/PermissionsInventory.java b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/PermissionsInventory.java similarity index 96% rename from api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/permissions/PermissionsInventory.java rename to api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/PermissionsInventory.java index 0c263af..c345326 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/permissions/PermissionsInventory.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/PermissionsInventory.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.api.skyblock.model.permissions; +package fr.euphyllia.skyllia.api.skyblock.model.permissions; import java.util.ArrayList; import java.util.Arrays; diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/permissions/PermissionsIsland.java b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/PermissionsIsland.java similarity index 95% rename from api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/permissions/PermissionsIsland.java rename to api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/PermissionsIsland.java index 889ce75..489958e 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/permissions/PermissionsIsland.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/PermissionsIsland.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.api.skyblock.model.permissions; +package fr.euphyllia.skyllia.api.skyblock.model.permissions; import java.util.ArrayList; import java.util.Arrays; diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/permissions/PermissionsType.java b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/PermissionsType.java similarity index 51% rename from api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/permissions/PermissionsType.java rename to api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/PermissionsType.java index f88dfc4..2493322 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/skyblock/model/permissions/PermissionsType.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/skyblock/model/permissions/PermissionsType.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.api.skyblock.model.permissions; +package fr.euphyllia.skyllia.api.skyblock.model.permissions; public enum PermissionsType { COMMANDS, ISLAND, INVENTORY diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/utils/BitwiseFlag.java b/api/src/main/java/fr/euphyllia/skyllia/api/utils/BitwiseFlag.java similarity index 89% rename from api/src/main/java/fr/euphyllia/skyfolia/api/utils/BitwiseFlag.java rename to api/src/main/java/fr/euphyllia/skyllia/api/utils/BitwiseFlag.java index 11c5987..042f4ce 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/utils/BitwiseFlag.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/utils/BitwiseFlag.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.api.utils; +package fr.euphyllia.skyllia.api.utils; public abstract class BitwiseFlag { diff --git a/api/src/main/java/fr/euphyllia/skyfolia/api/world/WorldFeedback.java b/api/src/main/java/fr/euphyllia/skyllia/api/world/WorldFeedback.java similarity index 96% rename from api/src/main/java/fr/euphyllia/skyfolia/api/world/WorldFeedback.java rename to api/src/main/java/fr/euphyllia/skyllia/api/world/WorldFeedback.java index 3a9d44e..2e593f9 100644 --- a/api/src/main/java/fr/euphyllia/skyfolia/api/world/WorldFeedback.java +++ b/api/src/main/java/fr/euphyllia/skyllia/api/world/WorldFeedback.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.api.world; +package fr.euphyllia.skyllia.api.world; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/nms/v1_19_R3/src/main/java/fr/euphyllia/skyfolia/utils/nms/v1_19_R3/PlayerNMS.java b/nms/v1_19_R3/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_19_R3/PlayerNMS.java similarity index 98% rename from nms/v1_19_R3/src/main/java/fr/euphyllia/skyfolia/utils/nms/v1_19_R3/PlayerNMS.java rename to nms/v1_19_R3/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_19_R3/PlayerNMS.java index b74c63a..b65c883 100644 --- a/nms/v1_19_R3/src/main/java/fr/euphyllia/skyfolia/utils/nms/v1_19_R3/PlayerNMS.java +++ b/nms/v1_19_R3/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_19_R3/PlayerNMS.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.utils.nms.v1_19_R3; +package fr.euphyllia.skyllia.utils.nms.v1_19_R3; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/nms/v1_19_R3/src/main/java/fr/euphyllia/skyfolia/utils/nms/v1_19_R3/WorldNMS.java b/nms/v1_19_R3/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_19_R3/WorldNMS.java similarity index 98% rename from nms/v1_19_R3/src/main/java/fr/euphyllia/skyfolia/utils/nms/v1_19_R3/WorldNMS.java rename to nms/v1_19_R3/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_19_R3/WorldNMS.java index 9521ca4..40d05b0 100644 --- a/nms/v1_19_R3/src/main/java/fr/euphyllia/skyfolia/utils/nms/v1_19_R3/WorldNMS.java +++ b/nms/v1_19_R3/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_19_R3/WorldNMS.java @@ -1,10 +1,10 @@ -package fr.euphyllia.skyfolia.utils.nms.v1_19_R3; +package fr.euphyllia.skyllia.utils.nms.v1_19_R3; import com.google.common.collect.ImmutableList; import com.mojang.datafixers.util.Pair; import com.mojang.serialization.DynamicOps; import com.mojang.serialization.Lifecycle; -import fr.euphyllia.skyfolia.api.world.WorldFeedback; +import fr.euphyllia.skyllia.api.world.WorldFeedback; import io.papermc.paper.threadedregions.RegionizedServer; import net.minecraft.core.Registry; import net.minecraft.core.registries.Registries; diff --git a/nms/v1_20_R1/src/main/java/fr/euphyllia/skyfolia/utils/nms/v1_20_R1/PlayerNMS.java b/nms/v1_20_R1/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_20_R1/PlayerNMS.java similarity index 98% rename from nms/v1_20_R1/src/main/java/fr/euphyllia/skyfolia/utils/nms/v1_20_R1/PlayerNMS.java rename to nms/v1_20_R1/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_20_R1/PlayerNMS.java index 586acc3..39827d3 100644 --- a/nms/v1_20_R1/src/main/java/fr/euphyllia/skyfolia/utils/nms/v1_20_R1/PlayerNMS.java +++ b/nms/v1_20_R1/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_20_R1/PlayerNMS.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.utils.nms.v1_20_R1; +package fr.euphyllia.skyllia.utils.nms.v1_20_R1; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/nms/v1_20_R1/src/main/java/fr/euphyllia/skyfolia/utils/nms/v1_20_R1/WorldNMS.java b/nms/v1_20_R1/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_20_R1/WorldNMS.java similarity index 98% rename from nms/v1_20_R1/src/main/java/fr/euphyllia/skyfolia/utils/nms/v1_20_R1/WorldNMS.java rename to nms/v1_20_R1/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_20_R1/WorldNMS.java index e3c6924..42dbadf 100644 --- a/nms/v1_20_R1/src/main/java/fr/euphyllia/skyfolia/utils/nms/v1_20_R1/WorldNMS.java +++ b/nms/v1_20_R1/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_20_R1/WorldNMS.java @@ -1,10 +1,10 @@ -package fr.euphyllia.skyfolia.utils.nms.v1_20_R1; +package fr.euphyllia.skyllia.utils.nms.v1_20_R1; import com.google.common.collect.ImmutableList; import com.mojang.datafixers.util.Pair; import com.mojang.serialization.DynamicOps; import com.mojang.serialization.Lifecycle; -import fr.euphyllia.skyfolia.api.world.WorldFeedback; +import fr.euphyllia.skyllia.api.world.WorldFeedback; import net.minecraft.core.registries.Registries; import net.minecraft.nbt.NbtOps; import net.minecraft.nbt.Tag; diff --git a/nms/v1_20_R2/src/main/java/fr/euphyllia/skyfolia/utils/nms/v1_20_R2/PlayerNMS.java b/nms/v1_20_R2/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_20_R2/PlayerNMS.java similarity index 98% rename from nms/v1_20_R2/src/main/java/fr/euphyllia/skyfolia/utils/nms/v1_20_R2/PlayerNMS.java rename to nms/v1_20_R2/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_20_R2/PlayerNMS.java index 84e1e93..ce94c83 100644 --- a/nms/v1_20_R2/src/main/java/fr/euphyllia/skyfolia/utils/nms/v1_20_R2/PlayerNMS.java +++ b/nms/v1_20_R2/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_20_R2/PlayerNMS.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.utils.nms.v1_20_R2; +package fr.euphyllia.skyllia.utils.nms.v1_20_R2; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/nms/v1_20_R2/src/main/java/fr/euphyllia/skyfolia/utils/nms/v1_20_R2/WorldNMS.java b/nms/v1_20_R2/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_20_R2/WorldNMS.java similarity index 98% rename from nms/v1_20_R2/src/main/java/fr/euphyllia/skyfolia/utils/nms/v1_20_R2/WorldNMS.java rename to nms/v1_20_R2/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_20_R2/WorldNMS.java index e6c1809..faec107 100644 --- a/nms/v1_20_R2/src/main/java/fr/euphyllia/skyfolia/utils/nms/v1_20_R2/WorldNMS.java +++ b/nms/v1_20_R2/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_20_R2/WorldNMS.java @@ -1,10 +1,10 @@ -package fr.euphyllia.skyfolia.utils.nms.v1_20_R2; +package fr.euphyllia.skyllia.utils.nms.v1_20_R2; import com.google.common.collect.ImmutableList; import com.mojang.datafixers.util.Pair; import com.mojang.serialization.DynamicOps; import com.mojang.serialization.Lifecycle; -import fr.euphyllia.skyfolia.api.world.WorldFeedback; +import fr.euphyllia.skyllia.api.world.WorldFeedback; import net.minecraft.core.registries.Registries; import net.minecraft.nbt.NbtOps; import net.minecraft.nbt.Tag; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/Main.java b/plugin/src/main/java/fr/euphyllia/skyllia/Main.java similarity index 88% rename from plugin/src/main/java/fr/euphyllia/skyfolia/Main.java rename to plugin/src/main/java/fr/euphyllia/skyllia/Main.java index 67a89df..f4c19ee 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/Main.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/Main.java @@ -1,13 +1,13 @@ -package fr.euphyllia.skyfolia; +package fr.euphyllia.skyllia; -import fr.euphyllia.skyfolia.api.InterneAPI; -import fr.euphyllia.skyfolia.api.exceptions.DatabaseException; -import fr.euphyllia.skyfolia.commands.SkyFoliaCommand; -import fr.euphyllia.skyfolia.configuration.ConfigToml; -import fr.euphyllia.skyfolia.listeners.bukkitevents.*; -import fr.euphyllia.skyfolia.listeners.skyblockevents.SkyblockEvent; -import fr.euphyllia.skyfolia.managers.Managers; +import fr.euphyllia.skyllia.api.InterneAPI; +import fr.euphyllia.skyllia.api.exceptions.DatabaseException; +import fr.euphyllia.skyllia.commands.SkylliaCommand; +import fr.euphyllia.skyllia.configuration.ConfigToml; +import fr.euphyllia.skyllia.listeners.bukkitevents.*; +import fr.euphyllia.skyllia.listeners.skyblockevents.SkyblockEvent; +import fr.euphyllia.skyllia.managers.Managers; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -70,8 +70,8 @@ public InterneAPI getInterneAPI() { } private void setupCommands() { - SkyFoliaCommand sc = new SkyFoliaCommand(this); - PluginCommand command = getServer().getPluginCommand("skyfolia"); + SkylliaCommand sc = new SkylliaCommand(this); + PluginCommand command = getServer().getPluginCommand("skyllia"); if (command == null) { logger.log(Level.FATAL, "Command not put in plugin.yml"); return; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/api/InterneAPI.java b/plugin/src/main/java/fr/euphyllia/skyllia/api/InterneAPI.java similarity index 83% rename from plugin/src/main/java/fr/euphyllia/skyfolia/api/InterneAPI.java rename to plugin/src/main/java/fr/euphyllia/skyllia/api/InterneAPI.java index f14433b..e91cdfc 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/api/InterneAPI.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/api/InterneAPI.java @@ -1,17 +1,17 @@ -package fr.euphyllia.skyfolia.api; - -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.exceptions.DatabaseException; -import fr.euphyllia.skyfolia.cache.CacheManager; -import fr.euphyllia.skyfolia.configuration.ConfigToml; -import fr.euphyllia.skyfolia.configuration.LanguageToml; -import fr.euphyllia.skyfolia.database.DatabaseLoader; -import fr.euphyllia.skyfolia.database.query.MariaDBCreateTable; -import fr.euphyllia.skyfolia.database.query.MariaDBTransactionQuery; -import fr.euphyllia.skyfolia.database.query.exec.IslandQuery; -import fr.euphyllia.skyfolia.database.sgbd.MariaDB; -import fr.euphyllia.skyfolia.managers.Managers; -import fr.euphyllia.skyfolia.managers.skyblock.SkyblockManager; +package fr.euphyllia.skyllia.api; + +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.exceptions.DatabaseException; +import fr.euphyllia.skyllia.cache.CacheManager; +import fr.euphyllia.skyllia.configuration.ConfigToml; +import fr.euphyllia.skyllia.configuration.LanguageToml; +import fr.euphyllia.skyllia.database.DatabaseLoader; +import fr.euphyllia.skyllia.database.query.MariaDBCreateTable; +import fr.euphyllia.skyllia.database.query.MariaDBTransactionQuery; +import fr.euphyllia.skyllia.database.query.exec.IslandQuery; +import fr.euphyllia.skyllia.database.sgbd.MariaDB; +import fr.euphyllia.skyllia.managers.Managers; +import fr.euphyllia.skyllia.managers.skyblock.SkyblockManager; import net.kyori.adventure.text.minimessage.MiniMessage; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; @@ -39,7 +39,7 @@ public class InterneAPI { public InterneAPI(Main plugin) { this.plugin = plugin; - this.logger = LogManager.getLogger("fr.euphyllia.skyfolia.api.InterneAPI"); + this.logger = LogManager.getLogger("fr.euphyllia.skyllia.api.InterneAPI"); this.skyblockManager = new SkyblockManager(this.plugin); this.cacheManager = new CacheManager(this.skyblockManager); } diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/cache/CacheManager.java b/plugin/src/main/java/fr/euphyllia/skyllia/cache/CacheManager.java similarity index 85% rename from plugin/src/main/java/fr/euphyllia/skyfolia/cache/CacheManager.java rename to plugin/src/main/java/fr/euphyllia/skyllia/cache/CacheManager.java index 585af45..b450925 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/cache/CacheManager.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/cache/CacheManager.java @@ -1,13 +1,13 @@ -package fr.euphyllia.skyfolia.cache; +package fr.euphyllia.skyllia.cache; -import fr.euphyllia.skyfolia.api.annotation.Experimental; -import fr.euphyllia.skyfolia.api.annotation.Information; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.Players; -import fr.euphyllia.skyfolia.api.skyblock.model.PermissionRoleIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsType; -import fr.euphyllia.skyfolia.managers.skyblock.SkyblockManager; +import fr.euphyllia.skyllia.api.annotation.Experimental; +import fr.euphyllia.skyllia.api.annotation.Information; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Players; +import fr.euphyllia.skyllia.api.skyblock.model.PermissionRoleIsland; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsType; +import fr.euphyllia.skyllia.managers.skyblock.SkyblockManager; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.bukkit.entity.Player; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/cache/CommandCacheExecution.java b/plugin/src/main/java/fr/euphyllia/skyllia/cache/CommandCacheExecution.java similarity index 96% rename from plugin/src/main/java/fr/euphyllia/skyfolia/cache/CommandCacheExecution.java rename to plugin/src/main/java/fr/euphyllia/skyllia/cache/CommandCacheExecution.java index a85d519..b09a74b 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/cache/CommandCacheExecution.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/cache/CommandCacheExecution.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.cache; +package fr.euphyllia.skyllia.cache; import java.util.ArrayList; import java.util.List; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/cache/InviteCacheExecution.java b/plugin/src/main/java/fr/euphyllia/skyllia/cache/InviteCacheExecution.java similarity index 97% rename from plugin/src/main/java/fr/euphyllia/skyfolia/cache/InviteCacheExecution.java rename to plugin/src/main/java/fr/euphyllia/skyllia/cache/InviteCacheExecution.java index 422779f..7083410 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/cache/InviteCacheExecution.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/cache/InviteCacheExecution.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.cache; +package fr.euphyllia.skyllia.cache; import java.util.ArrayList; import java.util.List; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/cache/PermissionRoleInIslandCache.java b/plugin/src/main/java/fr/euphyllia/skyllia/cache/PermissionRoleInIslandCache.java similarity index 85% rename from plugin/src/main/java/fr/euphyllia/skyfolia/cache/PermissionRoleInIslandCache.java rename to plugin/src/main/java/fr/euphyllia/skyllia/cache/PermissionRoleInIslandCache.java index 6a27ab9..db9f3fe 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/cache/PermissionRoleInIslandCache.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/cache/PermissionRoleInIslandCache.java @@ -1,8 +1,8 @@ -package fr.euphyllia.skyfolia.cache; +package fr.euphyllia.skyllia.cache; -import fr.euphyllia.skyfolia.api.skyblock.model.PermissionRoleIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsType; +import fr.euphyllia.skyllia.api.skyblock.model.PermissionRoleIsland; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsType; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/cache/PlayersInIslandCache.java b/plugin/src/main/java/fr/euphyllia/skyllia/cache/PlayersInIslandCache.java similarity index 91% rename from plugin/src/main/java/fr/euphyllia/skyfolia/cache/PlayersInIslandCache.java rename to plugin/src/main/java/fr/euphyllia/skyllia/cache/PlayersInIslandCache.java index 82c00e6..cae0cef 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/cache/PlayersInIslandCache.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/cache/PlayersInIslandCache.java @@ -1,7 +1,7 @@ -package fr.euphyllia.skyfolia.cache; +package fr.euphyllia.skyllia.cache; -import fr.euphyllia.skyfolia.api.skyblock.Players; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.api.skyblock.Players; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/cache/PositionIslandCache.java b/plugin/src/main/java/fr/euphyllia/skyllia/cache/PositionIslandCache.java similarity index 81% rename from plugin/src/main/java/fr/euphyllia/skyfolia/cache/PositionIslandCache.java rename to plugin/src/main/java/fr/euphyllia/skyllia/cache/PositionIslandCache.java index ba16675..4ada333 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/cache/PositionIslandCache.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/cache/PositionIslandCache.java @@ -1,7 +1,7 @@ -package fr.euphyllia.skyfolia.cache; +package fr.euphyllia.skyllia.cache; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.model.Position; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.model.Position; import org.jetbrains.annotations.Nullable; import java.util.concurrent.ConcurrentHashMap; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/SkyFoliaCommand.java b/plugin/src/main/java/fr/euphyllia/skyllia/commands/SkylliaCommand.java similarity index 90% rename from plugin/src/main/java/fr/euphyllia/skyfolia/commands/SkyFoliaCommand.java rename to plugin/src/main/java/fr/euphyllia/skyllia/commands/SkylliaCommand.java index d30481b..2ef51e9 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/SkyFoliaCommand.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/commands/SkylliaCommand.java @@ -1,6 +1,6 @@ -package fr.euphyllia.skyfolia.commands; +package fr.euphyllia.skyllia.commands; -import fr.euphyllia.skyfolia.Main; +import fr.euphyllia.skyllia.Main; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -12,11 +12,11 @@ import java.util.Arrays; import java.util.List; -public class SkyFoliaCommand implements CommandExecutor, TabCompleter { +public class SkylliaCommand implements CommandExecutor, TabCompleter { private final Main plugin; - public SkyFoliaCommand(Main main) { + public SkylliaCommand(Main main) { this.plugin = main; } diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/SubCommandInterface.java b/plugin/src/main/java/fr/euphyllia/skyllia/commands/SubCommandInterface.java similarity index 87% rename from plugin/src/main/java/fr/euphyllia/skyfolia/commands/SubCommandInterface.java rename to plugin/src/main/java/fr/euphyllia/skyllia/commands/SubCommandInterface.java index a39d8cd..a0a3bb7 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/SubCommandInterface.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/commands/SubCommandInterface.java @@ -1,6 +1,6 @@ -package fr.euphyllia.skyfolia.commands; +package fr.euphyllia.skyllia.commands; -import fr.euphyllia.skyfolia.Main; +import fr.euphyllia.skyllia.Main; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/SubCommands.java b/plugin/src/main/java/fr/euphyllia/skyllia/commands/SubCommands.java similarity index 93% rename from plugin/src/main/java/fr/euphyllia/skyfolia/commands/SubCommands.java rename to plugin/src/main/java/fr/euphyllia/skyllia/commands/SubCommands.java index f0e7418..586972f 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/SubCommands.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/commands/SubCommands.java @@ -1,6 +1,6 @@ -package fr.euphyllia.skyfolia.commands; +package fr.euphyllia.skyllia.commands; -import fr.euphyllia.skyfolia.commands.subcommands.*; +import fr.euphyllia.skyllia.commands.subcommands.*; import org.jetbrains.annotations.NotNull; public enum SubCommands { diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/AccessSubCommand.java b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/AccessSubCommand.java similarity index 81% rename from plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/AccessSubCommand.java rename to plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/AccessSubCommand.java index dd96531..72e0973 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/AccessSubCommand.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/AccessSubCommand.java @@ -1,19 +1,19 @@ -package fr.euphyllia.skyfolia.commands.subcommands; +package fr.euphyllia.skyllia.commands.subcommands; -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.Players; -import fr.euphyllia.skyfolia.api.skyblock.model.PermissionRoleIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsCommandIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsType; -import fr.euphyllia.skyfolia.commands.SubCommandInterface; -import fr.euphyllia.skyfolia.configuration.ConfigToml; -import fr.euphyllia.skyfolia.configuration.LanguageToml; -import fr.euphyllia.skyfolia.managers.skyblock.PermissionManager; -import fr.euphyllia.skyfolia.managers.skyblock.SkyblockManager; -import fr.euphyllia.skyfolia.utils.PlayerUtils; -import fr.euphyllia.skyfolia.utils.RegionUtils; +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Players; +import fr.euphyllia.skyllia.api.skyblock.model.PermissionRoleIsland; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsCommandIsland; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsType; +import fr.euphyllia.skyllia.commands.SubCommandInterface; +import fr.euphyllia.skyllia.configuration.ConfigToml; +import fr.euphyllia.skyllia.configuration.LanguageToml; +import fr.euphyllia.skyllia.managers.skyblock.PermissionManager; +import fr.euphyllia.skyllia.managers.skyblock.SkyblockManager; +import fr.euphyllia.skyllia.utils.PlayerUtils; +import fr.euphyllia.skyllia.utils.RegionUtils; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -39,7 +39,7 @@ public boolean onCommand(@NotNull Main plugin, @NotNull CommandSender sender, @N if (!(sender instanceof Player player)) { return true; } - if (!player.hasPermission("skyfolia.island.command.access")) { + if (!player.hasPermission("skyllia.island.command.access")) { LanguageToml.sendMessage(plugin, player, LanguageToml.messagePlayerPermissionDenied); return true; } @@ -76,7 +76,7 @@ public boolean onCommand(@NotNull Main plugin, @NotNull CommandSender sender, @N ConfigToml.worldConfigs.forEach(worldConfig -> { RegionUtils.getEntitiesInRegion(plugin, EntityType.PLAYER, Bukkit.getWorld(worldConfig.name()), island.getPosition().regionX(), island.getPosition().regionZ(), entity -> { Player playerInIsland = (Player) entity; - if (playerInIsland.hasPermission("skyfolia.island.command.access.bypass")) return; + if (playerInIsland.hasPermission("skyllia.island.command.access.bypass")) return; Players players = island.getMember(playerInIsland.getUniqueId()); if (players == null || players.getRoleType().equals(RoleType.BAN) || players.getRoleType().equals(RoleType.VISITOR)) { PlayerUtils.teleportPlayerSpawn(plugin, playerInIsland); diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/CreateSubCommand.java b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/CreateSubCommand.java similarity index 85% rename from plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/CreateSubCommand.java rename to plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/CreateSubCommand.java index f8ab873..0569575 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/CreateSubCommand.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/CreateSubCommand.java @@ -1,19 +1,19 @@ -package fr.euphyllia.skyfolia.commands.subcommands; - -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.Players; -import fr.euphyllia.skyfolia.api.skyblock.model.IslandType; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.api.skyblock.model.SchematicWorld; -import fr.euphyllia.skyfolia.commands.SubCommandInterface; -import fr.euphyllia.skyfolia.configuration.ConfigToml; -import fr.euphyllia.skyfolia.configuration.LanguageToml; -import fr.euphyllia.skyfolia.managers.skyblock.SkyblockManager; -import fr.euphyllia.skyfolia.utils.IslandUtils; -import fr.euphyllia.skyfolia.utils.PlayerUtils; -import fr.euphyllia.skyfolia.utils.RegionUtils; -import fr.euphyllia.skyfolia.utils.WorldEditUtils; +package fr.euphyllia.skyllia.commands.subcommands; + +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Players; +import fr.euphyllia.skyllia.api.skyblock.model.IslandType; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.api.skyblock.model.SchematicWorld; +import fr.euphyllia.skyllia.commands.SubCommandInterface; +import fr.euphyllia.skyllia.configuration.ConfigToml; +import fr.euphyllia.skyllia.configuration.LanguageToml; +import fr.euphyllia.skyllia.managers.skyblock.SkyblockManager; +import fr.euphyllia.skyllia.utils.IslandUtils; +import fr.euphyllia.skyllia.utils.PlayerUtils; +import fr.euphyllia.skyllia.utils.RegionUtils; +import fr.euphyllia.skyllia.utils.WorldEditUtils; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -40,7 +40,7 @@ public boolean onCommand(@NotNull Main plugin, @NotNull CommandSender sender, @N if (!(sender instanceof Player player)) { return true; } - if (!player.hasPermission("skyfolia.island.command.create")) { + if (!player.hasPermission("skyllia.island.command.create")) { LanguageToml.sendMessage(plugin, player, LanguageToml.messagePlayerPermissionDenied); return true; } @@ -66,7 +66,7 @@ public boolean onCommand(@NotNull Main plugin, @NotNull CommandSender sender, @N return; } - if (!player.hasPermission("skyfolia.island.command.create.%s".formatted(schematicWorld.key()))) { + if (!player.hasPermission("skyllia.island.command.create.%s".formatted(schematicWorld.key()))) { LanguageToml.sendMessage(plugin, player, LanguageToml.messagePlayerPermissionDenied); return; } diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/DelWarpSubCommand.java b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/DelWarpSubCommand.java similarity index 81% rename from plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/DelWarpSubCommand.java rename to plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/DelWarpSubCommand.java index 0461535..850978a 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/DelWarpSubCommand.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/DelWarpSubCommand.java @@ -1,17 +1,17 @@ -package fr.euphyllia.skyfolia.commands.subcommands; +package fr.euphyllia.skyllia.commands.subcommands; -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.Players; -import fr.euphyllia.skyfolia.api.skyblock.model.PermissionRoleIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsCommandIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsType; -import fr.euphyllia.skyfolia.commands.SubCommandInterface; -import fr.euphyllia.skyfolia.configuration.ConfigToml; -import fr.euphyllia.skyfolia.configuration.LanguageToml; -import fr.euphyllia.skyfolia.managers.skyblock.PermissionManager; -import fr.euphyllia.skyfolia.managers.skyblock.SkyblockManager; +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Players; +import fr.euphyllia.skyllia.api.skyblock.model.PermissionRoleIsland; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsCommandIsland; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsType; +import fr.euphyllia.skyllia.commands.SubCommandInterface; +import fr.euphyllia.skyllia.configuration.ConfigToml; +import fr.euphyllia.skyllia.configuration.LanguageToml; +import fr.euphyllia.skyllia.managers.skyblock.PermissionManager; +import fr.euphyllia.skyllia.managers.skyblock.SkyblockManager; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -38,7 +38,7 @@ public boolean onCommand(@NotNull Main plugin, @NotNull CommandSender sender, @N LanguageToml.sendMessage(plugin, player, LanguageToml.messageWarpCommandNotEnoughArgs); return true; } - if (!player.hasPermission("skyfolia.island.command.delwarp")) { + if (!player.hasPermission("skyllia.island.command.delwarp")) { LanguageToml.sendMessage(plugin, player, LanguageToml.messagePlayerPermissionDenied); return true; } diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/DeleteSubCommand.java b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/DeleteSubCommand.java similarity index 85% rename from plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/DeleteSubCommand.java rename to plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/DeleteSubCommand.java index df6d6fd..eebaac2 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/DeleteSubCommand.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/DeleteSubCommand.java @@ -1,16 +1,16 @@ -package fr.euphyllia.skyfolia.commands.subcommands; +package fr.euphyllia.skyllia.commands.subcommands; -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.configuration.WorldConfig; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.Players; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.commands.SubCommandInterface; -import fr.euphyllia.skyfolia.configuration.ConfigToml; -import fr.euphyllia.skyfolia.configuration.LanguageToml; -import fr.euphyllia.skyfolia.managers.skyblock.SkyblockManager; -import fr.euphyllia.skyfolia.utils.PlayerUtils; -import fr.euphyllia.skyfolia.utils.WorldEditUtils; +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.configuration.WorldConfig; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Players; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.commands.SubCommandInterface; +import fr.euphyllia.skyllia.configuration.ConfigToml; +import fr.euphyllia.skyllia.configuration.LanguageToml; +import fr.euphyllia.skyllia.managers.skyblock.SkyblockManager; +import fr.euphyllia.skyllia.utils.PlayerUtils; +import fr.euphyllia.skyllia.utils.WorldEditUtils; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -57,7 +57,7 @@ public boolean onCommand(@NotNull Main plugin, @NotNull CommandSender sender, @N if (!(sender instanceof Player player)) { return true; } - if (!player.hasPermission("skyfolia.island.command.delete")) { + if (!player.hasPermission("skyllia.island.command.delete")) { LanguageToml.sendMessage(plugin, player, LanguageToml.messagePlayerPermissionDenied); return true; } diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/DemoteSubCommand.java b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/DemoteSubCommand.java similarity index 84% rename from plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/DemoteSubCommand.java rename to plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/DemoteSubCommand.java index f3c659f..2a7619b 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/DemoteSubCommand.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/DemoteSubCommand.java @@ -1,16 +1,16 @@ -package fr.euphyllia.skyfolia.commands.subcommands; +package fr.euphyllia.skyllia.commands.subcommands; -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.Players; -import fr.euphyllia.skyfolia.api.skyblock.model.PermissionRoleIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsCommandIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsType; -import fr.euphyllia.skyfolia.commands.SubCommandInterface; -import fr.euphyllia.skyfolia.configuration.LanguageToml; -import fr.euphyllia.skyfolia.managers.skyblock.PermissionManager; -import fr.euphyllia.skyfolia.managers.skyblock.SkyblockManager; +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Players; +import fr.euphyllia.skyllia.api.skyblock.model.PermissionRoleIsland; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsCommandIsland; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsType; +import fr.euphyllia.skyllia.commands.SubCommandInterface; +import fr.euphyllia.skyllia.configuration.LanguageToml; +import fr.euphyllia.skyllia.managers.skyblock.PermissionManager; +import fr.euphyllia.skyllia.managers.skyblock.SkyblockManager; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -33,7 +33,7 @@ public boolean onCommand(@NotNull Main plugin, @NotNull CommandSender sender, @N if (!(sender instanceof Player player)) { return true; } - if (!player.hasPermission("skyfolia.island.command.demote")) { + if (!player.hasPermission("skyllia.island.command.demote")) { LanguageToml.sendMessage(plugin, player, LanguageToml.messagePlayerPermissionDenied); return true; } diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/ExpelSubCommand.java b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/ExpelSubCommand.java similarity index 81% rename from plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/ExpelSubCommand.java rename to plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/ExpelSubCommand.java index fa6794f..0fcfd9a 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/ExpelSubCommand.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/ExpelSubCommand.java @@ -1,20 +1,20 @@ -package fr.euphyllia.skyfolia.commands.subcommands; - -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.Players; -import fr.euphyllia.skyfolia.api.skyblock.model.PermissionRoleIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.Position; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsCommandIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsType; -import fr.euphyllia.skyfolia.commands.SubCommandInterface; -import fr.euphyllia.skyfolia.configuration.LanguageToml; -import fr.euphyllia.skyfolia.managers.skyblock.PermissionManager; -import fr.euphyllia.skyfolia.managers.skyblock.SkyblockManager; -import fr.euphyllia.skyfolia.utils.PlayerUtils; -import fr.euphyllia.skyfolia.utils.RegionUtils; -import fr.euphyllia.skyfolia.utils.WorldUtils; +package fr.euphyllia.skyllia.commands.subcommands; + +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Players; +import fr.euphyllia.skyllia.api.skyblock.model.PermissionRoleIsland; +import fr.euphyllia.skyllia.api.skyblock.model.Position; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsCommandIsland; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsType; +import fr.euphyllia.skyllia.commands.SubCommandInterface; +import fr.euphyllia.skyllia.configuration.LanguageToml; +import fr.euphyllia.skyllia.managers.skyblock.PermissionManager; +import fr.euphyllia.skyllia.managers.skyblock.SkyblockManager; +import fr.euphyllia.skyllia.utils.PlayerUtils; +import fr.euphyllia.skyllia.utils.RegionUtils; +import fr.euphyllia.skyllia.utils.WorldUtils; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -39,7 +39,7 @@ public boolean onCommand(@NotNull Main plugin, @NotNull CommandSender sender, @N if (!(sender instanceof Player player)) { return true; } - if (!player.hasPermission("skyfolia.island.command.expel")) { + if (!player.hasPermission("skyllia.island.command.expel")) { LanguageToml.sendMessage(plugin, player, LanguageToml.messagePlayerPermissionDenied); return true; } @@ -80,7 +80,7 @@ public boolean onCommand(@NotNull Main plugin, @NotNull CommandSender sender, @N LanguageToml.sendMessage(plugin, player, LanguageToml.messagePlayerNotConnected); return; } - if (bPlayerToExpel.hasPermission("skyfolia.island.command.expel.bypass")) { + if (bPlayerToExpel.hasPermission("skyllia.island.command.expel.bypass")) { LanguageToml.sendMessage(plugin, player, LanguageToml.messageExpelPlayerFailed); return; } diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/HomeSubCommand.java b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/HomeSubCommand.java similarity index 83% rename from plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/HomeSubCommand.java rename to plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/HomeSubCommand.java index c0cd5e4..62f6c31 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/HomeSubCommand.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/HomeSubCommand.java @@ -1,15 +1,15 @@ -package fr.euphyllia.skyfolia.commands.subcommands; +package fr.euphyllia.skyllia.commands.subcommands; -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.exceptions.UnsupportedMinecraftVersionException; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.model.WarpIsland; -import fr.euphyllia.skyfolia.commands.SubCommandInterface; -import fr.euphyllia.skyfolia.configuration.LanguageToml; -import fr.euphyllia.skyfolia.managers.skyblock.SkyblockManager; -import fr.euphyllia.skyfolia.utils.PlayerUtils; -import fr.euphyllia.skyfolia.utils.RegionUtils; -import fr.euphyllia.skyfolia.utils.WorldUtils; +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.exceptions.UnsupportedMinecraftVersionException; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.model.WarpIsland; +import fr.euphyllia.skyllia.commands.SubCommandInterface; +import fr.euphyllia.skyllia.configuration.LanguageToml; +import fr.euphyllia.skyllia.managers.skyblock.SkyblockManager; +import fr.euphyllia.skyllia.utils.PlayerUtils; +import fr.euphyllia.skyllia.utils.RegionUtils; +import fr.euphyllia.skyllia.utils.WorldUtils; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -37,7 +37,7 @@ public boolean onCommand(@NotNull Main plugin, @NotNull CommandSender sender, @N if (!(sender instanceof Player player)) { return true; } - if (!player.hasPermission("skyfolia.island.command.home")) { + if (!player.hasPermission("skyllia.island.command.home")) { LanguageToml.sendMessage(plugin, player, LanguageToml.messagePlayerPermissionDenied); return true; } diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/InviteSubCommand.java b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/InviteSubCommand.java similarity index 90% rename from plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/InviteSubCommand.java rename to plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/InviteSubCommand.java index bfb0c35..c216594 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/InviteSubCommand.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/InviteSubCommand.java @@ -1,17 +1,17 @@ -package fr.euphyllia.skyfolia.commands.subcommands; +package fr.euphyllia.skyllia.commands.subcommands; -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.Players; -import fr.euphyllia.skyfolia.api.skyblock.model.PermissionRoleIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsCommandIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsType; -import fr.euphyllia.skyfolia.cache.InviteCacheExecution; -import fr.euphyllia.skyfolia.commands.SubCommandInterface; -import fr.euphyllia.skyfolia.configuration.LanguageToml; -import fr.euphyllia.skyfolia.managers.skyblock.PermissionManager; -import fr.euphyllia.skyfolia.managers.skyblock.SkyblockManager; +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Players; +import fr.euphyllia.skyllia.api.skyblock.model.PermissionRoleIsland; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsCommandIsland; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsType; +import fr.euphyllia.skyllia.cache.InviteCacheExecution; +import fr.euphyllia.skyllia.commands.SubCommandInterface; +import fr.euphyllia.skyllia.configuration.LanguageToml; +import fr.euphyllia.skyllia.managers.skyblock.PermissionManager; +import fr.euphyllia.skyllia.managers.skyblock.SkyblockManager; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -37,7 +37,7 @@ public boolean onCommand(@NotNull Main plugin, @NotNull CommandSender sender, @N if (!(sender instanceof Player player)) { return true; } - if (!player.hasPermission("skyfolia.island.command.invite")) { + if (!player.hasPermission("skyllia.island.command.invite")) { LanguageToml.sendMessage(plugin, player, LanguageToml.messagePlayerPermissionDenied); return true; } diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/KickSubCommand.java b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/KickSubCommand.java similarity index 82% rename from plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/KickSubCommand.java rename to plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/KickSubCommand.java index 971fe40..dbcfb60 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/KickSubCommand.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/KickSubCommand.java @@ -1,16 +1,16 @@ -package fr.euphyllia.skyfolia.commands.subcommands; +package fr.euphyllia.skyllia.commands.subcommands; -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.Players; -import fr.euphyllia.skyfolia.api.skyblock.model.PermissionRoleIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsCommandIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsType; -import fr.euphyllia.skyfolia.commands.SubCommandInterface; -import fr.euphyllia.skyfolia.configuration.LanguageToml; -import fr.euphyllia.skyfolia.managers.skyblock.PermissionManager; -import fr.euphyllia.skyfolia.managers.skyblock.SkyblockManager; +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Players; +import fr.euphyllia.skyllia.api.skyblock.model.PermissionRoleIsland; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsCommandIsland; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsType; +import fr.euphyllia.skyllia.commands.SubCommandInterface; +import fr.euphyllia.skyllia.configuration.LanguageToml; +import fr.euphyllia.skyllia.managers.skyblock.PermissionManager; +import fr.euphyllia.skyllia.managers.skyblock.SkyblockManager; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.bukkit.command.Command; @@ -32,7 +32,7 @@ public boolean onCommand(@NotNull Main plugin, @NotNull CommandSender sender, @N if (!(sender instanceof Player player)) { return true; } - if (!player.hasPermission("skyfolia.island.command.kick")) { + if (!player.hasPermission("skyllia.island.command.kick")) { LanguageToml.sendMessage(plugin, player, LanguageToml.messagePlayerPermissionDenied); return true; } diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/LeaveSubCommand.java b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/LeaveSubCommand.java similarity index 83% rename from plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/LeaveSubCommand.java rename to plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/LeaveSubCommand.java index ea2750e..d347236 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/LeaveSubCommand.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/LeaveSubCommand.java @@ -1,12 +1,12 @@ -package fr.euphyllia.skyfolia.commands.subcommands; +package fr.euphyllia.skyllia.commands.subcommands; -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.Players; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.commands.SubCommandInterface; -import fr.euphyllia.skyfolia.configuration.LanguageToml; -import fr.euphyllia.skyfolia.managers.skyblock.SkyblockManager; +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Players; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.commands.SubCommandInterface; +import fr.euphyllia.skyllia.configuration.LanguageToml; +import fr.euphyllia.skyllia.managers.skyblock.SkyblockManager; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.bukkit.command.Command; @@ -28,7 +28,7 @@ public boolean onCommand(@NotNull Main plugin, @NotNull CommandSender sender, @N if (!(sender instanceof Player player)) { return true; } - if (!player.hasPermission("skyfolia.island.command.leave")) { + if (!player.hasPermission("skyllia.island.command.leave")) { LanguageToml.sendMessage(plugin, player, LanguageToml.messagePlayerPermissionDenied); return true; } diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/PermissionSubCommand.java b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/PermissionSubCommand.java similarity index 90% rename from plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/PermissionSubCommand.java rename to plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/PermissionSubCommand.java index d3bf2f2..5faefff 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/PermissionSubCommand.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/PermissionSubCommand.java @@ -1,16 +1,16 @@ -package fr.euphyllia.skyfolia.commands.subcommands; - -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.event.SkyblockChangePermissionEvent; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.Players; -import fr.euphyllia.skyfolia.api.skyblock.model.PermissionRoleIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.*; -import fr.euphyllia.skyfolia.commands.SubCommandInterface; -import fr.euphyllia.skyfolia.configuration.LanguageToml; -import fr.euphyllia.skyfolia.managers.skyblock.PermissionManager; -import fr.euphyllia.skyfolia.managers.skyblock.SkyblockManager; +package fr.euphyllia.skyllia.commands.subcommands; + +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.event.SkyblockChangePermissionEvent; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Players; +import fr.euphyllia.skyllia.api.skyblock.model.PermissionRoleIsland; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.*; +import fr.euphyllia.skyllia.commands.SubCommandInterface; +import fr.euphyllia.skyllia.configuration.LanguageToml; +import fr.euphyllia.skyllia.managers.skyblock.PermissionManager; +import fr.euphyllia.skyllia.managers.skyblock.SkyblockManager; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -37,7 +37,7 @@ public boolean onCommand(@NotNull Main plugin, @NotNull CommandSender sender, @N if (!(sender instanceof Player player)) { return true; } - if (!player.hasPermission("skyfolia.island.command.permission")) { + if (!player.hasPermission("skyllia.island.command.permission")) { LanguageToml.sendMessage(plugin, player, LanguageToml.messagePlayerPermissionDenied); return true; } diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/PromoteSubCommand.java b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/PromoteSubCommand.java similarity index 84% rename from plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/PromoteSubCommand.java rename to plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/PromoteSubCommand.java index b9f2917..e558030 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/PromoteSubCommand.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/PromoteSubCommand.java @@ -1,16 +1,16 @@ -package fr.euphyllia.skyfolia.commands.subcommands; +package fr.euphyllia.skyllia.commands.subcommands; -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.Players; -import fr.euphyllia.skyfolia.api.skyblock.model.PermissionRoleIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsCommandIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsType; -import fr.euphyllia.skyfolia.commands.SubCommandInterface; -import fr.euphyllia.skyfolia.configuration.LanguageToml; -import fr.euphyllia.skyfolia.managers.skyblock.PermissionManager; -import fr.euphyllia.skyfolia.managers.skyblock.SkyblockManager; +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Players; +import fr.euphyllia.skyllia.api.skyblock.model.PermissionRoleIsland; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsCommandIsland; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsType; +import fr.euphyllia.skyllia.commands.SubCommandInterface; +import fr.euphyllia.skyllia.configuration.LanguageToml; +import fr.euphyllia.skyllia.managers.skyblock.PermissionManager; +import fr.euphyllia.skyllia.managers.skyblock.SkyblockManager; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -33,7 +33,7 @@ public boolean onCommand(@NotNull Main plugin, @NotNull CommandSender sender, @N if (!(sender instanceof Player player)) { return true; } - if (!player.hasPermission("skyfolia.island.command.promote")) { + if (!player.hasPermission("skyllia.island.command.promote")) { LanguageToml.sendMessage(plugin, player, LanguageToml.messagePlayerPermissionDenied); return true; } diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/SetBiomeSubCommand.java b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/SetBiomeSubCommand.java similarity index 84% rename from plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/SetBiomeSubCommand.java rename to plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/SetBiomeSubCommand.java index 3fb7a54..60515f8 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/SetBiomeSubCommand.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/SetBiomeSubCommand.java @@ -1,22 +1,22 @@ -package fr.euphyllia.skyfolia.commands.subcommands; - -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.Players; -import fr.euphyllia.skyfolia.api.skyblock.model.PermissionRoleIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.Position; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsCommandIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsType; -import fr.euphyllia.skyfolia.cache.CommandCacheExecution; -import fr.euphyllia.skyfolia.commands.SubCommandInterface; -import fr.euphyllia.skyfolia.configuration.LanguageToml; -import fr.euphyllia.skyfolia.managers.skyblock.PermissionManager; -import fr.euphyllia.skyfolia.managers.skyblock.SkyblockManager; -import fr.euphyllia.skyfolia.utils.PlayerUtils; -import fr.euphyllia.skyfolia.utils.RegionUtils; -import fr.euphyllia.skyfolia.utils.WorldEditUtils; -import fr.euphyllia.skyfolia.utils.WorldUtils; +package fr.euphyllia.skyllia.commands.subcommands; + +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Players; +import fr.euphyllia.skyllia.api.skyblock.model.PermissionRoleIsland; +import fr.euphyllia.skyllia.api.skyblock.model.Position; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsCommandIsland; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsType; +import fr.euphyllia.skyllia.cache.CommandCacheExecution; +import fr.euphyllia.skyllia.commands.SubCommandInterface; +import fr.euphyllia.skyllia.configuration.LanguageToml; +import fr.euphyllia.skyllia.managers.skyblock.PermissionManager; +import fr.euphyllia.skyllia.managers.skyblock.SkyblockManager; +import fr.euphyllia.skyllia.utils.PlayerUtils; +import fr.euphyllia.skyllia.utils.RegionUtils; +import fr.euphyllia.skyllia.utils.WorldEditUtils; +import fr.euphyllia.skyllia.utils.WorldUtils; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -44,7 +44,7 @@ public boolean onCommand(@NotNull Main plugin, @NotNull CommandSender sender, @N if (!(sender instanceof Player player)) { return true; } - if (!player.hasPermission("skyfolia.island.command.biome")) { + if (!player.hasPermission("skyllia.island.command.biome")) { LanguageToml.sendMessage(plugin, player, LanguageToml.messagePlayerPermissionDenied); return true; } diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/SetHomeSubCommand.java b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/SetHomeSubCommand.java similarity index 81% rename from plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/SetHomeSubCommand.java rename to plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/SetHomeSubCommand.java index dd748b3..8a15a43 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/SetHomeSubCommand.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/SetHomeSubCommand.java @@ -1,18 +1,18 @@ -package fr.euphyllia.skyfolia.commands.subcommands; +package fr.euphyllia.skyllia.commands.subcommands; -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.Players; -import fr.euphyllia.skyfolia.api.skyblock.model.PermissionRoleIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.Position; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsCommandIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsType; -import fr.euphyllia.skyfolia.commands.SubCommandInterface; -import fr.euphyllia.skyfolia.configuration.LanguageToml; -import fr.euphyllia.skyfolia.managers.skyblock.PermissionManager; -import fr.euphyllia.skyfolia.managers.skyblock.SkyblockManager; -import fr.euphyllia.skyfolia.utils.RegionUtils; +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Players; +import fr.euphyllia.skyllia.api.skyblock.model.PermissionRoleIsland; +import fr.euphyllia.skyllia.api.skyblock.model.Position; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsCommandIsland; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsType; +import fr.euphyllia.skyllia.commands.SubCommandInterface; +import fr.euphyllia.skyllia.configuration.LanguageToml; +import fr.euphyllia.skyllia.managers.skyblock.PermissionManager; +import fr.euphyllia.skyllia.managers.skyblock.SkyblockManager; +import fr.euphyllia.skyllia.utils.RegionUtils; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -36,7 +36,7 @@ public boolean onCommand(@NotNull Main plugin, @NotNull CommandSender sender, @N if (!(sender instanceof Player player)) { return true; } - if (!player.hasPermission("skyfolia.island.command.sethome")) { + if (!player.hasPermission("skyllia.island.command.sethome")) { LanguageToml.sendMessage(plugin, player, LanguageToml.messagePlayerPermissionDenied); return true; } diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/SetWarpSubCommand.java b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/SetWarpSubCommand.java similarity index 81% rename from plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/SetWarpSubCommand.java rename to plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/SetWarpSubCommand.java index 2589b38..3877f09 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/SetWarpSubCommand.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/SetWarpSubCommand.java @@ -1,19 +1,19 @@ -package fr.euphyllia.skyfolia.commands.subcommands; - -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.Players; -import fr.euphyllia.skyfolia.api.skyblock.model.PermissionRoleIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.Position; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsCommandIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsType; -import fr.euphyllia.skyfolia.commands.SubCommandInterface; -import fr.euphyllia.skyfolia.configuration.LanguageToml; -import fr.euphyllia.skyfolia.managers.skyblock.PermissionManager; -import fr.euphyllia.skyfolia.managers.skyblock.SkyblockManager; -import fr.euphyllia.skyfolia.utils.RegionUtils; -import fr.euphyllia.skyfolia.utils.WorldUtils; +package fr.euphyllia.skyllia.commands.subcommands; + +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Players; +import fr.euphyllia.skyllia.api.skyblock.model.PermissionRoleIsland; +import fr.euphyllia.skyllia.api.skyblock.model.Position; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsCommandIsland; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsType; +import fr.euphyllia.skyllia.commands.SubCommandInterface; +import fr.euphyllia.skyllia.configuration.LanguageToml; +import fr.euphyllia.skyllia.managers.skyblock.PermissionManager; +import fr.euphyllia.skyllia.managers.skyblock.SkyblockManager; +import fr.euphyllia.skyllia.utils.RegionUtils; +import fr.euphyllia.skyllia.utils.WorldUtils; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -41,7 +41,7 @@ public boolean onCommand(@NotNull Main plugin, @NotNull CommandSender sender, @N LanguageToml.sendMessage(plugin, player, LanguageToml.messageWarpCommandNotEnoughArgs); return true; } - if (!player.hasPermission("skyfolia.island.command.setwarp")) { + if (!player.hasPermission("skyllia.island.command.setwarp")) { LanguageToml.sendMessage(plugin, player, LanguageToml.messagePlayerPermissionDenied); return true; } diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/TransferSubCommand.java b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/TransferSubCommand.java similarity index 88% rename from plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/TransferSubCommand.java rename to plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/TransferSubCommand.java index 45d3525..67ba4a7 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/TransferSubCommand.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/TransferSubCommand.java @@ -1,12 +1,12 @@ -package fr.euphyllia.skyfolia.commands.subcommands; +package fr.euphyllia.skyllia.commands.subcommands; -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.Players; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.commands.SubCommandInterface; -import fr.euphyllia.skyfolia.configuration.LanguageToml; -import fr.euphyllia.skyfolia.managers.skyblock.SkyblockManager; +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Players; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.commands.SubCommandInterface; +import fr.euphyllia.skyllia.configuration.LanguageToml; +import fr.euphyllia.skyllia.managers.skyblock.SkyblockManager; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/VisitSubCommand.java b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/VisitSubCommand.java similarity index 84% rename from plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/VisitSubCommand.java rename to plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/VisitSubCommand.java index 175bbcb..f61520a 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/VisitSubCommand.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/VisitSubCommand.java @@ -1,15 +1,15 @@ -package fr.euphyllia.skyfolia.commands.subcommands; +package fr.euphyllia.skyllia.commands.subcommands; -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.exceptions.UnsupportedMinecraftVersionException; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.model.WarpIsland; -import fr.euphyllia.skyfolia.commands.SubCommandInterface; -import fr.euphyllia.skyfolia.configuration.LanguageToml; -import fr.euphyllia.skyfolia.managers.skyblock.SkyblockManager; -import fr.euphyllia.skyfolia.utils.PlayerUtils; -import fr.euphyllia.skyfolia.utils.RegionUtils; -import fr.euphyllia.skyfolia.utils.WorldUtils; +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.exceptions.UnsupportedMinecraftVersionException; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.model.WarpIsland; +import fr.euphyllia.skyllia.commands.SubCommandInterface; +import fr.euphyllia.skyllia.configuration.LanguageToml; +import fr.euphyllia.skyllia.managers.skyblock.SkyblockManager; +import fr.euphyllia.skyllia.utils.PlayerUtils; +import fr.euphyllia.skyllia.utils.RegionUtils; +import fr.euphyllia.skyllia.utils.WorldUtils; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -36,7 +36,7 @@ public boolean onCommand(@NotNull Main plugin, @NotNull CommandSender sender, @N if (!(sender instanceof Player player)) { return true; } - if (!player.hasPermission("skyfolia.island.command.visit")) { + if (!player.hasPermission("skyllia.island.command.visit")) { LanguageToml.sendMessage(plugin, player, LanguageToml.messagePlayerPermissionDenied); return true; } @@ -63,7 +63,7 @@ public boolean onCommand(@NotNull Main plugin, @NotNull CommandSender sender, @N return; } - if (!player.hasPermission("skyfolia.island.command.visit.bypass")) { + if (!player.hasPermission("skyllia.island.command.visit.bypass")) { if (island.isPrivateIsland()) { LanguageToml.sendMessage(plugin, player, LanguageToml.messageVisitIslandIsPrivate); return; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/WarpSubCommand.java b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/WarpSubCommand.java similarity index 80% rename from plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/WarpSubCommand.java rename to plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/WarpSubCommand.java index 82d2f9a..3ae6ef9 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/commands/subcommands/WarpSubCommand.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/commands/subcommands/WarpSubCommand.java @@ -1,17 +1,17 @@ -package fr.euphyllia.skyfolia.commands.subcommands; +package fr.euphyllia.skyllia.commands.subcommands; -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.Players; -import fr.euphyllia.skyfolia.api.skyblock.model.PermissionRoleIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.api.skyblock.model.WarpIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsCommandIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsType; -import fr.euphyllia.skyfolia.commands.SubCommandInterface; -import fr.euphyllia.skyfolia.configuration.LanguageToml; -import fr.euphyllia.skyfolia.managers.skyblock.PermissionManager; -import fr.euphyllia.skyfolia.managers.skyblock.SkyblockManager; +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Players; +import fr.euphyllia.skyllia.api.skyblock.model.PermissionRoleIsland; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.api.skyblock.model.WarpIsland; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsCommandIsland; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsType; +import fr.euphyllia.skyllia.commands.SubCommandInterface; +import fr.euphyllia.skyllia.configuration.LanguageToml; +import fr.euphyllia.skyllia.managers.skyblock.PermissionManager; +import fr.euphyllia.skyllia.managers.skyblock.SkyblockManager; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -38,7 +38,7 @@ public boolean onCommand(@NotNull Main plugin, @NotNull CommandSender sender, @N LanguageToml.sendMessage(plugin, player, LanguageToml.messageWarpCommandNotEnoughArgs); return true; } - if (!player.hasPermission("skyfolia.island.command.warp")) { + if (!player.hasPermission("skyllia.island.command.warp")) { LanguageToml.sendMessage(plugin, player, LanguageToml.messagePlayerPermissionDenied); return true; } diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/configuration/ConfigToml.java b/plugin/src/main/java/fr/euphyllia/skyllia/configuration/ConfigToml.java similarity index 96% rename from plugin/src/main/java/fr/euphyllia/skyfolia/configuration/ConfigToml.java rename to plugin/src/main/java/fr/euphyllia/skyllia/configuration/ConfigToml.java index 2731c8d..70f3b2c 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/configuration/ConfigToml.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/configuration/ConfigToml.java @@ -1,12 +1,12 @@ -package fr.euphyllia.skyfolia.configuration; +package fr.euphyllia.skyllia.configuration; import com.electronwill.nightconfig.core.CommentedConfig; import com.electronwill.nightconfig.core.file.CommentedFileConfig; import com.google.common.collect.ImmutableMap; -import fr.euphyllia.skyfolia.api.configuration.WorldConfig; -import fr.euphyllia.skyfolia.api.skyblock.model.IslandType; -import fr.euphyllia.skyfolia.api.skyblock.model.SchematicWorld; -import fr.euphyllia.skyfolia.configuration.section.MariaDBConfig; +import fr.euphyllia.skyllia.api.configuration.WorldConfig; +import fr.euphyllia.skyllia.api.skyblock.model.IslandType; +import fr.euphyllia.skyllia.api.skyblock.model.SchematicWorld; +import fr.euphyllia.skyllia.configuration.section.MariaDBConfig; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -97,7 +97,7 @@ private static Double getDouble(@NotNull String path, Double def) { set(path, def); return def; } - if (tryIt instanceof Double) { // Fix issue https://github.com/Euphillya/SkyFolia/issues/9 + if (tryIt instanceof Double) { // Fix issue https://github.com/Euphillya/skyllia/issues/9 return config.get(path); } else { return Double.valueOf(config.get(path)); diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/configuration/LanguageToml.java b/plugin/src/main/java/fr/euphyllia/skyllia/configuration/LanguageToml.java similarity index 95% rename from plugin/src/main/java/fr/euphyllia/skyfolia/configuration/LanguageToml.java rename to plugin/src/main/java/fr/euphyllia/skyllia/configuration/LanguageToml.java index ad4e527..2842e01 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/configuration/LanguageToml.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/configuration/LanguageToml.java @@ -1,7 +1,7 @@ -package fr.euphyllia.skyfolia.configuration; +package fr.euphyllia.skyllia.configuration; import com.electronwill.nightconfig.core.file.CommentedFileConfig; -import fr.euphyllia.skyfolia.Main; +import fr.euphyllia.skyllia.Main; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -38,24 +38,24 @@ public class LanguageToml { public static String messageDemotePlayer = "Le joueur %s a été rétrogradé."; public static String messageDemotePlayerFailed = "Le joueur %s ne peut pas être rétrogradé."; public static String messageDemotePlayerFailedHighOrEqualsStatus = "Vous ne pouvez pas rétrograder un joueur de votre rang ou d'un rang plus élevé."; - public static String messageDemoteCommandNotEnoughArgs = "La commande n'est pas complète : /skyfolia demote "; + public static String messageDemoteCommandNotEnoughArgs = "La commande n'est pas complète : /skyllia demote "; public static String messagePromotePlayer = "Le joueur %s a été promu."; public static String messagePromotePlayerFailed = "Le joueur %s ne peut pas être promu."; public static String messagePromotePlayerFailedLowOrEqualsStatus = "Vous ne pouvez pas promouvoir un joueur à votre rang ou d'un rang plus élevé."; - public static String messagePromoteCommandNotEnoughArgs = "La commande n'est pas complète : /skyfolia promote "; + public static String messagePromoteCommandNotEnoughArgs = "La commande n'est pas complète : /skyllia promote "; public static String messageCommandAlreadyExecution = "La commande est déjà en cours d'execution, veuillez patienter quelques instants."; - public static String messageBiomeCommandNotEnoughArgs = "La commande n'est pas complète : /skyfolia biome "; + public static String messageBiomeCommandNotEnoughArgs = "La commande n'est pas complète : /skyllia biome "; public static String messageBiomeOnlyIsland = "La commande ne peut être exécuté seulement sur une île"; public static String messageBiomeNotExist = "Le biome %s n'existe pas."; public static String messageBiomeChangeInProgress = "Changement de biome en cours. Veuillez notez que ça prends du temps... Un message vous avertira quand le processus sera achevé."; public static String messageBiomeChangeSuccess = "Le changement de biome dans le chunk où vous étiez est terminé !"; public static String messageInviteAlreadyIsland = "Vous êtes déjà sur une île !"; - public static String messageInviteCommandNotEnoughArgs = "La commande n'est pas complète : /skyfolia invite "; - public static String messageInviteAcceptCommandNotEnoughArgs = "Vous devez préciser sur quel île vous souhaiter rejoindre : /skyfolia invite accept "; - public static String messageInviteDeclineCommandNotEnoughArgs = "Vous devez préciser sur quel île vous souhaiter décliner : /skyfolia invite decline "; - public static String messageInviteAddCommandNotEnoughArgs = "Vous devez préciser sur quel île vous souhaiter décliner : /skyfolia invite add "; + public static String messageInviteCommandNotEnoughArgs = "La commande n'est pas complète : /skyllia invite "; + public static String messageInviteAcceptCommandNotEnoughArgs = "Vous devez préciser sur quel île vous souhaiter rejoindre : /skyllia invite accept "; + public static String messageInviteDeclineCommandNotEnoughArgs = "Vous devez préciser sur quel île vous souhaiter décliner : /skyllia invite decline "; + public static String messageInviteAddCommandNotEnoughArgs = "Vous devez préciser sur quel île vous souhaiter décliner : /skyllia invite add "; public static String messageInvitePlayerInvited = "Le joueur %s a bien été invité. En attente d'une réponse..."; - public static String messageInvitePlayerNotification = "Le joueur %player_invite% vous a invité sur son île. Pour accepter : /skyfolia invite accept %player_invite%. Pour décliner : /skyfolia invite decline %player_invite%"; + public static String messageInvitePlayerNotification = "Le joueur %player_invite% vous a invité sur son île. Pour accepter : /skyllia invite accept %player_invite%. Pour décliner : /skyllia invite decline %player_invite%"; public static String messageInviteAcceptOwnerHasNotIsland = "L'île du joueur %s n'a pas été trouvé."; public static String messageInviteDeclineOwnerHasNotIsland = "L'île du joueur %s n'a pas été trouvé."; public static String messageInviteJoinIsland = "Vous êtes dorénavant membre de l'île !"; @@ -71,21 +71,21 @@ public class LanguageToml { public static String messageAccessIslandClose = "Votre île est maintenant fermée."; public static String messageHomeIslandSuccess = "Vous avez été téléporté sur votre île."; public static String messageHomeCreateSuccess = "Vous avez modifier votre home !"; - public static String messageWarpCommandNotEnoughArgs = "Vous devez préciser le nom du warp à enregistrer : /skyfolia warp "; + public static String messageWarpCommandNotEnoughArgs = "Vous devez préciser le nom du warp à enregistrer : /skyllia warp "; public static String messageIslandNotDeleteHome = "Vous ne pouvez pas supprimer le warp home."; public static String messageWarpDeleteSuccess = "Le warp a été supprimé."; public static String messageWarpNotExist = "Le warp demandé n'existe pas."; public static String messageWarpTeleportSuccess = "Vous avez été téléporter sur le warp demandé."; - public static String messageVisitCommandNotEnoughArgs = "Vous devez le nom de l'île que vous souhaitez visiter : /skyfolia visit "; + public static String messageVisitCommandNotEnoughArgs = "Vous devez le nom de l'île que vous souhaitez visiter : /skyllia visit "; public static String messageVisitPlayerHasNotIsland = "Le joueur n'a pas d'île"; public static String messageVisitIslandIsPrivate = "L'île est fermée."; public static String messageVisitIslandSuccess = "Vous avez été téléporté sur l'île de %player%."; public static String messageExpelPlayerFailed = "Le joueur ne peut être expulser de votre île."; public static String messageExpelPlayerFailedNotInIsland = "Le joueur n'est pas sur votre île."; - public static String messageExpelCommandNotEnoughArgs = "La commande n'est pas complète : /skyfolia expel "; + public static String messageExpelCommandNotEnoughArgs = "La commande n'est pas complète : /skyllia expel "; public static String messagePlayerNotConnected = "Le joueur n'est pas connecté"; public static String messageLocationNotSafe = "La localisation n'est pas sure ! Téléportation impossible."; - public static String messagePermissionCommandNotEnoughArgs = "La commande est incomplete : /skyfolia permission "; + public static String messagePermissionCommandNotEnoughArgs = "La commande est incomplete : /skyllia permission "; public static String messagePermissionPermissionTypeInvalid = "Le type est invalide, possibilité : "; public static String messagePermissionRoleTypeInvalid = "Le role est invalide, possibilité : "; public static String messagePermissionsPermissionsValueInvalid = "Cette permission n'existe pas."; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/configuration/section/MariaDBConfig.java b/plugin/src/main/java/fr/euphyllia/skyllia/configuration/section/MariaDBConfig.java similarity index 77% rename from plugin/src/main/java/fr/euphyllia/skyfolia/configuration/section/MariaDBConfig.java rename to plugin/src/main/java/fr/euphyllia/skyllia/configuration/section/MariaDBConfig.java index 75318a1..7e3425d 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/configuration/section/MariaDBConfig.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/configuration/section/MariaDBConfig.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.configuration.section; +package fr.euphyllia.skyllia.configuration.section; public record MariaDBConfig(String hostname, String port, String user, String pass, Boolean useSSL, Integer maxPool, Integer timeOut, String database) { diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/database/DatabaseLoader.java b/plugin/src/main/java/fr/euphyllia/skyllia/database/DatabaseLoader.java similarity index 94% rename from plugin/src/main/java/fr/euphyllia/skyfolia/database/DatabaseLoader.java rename to plugin/src/main/java/fr/euphyllia/skyllia/database/DatabaseLoader.java index 7e291b6..c044402 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/database/DatabaseLoader.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/database/DatabaseLoader.java @@ -1,9 +1,9 @@ -package fr.euphyllia.skyfolia.database; +package fr.euphyllia.skyllia.database; -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.database.sgbd.MariaDB; -import fr.euphyllia.skyfolia.database.stream.AsciiStream; -import fr.euphyllia.skyfolia.database.stream.BinaryStream; +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.database.sgbd.MariaDB; +import fr.euphyllia.skyllia.database.stream.AsciiStream; +import fr.euphyllia.skyllia.database.stream.BinaryStream; import org.jetbrains.annotations.Nullable; import java.math.BigDecimal; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/database/execute/MariaDBExecute.java b/plugin/src/main/java/fr/euphyllia/skyllia/database/execute/MariaDBExecute.java similarity index 88% rename from plugin/src/main/java/fr/euphyllia/skyfolia/database/execute/MariaDBExecute.java rename to plugin/src/main/java/fr/euphyllia/skyllia/database/execute/MariaDBExecute.java index a90207d..b8f692e 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/database/execute/MariaDBExecute.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/database/execute/MariaDBExecute.java @@ -1,10 +1,10 @@ -package fr.euphyllia.skyfolia.database.execute; +package fr.euphyllia.skyllia.database.execute; -import fr.euphyllia.skyfolia.api.InterneAPI; -import fr.euphyllia.skyfolia.database.DatabaseLoader; -import fr.euphyllia.skyfolia.database.model.DBCallback; -import fr.euphyllia.skyfolia.database.model.DBCallbackInt; -import fr.euphyllia.skyfolia.database.model.DBWork; +import fr.euphyllia.skyllia.api.InterneAPI; +import fr.euphyllia.skyllia.database.DatabaseLoader; +import fr.euphyllia.skyllia.database.model.DBCallback; +import fr.euphyllia.skyllia.database.model.DBCallbackInt; +import fr.euphyllia.skyllia.database.model.DBWork; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -17,7 +17,7 @@ public class MariaDBExecute { private static final String DATABASE_NOT_FOUND_ERROR = "Cannot get connection to the database"; - private static final Logger logger = LogManager.getLogger("fr.euphyllia.skyfolia.database.execute.MariaDBExecute"); + private static final Logger logger = LogManager.getLogger("fr.euphyllia.skyllia.database.execute.MariaDBExecute"); public static void executeQuery(InterneAPI internalApi, String query) throws SQLException { executeQuery(internalApi, query, null, null, null); diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/database/model/DBCallback.java b/plugin/src/main/java/fr/euphyllia/skyllia/database/model/DBCallback.java similarity index 62% rename from plugin/src/main/java/fr/euphyllia/skyfolia/database/model/DBCallback.java rename to plugin/src/main/java/fr/euphyllia/skyllia/database/model/DBCallback.java index d5a2271..27a8375 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/database/model/DBCallback.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/database/model/DBCallback.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.database.model; +package fr.euphyllia.skyllia.database.model; public interface DBCallback { void run(java.sql.ResultSet resultSet); diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/database/model/DBCallbackInt.java b/plugin/src/main/java/fr/euphyllia/skyllia/database/model/DBCallbackInt.java similarity index 56% rename from plugin/src/main/java/fr/euphyllia/skyfolia/database/model/DBCallbackInt.java rename to plugin/src/main/java/fr/euphyllia/skyllia/database/model/DBCallbackInt.java index 370666d..39f7d55 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/database/model/DBCallbackInt.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/database/model/DBCallbackInt.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.database.model; +package fr.euphyllia.skyllia.database.model; public interface DBCallbackInt { void run(int var1); diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/database/model/DBConnect.java b/plugin/src/main/java/fr/euphyllia/skyllia/database/model/DBConnect.java similarity index 69% rename from plugin/src/main/java/fr/euphyllia/skyfolia/database/model/DBConnect.java rename to plugin/src/main/java/fr/euphyllia/skyllia/database/model/DBConnect.java index 3f4d929..a6e995a 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/database/model/DBConnect.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/database/model/DBConnect.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.database.model; +package fr.euphyllia.skyllia.database.model; public interface DBConnect { diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/database/model/DBInterface.java b/plugin/src/main/java/fr/euphyllia/skyllia/database/model/DBInterface.java similarity index 71% rename from plugin/src/main/java/fr/euphyllia/skyfolia/database/model/DBInterface.java rename to plugin/src/main/java/fr/euphyllia/skyllia/database/model/DBInterface.java index b0bd4c0..18dcef4 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/database/model/DBInterface.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/database/model/DBInterface.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.database.model; +package fr.euphyllia.skyllia.database.model; public interface DBInterface { @org.jetbrains.annotations.Nullable diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/database/model/DBWork.java b/plugin/src/main/java/fr/euphyllia/skyllia/database/model/DBWork.java similarity index 61% rename from plugin/src/main/java/fr/euphyllia/skyfolia/database/model/DBWork.java rename to plugin/src/main/java/fr/euphyllia/skyllia/database/model/DBWork.java index 34b59b1..b51a218 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/database/model/DBWork.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/database/model/DBWork.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.database.model; +package fr.euphyllia.skyllia.database.model; public interface DBWork { void run(java.sql.Connection connection); diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/database/query/MariaDBCreateTable.java b/plugin/src/main/java/fr/euphyllia/skyllia/database/query/MariaDBCreateTable.java similarity index 93% rename from plugin/src/main/java/fr/euphyllia/skyfolia/database/query/MariaDBCreateTable.java rename to plugin/src/main/java/fr/euphyllia/skyllia/database/query/MariaDBCreateTable.java index 123e623..0f8dd89 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/database/query/MariaDBCreateTable.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/database/query/MariaDBCreateTable.java @@ -1,12 +1,12 @@ -package fr.euphyllia.skyfolia.database.query; +package fr.euphyllia.skyllia.database.query; -import fr.euphyllia.skyfolia.api.InterneAPI; -import fr.euphyllia.skyfolia.api.exceptions.DatabaseException; -import fr.euphyllia.skyfolia.api.skyblock.model.Position; -import fr.euphyllia.skyfolia.configuration.ConfigToml; -import fr.euphyllia.skyfolia.configuration.section.MariaDBConfig; -import fr.euphyllia.skyfolia.database.execute.MariaDBExecute; -import fr.euphyllia.skyfolia.utils.RegionUtils; +import fr.euphyllia.skyllia.api.InterneAPI; +import fr.euphyllia.skyllia.api.exceptions.DatabaseException; +import fr.euphyllia.skyllia.api.skyblock.model.Position; +import fr.euphyllia.skyllia.configuration.ConfigToml; +import fr.euphyllia.skyllia.configuration.section.MariaDBConfig; +import fr.euphyllia.skyllia.database.execute.MariaDBExecute; +import fr.euphyllia.skyllia.utils.RegionUtils; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/database/query/MariaDBTransactionQuery.java b/plugin/src/main/java/fr/euphyllia/skyllia/database/query/MariaDBTransactionQuery.java similarity index 81% rename from plugin/src/main/java/fr/euphyllia/skyfolia/database/query/MariaDBTransactionQuery.java rename to plugin/src/main/java/fr/euphyllia/skyllia/database/query/MariaDBTransactionQuery.java index e313031..38695a1 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/database/query/MariaDBTransactionQuery.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/database/query/MariaDBTransactionQuery.java @@ -1,6 +1,6 @@ -package fr.euphyllia.skyfolia.database.query; +package fr.euphyllia.skyllia.database.query; -import fr.euphyllia.skyfolia.configuration.ConfigToml; +import fr.euphyllia.skyllia.configuration.ConfigToml; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/database/query/exec/IslandDataQuery.java b/plugin/src/main/java/fr/euphyllia/skyllia/database/query/exec/IslandDataQuery.java similarity index 91% rename from plugin/src/main/java/fr/euphyllia/skyfolia/database/query/exec/IslandDataQuery.java rename to plugin/src/main/java/fr/euphyllia/skyllia/database/query/exec/IslandDataQuery.java index 9e4aa2a..31ce614 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/database/query/exec/IslandDataQuery.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/database/query/exec/IslandDataQuery.java @@ -1,13 +1,13 @@ -package fr.euphyllia.skyfolia.database.query.exec; +package fr.euphyllia.skyllia.database.query.exec; -import fr.euphyllia.skyfolia.api.InterneAPI; -import fr.euphyllia.skyfolia.api.event.SkyblockLoadEvent; -import fr.euphyllia.skyfolia.api.exceptions.MaxIslandSizeExceedException; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.model.Position; -import fr.euphyllia.skyfolia.database.execute.MariaDBExecute; -import fr.euphyllia.skyfolia.managers.skyblock.IslandHook; -import fr.euphyllia.skyfolia.utils.IslandUtils; +import fr.euphyllia.skyllia.api.InterneAPI; +import fr.euphyllia.skyllia.api.event.SkyblockLoadEvent; +import fr.euphyllia.skyllia.api.exceptions.MaxIslandSizeExceedException; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.model.Position; +import fr.euphyllia.skyllia.database.execute.MariaDBExecute; +import fr.euphyllia.skyllia.managers.skyblock.IslandHook; +import fr.euphyllia.skyllia.utils.IslandUtils; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/database/query/exec/IslandMemberQuery.java b/plugin/src/main/java/fr/euphyllia/skyllia/database/query/exec/IslandMemberQuery.java similarity index 96% rename from plugin/src/main/java/fr/euphyllia/skyfolia/database/query/exec/IslandMemberQuery.java rename to plugin/src/main/java/fr/euphyllia/skyllia/database/query/exec/IslandMemberQuery.java index eb22678..e9ae0a8 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/database/query/exec/IslandMemberQuery.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/database/query/exec/IslandMemberQuery.java @@ -1,10 +1,10 @@ -package fr.euphyllia.skyfolia.database.query.exec; +package fr.euphyllia.skyllia.database.query.exec; -import fr.euphyllia.skyfolia.api.InterneAPI; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.Players; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.database.execute.MariaDBExecute; +import fr.euphyllia.skyllia.api.InterneAPI; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Players; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.database.execute.MariaDBExecute; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/database/query/exec/IslandPermissionQuery.java b/plugin/src/main/java/fr/euphyllia/skyllia/database/query/exec/IslandPermissionQuery.java similarity index 88% rename from plugin/src/main/java/fr/euphyllia/skyfolia/database/query/exec/IslandPermissionQuery.java rename to plugin/src/main/java/fr/euphyllia/skyllia/database/query/exec/IslandPermissionQuery.java index 1a3e040..3cf7940 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/database/query/exec/IslandPermissionQuery.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/database/query/exec/IslandPermissionQuery.java @@ -1,11 +1,11 @@ -package fr.euphyllia.skyfolia.database.query.exec; +package fr.euphyllia.skyllia.database.query.exec; -import fr.euphyllia.skyfolia.api.InterneAPI; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.model.PermissionRoleIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsType; -import fr.euphyllia.skyfolia.database.execute.MariaDBExecute; +import fr.euphyllia.skyllia.api.InterneAPI; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.model.PermissionRoleIsland; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsType; +import fr.euphyllia.skyllia.database.execute.MariaDBExecute; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/database/query/exec/IslandQuery.java b/plugin/src/main/java/fr/euphyllia/skyllia/database/query/exec/IslandQuery.java similarity index 94% rename from plugin/src/main/java/fr/euphyllia/skyfolia/database/query/exec/IslandQuery.java rename to plugin/src/main/java/fr/euphyllia/skyllia/database/query/exec/IslandQuery.java index 54f4c45..54ba40f 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/database/query/exec/IslandQuery.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/database/query/exec/IslandQuery.java @@ -1,6 +1,6 @@ -package fr.euphyllia.skyfolia.database.query.exec; +package fr.euphyllia.skyllia.database.query.exec; -import fr.euphyllia.skyfolia.api.InterneAPI; +import fr.euphyllia.skyllia.api.InterneAPI; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/database/query/exec/IslandUpdateQuery.java b/plugin/src/main/java/fr/euphyllia/skyllia/database/query/exec/IslandUpdateQuery.java similarity index 94% rename from plugin/src/main/java/fr/euphyllia/skyfolia/database/query/exec/IslandUpdateQuery.java rename to plugin/src/main/java/fr/euphyllia/skyllia/database/query/exec/IslandUpdateQuery.java index 96d40d6..38f9ad0 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/database/query/exec/IslandUpdateQuery.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/database/query/exec/IslandUpdateQuery.java @@ -1,8 +1,8 @@ -package fr.euphyllia.skyfolia.database.query.exec; +package fr.euphyllia.skyllia.database.query.exec; -import fr.euphyllia.skyfolia.api.InterneAPI; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.database.execute.MariaDBExecute; +import fr.euphyllia.skyllia.api.InterneAPI; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.database.execute.MariaDBExecute; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/database/query/exec/IslandWarpQuery.java b/plugin/src/main/java/fr/euphyllia/skyllia/database/query/exec/IslandWarpQuery.java similarity index 96% rename from plugin/src/main/java/fr/euphyllia/skyfolia/database/query/exec/IslandWarpQuery.java rename to plugin/src/main/java/fr/euphyllia/skyllia/database/query/exec/IslandWarpQuery.java index b8afa6c..482e746 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/database/query/exec/IslandWarpQuery.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/database/query/exec/IslandWarpQuery.java @@ -1,9 +1,9 @@ -package fr.euphyllia.skyfolia.database.query.exec; +package fr.euphyllia.skyllia.database.query.exec; -import fr.euphyllia.skyfolia.api.InterneAPI; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.model.WarpIsland; -import fr.euphyllia.skyfolia.database.execute.MariaDBExecute; +import fr.euphyllia.skyllia.api.InterneAPI; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.model.WarpIsland; +import fr.euphyllia.skyllia.database.execute.MariaDBExecute; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/database/sgbd/MariaDB.java b/plugin/src/main/java/fr/euphyllia/skyllia/database/sgbd/MariaDB.java similarity index 86% rename from plugin/src/main/java/fr/euphyllia/skyfolia/database/sgbd/MariaDB.java rename to plugin/src/main/java/fr/euphyllia/skyllia/database/sgbd/MariaDB.java index d606593..6634542 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/database/sgbd/MariaDB.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/database/sgbd/MariaDB.java @@ -1,9 +1,9 @@ -package fr.euphyllia.skyfolia.database.sgbd; +package fr.euphyllia.skyllia.database.sgbd; import com.zaxxer.hikari.HikariDataSource; -import fr.euphyllia.skyfolia.configuration.section.MariaDBConfig; -import fr.euphyllia.skyfolia.database.model.DBConnect; -import fr.euphyllia.skyfolia.database.model.DBInterface; +import fr.euphyllia.skyllia.configuration.section.MariaDBConfig; +import fr.euphyllia.skyllia.database.model.DBConnect; +import fr.euphyllia.skyllia.database.model.DBInterface; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -20,7 +20,7 @@ public class MariaDB implements DBConnect, DBInterface { private boolean connected = false; public MariaDB(final MariaDBConfig configMariaDB) { - this.logger = LogManager.getLogger("fr.euphyllia.skyfolia.database.sgbd.MariaDB"); + this.logger = LogManager.getLogger("fr.euphyllia.skyllia.database.sgbd.MariaDB"); this.mariaDBConfig = configMariaDB; this.connected = false; } diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/database/stream/AsciiStream.java b/plugin/src/main/java/fr/euphyllia/skyllia/database/stream/AsciiStream.java similarity index 58% rename from plugin/src/main/java/fr/euphyllia/skyfolia/database/stream/AsciiStream.java rename to plugin/src/main/java/fr/euphyllia/skyllia/database/stream/AsciiStream.java index fbbf8a8..bc4eb2c 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/database/stream/AsciiStream.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/database/stream/AsciiStream.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.database.stream; +package fr.euphyllia.skyllia.database.stream; public record AsciiStream(java.io.InputStream x, int length) { } \ No newline at end of file diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/database/stream/BinaryStream.java b/plugin/src/main/java/fr/euphyllia/skyllia/database/stream/BinaryStream.java similarity index 58% rename from plugin/src/main/java/fr/euphyllia/skyfolia/database/stream/BinaryStream.java rename to plugin/src/main/java/fr/euphyllia/skyllia/database/stream/BinaryStream.java index f8d88bb..fec9059 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/database/stream/BinaryStream.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/database/stream/BinaryStream.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.database.stream; +package fr.euphyllia.skyllia.database.stream; public record BinaryStream(java.io.InputStream x, int length) { } \ No newline at end of file diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/listeners/ListenersUtils.java b/plugin/src/main/java/fr/euphyllia/skyllia/listeners/ListenersUtils.java similarity index 66% rename from plugin/src/main/java/fr/euphyllia/skyfolia/listeners/ListenersUtils.java rename to plugin/src/main/java/fr/euphyllia/skyllia/listeners/ListenersUtils.java index e0fd9b4..93048dc 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/listeners/ListenersUtils.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/listeners/ListenersUtils.java @@ -1,17 +1,17 @@ -package fr.euphyllia.skyfolia.listeners; +package fr.euphyllia.skyllia.listeners; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.Players; -import fr.euphyllia.skyfolia.api.skyblock.model.PermissionRoleIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.Position; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.Permissions; -import fr.euphyllia.skyfolia.cache.PermissionRoleInIslandCache; -import fr.euphyllia.skyfolia.cache.PlayersInIslandCache; -import fr.euphyllia.skyfolia.cache.PositionIslandCache; -import fr.euphyllia.skyfolia.managers.skyblock.PermissionManager; -import fr.euphyllia.skyfolia.utils.RegionUtils; -import fr.euphyllia.skyfolia.utils.WorldUtils; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Players; +import fr.euphyllia.skyllia.api.skyblock.model.PermissionRoleIsland; +import fr.euphyllia.skyllia.api.skyblock.model.Position; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.Permissions; +import fr.euphyllia.skyllia.cache.PermissionRoleInIslandCache; +import fr.euphyllia.skyllia.cache.PlayersInIslandCache; +import fr.euphyllia.skyllia.cache.PositionIslandCache; +import fr.euphyllia.skyllia.managers.skyblock.PermissionManager; +import fr.euphyllia.skyllia.utils.RegionUtils; +import fr.euphyllia.skyllia.utils.WorldUtils; import org.bukkit.Chunk; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/listeners/bukkitevents/BlockEvent.java b/plugin/src/main/java/fr/euphyllia/skyllia/listeners/bukkitevents/BlockEvent.java similarity index 82% rename from plugin/src/main/java/fr/euphyllia/skyfolia/listeners/bukkitevents/BlockEvent.java rename to plugin/src/main/java/fr/euphyllia/skyllia/listeners/bukkitevents/BlockEvent.java index 400c867..9f85aa3 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/listeners/bukkitevents/BlockEvent.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/listeners/bukkitevents/BlockEvent.java @@ -1,8 +1,8 @@ -package fr.euphyllia.skyfolia.listeners.bukkitevents; +package fr.euphyllia.skyllia.listeners.bukkitevents; -import fr.euphyllia.skyfolia.api.InterneAPI; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsIsland; -import fr.euphyllia.skyfolia.listeners.ListenersUtils; +import fr.euphyllia.skyllia.api.InterneAPI; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsIsland; +import fr.euphyllia.skyllia.listeners.ListenersUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.bukkit.event.EventHandler; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/listeners/bukkitevents/InventoryEvent.java b/plugin/src/main/java/fr/euphyllia/skyllia/listeners/bukkitevents/InventoryEvent.java similarity index 95% rename from plugin/src/main/java/fr/euphyllia/skyfolia/listeners/bukkitevents/InventoryEvent.java rename to plugin/src/main/java/fr/euphyllia/skyllia/listeners/bukkitevents/InventoryEvent.java index 19443e3..0eee7ee 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/listeners/bukkitevents/InventoryEvent.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/listeners/bukkitevents/InventoryEvent.java @@ -1,8 +1,8 @@ -package fr.euphyllia.skyfolia.listeners.bukkitevents; +package fr.euphyllia.skyllia.listeners.bukkitevents; -import fr.euphyllia.skyfolia.api.InterneAPI; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsInventory; -import fr.euphyllia.skyfolia.listeners.ListenersUtils; +import fr.euphyllia.skyllia.api.InterneAPI; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsInventory; +import fr.euphyllia.skyllia.listeners.ListenersUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.bukkit.entity.Player; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/listeners/bukkitevents/JoinEvent.java b/plugin/src/main/java/fr/euphyllia/skyllia/listeners/bukkitevents/JoinEvent.java similarity index 87% rename from plugin/src/main/java/fr/euphyllia/skyfolia/listeners/bukkitevents/JoinEvent.java rename to plugin/src/main/java/fr/euphyllia/skyllia/listeners/bukkitevents/JoinEvent.java index b42540a..845688a 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/listeners/bukkitevents/JoinEvent.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/listeners/bukkitevents/JoinEvent.java @@ -1,13 +1,13 @@ -package fr.euphyllia.skyfolia.listeners.bukkitevents; +package fr.euphyllia.skyllia.listeners.bukkitevents; -import fr.euphyllia.skyfolia.api.InterneAPI; -import fr.euphyllia.skyfolia.api.exceptions.UnsupportedMinecraftVersionException; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.configuration.ConfigToml; -import fr.euphyllia.skyfolia.managers.skyblock.SkyblockManager; -import fr.euphyllia.skyfolia.utils.PlayerUtils; -import fr.euphyllia.skyfolia.utils.RegionUtils; -import fr.euphyllia.skyfolia.utils.WorldUtils; +import fr.euphyllia.skyllia.api.InterneAPI; +import fr.euphyllia.skyllia.api.exceptions.UnsupportedMinecraftVersionException; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.configuration.ConfigToml; +import fr.euphyllia.skyllia.managers.skyblock.SkyblockManager; +import fr.euphyllia.skyllia.utils.PlayerUtils; +import fr.euphyllia.skyllia.utils.RegionUtils; +import fr.euphyllia.skyllia.utils.WorldUtils; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/listeners/bukkitevents/PlayerEvent.java b/plugin/src/main/java/fr/euphyllia/skyllia/listeners/bukkitevents/PlayerEvent.java similarity index 89% rename from plugin/src/main/java/fr/euphyllia/skyfolia/listeners/bukkitevents/PlayerEvent.java rename to plugin/src/main/java/fr/euphyllia/skyllia/listeners/bukkitevents/PlayerEvent.java index ddb1aef..d07b336 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/listeners/bukkitevents/PlayerEvent.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/listeners/bukkitevents/PlayerEvent.java @@ -1,8 +1,8 @@ -package fr.euphyllia.skyfolia.listeners.bukkitevents; +package fr.euphyllia.skyllia.listeners.bukkitevents; -import fr.euphyllia.skyfolia.api.InterneAPI; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsIsland; -import fr.euphyllia.skyfolia.listeners.ListenersUtils; +import fr.euphyllia.skyllia.api.InterneAPI; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsIsland; +import fr.euphyllia.skyllia.listeners.ListenersUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.bukkit.entity.Player; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/listeners/bukkitevents/PortailAlternativeFoliaEvent.java b/plugin/src/main/java/fr/euphyllia/skyllia/listeners/bukkitevents/PortailAlternativeFoliaEvent.java similarity index 92% rename from plugin/src/main/java/fr/euphyllia/skyfolia/listeners/bukkitevents/PortailAlternativeFoliaEvent.java rename to plugin/src/main/java/fr/euphyllia/skyllia/listeners/bukkitevents/PortailAlternativeFoliaEvent.java index d4b896a..9444544 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/listeners/bukkitevents/PortailAlternativeFoliaEvent.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/listeners/bukkitevents/PortailAlternativeFoliaEvent.java @@ -1,9 +1,9 @@ -package fr.euphyllia.skyfolia.listeners.bukkitevents; +package fr.euphyllia.skyllia.listeners.bukkitevents; -import fr.euphyllia.skyfolia.api.InterneAPI; -import fr.euphyllia.skyfolia.api.configuration.WorldConfig; -import fr.euphyllia.skyfolia.api.event.PlayerPrepareChangeWorldSkyblockEvent; -import fr.euphyllia.skyfolia.utils.WorldUtils; +import fr.euphyllia.skyllia.api.InterneAPI; +import fr.euphyllia.skyllia.api.configuration.WorldConfig; +import fr.euphyllia.skyllia.api.event.PlayerPrepareChangeWorldSkyblockEvent; +import fr.euphyllia.skyllia.utils.WorldUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.bukkit.Bukkit; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/listeners/skyblockevents/SkyblockEvent.java b/plugin/src/main/java/fr/euphyllia/skyllia/listeners/skyblockevents/SkyblockEvent.java similarity index 88% rename from plugin/src/main/java/fr/euphyllia/skyfolia/listeners/skyblockevents/SkyblockEvent.java rename to plugin/src/main/java/fr/euphyllia/skyllia/listeners/skyblockevents/SkyblockEvent.java index 0253a99..294d745 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/listeners/skyblockevents/SkyblockEvent.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/listeners/skyblockevents/SkyblockEvent.java @@ -1,13 +1,13 @@ -package fr.euphyllia.skyfolia.listeners.skyblockevents; +package fr.euphyllia.skyllia.listeners.skyblockevents; -import fr.euphyllia.skyfolia.api.InterneAPI; -import fr.euphyllia.skyfolia.api.configuration.WorldConfig; -import fr.euphyllia.skyfolia.api.event.*; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsIsland; -import fr.euphyllia.skyfolia.configuration.LanguageToml; -import fr.euphyllia.skyfolia.listeners.ListenersUtils; -import fr.euphyllia.skyfolia.utils.WorldUtils; +import fr.euphyllia.skyllia.api.InterneAPI; +import fr.euphyllia.skyllia.api.configuration.WorldConfig; +import fr.euphyllia.skyllia.api.event.*; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsIsland; +import fr.euphyllia.skyllia.configuration.LanguageToml; +import fr.euphyllia.skyllia.listeners.ListenersUtils; +import fr.euphyllia.skyllia.utils.WorldUtils; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/managers/Managers.java b/plugin/src/main/java/fr/euphyllia/skyllia/managers/Managers.java similarity index 76% rename from plugin/src/main/java/fr/euphyllia/skyfolia/managers/Managers.java rename to plugin/src/main/java/fr/euphyllia/skyllia/managers/Managers.java index 2caf606..edc0ab7 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/managers/Managers.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/managers/Managers.java @@ -1,7 +1,7 @@ -package fr.euphyllia.skyfolia.managers; +package fr.euphyllia.skyllia.managers; -import fr.euphyllia.skyfolia.api.InterneAPI; -import fr.euphyllia.skyfolia.managers.world.WorldsManager; +import fr.euphyllia.skyllia.api.InterneAPI; +import fr.euphyllia.skyllia.managers.world.WorldsManager; import org.bukkit.Bukkit; public class Managers { diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/managers/skyblock/IslandHook.java b/plugin/src/main/java/fr/euphyllia/skyllia/managers/skyblock/IslandHook.java similarity index 86% rename from plugin/src/main/java/fr/euphyllia/skyfolia/managers/skyblock/IslandHook.java rename to plugin/src/main/java/fr/euphyllia/skyllia/managers/skyblock/IslandHook.java index 5bf0d9f..a55f8a0 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/managers/skyblock/IslandHook.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/managers/skyblock/IslandHook.java @@ -1,18 +1,18 @@ -package fr.euphyllia.skyfolia.managers.skyblock; - -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.event.SkyblockChangeAccessEvent; -import fr.euphyllia.skyfolia.api.event.SkyblockCreateWarpEvent; -import fr.euphyllia.skyfolia.api.event.SkyblockDeleteEvent; -import fr.euphyllia.skyfolia.api.event.SkyblockDeleteWarpEvent; -import fr.euphyllia.skyfolia.api.exceptions.MaxIslandSizeExceedException; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.Players; -import fr.euphyllia.skyfolia.api.skyblock.model.IslandType; -import fr.euphyllia.skyfolia.api.skyblock.model.Position; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.api.skyblock.model.WarpIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsType; +package fr.euphyllia.skyllia.managers.skyblock; + +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.event.SkyblockChangeAccessEvent; +import fr.euphyllia.skyllia.api.event.SkyblockCreateWarpEvent; +import fr.euphyllia.skyllia.api.event.SkyblockDeleteEvent; +import fr.euphyllia.skyllia.api.event.SkyblockDeleteWarpEvent; +import fr.euphyllia.skyllia.api.exceptions.MaxIslandSizeExceedException; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Players; +import fr.euphyllia.skyllia.api.skyblock.model.IslandType; +import fr.euphyllia.skyllia.api.skyblock.model.Position; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.api.skyblock.model.WarpIsland; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsType; import org.bukkit.Bukkit; import org.bukkit.Location; import org.jetbrains.annotations.Nullable; @@ -32,7 +32,7 @@ public class IslandHook extends Island { private double size; /** - * @param main Plugin Skyfolia + * @param main Plugin skyllia * @param islandType Type Island (config.toml) * @param islandId Island ID * @param ownerId Owner Island @@ -71,7 +71,7 @@ public double getSize() { @Override public void setSize(double rayon) throws MaxIslandSizeExceedException { if (rayon >= 511) { - throw new MaxIslandSizeExceedException("The size of the island exceeds the permitted limit! Must be between 2 and 511."); // Fix https://github.com/Euphillya/SkyFolia/issues/9 + throw new MaxIslandSizeExceedException("The size of the island exceeds the permitted limit! Must be between 2 and 511."); // Fix https://github.com/Euphillya/skyllia/issues/9 } this.size = rayon; } diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/managers/skyblock/PermissionManager.java b/plugin/src/main/java/fr/euphyllia/skyllia/managers/skyblock/PermissionManager.java similarity index 73% rename from plugin/src/main/java/fr/euphyllia/skyfolia/managers/skyblock/PermissionManager.java rename to plugin/src/main/java/fr/euphyllia/skyllia/managers/skyblock/PermissionManager.java index c548f58..ad50855 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/managers/skyblock/PermissionManager.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/managers/skyblock/PermissionManager.java @@ -1,8 +1,8 @@ -package fr.euphyllia.skyfolia.managers.skyblock; +package fr.euphyllia.skyllia.managers.skyblock; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.Permissions; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsIsland; -import fr.euphyllia.skyfolia.api.utils.BitwiseFlag; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.Permissions; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsIsland; +import fr.euphyllia.skyllia.api.utils.BitwiseFlag; public class PermissionManager extends BitwiseFlag { diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/managers/skyblock/SkyblockManager.java b/plugin/src/main/java/fr/euphyllia/skyllia/managers/skyblock/SkyblockManager.java similarity index 91% rename from plugin/src/main/java/fr/euphyllia/skyfolia/managers/skyblock/SkyblockManager.java rename to plugin/src/main/java/fr/euphyllia/skyllia/managers/skyblock/SkyblockManager.java index 67030f9..a07322e 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/managers/skyblock/SkyblockManager.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/managers/skyblock/SkyblockManager.java @@ -1,14 +1,14 @@ -package fr.euphyllia.skyfolia.managers.skyblock; - -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.event.SkyblockCreateEvent; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.Players; -import fr.euphyllia.skyfolia.api.skyblock.model.IslandType; -import fr.euphyllia.skyfolia.api.skyblock.model.PermissionRoleIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.RoleType; -import fr.euphyllia.skyfolia.api.skyblock.model.WarpIsland; -import fr.euphyllia.skyfolia.api.skyblock.model.permissions.PermissionsType; +package fr.euphyllia.skyllia.managers.skyblock; + +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.event.SkyblockCreateEvent; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.Players; +import fr.euphyllia.skyllia.api.skyblock.model.IslandType; +import fr.euphyllia.skyllia.api.skyblock.model.PermissionRoleIsland; +import fr.euphyllia.skyllia.api.skyblock.model.RoleType; +import fr.euphyllia.skyllia.api.skyblock.model.WarpIsland; +import fr.euphyllia.skyllia.api.skyblock.model.permissions.PermissionsType; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/managers/world/WorldsManager.java b/plugin/src/main/java/fr/euphyllia/skyllia/managers/world/WorldsManager.java similarity index 77% rename from plugin/src/main/java/fr/euphyllia/skyfolia/managers/world/WorldsManager.java rename to plugin/src/main/java/fr/euphyllia/skyllia/managers/world/WorldsManager.java index f959831..8f0fc49 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/managers/world/WorldsManager.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/managers/world/WorldsManager.java @@ -1,12 +1,12 @@ -package fr.euphyllia.skyfolia.managers.world; +package fr.euphyllia.skyllia.managers.world; -import fr.euphyllia.skyfolia.api.InterneAPI; -import fr.euphyllia.skyfolia.api.configuration.WorldConfig; -import fr.euphyllia.skyfolia.api.exceptions.UnsupportedMinecraftVersionException; -import fr.euphyllia.skyfolia.api.world.WorldFeedback; -import fr.euphyllia.skyfolia.configuration.ConfigToml; -import fr.euphyllia.skyfolia.utils.WorldUtils; -import fr.euphyllia.skyfolia.utils.generators.VoidWorldGen; +import fr.euphyllia.skyllia.api.InterneAPI; +import fr.euphyllia.skyllia.api.configuration.WorldConfig; +import fr.euphyllia.skyllia.api.exceptions.UnsupportedMinecraftVersionException; +import fr.euphyllia.skyllia.api.world.WorldFeedback; +import fr.euphyllia.skyllia.configuration.ConfigToml; +import fr.euphyllia.skyllia.utils.WorldUtils; +import fr.euphyllia.skyllia.utils.generators.VoidWorldGen; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -23,7 +23,7 @@ public class WorldsManager { public WorldsManager(InterneAPI interneAPI) { this.api = interneAPI; - this.logger = LogManager.getLogger("fr.euphyllia.skyfolia.managers.world.WorldsManager"); + this.logger = LogManager.getLogger("fr.euphyllia.skyllia.managers.world.WorldsManager"); } public void initWorld() { diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/utils/IslandUtils.java b/plugin/src/main/java/fr/euphyllia/skyllia/utils/IslandUtils.java similarity index 80% rename from plugin/src/main/java/fr/euphyllia/skyfolia/utils/IslandUtils.java rename to plugin/src/main/java/fr/euphyllia/skyllia/utils/IslandUtils.java index a49e61c..93555fb 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/utils/IslandUtils.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/utils/IslandUtils.java @@ -1,8 +1,8 @@ -package fr.euphyllia.skyfolia.utils; +package fr.euphyllia.skyllia.utils; -import fr.euphyllia.skyfolia.api.skyblock.model.IslandType; -import fr.euphyllia.skyfolia.api.skyblock.model.SchematicWorld; -import fr.euphyllia.skyfolia.configuration.ConfigToml; +import fr.euphyllia.skyllia.api.skyblock.model.IslandType; +import fr.euphyllia.skyllia.api.skyblock.model.SchematicWorld; +import fr.euphyllia.skyllia.configuration.ConfigToml; import org.jetbrains.annotations.Nullable; public class IslandUtils { diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/utils/PlayerUtils.java b/plugin/src/main/java/fr/euphyllia/skyllia/utils/PlayerUtils.java similarity index 70% rename from plugin/src/main/java/fr/euphyllia/skyfolia/utils/PlayerUtils.java rename to plugin/src/main/java/fr/euphyllia/skyllia/utils/PlayerUtils.java index ceb858d..f04ec6b 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/utils/PlayerUtils.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/utils/PlayerUtils.java @@ -1,9 +1,10 @@ -package fr.euphyllia.skyfolia.utils; +package fr.euphyllia.skyllia.utils; import com.earth2me.essentials.Essentials; import com.earth2me.essentials.spawn.EssentialsSpawn; -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.exceptions.UnsupportedMinecraftVersionException; +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.exceptions.UnsupportedMinecraftVersionException; +import fr.euphyllia.skyllia.utils.nms.v1_19_R3.PlayerNMS; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; @@ -34,11 +35,11 @@ public static void updateChunk(Main main, Player player, int chunkX, int chunkZ) final String versionMC = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3]; switch (versionMC) { case "v1_19_R3" -> - fr.euphyllia.skyfolia.utils.nms.v1_19_R3.PlayerNMS.refreshPlayerChunk(main, player, chunkX, chunkZ); + PlayerNMS.refreshPlayerChunk(main, player, chunkX, chunkZ); case "v1_20_R1" -> - fr.euphyllia.skyfolia.utils.nms.v1_20_R1.PlayerNMS.refreshPlayerChunk(main, player, chunkX, chunkZ); + fr.euphyllia.skyllia.utils.nms.v1_20_R1.PlayerNMS.refreshPlayerChunk(main, player, chunkX, chunkZ); case "v1_20_R2" -> - fr.euphyllia.skyfolia.utils.nms.v1_20_R2.PlayerNMS.refreshPlayerChunk(main, player, chunkX, chunkZ); + fr.euphyllia.skyllia.utils.nms.v1_20_R2.PlayerNMS.refreshPlayerChunk(main, player, chunkX, chunkZ); default -> throw new UnsupportedMinecraftVersionException("Version %s not supported !".formatted(versionMC)); } @@ -48,11 +49,11 @@ public static void setOwnWorldBorder(Main main, Player player, @NotNull Location final String versionMC = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3]; switch (versionMC) { case "v1_19_R3" -> - fr.euphyllia.skyfolia.utils.nms.v1_19_R3.PlayerNMS.setOwnWorldBorder(main, player, centerBorder, colorBorder, borderSize, warningBlocks, warningTime); + PlayerNMS.setOwnWorldBorder(main, player, centerBorder, colorBorder, borderSize, warningBlocks, warningTime); case "v1_20_R1" -> - fr.euphyllia.skyfolia.utils.nms.v1_20_R1.PlayerNMS.setOwnWorldBorder(main, player, centerBorder, colorBorder, borderSize, warningBlocks, warningTime); + fr.euphyllia.skyllia.utils.nms.v1_20_R1.PlayerNMS.setOwnWorldBorder(main, player, centerBorder, colorBorder, borderSize, warningBlocks, warningTime); case "v1_20_R2" -> - fr.euphyllia.skyfolia.utils.nms.v1_20_R2.PlayerNMS.setOwnWorldBorder(main, player, centerBorder, colorBorder, borderSize, warningBlocks, warningTime); + fr.euphyllia.skyllia.utils.nms.v1_20_R2.PlayerNMS.setOwnWorldBorder(main, player, centerBorder, colorBorder, borderSize, warningBlocks, warningTime); default -> throw new UnsupportedMinecraftVersionException("Version %s not supported !".formatted(versionMC)); } diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/utils/RegionUtils.java b/plugin/src/main/java/fr/euphyllia/skyllia/utils/RegionUtils.java similarity index 95% rename from plugin/src/main/java/fr/euphyllia/skyfolia/utils/RegionUtils.java rename to plugin/src/main/java/fr/euphyllia/skyllia/utils/RegionUtils.java index 816a419..08cf54b 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/utils/RegionUtils.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/utils/RegionUtils.java @@ -1,9 +1,9 @@ -package fr.euphyllia.skyfolia.utils; +package fr.euphyllia.skyllia.utils; -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.skyblock.model.Position; -import fr.euphyllia.skyfolia.utils.models.CallbackEntity; -import fr.euphyllia.skyfolia.utils.models.CallbackLocation; +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.skyblock.model.Position; +import fr.euphyllia.skyllia.utils.models.CallbackEntity; +import fr.euphyllia.skyllia.utils.models.CallbackLocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.bukkit.Bukkit; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/utils/WorldEditUtils.java b/plugin/src/main/java/fr/euphyllia/skyllia/utils/WorldEditUtils.java similarity index 97% rename from plugin/src/main/java/fr/euphyllia/skyfolia/utils/WorldEditUtils.java rename to plugin/src/main/java/fr/euphyllia/skyllia/utils/WorldEditUtils.java index fc0028b..c4db3c3 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/utils/WorldEditUtils.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/utils/WorldEditUtils.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.utils; +package fr.euphyllia.skyllia.utils; import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.MaxChangedBlocksException; @@ -17,11 +17,11 @@ import com.sk89q.worldedit.util.SideEffectSet; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.block.BlockState; -import fr.euphyllia.skyfolia.Main; -import fr.euphyllia.skyfolia.api.InterneAPI; -import fr.euphyllia.skyfolia.api.skyblock.Island; -import fr.euphyllia.skyfolia.api.skyblock.model.Position; -import fr.euphyllia.skyfolia.api.skyblock.model.SchematicWorld; +import fr.euphyllia.skyllia.Main; +import fr.euphyllia.skyllia.api.InterneAPI; +import fr.euphyllia.skyllia.api.skyblock.Island; +import fr.euphyllia.skyllia.api.skyblock.model.Position; +import fr.euphyllia.skyllia.api.skyblock.model.SchematicWorld; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/utils/WorldUtils.java b/plugin/src/main/java/fr/euphyllia/skyllia/utils/WorldUtils.java similarity index 79% rename from plugin/src/main/java/fr/euphyllia/skyfolia/utils/WorldUtils.java rename to plugin/src/main/java/fr/euphyllia/skyllia/utils/WorldUtils.java index 78b6333..10398bc 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/utils/WorldUtils.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/utils/WorldUtils.java @@ -1,9 +1,10 @@ -package fr.euphyllia.skyfolia.utils; +package fr.euphyllia.skyllia.utils; -import fr.euphyllia.skyfolia.api.configuration.WorldConfig; -import fr.euphyllia.skyfolia.api.exceptions.UnsupportedMinecraftVersionException; -import fr.euphyllia.skyfolia.api.world.WorldFeedback; -import fr.euphyllia.skyfolia.configuration.ConfigToml; +import fr.euphyllia.skyllia.api.configuration.WorldConfig; +import fr.euphyllia.skyllia.api.exceptions.UnsupportedMinecraftVersionException; +import fr.euphyllia.skyllia.api.world.WorldFeedback; +import fr.euphyllia.skyllia.configuration.ConfigToml; +import fr.euphyllia.skyllia.utils.nms.v1_19_R3.WorldNMS; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.bukkit.Bukkit; @@ -25,9 +26,9 @@ public final class WorldUtils { public static WorldFeedback.FeedbackWorld addWorld(WorldCreator creator) throws UnsupportedMinecraftVersionException { final String versionMC = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3]; return switch (versionMC) { - case "v1_19_R3" -> fr.euphyllia.skyfolia.utils.nms.v1_19_R3.WorldNMS.createWorld(creator); - case "v1_20_R1" -> fr.euphyllia.skyfolia.utils.nms.v1_20_R1.WorldNMS.createWorld(creator); - case "v1_20_R2" -> fr.euphyllia.skyfolia.utils.nms.v1_20_R2.WorldNMS.createWorld(creator); + case "v1_19_R3" -> WorldNMS.createWorld(creator); + case "v1_20_R1" -> fr.euphyllia.skyllia.utils.nms.v1_20_R1.WorldNMS.createWorld(creator); + case "v1_20_R2" -> fr.euphyllia.skyllia.utils.nms.v1_20_R2.WorldNMS.createWorld(creator); default -> throw new UnsupportedMinecraftVersionException("Version %s not supported !".formatted(versionMC)); }; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/utils/generators/VoidWorldGen.java b/plugin/src/main/java/fr/euphyllia/skyllia/utils/generators/VoidWorldGen.java similarity index 95% rename from plugin/src/main/java/fr/euphyllia/skyfolia/utils/generators/VoidWorldGen.java rename to plugin/src/main/java/fr/euphyllia/skyllia/utils/generators/VoidWorldGen.java index 696f490..c6703ef 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/utils/generators/VoidWorldGen.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/utils/generators/VoidWorldGen.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.utils.generators; +package fr.euphyllia.skyllia.utils.generators; import org.bukkit.Material; import org.bukkit.generator.ChunkGenerator; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/utils/models/CallbackEntity.java b/plugin/src/main/java/fr/euphyllia/skyllia/utils/models/CallbackEntity.java similarity index 69% rename from plugin/src/main/java/fr/euphyllia/skyfolia/utils/models/CallbackEntity.java rename to plugin/src/main/java/fr/euphyllia/skyllia/utils/models/CallbackEntity.java index 7733aa1..4e88333 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/utils/models/CallbackEntity.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/utils/models/CallbackEntity.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.utils.models; +package fr.euphyllia.skyllia.utils.models; import org.bukkit.entity.Entity; diff --git a/plugin/src/main/java/fr/euphyllia/skyfolia/utils/models/CallbackLocation.java b/plugin/src/main/java/fr/euphyllia/skyllia/utils/models/CallbackLocation.java similarity index 68% rename from plugin/src/main/java/fr/euphyllia/skyfolia/utils/models/CallbackLocation.java rename to plugin/src/main/java/fr/euphyllia/skyllia/utils/models/CallbackLocation.java index 22bec44..dad2066 100644 --- a/plugin/src/main/java/fr/euphyllia/skyfolia/utils/models/CallbackLocation.java +++ b/plugin/src/main/java/fr/euphyllia/skyllia/utils/models/CallbackLocation.java @@ -1,4 +1,4 @@ -package fr.euphyllia.skyfolia.utils.models; +package fr.euphyllia.skyllia.utils.models; import org.bukkit.Location; diff --git a/plugin/src/main/resources/plugin.yml b/plugin/src/main/resources/plugin.yml index e3bdd10..9d5c30d 100644 --- a/plugin/src/main/resources/plugin.yml +++ b/plugin/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ -name: "SkyFolia" +name: "Skyllia" version: "1.0-alpha.3" -main: fr.euphyllia.skyfolia.Main +main: fr.euphyllia.skyllia.Main api-version: 1.19 author: Euphyllia description: "Plugin Skyblock pour Folia / PaperMC" @@ -9,8 +9,9 @@ depend: - WorldEdit commands: - skyfolia: + skyllia: description: "Plugin Island" aliases: - island + - skyfolia // oldb - is \ No newline at end of file diff --git a/readme.md b/readme.md index 3776ba8..8a0e270 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@ ## Plugin Skyblock for Folia -SkyFolia is a Skyblock plugin that will essentially run on Folia. +Skyllia is a Skyblock plugin that will essentially run on Folia. The plugin will have very little innovative functionality, and it's not my intention at all that there should be external features (like quests, for example). The plugin has an API that you can use to add feature extensions to customize your server. @@ -15,7 +15,7 @@ that comes along at once. Nevertheless, don't hesitate to tell me about any prob - Performance problems (spark recommended) - Minor or fatal bug -To see the progress of the plugin, look here : [In progress](https://github.com/Euphillya/SkyFolia/issues/3) +To see the progress of the plugin, look here : [In progress](https://github.com/Euphillya/Skyllia/issues/3) ## Compatible Plugin @@ -31,7 +31,7 @@ Each island will be generated on a single region file! ## Configuration -plugins/SkyFolia/config.toml +plugins/Skyllia/config.toml ```toml config-version = 1 @@ -93,7 +93,7 @@ max-island = 1_000_000 ``` -plugins/SkyFolia/language.toml (Support MiniMessage) +plugins/Skyllia/language.toml (Support MiniMessage) ```toml config-version = 1 @@ -105,19 +105,19 @@ verbose = false fail = "Le joueur %s ne peut pas être promu." fail-high-equals-status = "Vous ne pouvez pas promouvoir un joueur à votre rang ou d'un rang plus élevé." success = "Le joueur %s a été promu." -not-enough-args = "La commande n'est pas complète : /skyfolia promote " +not-enough-args = "La commande n'est pas complète : /skyllia promote " [island.demote] fail = "Le joueur %s ne peut pas être rétrogradé." fail-high-equals-status = "Vous ne pouvez pas rétrograder un joueur à votre rang ou celui au dessus." success = "Le joueur %s a été rétrogradé." -not-enough-args = "La commande n'est pas complète : /skyfolia demote " +not-enough-args = "La commande n'est pas complète : /skyllia demote " [island.biome] change-in-progress = "Changement de biome en cours. Veuillez notez que ça prends du temps... Un message vous avertira quand le processus sera achevé." success = "Le changement de biome dans le chunk où vous étiez est terminé !" only-island = "La commande ne peut être exécuté seulement sur une île" -not-enough-args = "La commande n'est pas complète : /skyfolia biome " +not-enough-args = "La commande n'est pas complète : /skyllia biome " biome-not-exist = "Le biome %s n'existe pas." [island.transfert] @@ -132,22 +132,22 @@ schem-no-exist = "La schematic pour créer l'ile n'existe pas." [island.invite] already-on-an-island = "Vous êtes déjà sur une île !" -not-enough-args = "La commande n'est pas complète : /skyfolia invite " +not-enough-args = "La commande n'est pas complète : /skyllia invite " [island.invite.add] -notification-player = "Le joueur %player_invite% vous a invité sur son île. Pour accepter : /skyfolia invite accept %player_invite%. Pour décliner : /skyfolia invite decline %player_invite%" +notification-player = "Le joueur %player_invite% vous a invité sur son île. Pour accepter : /skyllia invite accept %player_invite%. Pour décliner : /skyllia invite decline %player_invite%" pending = "Le joueur %s a bien été invité. En attente d'une réponse..." -not-enough-args = "Vous devez préciser sur quel île vous souhaiter décliner : /skyfolia invite add " +not-enough-args = "Vous devez préciser sur quel île vous souhaiter décliner : /skyllia invite add " [island.invite.decline] owner-not-island = "L'île du joueur %s n'a pas été trouvé." -not-enough-args = "Vous devez préciser sur quel île vous souhaiter décliner : /skyfolia invite decline " +not-enough-args = "Vous devez préciser sur quel île vous souhaiter décliner : /skyllia invite decline " [island.invite.accept] owner-not-island = "L'île du joueur %s n'a pas été trouvé." success = "Vous êtes dorénavant membre de l'île !" max-member-exceeded = "Le seuil de place de membre de l'ile a été atteints. Vous ne pouvez pas rejoindre l'île." -not-enough-args = "Vous devez préciser sur quel île vous souhaiter rejoindre : /skyfolia invite accept " +not-enough-args = "Vous devez préciser sur quel île vous souhaiter rejoindre : /skyllia invite accept " [island.generic] not-member = "Le joueur n'est pas membre de l'ile" diff --git a/settings.gradle.kts b/settings.gradle.kts index e4c4368..06701d3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,4 +1,4 @@ -rootProject.name = "SkyFolia" +rootProject.name = "Skyllia" include("plugin") include("api")